From owner-p4-projects@FreeBSD.ORG Sun Jan 10 08:13:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F21DB106566C; Sun, 10 Jan 2010 08:13:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6FE11065670 for ; Sun, 10 Jan 2010 08:13:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C3FB8FC0A for ; Sun, 10 Jan 2010 08:13:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0A8DcHb013652 for ; Sun, 10 Jan 2010 08:13:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0A8Dcp6013650 for perforce@freebsd.org; Sun, 10 Jan 2010 08:13:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 10 Jan 2010 08:13:38 GMT Message-Id: <201001100813.o0A8Dcp6013650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2010 08:13:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=172906 Change 172906 by hselasky@hselasky_laptop001 on 2010/01/10 08:13:25 USB WLAN: - add initial RUN driver from Akinori which has been ported from OpenBSD. - some fixes to come. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#1 add .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#1 add .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 10 11:47:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E65011065679; Sun, 10 Jan 2010 11:47:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91D50106566B for ; Sun, 10 Jan 2010 11:47:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E20D8FC13 for ; Sun, 10 Jan 2010 11:47:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ABlCYK043891 for ; Sun, 10 Jan 2010 11:47:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0ABlC7F043889 for perforce@freebsd.org; Sun, 10 Jan 2010 11:47:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 10 Jan 2010 11:47:12 GMT Message-Id: <201001101147.o0ABlC7F043889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2010 11:47:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=172912 Change 172912 by hselasky@hselasky_laptop001 on 2010/01/10 11:46:39 USB CORE: - add new ID's to usbdevs in connection to recently added RUN driver. - patch by: HPS Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#98 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#98 (text+ko) ==== @@ -524,6 +524,7 @@ vendor NETAC 0x0dd8 Netac vendor SITECOMEU 0x0df6 Sitecom Europe vendor MOBILEACTION 0x0df7 Mobile Action +vendor AMIGO 0x0e0b Amigo Technology vendor SPEEDDRAGON 0x0e55 Speed Dragon Multimedia vendor HAWKING 0x0e66 Hawking vendor FOSSIL 0x0e67 Fossil, Inc @@ -589,12 +590,14 @@ vendor BALTECH 0x13ad Baltech vendor CISCOLINKSYS 0x13b1 Cisco-Linksys vendor SHARK 0x13d2 Shark +vendor AZUREWAVE 0x13d3 AsureWave vendor EMTEC 0x13fe Emtec vendor NOVATEL 0x1410 Novatel Wireless vendor MERLIN 0x1416 Merlin vendor WISTRONNEWEB 0x1435 Wistron NeWeb vendor RADIOSHACK 0x1453 Radio Shack vendor HUAWEI3COM 0x1472 Huawei-3Com +vendor ABOCOM2 0x1482 AboCom Systems vendor SILICOM 0x1485 Silicom vendor RALINK 0x148f Ralink Technology vendor IMAGINATION 0x149a Imagination Technologies @@ -610,6 +613,7 @@ vendor UMEDIA 0x157e U-MEDIA Communications vendor FIBERLINE 0x1582 Fiberline vendor SPARKLAN 0x15a9 SparkLAN +vendor AMIT2 0x15c5 AMIT vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX Data Systems vendor INSIDEOUT 0x1608 Inside Out Networks @@ -617,6 +621,7 @@ vendor GOODWAY 0x1631 Good Way Technology vendor ENTREGA 0x1645 Entrega vendor ACTIONTEC 0x1668 Actiontec Electronics +vendor CISCOLINKSYS2 0x167b Cisco-Linksys vendor ATHEROS 0x168c Atheros Communications vendor GIGASET 0x1690 Gigaset vendor GLOBALSUN 0x16ab Global Sun Technology @@ -626,6 +631,8 @@ vendor AXESSTEL 0x1726 Axesstel Co., Ltd. vendor LINKSYS4 0x1737 Linksys vendor SENAO 0x1740 Senao +vendor ASUS2 0x1761 ASUS +vendor SWEEX2 0x177f Sweex vendor METAGEEK 0x1781 MetaGeek vendor AMIT 0x18c5 AMIT vendor QCOM 0x18e8 Qcom @@ -637,11 +644,15 @@ vendor TELIT 0x1bc7 Telit vendor MPMAN 0x1cae MpMan vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik +vendor PEGATRON 0x1d4d Pegatron vendor QISDA 0x1da5 Qisda vendor ALINK 0x1e0e Alink +vendor AIRTIES 0x1eda AirTies vendor DLINK 0x2001 D-Link vendor PLANEX2 0x2019 Planex Communications vendor TLAYTECH 0x20b9 Tlay Tech +vendor ENCORE 0x203d Encore +vendor PARA 0x20b8 PARA Industrial vendor ERICSSON 0x2282 Ericsson vendor MOTOROLA2 0x22b8 Motorola vendor TRIPPLITE 0x2478 Tripp-Lite @@ -702,6 +713,12 @@ /* AboCom products */ product ABOCOM XX1 0x110c XX1 product ABOCOM XX2 0x200c XX2 +product ABOCOM RT2770 0x2770 RT2770 +product ABOCOM RT2870 0x2870 RT2870 +product ABOCOM RT3070 0x3070 RT3070 +product ABOCOM RT3071 0x3071 RT3071 +product ABOCOM RT3072 0x3072 RT3072 +product ABOCOM2 RT2870_1 0x3c09 RT2870 product ABOCOM URE450 0x4000 URE450 Ethernet Adapter product ABOCOM UFE1000 0x4002 UFE1000 Fast Ethernet Adapter product ABOCOM DSB650TX_PNA 0x4003 1/10/100 Ethernet Adapter @@ -732,6 +749,17 @@ product ACCTON SMCWUSBTG2 0x4508 SMCWUSBT-G2 product ACCTON PRISM_GT 0x4521 PrismGT USB 2.0 WLAN product ACCTON SS1001 0x5046 SpeedStream Ethernet Adapter +product ACCTON RT2870_2 0x6618 RT2870 +product ACCTON RT3070 0x7511 RT3070 +product ACCTON RT2770 0x7512 RT2770 +product ACCTON RT2870_3 0x7522 RT2870 +product ACCTON RT2870_5 0x8522 RT2870 +product ACCTON RT3070_4 0xa512 RT3070 +product ACCTON RT2870_4 0xa618 RT2870 +product ACCTON RT3070_1 0xa701 RT3070 +product ACCTON RT3070_2 0xa702 RT3070 +product ACCTON RT2870_1 0xb522 RT2870 +product ACCTON RT3070_3 0xc522 RT3070 product ACCTON ZD1211B 0xe501 ZD1211B /* Aceeca products */ @@ -834,6 +862,9 @@ /* AirPrime products */ product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card +/* AirTies products */ +product AIRTIES RT3070 0x2310 RT3070 + /* AKS products */ product AKS USBHASP 0x0001 USB-HASP 0.06 @@ -873,8 +904,20 @@ product AMBIT WLAN 0x0302 WLAN product AMBIT NTL_250 0x6098 NTL 250 cable modem +/* American Power Conversion products */ +product APC UPS 0x0002 Uninterruptible Power Supply + +/* Amigo Technology products */ +product AMIGO RT2870_1 0x9031 RT2870 +product AMIGO RT2870_2 0x9041 RT2870 + /* AMIT products */ product AMIT CGWLUSB2GO 0x0002 CG-WLUSB2GO +product AMIT CGWLUSB2GNR 0x0008 CG-WLUSB2GNR +product AMIT RT2870_1 0x0012 RT2870 + +/* AMIT(2) products */ +product AMIT2 RT2870 0x0008 RT2870 /* Anchor products */ product ANCHOR EZUSB 0x2131 EZUSB @@ -934,6 +977,7 @@ product ASIX AX88772A 0x772a AX88772A USB 2.0 10/100 Ethernet /* ASUS products */ +product ASUS2 USBN11 0x0b05 USB-N11 product ASUS WL167G 0x1707 WL-167g Wireless Adapter product ASUS WL159G 0x170c WL-159g product ASUS A9T_WIFI 0x171b A9T wireless @@ -941,6 +985,12 @@ product ASUS RT2573_1 0x1723 RT2573 product ASUS RT2573_2 0x1724 RT2573 product ASUS LCM 0x1726 LCM display +product ASUS RT2870_1 0x1731 RT2870 +product ASUS RT2870_2 0x1732 RT2870 +product ASUS RT2870_3 0x1742 RT2870 +product ASUS RT2870_4 0x1760 RT2870 +product ASUS RT2870_5 0x1761 RT2870 +product ASUS RT3070 0x1784 RT3070 product ASUS P535 0x420f ASUS P535 PDA product ASUS GMSC 0x422f ASUS Generic Mass Storage product ASUS RT2570 0x1706 RT2500USB Wireless Adapter @@ -977,6 +1027,13 @@ /* Axesstel products */ product AXESSTEL DATAMODEM 0x1000 Data Modem +/* AsureWave products */ +product AZUREWAVE RT2870_1 0x3247 RT2870 +product AZUREWAVE RT2870_2 0x3262 RT2870 +product AZUREWAVE RT3070_1 0x3273 RT3070 +product AZUREWAVE RT3070_2 0x3284 RT3070 +product AZUREWAVE RT3070_3 0x3305 RT3070 + /* Baltech products */ product BALTECH CARDREADER 0x9999 Card reader @@ -1007,8 +1064,13 @@ /* Also sold as 'Ativa 802.11g wireless card' */ product BELKIN F5D7050_V4000 0x705c F5D7050 v4000 Wireless Adapter product BELKIN F5D7050E 0x705e F5D7050E Wireless Adapter +product BELKIN RT2870_1 0x8053 RT2870 +product BELKIN RT2870_2 0x805c RT2870 +product BELKIN F5D8053V3 0x815c F5D8053 v3 +product BELKIN F5D8055 0x825a F5D8055 product BELKIN F5D9050V3 0x905b F5D9050 ver 3 Wireless Adapter product BELKIN2 F5U002 0x0002 F5U002 Parallel printer +product BELKIN F6D4050V1 0x935a F6D4050 v1 /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet @@ -1085,6 +1147,7 @@ product CISCOLINKSYS WUSB54GC 0x0020 WUSB54GC product CISCOLINKSYS WUSB54GR 0x0023 WUSB54GR product CISCOLINKSYS WUSBF54G 0x0024 WUSBF54G +product CISCOLINKSYS2 RT3070 0x4001 RT3070 /* CMOTECH products */ product CMOTECH CNU510 0x5141 CDMA Technologies USB modem @@ -1111,6 +1174,15 @@ product CONCEPTRONIC AR5523_2_NF 0x7812 AR5523 (no firmware) product CONCEPTRONIC2 C54RU 0x3c02 C54RU WLAN product CONCEPTRONIC2 C54RU2 0x3c22 C54RU +product CONCEPTRONIC2 VIGORN61 0x3c25 VIGORN61 +product CONCEPTRONIC2 RT2870_1 0x3c06 RT2870 +product CONCEPTRONIC2 RT2870_2 0x3c07 RT2870 +product CONCEPTRONIC2 RT2870_7 0x3c09 RT2870 +product CONCEPTRONIC2 RT2870_8 0x3c12 RT2870 +product CONCEPTRONIC2 RT2870_3 0x3c23 RT2870 +product CONCEPTRONIC2 RT2870_4 0x3c25 RT2870 +product CONCEPTRONIC2 RT2870_5 0x3c27 RT2870 +product CONCEPTRONIC2 RT2870_6 0x3c28 RT2870 /* Connectix products */ product CONNECTIX QUICKCAM 0x0001 QuickCam @@ -1125,6 +1197,12 @@ product COREGA WLUSB_11_KEY 0x001a ULUSB-11 Key product COREGA CGWLUSB2GL 0x002d CG-WLUSB2GL product COREGA CGWLUSB2GPX 0x002e CG-WLUSB2GPX +product COREGA RT2870_1 0x002f RT2870 +product COREGA RT2870_2 0x003c RT2870 +product COREGA RT2870_3 0x003f RT2870 +product COREGA RT3070 0x0041 RT3070 +product COREGA CGWLUSB300GNM 0x0042 CG-WLUSB300GNM + product COREGA WLUSB_11_STICK 0x7613 WLAN USB Stick 11 product COREGA FETHER_USB_TXC 0x9601 FEther USB-TXC @@ -1153,6 +1231,7 @@ /* CyberTAN Technology products */ product CYBERTAN TG54USB 0x1666 TG54USB +product CYBERTAN RT2870 0x1828 RT2870 /* Cypress Semiconductor products */ product CYPRESS MOUSE 0x0001 mouse @@ -1230,6 +1309,8 @@ product DLINK DWLAG122_NF 0x3a05 DWL-AG122 (no firmware) product DLINK DWLG122 0x3c00 DWL-G122 b1 Wireless Adapter product DLINK DUBE100B1 0x3c05 DUB-E100 rev B1 +product DLINK RT2870 0x3c09 RT2870 +product DLINK RT3072 0x3c0a RT3072 product DLINK DSB650C 0x4000 10Mbps Ethernet product DLINK DSB650TX1 0x4001 10/100 Ethernet product DLINK DSB650TX 0x4002 10/100 Ethernet @@ -1242,7 +1323,15 @@ product DLINK2 DWLG122C1 0x3c03 DWL-G122 c1 product DLINK2 WUA1340 0x3c04 WUA-1340 product DLINK2 DWA111 0x3c06 DWA-111 +product DLINK2 RT2870_1 0x3c09 RT2870 product DLINK2 DWA110 0x3c07 DWA-110 +product DLINK2 RT3072 0x3c0a RT3072 +product DLINK2 RT3070_1 0x3c0d RT3070 +product DLINK2 RT3070_2 0x3c0e RT3070 +product DLINK2 RT3070_3 0x3c0f RT3070 +product DLINK2 RT2870_2 0x3c11 RT2870 +product DLINK2 DWA130 0x3c13 DWA-130 +product DLINK2 RT3070_4 0x3c15 RT3070 product DLINK3 DWM652 0x3e04 DWM-652 /* DMI products */ @@ -1260,6 +1349,9 @@ /* Edimax products */ product EDIMAX EW7318USG 0x7318 USB Wireless dongle +product EDIMAX RT2870_1 0x7711 RT2870 +product EDIMAX EW7717 0x7717 EW-7717 +product EDIMAX EW7718 0x7718 EW-7718 /* Eicon Networks */ product EICON DIVA852 0x4905 Diva 852 ISDN TA @@ -1289,6 +1381,11 @@ /* EMS products */ product EMS DUAL_SHOOTER 0x0003 PSX gun controller converter +/* Encore products */ +product ENCORE RT3070_1 0x1480 RT3070 +product ENCORE RT3070_2 0x14a1 RT3070 +product ENCORE RT3070_3 0x14a9 RT3070 + /* Entrega products */ product ENTREGA 1S 0x0001 1S serial product ENTREGA 2S 0x0002 2S serial @@ -1433,6 +1530,11 @@ product GIGASET AR5523 0x0712 AR5523 product GIGASET AR5523_NF 0x0713 AR5523 (no firmware) product GIGASET RT2573 0x0722 RT2573 +product GIGASET RT3070_1 0x0740 RT3070 +product GIGASET RT3070_2 0x0744 RT3070 +product GIGABYTE RT2870_1 0x800b RT2870 +product GIGABYTE GNWB31N 0x800c GN-WB31N +product GIGABYTE GNWB32L 0x800d GN-WB32L /* Global Sun Technology product */ product GLOBALSUN AR5523_1 0x7801 AR5523 @@ -1468,6 +1570,7 @@ product GUILLEMOT HWGUSB254 0xe000 HWGUSB2-54 WLAN product GUILLEMOT HWGUSB254LB 0xe010 HWGUSB2-54-LB product GUILLEMOT HWGUSB254V2AP 0xe020 HWGUSB2-54V2-AP +product GUILLEMOT HWNU300 0xe030 HWNU-300 /* Hagiwara products */ product HAGIWARA FGSM 0x0002 FlashGate SmartMedia Card Reader @@ -1486,6 +1589,10 @@ product HAUPPAUGE WINTV_USB_FM 0x4d12 WinTV USB FM /* Hawking Technologies products */ +product HAWKING RT2870_1 0x0001 RT2870 +product HAWKING RT2870_2 0x0003 RT2870 +product HAWKING HWUN2 0x0009 HWUN2 +product HAWKING RT3070 0x000b RT3070 product HAWKING UF100 0x400c 10/100 USB Ethernet /* Hitachi, Ltd. products */ @@ -1532,6 +1639,7 @@ product HP 568J 0x1116 Jornada 568 product HP 930C 0x1204 DeskJet 930c product HP P2000U 0x1801 Inkjet P-2000U +product HP HS2300 0x1e1d HS2300 HSDPA (aka MC8775) product HP 640C 0x2004 DeskJet 640c product HP 4670V 0x3005 ScanJet 4670v product HP P1100 0x3102 Photosmart P1100 @@ -1659,6 +1767,10 @@ product IODATA USBWNB11A 0x0919 USB WN-B11 product IODATA USBWNB11 0x0922 USB Airport WN-B11 product IODATA ETGUS2 0x0930 ETG-US2 +product IODATA RT3072_1 0x0944 RT3072 +product IODATA RT3072_2 0x0945 RT3072 +product IODATA RT3072_3 0x0947 RT3072 +product IODATA RT3072_4 0x0948 RT3072 product IODATA USBRSAQ 0x0a03 Serial USB-RSAQ1 product IODATA2 USB2SC 0x0a09 USB2.0-SCSI Bridge USB2-SC @@ -1783,7 +1895,11 @@ product LINKSYS2 USB200M 0x2226 USB 2.0 10/100 Ethernet product LINKSYS3 WUSB11v28 0x2233 WUSB11 v2.8 Wireless Adapter product LINKSYS4 USB1000 0x0039 USB1000 +product LINKSYS4 WUSB100 0x0070 WUSB100 +product LINKSYS4 WUSB600N 0x0071 WUSB600N product LINKSYS4 WUSB54GCV2 0x0073 WUSB54GC v2 +product LINKSYS4 WUSB54GCV3 0x0077 WUSB54GC v3 +product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2 /* Logitech products */ product LOGITECH M2452 0x0203 M2452 keyboard @@ -1813,6 +1929,9 @@ /* Logitec Corp. products */ product LOGITEC LDR_H443SU2 0x0033 DVD Multi-plus unit LDR-H443SU2 product LOGITEC LDR_H443U2 0x00b3 DVD Multi-plus unit LDR-H443U2 +product LOGITEC RT2870_1 0x0162 RT2870 +product LOGITEC RT2870_2 0x0163 RT2870 +product LOGITEC RT2870_3 0x0164 RT2870 /* Lucent products */ product LUCENT EVALKIT 0x1001 USS-720 evaluation kit @@ -1850,7 +1969,10 @@ product MELCO SG54HP 0x00d8 WLI-U2-SG54HP product MELCO G54HP 0x00d9 WLI-U2-G54HP product MELCO KG54L 0x00da WLI-U2-KG54L +product MELCO WLIUCG300N 0x00e8 WLI-UC-G300N product MELCO SG54HG 0x00f4 WLI-U2-SG54HG +product MELCO WLIUCAG300N 0x012e WLI-UC-AG300N +product MELCO WLIUCGN 0x015d WLI-UC-GN /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 @@ -1868,15 +1990,25 @@ /* Micro Star International products */ product MSI BT_DONGLE 0x1967 Bluetooth USB dongle +product MSI RT3070_1 0x3820 RT3070 +product MSI RT3070_2 0x3821 RT3070 +product MSI RT3070_3 0x3870 RT3070 product MSI UB11B 0x6823 UB11B product MSI RT2570 0x6861 RT2570 product MSI RT2570_2 0x6865 RT2570 product MSI RT2570_3 0x6869 RT2570 product MSI RT2573_1 0x6874 RT2573 product MSI RT2573_2 0x6877 RT2573 +product MSI RT3070_4 0x6899 RT3070 +product MSI RT3070_5 0x821a RT3070 +product MSI RT3070_6 0x870a RT3070 +product MSI RT3070_7 0x899a RT3070 product MSI RT2573_3 0xa861 RT2573 product MSI RT2573_4 0xa874 RT2573 +/* Microdia products */ +product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera + /* Microsoft products */ product MICROSOFT SIDEPREC 0x0008 SideWinder Precision Pro product MICROSOFT INTELLIMOUSE 0x0009 IntelliMouse @@ -2026,8 +2158,12 @@ product NOVATECH NV902 0x9020 NovaTech NV-902W product NOVATECH RT2573 0x9021 RT2573 +/* Nokia products */ +product NOKIA N958GB 0x0070 Nokia N95 8GBc + /* Novatel Wireless products */ product NOVATEL V640 0x1100 Merlin V620 +product NOVATEL CDMA_MODEM 0x1110 Novatel Wireless Merlin CDMA product NOVATEL V620 0x1110 Merlin V620 product NOVATEL V740 0x1120 Merlin V740 product NOVATEL V720 0x1130 Merlin V720 @@ -2039,6 +2175,7 @@ product NOVATEL ES620 0x2100 Expedite ES620 product NOVATEL E725 0x2120 Expedite E725 product NOVATEL ES620_2 0x2130 Expedite ES620 +product NOVATEL ES620 0x2100 ES620 CDMA product NOVATEL U720 0x2110 Merlin U720 product NOVATEL EU730 0x2400 Expedite EU730 product NOVATEL EU740 0x2410 Expedite EU740 @@ -2132,6 +2269,14 @@ product PANASONIC KXLCB35AN 0x0d0e DVD-ROM & CD-R/RW product PANASONIC SDCAAE 0x1b00 MultiMediaCard +/* PARA Industrial products */ +product PARA RT3070 0x8888 RT3070 + +/* Pegatron products */ +product PEGATRON RT2870 0x0002 RT2870 +product PEGATRON RT3070 0x000c RT3070 +product PEGATRON RT3070_2 0x000e RT3070 + /* Peracom products */ product PERACOM SERIAL1 0x0001 Serial product PERACOM ENET 0x0002 Ethernet @@ -2149,6 +2294,7 @@ product PHILIPS SNU5600 0x1236 SNU5600 product PHILIPS UM10016 0x1552 ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit product PHILIPS DIVAUSB 0x1801 DIVA USB mp3 player +product PHILIPS RT2870 0x200f RT2870 /* Philips Semiconductor products */ product PHILIPSSEMI HUB1122 0x1122 HUB @@ -2164,11 +2310,15 @@ product PLANEX2 GW_US11S 0x3220 GW-US11S WLAN product PLANEX2 GW_US54GXS 0x5303 GW-US54GXS WLAN product PLANEX2 GWUS54HP 0xab01 GW-US54HP +product PLANEX2 GWUS300MINIS 0xab24 GW-US300MiniS +product PLANEX2 RT3070 0xab25 RT3070 product PLANEX2 GWUS54MINI2 0xab50 GW-US54Mini2 product PLANEX2 GWUS54SG 0xc002 GW-US54SG product PLANEX2 GWUS54GZL 0xc007 GW-US54GZL product PLANEX2 GWUS54GD 0xed01 GW-US54GD product PLANEX2 GWUSMM 0xed02 GW-USMM +product PLANEX2 RT2870 0xed06 RT2870 +product PLANEX2 GWUSMICRON 0xed14 GW-USMicroN product PLANEX3 GWUS54GZ 0xab10 GW-US54GZ product PLANEX3 GU1000T 0xab11 GU-1000T product PLANEX3 GWUS54MINI 0xab13 GW-US54Mini @@ -2226,6 +2376,7 @@ product QCOM RT2573 0x6196 RT2573 product QCOM RT2573_2 0x6229 RT2573 product QCOM RT2573_3 0x6238 RT2573 +product QCOM RT2870 0x6259 RT2870 /* Qisda products */ product QISDA H21_1 0x4512 3G modem @@ -2312,6 +2463,8 @@ product QUALCOMMINC E2003 0x2003 3G modem /* Quanta products */ +/* Quanta products */ +product QUANTA RT3070 0x0304 RT3070 product QUANTA Q101 0xea02 HSDPA modem product QUANTA Q111 0xea03 HSDPA modem product QUANTA GLX 0xea04 HSDPA modem @@ -2332,9 +2485,16 @@ /* Ralink Technology products */ product RALINK RT2570 0x1706 RT2500USB Wireless Adapter +product RALINK RT2070 0x2070 RT2070 product RALINK RT2570_2 0x2570 RT2500USB Wireless Adapter product RALINK RT2573 0x2573 RT2501USB Wireless Adapter product RALINK RT2671 0x2671 RT2601USB Wireless Adapter +product RALINK RT2770 0x2770 RT2770 +product RALINK RT2870 0x2870 RT2870 +product RALINK RT3070 0x3070 RT3070 +product RALINK RT3071 0x3071 RT3071 +product RALINK RT3072 0x3072 RT3072 +product RALINK RT3572 0x3572 RT3572 product RALINK RT2570_3 0x9020 RT2500USB Wireless Adapter product RALINK RT2573_2 0x9021 RT2501USB Wireless Adapter @@ -2375,6 +2535,7 @@ product SAMSUNG ML6060 0x3008 ML-6060 laser printer product SAMSUNG YP_U2 0x5050 YP-U2 MP3 Player product SAMSUNG I500 0x6601 I500 Palm USB Phone +product SAMSUNG2 RT2870_1 0x2018 RT2870 /* Samsung Techwin products */ product SAMSUNG_TECHWIN DIGIMAX_410 0x000a Digimax 410 @@ -2398,7 +2559,18 @@ product SCANLOGIC 336CX 0x0300 Phantom 336CX - C3 scanner /* Senao products */ +product SENAO RT2870_3 0x0605 RT2870 +product SENAO RT2870_4 0x0615 RT2870 product SENAO NUB8301 0x2000 NUB-8301 +product SENAO RT2870_1 0x9701 RT2870 +product SENAO RT2870_2 0x9702 RT2870 +product SENAO RT3070 0x9703 RT3070 +product SENAO RT3071 0x9705 RT3071 +product SENAO RT3072_1 0x9706 RT3072 +product SENAO RT3072_2 0x9707 RT3072 +product SENAO RT3072_3 0x9708 RT3072 +product SENAO RT3072_4 0x9709 RT3072 +product SENAO RT3072_5 0x9801 RT3072 /* ShanTou products */ product SHANTOU ST268 0x0268 ST268 @@ -2445,7 +2617,9 @@ product SIERRA EM5625 0x0017 EM5625 product SIERRA MC5720_2 0x0018 MC5720 product SIERRA MC5725 0x0020 MC5725 +product SIERRA AIRCARD580 0x0112 Sierra Wireless AirCard 580 product SIERRA AIRCARD595 0x0019 Sierra Wireless AirCard 595 +product SIERRA AC595U 0x0120 Sierra Wireless AirCard 595U product SIERRA AC597E 0x0021 Sierra Wireless AirCard 597E product SIERRA EM5725 0x0022 EM5725 product SIERRA C597 0x0023 Sierra Wireless Compass 597 @@ -2545,8 +2719,24 @@ product SITECOM2 WL022 0x182d WL-022 /* Sitecom Europe products */ +product SITECOMEU RT2870_1 0x0017 RT2870 product SITECOMEU WL168V1 0x000d WL-168 v1 product SITECOMEU WL168V4 0x0028 WL-168 v4 +product SITECOMEU RT2870_2 0x002b RT2870 +product SITECOMEU RT2870_3 0x002c RT2870 +product SITECOMEU RT2870_4 0x002d RT2870 +product SITECOMEU RT2770 0x0039 RT2770 +product SITECOMEU RT3070_2 0x003b RT3070 +product SITECOMEU RT3070_3 0x003c RT3070 +product SITECOMEU RT3070_4 0x003d RT3070 +product SITECOMEU RT3070 0x003e RT3070 +product SITECOMEU WL608 0x003f WL-608 +product SITECOMEU RT3072_1 0x0041 RT3072 +product SITECOMEU RT3072_2 0x0042 RT3072 +product SITECOMEU RT3072_3 0x0047 RT3072 +product SITECOMEU RT3072_4 0x0048 RT3072 +product SITECOMEU RT3072_5 0x004a RT3072 +product SITECOMEU RT3072_6 0x004d RT3072 product SITECOMEU LN028 0x061c LN-028 product SITECOMEU WL113 0x9071 WL-113 product SITECOMEU ZD1211B 0x9075 ZD1211B @@ -2604,7 +2794,9 @@ product SOURCENEXT KEIKAI8_CHG 0x012e KeikaiDenwa 8 with charger /* SparkLAN products */ -product SPARKLAN RT2573 0x0004 RT2573 +product SPARKLAN RT2573 0x0004 RT2573 +product SPARKLAN RT2870_1 0x0006 RT2870 +product SPARKLAN RT3070 0x0010 RT3070 /* Sphairon Access Systems GmbH products */ product SPHAIRON UB801R 0x0110 UB801R @@ -2674,6 +2866,8 @@ /* Sweex products */ product SWEEX ZD1211 0x1809 ZD1211 +product SWEEX2 LW303 0x0302 LW303 +product SWEEX2 LW313 0x0313 LW313 /* System TALKS, Inc. */ product SYSTEMTALKS SGCX2UL 0x1920 SGC-X2UL @@ -2767,6 +2961,7 @@ product UMEDIA TEW429UB_A 0x300a TEW-429UB_A product UMEDIA TEW429UB 0x300b TEW-429UB product UMEDIA TEW429UBC1 0x300d TEW-429UB C1 +product UMEDIA RT2870_1 0x300e RT2870 product UMEDIA ALL0298V2 0x3204 ALL0298 v2 product UMEDIA AR5523_2 0x3205 AR5523 product UMEDIA AR5523_2_NF 0x3206 AR5523 (no firmware) @@ -2876,9 +3071,16 @@ product ZCOM AR5523_NF 0x0013 AR5523 driver (no firmware) product ZCOM XM142 0x0015 XM-142 product ZCOM ZD1211B 0x001a ZD1211B +product ZCOM RT2870_1 0x0022 RT2870 +product ZCOM RT2870_2 0x0025 RT2870 /* Zinwell products */ product ZINWELL RT2570 0x0260 RT2570 +product ZINWELL RT2870_1 0x0280 RT2870 +product ZINWELL RT2870_2 0x0282 RT2870 +product ZINWELL RT3072_1 0x0283 RT3072 +product ZINWELL RT3072_2 0x0284 RT3072 +product ZINWELL RT3070 0x5257 RT3070 /* Zoom Telephonics, Inc. products */ product ZOOM 2986L 0x9700 2986L Fax modem @@ -2899,3 +3101,4 @@ product ZYXEL M202 0x340a M-202 product ZYXEL G220V2 0x340f G-220 v2 product ZYXEL G202 0x3410 G-202 +product ZYXEL RT2870_1 0x3416 RT2870 From owner-p4-projects@FreeBSD.ORG Sun Jan 10 11:48:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1808E1065694; Sun, 10 Jan 2010 11:48:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D071D106568B for ; Sun, 10 Jan 2010 11:48:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A42B18FC17 for ; Sun, 10 Jan 2010 11:48:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ABmDFr043950 for ; Sun, 10 Jan 2010 11:48:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0ABmDTt043948 for perforce@freebsd.org; Sun, 10 Jan 2010 11:48:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 10 Jan 2010 11:48:13 GMT Message-Id: <201001101148.o0ABmDTt043948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2010 11:48:14 -0000 http://p4web.freebsd.org/chv.cgi?CH=172913 Change 172913 by hselasky@hselasky_laptop001 on 2010/01/10 11:47:32 USB WLAN: - add Makefile for RUN driver. Affected files ... .. //depot/projects/usb/src/sys/modules/usb/run/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 10 11:49:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B3111065676; Sun, 10 Jan 2010 11:49:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3526106566B for ; Sun, 10 Jan 2010 11:49:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEE728FC20 for ; Sun, 10 Jan 2010 11:49:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ABnEJm044013 for ; Sun, 10 Jan 2010 11:49:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0ABnEeu044011 for perforce@freebsd.org; Sun, 10 Jan 2010 11:49:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 10 Jan 2010 11:49:14 GMT Message-Id: <201001101149.o0ABnEeu044011@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2010 11:49:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=172914 Change 172914 by hselasky@hselasky_laptop001 on 2010/01/10 11:48:34 USB WLAN: - fixes and corrections to RUN driver. - patch by: HPS Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#2 (text+ko) ==== @@ -75,7 +75,7 @@ #define USB_DEBUG_VAR run_debug #include -#include "rt2860reg.h" /* shared with ral(4) */ +#include "if_runreg.h" /* shared with ral(4) */ #include "if_runvar.h" #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0])) @@ -266,15 +266,22 @@ static device_detach_t run_detach; static usb_callback_t run_bulk_rx_callback; -static usb_callback_t run_bulk_tx_callback; +static usb_callback_t run_bulk_tx_callback0; +static usb_callback_t run_bulk_tx_callback1; +static usb_callback_t run_bulk_tx_callback2; +static usb_callback_t run_bulk_tx_callback3; +static usb_callback_t run_bulk_tx_callback4; +static usb_callback_t run_bulk_tx_callback5; +static void run_bulk_tx_callbackN(struct usb_xfer *xfer, + usb_error_t error, unsigned int index); static struct ieee80211vap *run_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]); static void run_vap_delete(struct ieee80211vap *); -static void run_setup_tx_list(struct run_softc *); -static void run_unsetup_tx_list(struct run_softc *); +static void run_setup_tx_list(struct run_softc *sc, struct run_endpoint_queue *pq); +static void run_unsetup_tx_list(struct run_softc *sc, struct run_endpoint_queue *pq); static int run_load_microcode(struct run_softc *); static int run_reset(struct run_softc *); static usb_error_t run_do_request(struct run_softc *sc, @@ -314,9 +321,9 @@ static void run_iter_func(void *, struct ieee80211_node *); static void run_newassoc(struct ieee80211_node *, int); static void run_rx_frame(struct run_softc *, struct mbuf *, uint32_t); -static void run_tx_free(struct run_tx_data *, int); +static void run_tx_free(struct run_endpoint_queue *pq, struct run_tx_data *, int); static void run_set_tx_desc(struct run_softc *, struct run_tx_data *, - uint8_t, uint8_t, uint8_t, uint8_t, uint8_t); + uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t); static int run_tx(struct run_softc *, struct mbuf *, struct ieee80211_node *); static int run_tx_mgt(struct run_softc *, struct mbuf *, struct ieee80211_node *); @@ -326,7 +333,6 @@ struct ieee80211_node *, const struct ieee80211_bpf_params *); static int run_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); -static void run_start_task(void *, int); static void run_start(struct ifnet *); static int run_ioctl(struct ifnet *, u_long, caddr_t); static void run_select_chan_group(struct run_softc *, int); @@ -363,6 +369,7 @@ static void run_init(void *); static void run_init_locked(struct run_softc *); static void run_stop(void *); +static void run_delay(struct run_softc *, unsigned int); static const struct { uint32_t reg; @@ -406,7 +413,7 @@ .direction = UE_DIR_OUT, .bufsize = RUN_MAX_TXSZ, .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, - .callback = run_bulk_tx_callback, + .callback = run_bulk_tx_callback0, .timeout = 5000, /* ms */ }, [RUN_BULK_TX_BK] = { @@ -416,7 +423,7 @@ .ep_index = 1, .bufsize = RUN_MAX_TXSZ, .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, - .callback = run_bulk_tx_callback, + .callback = run_bulk_tx_callback1, .timeout = 5000, /* ms */ }, [RUN_BULK_TX_VI] = { @@ -426,7 +433,7 @@ .ep_index = 2, .bufsize = RUN_MAX_TXSZ, .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, - .callback = run_bulk_tx_callback, + .callback = run_bulk_tx_callback2, .timeout = 5000, /* ms */ }, [RUN_BULK_TX_VO] = { @@ -436,18 +443,17 @@ .ep_index = 3, .bufsize = RUN_MAX_TXSZ, .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, - .callback = run_bulk_tx_callback, + .callback = run_bulk_tx_callback3, .timeout = 5000, /* ms */ }, -#ifdef SIX /* see enum in if_runvar.h */ [RUN_BULK_TX_HCCA] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .ep_index = 4, .bufsize = RUN_MAX_TXSZ, - .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, - .callback = run_bulk_tx_callback, + .flags = {.pipe_bof = 1,.force_short_xfer = 1,.no_pipe_ok = 1,}, + .callback = run_bulk_tx_callback4, .timeout = 5000, /* ms */ }, [RUN_BULK_TX_PRIO] = { @@ -456,11 +462,10 @@ .direction = UE_DIR_OUT, .ep_index = 5, .bufsize = RUN_MAX_TXSZ, - .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, - .callback = run_bulk_tx_callback, + .flags = {.pipe_bof = 1,.force_short_xfer = 1,.no_pipe_ok = 1,}, + .callback = run_bulk_tx_callback5, .timeout = 5000, /* ms */ }, -#endif /* SIX */ [RUN_BULK_RX] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, @@ -502,26 +507,16 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(sc->sc_dev), MTX_NETWORK_LOCK, MTX_DEF); - mtx_init(&sc->rx_cb_mtx, device_get_nameunit(sc->sc_dev), - "USB NIC Rx callback", MTX_DEF); /* for Rx callback lock */ iface_index = RT2860_IFACE_INDEX; /* Rx transfer has own lock */ error = usbd_transfer_setup(uaa->device, &iface_index, - sc->sc_xfer, run_config, RUN_N_XFER -1, sc, &sc->sc_mtx); + sc->sc_xfer, run_config, RUN_N_XFER, sc, &sc->sc_mtx); if (error) { device_printf(self, "could not allocate USB Tx transfers, " "err=%s\n", usbd_errstr(error)); goto detach; } - error = usbd_transfer_setup(uaa->device, &iface_index, - &sc->sc_xfer[RUN_N_XFER -1], &run_config[RUN_N_XFER -1], 1, - sc, &sc->rx_cb_mtx); - if (error) { - device_printf(self, "could not allocate USB Rx transfers, " - "err=%s\n", usbd_errstr(error)); - goto detach; - } RUN_LOCK(sc); @@ -533,7 +528,7 @@ } if (sc->mac_rev != 0 && sc->mac_rev != 0xffffffff) break; - DELAY(10); + run_delay(sc, 10); } if (ntries == 100) { printf("%s: timeout waiting for NIC to initialize\n", @@ -663,13 +658,15 @@ struct run_softc *sc = device_get_softc(self); struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic; + int i; /* stop all USB transfers */ usbd_transfer_unsetup(sc->sc_xfer, RUN_N_XFER); RUN_LOCK(sc); /* free TX list, if any */ - run_unsetup_tx_list(sc); + for (i = 0; i != RUN_EP_QUEUES; i++) + run_unsetup_tx_list(sc, &sc->sc_epq[i]); RUN_UNLOCK(sc); if (ifp) { @@ -679,9 +676,8 @@ } mtx_destroy(&sc->sc_mtx); - mtx_destroy(&sc->rx_cb_mtx); - return 0; + return (0); } static struct ieee80211vap * @@ -720,7 +716,6 @@ vap->iv_newstate = run_newstate; TASK_INIT(&rvp->amrr_task, 0, run_amrr_cb, rvp); - TASK_INIT(&sc->start_task, 0, run_start_task, ic->ic_ifp); TASK_INIT(&sc->wme_task, 0, run_wme_update_cb, ic); callout_init((struct callout *)&rvp->amrr_ch, 1); ieee80211_amrr_init(&rvp->amrr, vap, @@ -763,38 +758,36 @@ } static void -run_setup_tx_list(struct run_softc *sc) +run_setup_tx_list(struct run_softc *sc, struct run_endpoint_queue *pq) { - struct run_tx_data *data; + struct run_tx_data *data; - sc->tx_nfree = 0; - STAILQ_INIT(&sc->tx_q); - STAILQ_INIT(&sc->tx_free); + memset(pq, 0, sizeof(*pq)); - for (data = &sc->txq[0]; - data < &sc->txq[RUN_TX_RING_COUNT]; data++){ - memset(data->desc, 0, sizeof (struct rt2870_txd) + - sizeof (struct rt2860_txwi)); + STAILQ_INIT(&pq->tx_qh); + STAILQ_INIT(&pq->tx_fh); + for (data = &pq->tx_data[0]; + data < &pq->tx_data[RUN_TX_RING_COUNT]; data++) { data->sc = sc; - STAILQ_INSERT_TAIL(&sc->tx_free, data, next); - sc->tx_nfree++; + STAILQ_INSERT_TAIL(&pq->tx_fh, data, next); } + pq->tx_nfree = RUN_TX_RING_COUNT; } static void -run_unsetup_tx_list(struct run_softc *sc) +run_unsetup_tx_list(struct run_softc *sc, struct run_endpoint_queue *pq) { - struct run_tx_data *data; + struct run_tx_data *data; /* make sure any subsequent use of the queues will fail */ - sc->tx_nfree = 0; - STAILQ_INIT(&sc->tx_q); - STAILQ_INIT(&sc->tx_free); + pq->tx_nfree = 0; + STAILQ_INIT(&pq->tx_fh); + STAILQ_INIT(&pq->tx_qh); /* free up all node references and mbufs */ - for (data = &sc->txq[0]; - data < &sc->txq[RUN_TX_RING_COUNT]; data++){ + for (data = &pq->tx_data[0]; + data < &pq->tx_data[RUN_TX_RING_COUNT]; data++){ if (data->m != NULL) { m_freem(data->m); data->m = NULL; @@ -864,8 +857,8 @@ if ((error = usbd_do_request(sc->sc_udev, &sc->sc_mtx, &req, NULL)) != 0) return error; - /*TODO make macro */ - usb_pause_mtx(&sc->sc_mtx, 10); + run_delay(sc, 10); + run_write(sc, RT2860_H2M_MAILBOX, 0); if ((error = run_mcu_cmd(sc, RT2860_MCU_CMD_BOOT, 0)) != 0) return error; @@ -876,7 +869,7 @@ return error; if (tmp & RT2860_MCU_READY) break; - DELAY(1000); + run_delay(sc, 1000); } if (ntries == 1000) { printf("%s: timeout waiting for MCU to initialize\n", @@ -917,7 +910,7 @@ break; DPRINTFN(1, "Control request failed, %s (retrying)\n", usbd_errstr(err)); - DELAY(10); + run_delay(sc, 10); } return (err); } @@ -1038,7 +1031,7 @@ return error; if (!(tmp & RT3070_EFSROM_KICK)) break; - DELAY(2); + run_delay(sc, 2); } if (ntries == 100) return ETIMEDOUT; @@ -1603,6 +1596,7 @@ break; default: DPRINTFN(6, "undefined case\n"); + break; } RUN_UNLOCK(sc); @@ -2071,7 +2065,7 @@ return rxchain; } -static __inline void /* big but inlined only once */ +static void run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen) { struct ifnet *ifp = sc->sc_ifp; @@ -2089,6 +2083,8 @@ rxwi = mtod(m, struct rt2860_rxwi *); len = le16toh(rxwi->len) & 0xfff; if (__predict_false(len > dmalen)) { + m_freem(m); + ifp->if_ierrors++; DPRINTF("bad RXWI length %u > %u\n", len, dmalen); return; } @@ -2097,6 +2093,7 @@ flags = le32toh(rxd->flags); if (__predict_false(flags & (RT2860_RX_CRCERR | RT2860_RX_ICVERR))) { + m_freem(m); ifp->if_ierrors++; DPRINTF("%s error.\n", (flags & RT2860_RX_CRCERR)?"CRC":"ICV"); return; @@ -2133,17 +2130,14 @@ m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = len; -#if 1 - DPRINTFN(3, "addr1 %s\n", ether_sprintf(mtod(m, struct ieee80211_frame_min *)->i_addr1)); -#endif - ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); if (ni != NULL) { (void)ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); - } else + } else { (void)ieee80211_input_all(ic, m, rssi, nf); + } if(__predict_false(ieee80211_radiotap_active(ic))){ struct run_rx_radiotap_header *tap = &sc->sc_rxtap; @@ -2180,10 +2174,7 @@ } break; } - //ieee80211_radiotap_rx(vap, m); } - - return; } static void @@ -2191,9 +2182,10 @@ { struct run_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = sc->sc_ifp; - struct mbuf *m, *m0; - uint32_t dmalen; - int xferlen; + struct mbuf *m = NULL; + struct mbuf *m0; + uint32_t dmalen; + int xferlen; usbd_xfer_status(xfer, &xferlen, NULL, NULL, NULL); @@ -2205,117 +2197,113 @@ if (xferlen < sizeof (uint32_t) + sizeof (struct rt2860_rxwi) + sizeof (struct rt2870_rxd)) { DPRINTF("xfer too short %d\n", xferlen); - goto tr_set; + goto tr_setup; } -#if 1 - if(xferlen > MJUMPAGESIZE) - DPRINTF("rx buf overflow\n"); -#endif - m = sc->rx_m; sc->rx_m = NULL; - m->m_pkthdr.len = m->m_len = xferlen; - - mtx_unlock(&sc->rx_cb_mtx); - /* HW can aggregate multiple 802.11 frames in a single USB xfer */ - for(;;){ - dmalen = le32toh(*mtod(m, uint32_t *)) & 0xffff; - - if (__predict_false(dmalen == 0 || (dmalen & 3) != 0)) { - DPRINTF("bad DMA length %u\n", dmalen); - break; - } - if (__predict_false(dmalen + 8 > xferlen)) { - DPRINTF("bad DMA length %u > %d\n", - dmalen + 8, xferlen); - break; - } - - /* If it is the last one or a single frame, we won't copy. */ - if((xferlen -= dmalen + 8) <= 8){ - /* trim 32-bit DMA-len header */ - m->m_data += 4; - m->m_pkthdr.len = m->m_len -= 4; - run_rx_frame(sc, m, dmalen); - break; - } - - /* copy aggregated frames to another mbuf */ - m0 = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - if (__predict_false(m0 == NULL)) { - DPRINTF("could not allocate mbuf\n"); - ifp->if_ierrors++; - return; - } - m_copydata(m, 4 /* skip 32-bit DMA-len header */, - dmalen + sizeof(struct rt2870_rxd), mtod(m0, caddr_t)); - m0->m_pkthdr.len = m0->m_len = - dmalen + sizeof(struct rt2870_rxd); - run_rx_frame(sc, m0, dmalen); - /* update data ptr */ - m->m_data += dmalen + 8; - m->m_pkthdr.len = m->m_len -= dmalen + 8; - } - - mtx_lock(&sc->rx_cb_mtx); - /* FALLTHROUGH */ case USB_ST_SETUP: - if(__predict_false(sc->rx_m != NULL)){ - DPRINTF("rx buf is full\n"); - ifp->if_ierrors++; - return; +tr_setup: + if (sc->rx_m == NULL) { + sc->rx_m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, + MJUMPAGESIZE /* xfer can be bigger than MCLBYTES */); } - sc->rx_m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, - MJUMPAGESIZE /* xfer can be begger than MCLBYTES */); - if (__predict_false(sc->rx_m == NULL)) { - DPRINTF("could not allocate mbuf\n"); + if (sc->rx_m == NULL) { + DPRINTF("could not allocate mbuf - idle with stall\n"); ifp->if_ierrors++; - return; + usbd_xfer_set_stall(xfer); + usbd_xfer_set_frames(xfer, 0); + } else { + /* + * Directly loading a mbuf cluster into DMA to + * save some data copying. This works because + * there is only one cluster. + */ + usbd_xfer_set_frame_data(xfer, 0, + mtod(sc->rx_m, caddr_t), RUN_MAX_RXSZ); + usbd_xfer_set_frames(xfer, 1); } -tr_set: - /* - * directly loading a mbuf cluster into DMA - * to save some data copying - * This works because there is only one cluster. - */ - usbd_xfer_set_frame_data(xfer, 0, mtod(sc->rx_m, caddr_t), - usbd_xfer_max_len(xfer)); usbd_transfer_submit(xfer); + break; - return; - default: /* Error */ if (error != USB_ERR_CANCELLED) { /* try to clear stall first */ usbd_xfer_set_stall(xfer); - if(__predict_true(sc->rx_m != NULL)) - goto tr_set; - sc->rx_m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - if (__predict_false(sc->rx_m == NULL)) { - DPRINTF("could not allocate mbuf\n"); - ifp->if_ierrors++; - return; - } - goto tr_set; + + if (error == USB_ERR_TIMEOUT) + device_printf(sc->sc_dev, "device timeout\n"); + + ifp->if_ierrors++; + + goto tr_setup; } if(sc->rx_m != NULL){ - m_free(sc->rx_m); + m_freem(sc->rx_m); sc->rx_m = NULL; } + break; + } + + if (m == NULL) + return; + + /* inputting all the frames must be last */ + + RUN_UNLOCK(sc); + + m->m_pkthdr.len = m->m_len = xferlen; + + /* HW can aggregate multiple 802.11 frames in a single USB xfer */ + for(;;) { + dmalen = le32toh(*mtod(m, uint32_t *)) & 0xffff; + + if ((dmalen == 0) || ((dmalen & 3) != 0)) { + DPRINTF("bad DMA length %u\n", dmalen); + break; + } + if ((dmalen + 8) > xferlen) { + DPRINTF("bad DMA length %u > %d\n", + dmalen + 8, xferlen); + break; + } + + /* If it is the last one or a single frame, we won't copy. */ + if((xferlen -= dmalen + 8) <= 8){ + /* trim 32-bit DMA-len header */ + m->m_data += 4; + m->m_pkthdr.len = m->m_len -= 4; + run_rx_frame(sc, m, dmalen); + break; + } + + /* copy aggregated frames to another mbuf */ + m0 = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (__predict_false(m0 == NULL)) { + DPRINTF("could not allocate mbuf\n"); + ifp->if_ierrors++; + break; + } + m_copydata(m, 4 /* skip 32-bit DMA-len header */, + dmalen + sizeof(struct rt2870_rxd), mtod(m0, caddr_t)); + m0->m_pkthdr.len = m0->m_len = + dmalen + sizeof(struct rt2870_rxd); + run_rx_frame(sc, m0, dmalen); + + /* update data ptr */ + m->m_data += dmalen + 8; + m->m_pkthdr.len = m->m_len -= dmalen + 8; } - return; + + RUN_LOCK(sc); } -static __inline void -run_tx_free(struct run_tx_data *data, int txerr) +static void +run_tx_free(struct run_endpoint_queue *pq, + struct run_tx_data *data, int txerr) { - struct run_softc *sc = data->sc; - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; - if (data->m != NULL) { if (data->m->m_flags & M_TXCB) ieee80211_process_callback(data->ni, data->m, @@ -2323,33 +2311,27 @@ m_freem(data->m); data->m = NULL; - if(data->ni == NULL) + if(data->ni == NULL) { DPRINTF("no node\n"); - else{ + } else { ieee80211_free_node(data->ni); data->ni = NULL; } } - STAILQ_INSERT_TAIL(&sc->tx_free, data, next); - sc->tx_nfree++; - if(__predict_false(ifp->if_drv_flags & IFF_DRV_OACTIVE && - sc->tx_nfree > RUN_TX_RING_COUNT - 2)){ - /* call run_start() when tx ring gets 'almost' empty */ - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - if(sc->dequeue == RUN_NO_DEQUEUE) - ieee80211_runtask(ic, &sc->start_task); - } + STAILQ_INSERT_TAIL(&pq->tx_fh, data, next); + pq->tx_nfree++; } static void -run_bulk_tx_callback(struct usb_xfer *xfer, usb_error_t error) +run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, unsigned int index) { struct run_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = sc->sc_ifp; struct run_tx_data *data; struct ieee80211vap *vap = NULL; struct usb_page_cache *pc; + struct run_endpoint_queue *pq = &sc->sc_epq[index]; struct mbuf *m; usb_frlength_t size; unsigned int len; @@ -2359,103 +2341,167 @@ switch (USB_GET_STATE(xfer)){ case USB_ST_TRANSFERRED: - DPRINTFN(11, "transfer complete, %d bytes\n", actlen); + DPRINTFN(11, "transfer complete: %d " + "bytes @ index %d\n", actlen, index); + data = usbd_xfer_get_priv(xfer); - run_tx_free(data, 0); + + run_tx_free(pq, data, 0); + usbd_xfer_set_priv(xfer, NULL); ifp->if_opackets++; /* FALLTHROUGH */ case USB_ST_SETUP: -tr_set:; - data = STAILQ_FIRST(&sc->tx_q); - if(__predict_false(data == NULL)){ +tr_setup: + data = STAILQ_FIRST(&pq->tx_qh); + if(data == NULL) break; - } - STAILQ_REMOVE_HEAD(&sc->tx_q, next); + + STAILQ_REMOVE_HEAD(&pq->tx_qh, next); m = data->m; - if (__predict_false(m->m_pkthdr.len > RUN_MAX_TXSZ)) { + if (m->m_pkthdr.len > RUN_MAX_TXSZ) { DPRINTF("data overflow, %u bytes\n", m->m_pkthdr.len); - error = 10; /* just give non 0 */ - goto fail; /* sorry for an extra goto */ + + ifp->if_oerrors++; + + run_tx_free(pq, data, 1); + + goto tr_setup; } pc = usbd_xfer_get_frame(xfer, 0); - size = sizeof(struct rt2870_txd) + sizeof(struct rt2860_txwi); + size = sizeof(data->desc); usbd_copy_in(pc, 0, &data->desc, size); usbd_m_copy_in(pc, size, m, 0, m->m_pkthdr.len); - if(data->ni != NULL){ - if((vap = data->ni->ni_vap) != NULL); - if (__predict_false(ieee80211_radiotap_active_vap(vap))) { + vap = data->ni->ni_vap; + if (ieee80211_radiotap_active_vap(vap)) { struct run_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; tap->wt_rate = rt2860_rates[data->ridx].rate; tap->wt_chan_freq = htole16(vap->iv_bss->ni_chan->ic_freq); tap->wt_chan_flags = htole16(vap->iv_bss->ni_chan->ic_flags); - tap->wt_hwqueue = data->qid; + tap->wt_hwqueue = index; if (data->mcs & RT2860_PHY_SHPRE) tap->wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE; ieee80211_radiotap_tx(vap, m); } - } + /* align end on a 4-bytes boundary */ - len = (size + 4 + m->m_pkthdr.len + 3) & ~3; + len = (size + m->m_pkthdr.len + 3) & ~3; - DPRINTFN(11, "sending frame len=%u xferlen=%u\n", - m->m_pkthdr.len, len); + DPRINTFN(11, "sending frame len=%u xferlen=%u @ index %d\n", + m->m_pkthdr.len, len, index); usbd_xfer_set_frame_len(xfer, 0, len); usbd_xfer_set_priv(xfer, data); usbd_transfer_submit(xfer); + RUN_UNLOCK(sc); + run_start(ifp); + RUN_LOCK(sc); + break; + default: DPRINTF("USB transfer error, %s\n", usbd_errstr(error)); data = usbd_xfer_get_priv(xfer); -fail: + ifp->if_oerrors++; if (data != NULL) { - run_tx_free(data, error); + run_tx_free(pq, data, error); usbd_xfer_set_priv(xfer, NULL); } - if (error == USB_ERR_TIMEOUT){ - device_printf(sc->sc_dev, "device timeout\n"); - /* check if timeout is caused due to livelock */ - run_usb_timeout(sc); + if (error != USB_ERR_CANCELLED) { + if (error == USB_ERR_TIMEOUT) { + device_printf(sc->sc_dev, "device timeout\n"); + + /* defer until later */ + sc->sc_usb_timeout = 1; + + /* XXX this should be in a separate task! */ + run_usb_timeout(sc); + } + + /* + * Try to clear stall first, also if other + * errors occur, hence clearing stall + * introduces a 50 ms delay: + */ + usbd_xfer_set_stall(xfer); + goto tr_setup; } - if (error == USB_ERR_STALLED) - usbd_xfer_set_stall(xfer); - goto tr_set; break; } } static void +run_bulk_tx_callback0(struct usb_xfer *xfer, usb_error_t error) +{ + run_bulk_tx_callbackN(xfer, error, 0); +} + +static void +run_bulk_tx_callback1(struct usb_xfer *xfer, usb_error_t error) +{ + run_bulk_tx_callbackN(xfer, error, 1); +} + +static void +run_bulk_tx_callback2(struct usb_xfer *xfer, usb_error_t error) +{ + run_bulk_tx_callbackN(xfer, error, 2); +} + +static void +run_bulk_tx_callback3(struct usb_xfer *xfer, usb_error_t error) +{ + run_bulk_tx_callbackN(xfer, error, 3); +} + +static void +run_bulk_tx_callback4(struct usb_xfer *xfer, usb_error_t error) +{ + run_bulk_tx_callbackN(xfer, error, 4); +} + +static void +run_bulk_tx_callback5(struct usb_xfer *xfer, usb_error_t error) +{ + run_bulk_tx_callbackN(xfer, error, 5); +} + +static void run_set_tx_desc(struct run_softc *sc, struct run_tx_data *data, - uint8_t wflags, uint8_t xflags, uint8_t opflags, uint8_t dflags, uint8_t type) + uint8_t wflags, uint8_t xflags, uint8_t opflags, uint8_t dflags, + uint8_t type, uint8_t pad) { struct mbuf *m = data->m; struct ieee80211com *ic = sc->sc_ifp->if_l2com; + struct ieee80211vap *vap = &sc->sc_rvp->vap; + struct ieee80211_frame *wh; struct rt2870_txd *txd; struct rt2860_txwi *txwi; int xferlen; - uint8_t mcs, ridx = data->ridx; + uint8_t mcs; + uint8_t ridx = data->ridx; /* get MCS code from rate index */ data->mcs = mcs = rt2860_rates[ridx].mcs; - xferlen = sizeof (*txwi) + m->m_pkthdr.len; + xferlen = sizeof(*txwi) + m->m_pkthdr.len; + /* roundup to 32-bit alignment */ xferlen = (xferlen + 3) & ~3; @@ -2469,7 +2515,7 @@ txwi->xflags = xflags; txwi->wcid = (type == IEEE80211_FC0_TYPE_DATA) ? RUN_AID2WCID(data->ni->ni_associd) : 0xff; - txwi->len = htole16(m->m_pkthdr.len); + txwi->len = htole16(m->m_pkthdr.len - pad); if (rt2860_rates[ridx].phy == IEEE80211_T_DS) { txwi->phy = htole16(RT2860_PHY_CCK); if (ridx != RT2860_RIDX_CCK1 && @@ -2479,9 +2525,6 @@ txwi->phy = htole16(RT2860_PHY_OFDM); txwi->phy |= htole16(mcs); -#if 1 - struct ieee80211vap *vap = &sc->sc_rvp->vap; - struct ieee80211_frame *wh; wh = mtod(m, struct ieee80211_frame *); /* check if RTS/CTS or CTS-to-self protection is required */ @@ -2491,22 +2534,31 @@ rt2860_rates[ridx].phy == IEEE80211_T_OFDM))) txwi->txop = RT2860_TX_TXOP_HT | opflags; else -#endif txwi->txop = RT2860_TX_TXOP_BACKOFF | opflags; } +/* This function must be called locked */ static int run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni) { - struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ieee80211vap *vap = &sc->sc_rvp->vap; struct ieee80211_frame *wh; const struct ieee80211_txparam *tp; struct run_tx_data *data; - uint16_t qos, dur; - uint8_t *frm, type, tid, qid, qflags, pad, xflags = 0; - int hasqos, ridx, ctl_ridx, error = 0; + uint16_t qos; + uint16_t dur; + uint8_t type; + uint8_t tid; + uint8_t qid; + uint8_t qflags; + uint8_t pad; + uint8_t xflags = 0; + int hasqos; + int ridx; + int ctl_ridx; + + RUN_LOCK_ASSERT(sc, MA_OWNED); wh = mtod(m, struct ieee80211_frame *); @@ -2519,35 +2571,28 @@ * seem to have only 4 TX bulk endpoints (Fukaumi Naoki). */ if ((hasqos = IEEE80211_QOS_HAS_SEQ(wh))) { + uint8_t *frm; + if(IEEE80211_HAS_ADDR4(wh)) frm = ((struct ieee80211_qosframe_addr4 *)wh)->i_qos; else frm =((struct ieee80211_qosframe *)wh)->i_qos; + qos = le16toh(*(const uint16_t *)frm); tid = qos & IEEE80211_QOS_TID; + qid = TID_TO_WME_AC(tid); pad = 2; - - /* - * This is my best guess based on original code. - * I don't have data sheet. - */ -#ifdef SIX - qid = tid <= 6? tid: 6; - qflags = qid < 5? RT2860_TX_QSEL_EDCA : RT2860_TX_QSEL_HCCA; -#else - qid = TID_TO_WME_AC(tid); - qflags = RT2860_TX_QSEL_EDCA; -#endif - DPRINTFN(8, "qos %d\tqid %d\ttid %d\tqflags %x\n", - qos, qid, tid, qflags); } else { qos = 0; tid = 0; qid = WME_AC_BE; - qflags = RT2860_TX_QSEL_EDCA; pad = 0; } + qflags = (qid < 4) ? RT2860_TX_QSEL_EDCA : RT2860_TX_QSEL_HCCA; + DPRINTFN(8, "qos %d\tqid %d\ttid %d\tqflags %x\n", + qos, qid, tid, qflags); + tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; /* pickup a rate index */ @@ -2578,110 +2623,31 @@ *(uint16_t *)wh->i_dur = htole16(dur + sc->sifs); } - RUN_LOCK(sc); - /* save one for mgt packet, just in case */ - if (__predict_false(sc->tx_nfree < 3)) { - /* - * Stop dequeuing when the last txq ring is used, - * so that we don't have to call IFQ_DRV_PREPEND(). - * (no txq, no dequeue) - * - * Returning '-1' cause the process exit from the loop in run_start(). - * (Don't for get to mark flag as not dequeuing.) - * - * It would be better to put these in run_start(), - * but do these here while holding a lock. - */ - sc->dequeue = RUN_NO_DEQUEUE; - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - if(sc->tx_nfree == 2){ - error = -1; - DPRINTFN(4, "the last of txq ring used\n"); - /* continue to process packet */ - } else { - /* shouldn't reach here, but just in case */ - IFQ_DRV_PREPEND(&ifp->if_snd, m); - RUN_UNLOCK(sc); - DPRINTF("txq ring is full\n"); - return -1; - } + /* reserve slots for mgmt packets, just in case */ + if (sc->sc_epq[qid].tx_nfree < 3) { + DPRINTF("tx ring %d is full\n", qid); + return (-1); } - data = STAILQ_FIRST(&sc->tx_free); - STAILQ_REMOVE_HEAD(&sc->tx_free, next); - sc->tx_nfree--; - RUN_UNLOCK(sc); /* to be kept lockd, or not to be */ + + data = STAILQ_FIRST(&sc->sc_epq[qid].tx_fh); + STAILQ_REMOVE_HEAD(&sc->sc_epq[qid].tx_fh, next); + sc->sc_epq[qid].tx_nfree--; data->m = m; data->ni = ni; data->ridx = ridx; - data->qid = qid; -#if 1 - /* - * We could call run_set_tx_desc() instead, - * but context switching is expensive. - * (The file size is almost the same.) - */ - struct rt2870_txd *txd; - struct rt2860_txwi *txwi; - int xferlen; - uint8_t mcs; + run_set_tx_desc(sc, data, 0, xflags, 0, qflags, type, pad); - /* get MCS code from rate index */ - data->mcs = mcs = rt2860_rates[ridx].mcs; + STAILQ_INSERT_TAIL(&sc->sc_epq[qid].tx_qh, data, next); - xferlen = sizeof (*txwi) + m->m_pkthdr.len; - /* roundup to 32-bit alignment */ - xferlen = (xferlen + 3) & ~3; - - txd = (struct rt2870_txd *)&data->desc; - txd->flags = qflags; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 10 11:51:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54290106568F; Sun, 10 Jan 2010 11:51:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18BF61065670 for ; Sun, 10 Jan 2010 11:51:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05E068FC1F for ; Sun, 10 Jan 2010 11:51:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ABpGmi044193 for ; Sun, 10 Jan 2010 11:51:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0ABpG8x044191 for perforce@freebsd.org; Sun, 10 Jan 2010 11:51:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 10 Jan 2010 11:51:16 GMT Message-Id: <201001101151.o0ABpG8x044191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2010 11:51:17 -0000 http://p4web.freebsd.org/chv.cgi?CH=172915 Change 172915 by hselasky@hselasky_laptop001 on 2010/01/10 11:50:27 USB WLAN: - minor fix to RUM and ZYD. - don't stop TX patch on errors. - patch by: HPS Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#22 (text+ko) ==== @@ -845,13 +845,18 @@ usbd_xfer_set_priv(xfer, NULL); } - if (error == USB_ERR_STALLED) { - /* try to clear stall first */ + if (error != USB_ERR_CANCELLED) { + if (error == USB_ERR_TIMEOUT) + device_printf(sc->sc_dev, "device timeout\n"); + + /* + * Try to clear stall first, also if other + * errors occur, hence clearing stall + * introduces a 50 ms delay: + */ usbd_xfer_set_stall(xfer); goto tr_setup; } - if (error == USB_ERR_TIMEOUT) - device_printf(sc->sc_dev, "device timeout\n"); break; } } ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#24 (text+ko) ==== @@ -2449,13 +2449,18 @@ if (data != NULL) zyd_tx_free(data, error); - if (error == USB_ERR_STALLED) { - /* try to clear stall first */ + if (error != USB_ERR_CANCELLED) { + if (error == USB_ERR_TIMEOUT) + device_printf(sc->sc_dev, "device timeout\n"); + + /* + * Try to clear stall first, also if other + * errors occur, hence clearing stall + * introduces a 50 ms delay: + */ usbd_xfer_set_stall(xfer); goto tr_setup; } - if (error == USB_ERR_TIMEOUT) - device_printf(sc->sc_dev, "device timeout\n"); break; } } From owner-p4-projects@FreeBSD.ORG Sun Jan 10 19:32:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 979941065672; Sun, 10 Jan 2010 19:32:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3FA35106566C for ; Sun, 10 Jan 2010 19:32:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2BC638FC15 for ; Sun, 10 Jan 2010 19:32:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0AJWCrr007869 for ; Sun, 10 Jan 2010 19:32:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0AJVwxW007855 for perforce@freebsd.org; Sun, 10 Jan 2010 19:31:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jan 2010 19:31:58 GMT Message-Id: <201001101931.o0AJVwxW007855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2010 19:32:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=172931 Change 172931 by rwatson@rwatson_vimage_client on 2010/01/10 19:31:37 Integrate TrustedBSD capabilities branch from svn head. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/capabilities/src/MAINTAINERS#6 integrate .. //depot/projects/trustedbsd/capabilities/src/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#12 integrate .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#13 integrate .. //depot/projects/trustedbsd/capabilities/src/UPDATING#13 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/date/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/date/date.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/kenv/kenv.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/ftree.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/sel_subs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/pkill.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/keyword.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pwait/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/bin/pwait/pwait.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/bin/pwait/pwait.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/merge.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/remove.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/util.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/alias.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/alias.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/arith.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/arith.y#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/cd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/error.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/error.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/expand.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/expand.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/histedit.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/input.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/input.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/jobs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mail.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/main.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/main.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/memalloc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/memalloc.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/miscbltin.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mkbuiltins#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mkinit.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mksyntax.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/myhistedit.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mystring.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/options.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/options.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/output.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/output.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/redir.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/sh.1#8 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/show.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/show.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/trap.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/trap.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/var.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/var.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/CHANGES#7 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/masterdump.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/version#7 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/expat/lib/xmlparse.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/expat/lib/xmltok_impl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/freebsd-spec.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/mips/freebsd.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/inet.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/FREEBSD-vendor#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ChangeLog#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/CommitLog#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/NEWS#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/README#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/README.bk#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/README.patches#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/WHERE-TO-START#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/adjtimed/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/arlib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/arlib/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/arlib/configure#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/build#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/clockstuff/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/config.h.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/configure#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/configure.ac#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/flock-build#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/html/build/hints/solaris.xtra.4095849#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/html/copyright.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/html/drivers/driver40.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/include/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/include/copyright.def#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/include/isc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/include/ntp_debug.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/include/version.def#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/kernel/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/kernel/sys/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/libntp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/libopts/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/libparse/Makefile.am#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/libparse/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/libparse/clk_rawdcf.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/cmd_args.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntp_crypto.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntp_intres.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntp_io.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntp_request.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntp_timer.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpd-opts.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpd-opts.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpd-opts.texi#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpd.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpdsim-opts.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpdsim-opts.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpdsim-opts.texi#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/ntpdsim.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/refclock_dumbclock.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/refclock_hopfser.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/refclock_jjy.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/refclock_nmea.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpd/refclock_palisade.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpdate/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpdc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpdc/ntpdc-opts.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpdc/ntpdc-opts.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpdc/ntpdc-opts.texi#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpdc/ntpdc.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpq/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpq/ntpq-opts.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpq/ntpq-opts.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpq/ntpq-opts.texi#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpq/ntpq.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/ntpq/ntpq.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/packageinfo.sh#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/parseutil/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/scripts/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/config.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/configure#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/configure.ac#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/libopts/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/sntp-opts.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/sntp-opts.def#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/sntp-opts.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/sntp-opts.texi#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/sntp.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/sntp/version.def#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/util/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/util/ntp-keygen-opts.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/util/ntp-keygen-opts.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/util/ntp-keygen-opts.texi#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/util/ntp-keygen.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/version#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ntp/version.m4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/mac.code#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/maketab.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/proctab.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/proto.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/pf/man/pf.conf.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/pf/pfctl/pf_print_state.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcp_wrappers/hosts_access.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnetd/sys_term.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/top/username.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/heimdal/kcm/connect.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/defaults/devfs.rules#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/defaults/rc.conf#12 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.amd64/ttys#6 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.arm/ttys#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.i386/ttys#6 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.ia64/ttys#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.mips/ttys#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.pc98/ttys#1 branch .. //depot/projects/trustedbsd/capabilities/src/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BIND.chroot.dist#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/namedb/named.conf#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/namedb/named.root#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/network.subr#9 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/Makefile#8 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ip6fw#3 delete .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ipfw#7 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/named#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/nsswitch#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.firewall#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.firewall6#2 delete .. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#9 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/root/dot.profile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/termcap.small#3 integrate .. //depot/projects/trustedbsd/capabilities/src/games/factor/factor.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes-o.real#5 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/games/number/number.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/games/pom/pom.6#2 integrate .. //depot/projects/trustedbsd/capabilities/src/games/pom/pom.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/lib/libgcc/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/binutils/ld/Makefile.mips#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/trustedbsd/capabilities/src/include/Makefile#8 integrate .. //depot/projects/trustedbsd/capabilities/src/include/dirent.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/include/paths.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/include/semaphore.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/include/signal.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/include/strings.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/include/termios.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/kerberos5/usr.bin/kpasswd/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/Makefile#13 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/bind/config.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/csu/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/csu/arm/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#6 delete .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_c.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_s.S#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/csu/ia64/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/csu/mips/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/csu/powerpc/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/csu/sparc64/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_crc32.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_endian.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry_link_resolver.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry_private.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry_stat.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_entry_xattr.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_hash.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_private.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_disk_entry_from_file.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_disk_private.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_disk_set_standard_lookup.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_open_fd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_open_file.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_open_filename.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_private.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_compression_all.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_compression_program.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_compression_uu.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_compression_xz.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_ar.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_cpio.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_iso9660.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_mtree.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_raw.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_util.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_virtual.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write.3#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_disk.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_disk_private.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_open_fd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_private.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_compression_bzip2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_compression_compress.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_compression_program.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_compression_xz.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_format_ar.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_format_cpio_newc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_format_mtree.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_write_set_format_zip.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/config_freebsd.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/filter_fork.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/tar.5#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/Makefile#8 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/main.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_acl_pax.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_bzip2.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_cpio.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_cpio_1.cpio.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_lzma.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_lzma_1.tlz.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_lzma_2.tlz.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_lzma_3.tlz.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_solaris_tar_acl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_entry.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_entry_strmode.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_extattr_freebsd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_fuzz.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_fuzz_1.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_fuzz_1.iso.uu#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_open_fd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_open_file.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_pax_filename_encoding.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_compress_program.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_data_large.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_disk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_disk_entry_from_file.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_extract.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_ar.ar.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_cpio_bin_lzma.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_gz.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_multi_extent.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isojoliet_long.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isojoliet_rr.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isorr_bz2.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#3 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isorr_ce.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isorr_new_bz2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isorr_rr_moved.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isozisofs_bz2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_mtree.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_mtree.mtree.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_pax_bz2.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_tar.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_tbz.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_tlz.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_large.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_uu.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_tar_large.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_compress_program.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_failures.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_hardlink.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_secure.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_sparse.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_symlink.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_disk_times.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_format_cpio_empty.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_format_cpio_newc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_format_cpio_odc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_format_tar_ustar.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_format_zip.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_format_zip_empty.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_write_format_zip_no_compression.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libauditd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libautofs/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libbegemot/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libbsm/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libbz2/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#17 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/_once_stub.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/exec.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fdevname.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fts.3#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fts.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getcap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/opendir.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/pause.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/raise.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/scandir.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/sem.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/sem_init.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/sem_new.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/termios.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/time.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/time.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isgraph.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isprint.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/Symbol.map#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/fpgetmask.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/fpgetround.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/fpgetsticky.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/fpsetmask.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/fpsetround.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/fpsetsticky.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/hardfloat/fpgetmask.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/hardfloat/fpgetround.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/hardfloat/fpgetsticky.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/hardfloat/fpsetmask.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/hardfloat/fpsetround.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/gen/hardfloat/fpsetsticky.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/mips/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/es_ES.ISO8859-1.msg#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_delete_entry.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_from_text.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_to_text.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/rpc/clnt_raw.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/rpc/getnetconfig.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/rpc/getnetpath.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/rpc/key_call.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/rpc/svc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/rpc/svc_auth_des.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/rpc/svc_raw.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/fgetws.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/findfp.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/getline.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/printf.3#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/sprintf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/sscanf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/vfwprintf.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/getenv.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdtime/localtime.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdtime/tzfile.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/string/strcat.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/string/strcmp.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/__error.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cpuset.2#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libcalendar/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libcam/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libcompat/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libcrypt/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libdevinfo/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libdevinfo/devinfo.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libdevstat/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libdwarf/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libedit/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libelf/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libexpat/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libexpat/libbsdxml.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libfetch/ftp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libftpio/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libgeom/geom_getxml.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libgssapi/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libgssapi/gss_mech_switch.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libipsec/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libipx/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libjail/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libjail/jail.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libkiconv/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_proc.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libmagic/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libmd/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libmilter/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libmp/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libncp/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libnetgraph/debug.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libngatm/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libopie/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_exec/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_krb5/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_lastlog/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_radius/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_ssh/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpcap/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/libpmc.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.xscale.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libproc/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libradius/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/librpcsec_gss/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/librpcsec_gss/rpcsec_gss_conf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/librpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/librt/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/librt/mq.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/librt/sigev_thread.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libsbuf/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libsm/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libsmdb/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libsmutil/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/dosfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libtacplus/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libtacplus/libtacplus.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libtacplus/taclib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libtacplus/taclib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libtacplus/taclib_private.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/arch/mips/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/pthread.map#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthread_db/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libufs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libugidfw/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libugidfw/ugidfw.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/Symbol.map#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_getutxent.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_getutxent.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_internal.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_login.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_login.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_login_pseudo.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_pututxline.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_setutxfile.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/ulog_util.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/utempter.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/utempter.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libulog/utempter_add_record.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb10.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb10.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libutil/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libutil/gr_util.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libutil/libutil.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libutil/pw_util.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libvgl/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libwrap/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/liby/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libypclnt/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libz/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/ncurses/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/atrun/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/atrun/atrun.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/bootpd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/bootpd/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/bootpd/tools/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/comsat/comsat.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/fingerd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/getty/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/mail.local/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/mknetid/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/pppoed/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rbootd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/revnetgroup/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.rquotad/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.rstatd/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.rusersd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.rusersd/rusers_proc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.rusersd/rusersd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.rwalld/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.sprayd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rshd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-aout/shlib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-aout/support.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#31 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/smrsh/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/talkd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/talkd/process.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/tcpd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/tftp-proxy/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/tftpd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/libexec/ulog-helper/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/libexec/ulog-helper/ulog-helper.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/libexec/ypxfr/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/release/Makefile#8 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/share/misc/dev.archlist.txt#7 integrate .. //depot/projects/trustedbsd/capabilities/src/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/trustedbsd/capabilities/src/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/trustedbsd/capabilities/src/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/bridge/crunch.conf#5 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/build/mfs.mtree#2 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/build/picobsd#5 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/floppy.tree/etc/master.passwd#2 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/floppy.tree/etc/ttys#3 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/floppy.tree/sbin/dhclient-script#1 branch .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/qemu/PICOBSD#1 branch .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/qemu/PICOBSD.hints#1 branch .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/qemu/config#1 branch .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/qemu/crunch.conf#1 branch .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/qemu/floppy.tree.exclude#1 branch .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/tinyware/oinit/oinit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/rescue/rescue/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/atacontrol/atacontrol.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.8#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dumpfs/dumpfs.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck/fsck.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck_ffs/fsutil.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck_ffs/gjournal.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck_ffs/main.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/fsck_ffs/pass1.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/cache/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/cache/gcache.8#1 branch .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/raid3/geom_raid3.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/stripe/geom_stripe.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/core/geom.8#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ggate/ggated/ggated.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/growfs/growfs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/regdomain.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/init/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/init/init.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/dummynet.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw2.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mntopts.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mount.8#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mount.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount/vfslist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_cd9660/mount_cd9660.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_nullfs/mount_nullfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/natd/natd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/newfs/mkfs.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/nfsiod/nfsiod.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/nfsiod/nfsiod.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/rcorder/ealloc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/rcorder/hash.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/rcorder/rcorder.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/reboot/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/reboot/reboot.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/routed/if.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/tunefs/tunefs.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/umount/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/umount/umount.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/etc/make.conf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/auth-down.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/auth-up.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/chap-secrets.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/chat.sh.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/ip-down.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/ip-up.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/options.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/pap-secrets.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/ppp.deny.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/pppd/ppp.shells.sample#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/slattach/unit-command.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/sliplogin/slip.hosts#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/sliplogin/slip.login#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/sliplogin/slip.logout#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/sliplogin/slip.slparms#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/startslip/sldown.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/startslip/slip.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/examples/startslip/slup.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/share/man/man3/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man3/pthread.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man3/pthread_affinity_np.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man3/pthread_attr_affinity_np.3#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man3/queue.3#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/Makefile#14 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ada.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/amdsbwd.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ata.4#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/atp.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bridge.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/carp.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/faith.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/gem.4#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ifmib.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ipsec.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/iwnfw.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/adb.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/akbd.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/ams.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/cuda.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.powerpc/pmu.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mfi.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mk48txx.4#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mwlfw.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/netintro.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/psm.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/sctp.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ste.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/termios.4#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/tty.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/u3g.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/uart.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ucom.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/vge.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/watchdog.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/wi.4#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/make.conf.5#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/rc.conf.5#11 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man7/build.7#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man7/security.7#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man8/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man8/rc.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/LOCK_PROFILING.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/Makefile#12 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/VFS.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/VFS_CHECKEXP.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/VFS_FHTOVP.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/VOP_OPENCLOSE.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ifnet.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/sleep.9#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/sleepqueue.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/usbdi.9#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/vm_page_bits.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/bsd-family-tree#10 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/committers-doc.dot#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/committers-ports.dot#9 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/committers-src.dot#11 integrate .. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#10 integrate .. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.sys.mk#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/skel/dot.profile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/termcap/termcap.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/termcap/termcap.src#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.SJIS.src#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.UTF-8.src#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.eucJP.src#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/antarctica#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/asia#11 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/australasia#6 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/etcetera#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/europe#8 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/zone.tab#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/cpufunc.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/param.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/mem.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/trap.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/AVILA#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/econa.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/files.econa#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/std.econa#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/timer.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mv_sata.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/ixp425/files.ixp425#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/bootstrap.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/dev_net.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/md.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/module.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/efi/libefi/efifs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/efi/libefi/efipart.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/gptboot/gptboot.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/biosdisk.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/loader/conf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/loader/main.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/zfsboot/zfsboot.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/bios.S#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/boot.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/boot.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/disk.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/inode.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/io.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/serial_16550.S#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/sys.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/sparc64/loader/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/uboot/lib/glue.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/zfs/zfsimpl.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_da.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_pmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_ccb.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_queue.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_queue.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/boot/zfs/zfsimpl.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#21 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#17 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_futex.c#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 11 11:00:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED466106568D; Mon, 11 Jan 2010 11:00:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B20091065670 for ; Mon, 11 Jan 2010 11:00:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A024D8FC12 for ; Mon, 11 Jan 2010 11:00:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BB0hqZ042806 for ; Mon, 11 Jan 2010 11:00:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BB0h0c042804 for perforce@freebsd.org; Mon, 11 Jan 2010 11:00:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jan 2010 11:00:43 GMT Message-Id: <201001111100.o0BB0h0c042804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 11:00:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=172961 Change 172961 by rwatson@rwatson_vimage_client on 2010/01/11 10:59:51 With higher warnings level, proper include of capability.h is now required. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcpdump.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcpdump.c#4 (text+ko) ==== @@ -76,6 +76,7 @@ #include #endif /* WIN32 */ +#include #include "netdissect.h" #include "interface.h" From owner-p4-projects@FreeBSD.ORG Mon Jan 11 14:10:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A3A510656A5; Mon, 11 Jan 2010 14:10:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EF171065697 for ; Mon, 11 Jan 2010 14:10:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D77DF8FC20 for ; Mon, 11 Jan 2010 14:10:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BEArmB071654 for ; Mon, 11 Jan 2010 14:10:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BEArxe071652 for perforce@freebsd.org; Mon, 11 Jan 2010 14:10:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jan 2010 14:10:53 GMT Message-Id: <201001111410.o0BEArxe071652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 14:10:54 -0000 http://p4web.freebsd.org/chv.cgi?CH=172964 Change 172964 by rwatson@rwatson_vimage_client on 2010/01/11 14:10:50 Make video4linux ioctl fget's check CAP_IOCTL. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_ioctl.c#13 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_ioctl.c#13 (text+ko) ==== @@ -2757,7 +2757,7 @@ case LINUX_VIDIOCSCHAN: args->cmd = VIDIOCSCHAN; break; case LINUX_VIDIOCGTUNER: - if ((error = fget(td, args->fd, &fp)) != 0) + if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) return (error); error = fo_ioctl(fp, VIDIOCGTUNER, &vtun, td->td_ucred, td); if (!error) { @@ -2769,7 +2769,7 @@ return (error); case LINUX_VIDIOCSTUNER: - if ((error = fget(td, args->fd, &fp)) != 0) + if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) return (error); error = copyin((void *) args->arg, &l_vtun, sizeof(l_vtun)); if (error) { @@ -2786,7 +2786,7 @@ case LINUX_VIDIOCCAPTURE: args->cmd = VIDIOCCAPTURE; break; case LINUX_VIDIOCGWIN: - if ((error = fget(td, args->fd, &fp)) != 0) + if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) return (error); error = fo_ioctl(fp, VIDIOCGWIN, &vwin, td->td_ucred, td); if (!error) { @@ -2798,7 +2798,7 @@ return (error); case LINUX_VIDIOCSWIN: - if ((error = fget(td, args->fd, &fp)) != 0) + if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) return (error); error = copyin((void *) args->arg, &l_vwin, sizeof(l_vwin)); if (error) { @@ -2824,7 +2824,7 @@ return (error); case LINUX_VIDIOCGFBUF: - if ((error = fget(td, args->fd, &fp)) != 0) + if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) return (error); error = fo_ioctl(fp, VIDIOCGFBUF, &vbuf, td->td_ucred, td); if (!error) { @@ -2836,7 +2836,7 @@ return (error); case LINUX_VIDIOCSFBUF: - if ((error = fget(td, args->fd, &fp)) != 0) + if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) return (error); error = copyin((void *) args->arg, &l_vbuf, sizeof(l_vbuf)); if (error) { @@ -2864,7 +2864,7 @@ case LINUX_VIDIOCGPLAYINFO: args->cmd = VIDIOCGPLAYINFO; break; case LINUX_VIDIOCSMICROCODE: - if ((error = fget(td, args->fd, &fp)) != 0) + if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) return (error); error = copyin((void *) args->arg, &l_vcode, sizeof(l_vcode)); if (error) { From owner-p4-projects@FreeBSD.ORG Mon Jan 11 15:24:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A0531065679; Mon, 11 Jan 2010 15:24:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B8BD106566B for ; Mon, 11 Jan 2010 15:24:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 172F58FC0A for ; Mon, 11 Jan 2010 15:24:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BFO6NQ078046 for ; Mon, 11 Jan 2010 15:24:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BFO6OF078044 for perforce@freebsd.org; Mon, 11 Jan 2010 15:24:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jan 2010 15:24:06 GMT Message-Id: <201001111524.o0BFO6OF078044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 15:24:07 -0000 http://p4web.freebsd.org/chv.cgi?CH=172965 Change 172965 by rwatson@rwatson_vimage_client on 2010/01/11 15:23:44 Make post fooat(2) capability support in vfs_syscalls.c compile when "options CAPABILITIES" is not present. Do a bit of style cleanup, and prefer NULL to 0 when talking about pointers. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#24 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#24 (text+ko) ==== @@ -159,23 +159,26 @@ return (0); } -/* +#ifdef CAPABILITIES +/*- * Get the "base" vnode defined by a user file descriptor. * - * Several *at() system calls are now supported in capability mode. This function - * finds out what their "*at base" vnode, which is needed by namei(), should be: + * Several *at() system calls are now supported in capability mode. This + * function finds out what their "*at base" vnode, which is needed by + * namei(), should be: * - * 1. In non-capability (and thus unconstrained) mode, *base = 0. - * 2. In capability mode, base is the vnode given by the fd parameter, subject to - * the condition that the supplied 'rights' parameter (OR'ed with CAP_LOOKUP - * and CAP_ATBASE) is satisfied. The vnode is returned with a shared lock. + * 1. In non-capability (and thus unconstrained) mode, *base = NULL. + * 2. In capability mode, base is the vnode given by the fd parameter, + * subject to the condition that the supplied 'rights' parameter (OR'ed + * with CAP_LOOKUP and CAP_ATBASE) is satisfied. The vnode is returned + * with a shared lock. */ int fgetbase(struct thread *td, int fd, cap_rights_t rights, struct vnode **base) { + if (!(td->td_ucred->cr_flags & CRED_FLAG_CAPMODE)) - *base = 0; - + *base = NULL; else { int error; @@ -188,10 +191,9 @@ return (error); } } - - return 0; + return (0); } - +#endif /* * Sync each mounted filesystem. @@ -1126,7 +1128,7 @@ struct proc *p = td->td_proc; struct filedesc *fdp = p->p_fd; struct file *fp; - struct vnode *vp, *base = 0; + struct vnode *vp, *base = NULL; struct vattr vat; struct mount *mp; int cmode; @@ -1152,9 +1154,9 @@ else flags = FFLAGS(flags); +#ifdef CAPABILITIES /* get capability info of base FD */ - if (fd >= 0) - { + if (fd >= 0) { struct file *f; const cap_rights_t LOOKUP_RIGHTS = CAP_LOOKUP | CAP_ATBASE; @@ -1169,35 +1171,32 @@ error = cap_fextract(f, LOOKUP_RIGHTS, &real_fp); /* hold the underlying file, not the capability */ - if (error == 0) fhold(real_fp); + if (error == 0) + fhold(real_fp); fdrop(f, td); f = real_fp; - } - else if (error == EINVAL) + } else if (error == EINVAL) /* not a capability; get the real file pointer */ error = fget(td, fd, LOOKUP_RIGHTS, &f); - - /* if in capability mode, get base vnode (for namei) */ if (!error && (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE)) { base = f->f_vnode; vref(base); } - /* don't need to hold the base any more */ - if (f != NULL) fdrop(f, td); + if (f != NULL) + fdrop(f, td); if (error) { FILEDESC_SUNLOCK(fdp); return (error); - } - else + } else FILEDESC_SUNLOCK(fdp); } - +#endif /* * allocate the file descriptor, but only add it to the descriptor @@ -1241,7 +1240,10 @@ * Clean up the descriptor, but only if another thread hadn't * replaced or closed it. */ - if (base) vrele(base); +#ifdef CAPABILITIES + if (base) + vrele(base); +#endif fdclose(fdp, fp, indx, td); fdrop(fp, td); @@ -1301,26 +1303,35 @@ VFS_UNLOCK_GIANT(vfslocked); success: +#ifdef CAPABILITIES if (baserights != -1) { /* wrap the result in a capability */ struct file *cap; error = kern_capwrap(td, fp, baserights, &cap, &indx); - if (error) goto bad_unlocked; + if (error) + goto bad_unlocked; } +#endif /* * Release our private reference, leaving the one associated with * the descriptor table intact. */ - if (base) vrele(base); +#ifdef CAPABILITIES + if (base) + vrele(base); +#endif fdrop(fp, td); td->td_retval[0] = indx; return (0); bad: VFS_UNLOCK_GIANT(vfslocked); +#ifdef CAPABILITIES bad_unlocked: - if (base) vrele(base); + if (base) + vrele(base); +#endif fdclose(fdp, fp, indx, td); fdrop(fp, td); return (error); @@ -2253,7 +2264,7 @@ int flags, int mode) { struct ucred *cred, *tmpcred; - struct vnode *vp, *base = 0; + struct vnode *vp, *base = NULL; struct nameidata nd; int vfslocked; int error; @@ -2273,9 +2284,11 @@ cred = tmpcred = td->td_ucred; AUDIT_ARG_VALUE(mode); +#ifdef CAPABILITIES /* get *at base vnode for namei() */ if ((error = fgetbase(td, fd, CAP_FSTAT, &base))) return (error); +#endif NDINIT_ATBASE(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, fd, base, td); @@ -2293,7 +2306,10 @@ td->td_ucred = cred; crfree(tmpcred); } - if (base) vput(base); +#ifdef CAPABILITIES + if (base) + vput(base); +#endif return (error); } @@ -3042,17 +3058,22 @@ struct nameidata nd; int vfslocked; int follow; - struct vnode *base; + struct vnode *base = NULL; AUDIT_ARG_MODE(mode); follow = (flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : FOLLOW; +#ifdef CAPABILITIES if ((error = fgetbase(td, fd, CAP_FCHMOD, &base))) return (error); +#endif - NDINIT_ATBASE(&nd, LOOKUP, follow | MPSAFE | AUDITVNODE1, pathseg, path, - fd, base, td); + NDINIT_ATBASE(&nd, LOOKUP, follow | MPSAFE | AUDITVNODE1, pathseg, + path, fd, base, td); error = namei(&nd); - if (base) vput(base); +#ifdef CAPABILITIES + if (base) + vput(base); +#endif if (error) return (error); From owner-p4-projects@FreeBSD.ORG Mon Jan 11 15:43:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F286E106568B; Mon, 11 Jan 2010 15:43:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B73291065670 for ; Mon, 11 Jan 2010 15:43:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A369A8FC14 for ; Mon, 11 Jan 2010 15:43:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BFhQbU079526 for ; Mon, 11 Jan 2010 15:43:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BFhQKW079524 for perforce@freebsd.org; Mon, 11 Jan 2010 15:43:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jan 2010 15:43:26 GMT Message-Id: <201001111543.o0BFhQKW079524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 15:43:27 -0000 http://p4web.freebsd.org/chv.cgi?CH=172967 Change 172967 by rwatson@rwatson_vimage_client on 2010/01/11 15:43:05 Prefer tcpdump's own error() routine to err(). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcpdump.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcpdump.c#5 (text+ko) ==== @@ -1199,7 +1199,7 @@ } #endif /* WIN32 */ if (cap_enter() < 0) - err(-1, "cap_enter"); + error("cap_enter: %s", pcap_strerror(errno)); status = pcap_loop(pd, cnt, callback, pcap_userdata); if (WFileName == NULL) { /* From owner-p4-projects@FreeBSD.ORG Mon Jan 11 15:44:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25339106566C; Mon, 11 Jan 2010 15:44:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE2E81065670 for ; Mon, 11 Jan 2010 15:44:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA5758FC0A for ; Mon, 11 Jan 2010 15:44:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BFiROv079598 for ; Mon, 11 Jan 2010 15:44:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BFiRSf079596 for perforce@freebsd.org; Mon, 11 Jan 2010 15:44:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jan 2010 15:44:27 GMT Message-Id: <201001111544.o0BFiRSf079596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 15:44:28 -0000 http://p4web.freebsd.org/chv.cgi?CH=172968 Change 172968 by rwatson@rwatson_vimage_client on 2010/01/11 15:43:32 Merge changes in rtld-elf's makefile into our local rtld-elf-cap. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#20 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#20 (text+ko) ==== @@ -1,9 +1,8 @@ # $FreeBSD$ -# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#19 $ - -WITHOUT_SSP= +# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#20 $ .include +MK_SSP= no PROG?= ld-elf-cap.so.1 SRCS= rtld_start.S \ @@ -15,6 +14,7 @@ CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP -g CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf LDFLAGS+= -nostdlib -Wl,-e,.rtld_start +WARNS?= 2 INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec @@ -23,7 +23,7 @@ CFLAGS+= -fpic -DPIC LDFLAGS+= -shared -Wl,-Bsymbolic DPADD= ${LIBC_PIC} -LDADD= -lc_pic +LDADD= -lc_pic -lssp_nonshared .if ${MACHINE_ARCH} != "ia64" .if ${MK_SYMVER} == "yes" From owner-p4-projects@FreeBSD.ORG Mon Jan 11 16:35:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65E68106568F; Mon, 11 Jan 2010 16:35:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29A081065670 for ; Mon, 11 Jan 2010 16:35:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1697C8FC0C for ; Mon, 11 Jan 2010 16:35:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BGZIi3084469 for ; Mon, 11 Jan 2010 16:35:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BGZIhn084467 for perforce@freebsd.org; Mon, 11 Jan 2010 16:35:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Jan 2010 16:35:18 GMT Message-Id: <201001111635.o0BGZIhn084467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 16:35:19 -0000 http://p4web.freebsd.org/chv.cgi?CH=172971 Change 172971 by hselasky@hselasky_laptop001 on 2010/01/11 16:34:59 USB input: - first round of patches, problem partly solved. PR: kern/141011 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#39 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#39 (text+ko) ==== @@ -1419,7 +1419,17 @@ * keyboard system must get out of "Giant" first, before the * CPU can proceed here ... */ - return (EINVAL); + switch (cmd) { + case KDGKBMODE: + case KDSKBMODE: + /* workaround for Geli */ + mtx_lock(&Giant); + i = ukbd_ioctl(kbd, cmd, arg); + mtx_unlock(&Giant); + return (i); + default: + return (EINVAL); + } } switch (cmd) { @@ -1552,7 +1562,11 @@ struct ukbd_softc *sc = kbd->kb_data; if (!mtx_owned(&Giant)) { - return; /* XXX */ + /* XXX cludge */ + mtx_lock(&Giant); + ukbd_clear_state(kbd); + mtx_unlock(&Giant); + return; } sc->sc_flags &= ~(UKBD_FLAG_COMPOSE | UKBD_FLAG_POLLING); @@ -1563,10 +1577,10 @@ sc->sc_buffered_char[0] = 0; sc->sc_buffered_char[1] = 0; #endif - bzero(&sc->sc_ndata, sizeof(sc->sc_ndata)); - bzero(&sc->sc_odata, sizeof(sc->sc_odata)); - bzero(&sc->sc_ntime, sizeof(sc->sc_ntime)); - bzero(&sc->sc_otime, sizeof(sc->sc_otime)); + memset(&sc->sc_ndata, 0, sizeof(sc->sc_ndata)); + memset(&sc->sc_odata, 0, sizeof(sc->sc_odata)); + memset(&sc->sc_ntime, 0, sizeof(sc->sc_ntime)); + memset(&sc->sc_otime, 0, sizeof(sc->sc_otime)); } /* save the internal state, not used */ From owner-p4-projects@FreeBSD.ORG Mon Jan 11 17:02:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF4DE1065679; Mon, 11 Jan 2010 17:02:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89F5F1065672 for ; Mon, 11 Jan 2010 17:02:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74A528FC16 for ; Mon, 11 Jan 2010 17:02:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BH2liS096795 for ; Mon, 11 Jan 2010 17:02:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BH2kEX096793 for perforce@freebsd.org; Mon, 11 Jan 2010 17:02:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Jan 2010 17:02:46 GMT Message-Id: <201001111702.o0BH2kEX096793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 17:02:48 -0000 http://p4web.freebsd.org/chv.cgi?CH=172973 Change 172973 by hselasky@hselasky_laptop001 on 2010/01/11 17:02:28 IFC @ 172972 Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb20.c#14 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#26 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#34 integrate .. //depot/projects/usb/src/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#34 integrate .. //depot/projects/usb/src/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/common/bootstrap.h#5 integrate .. //depot/projects/usb/src/sys/boot/common/dev_net.c#5 integrate .. //depot/projects/usb/src/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/usb/src/sys/boot/efi/libefi/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/efi/libefi/efifs.c#3 delete .. //depot/projects/usb/src/sys/boot/efi/libefi/efipart.c#1 branch .. //depot/projects/usb/src/sys/boot/ia64/efi/conf.c#3 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/version#3 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/Makefile#4 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#10 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_targ_bh.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#13 integrate .. //depot/projects/usb/src/sys/conf/Makefile.mips#2 integrate .. //depot/projects/usb/src/sys/conf/NOTES#52 integrate .. //depot/projects/usb/src/sys/conf/files#90 integrate .. //depot/projects/usb/src/sys/conf/files.mips#7 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#15 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#11 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips#4 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips.mips64#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.mips.octeon1.32#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.mips.octeon1.64#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.mips.octeon1.n32#1 branch .. //depot/projects/usb/src/sys/conf/makeLINT.mk#2 integrate .. //depot/projects/usb/src/sys/conf/options#45 integrate .. //depot/projects/usb/src/sys/conf/options.mips#4 integrate .. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#3 integrate .. //depot/projects/usb/src/sys/ddb/db_ps.c#8 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#13 integrate .. //depot/projects/usb/src/sys/dev/ae/if_ae.c#8 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#10 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#10 integrate .. //depot/projects/usb/src/sys/dev/amd/amd.c#5 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#13 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#23 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ati.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#5 integrate .. //depot/projects/usb/src/sys/dev/bktr/bktr_i2c.c#6 integrate .. //depot/projects/usb/src/sys/dev/cfe/cfe_env.c#1 branch .. //depot/projects/usb/src/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#14 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#20 integrate .. //depot/projects/usb/src/sys/dev/de/if_de.c#10 integrate .. //depot/projects/usb/src/sys/dev/dpt/dpt.h#4 integrate .. //depot/projects/usb/src/sys/dev/dpt/dpt_scsi.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#15 integrate .. //depot/projects/usb/src/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/usb/src/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/usb/src/sys/dev/fatm/if_fatm.c#6 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/usb/src/sys/dev/flash/mx25l.c#1 branch .. //depot/projects/usb/src/sys/dev/flash/mx25lreg.h#1 branch .. //depot/projects/usb/src/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/usb/src/sys/dev/hptmv/entry.c#7 integrate .. //depot/projects/usb/src/sys/dev/ic/ns16550.h#4 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#25 integrate .. //depot/projects/usb/src/sys/dev/iir/iir.c#8 integrate .. //depot/projects/usb/src/sys/dev/iir/iir_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_sm.c#3 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#11 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_library.c#7 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#14 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwnvar.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#16 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#10 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#14 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo.c#7 integrate .. //depot/projects/usb/src/sys/dev/mge/if_mge.c#9 integrate .. //depot/projects/usb/src/sys/dev/mly/mly.c#7 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#20 integrate .. //depot/projects/usb/src/sys/dev/patm/if_patm_intr.c#4 integrate .. //depot/projects/usb/src/sys/dev/pdq/if_fea.c#4 integrate .. //depot/projects/usb/src/sys/dev/safe/safe.c#6 integrate .. //depot/projects/usb/src/sys/dev/siba/siba_cc.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/usb/src/sys/dev/ste/if_ste.c#7 integrate .. //depot/projects/usb/src/sys/dev/trm/trm.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#31 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#99 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_status.c#7 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_smb.c#4 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#33 integrate .. //depot/projects/usb/src/sys/i386/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/i386/conf/PAE#10 integrate .. //depot/projects/usb/src/sys/i386/i386/locore.s#6 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#15 integrate .. //depot/projects/usb/src/sys/i386/xen/locore.s#5 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#13 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#19 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#10 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/usb/src/sys/ia64/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/isa/pnp.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_clock.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_cpu.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_environment.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_fail.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#23 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#14 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#14 integrate .. //depot/projects/usb/src/sys/kern/subr_firmware.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#11 integrate .. //depot/projects/usb/src/sys/mips/adm5120/adm5120_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/adm5120/files.adm5120#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#8 integrate .. //depot/projects/usb/src/sys/mips/adm5120/obio.c#4 integrate .. //depot/projects/usb/src/sys/mips/adm5120/uart_cpu_adm5120.c#3 integrate .. //depot/projects/usb/src/sys/mips/alchemy/alchemy_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/aureg.h#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/files.alchemy#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/obio.c#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/std.alchemy#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/uart_bus_alchemy.c#1 branch .. //depot/projects/usb/src/sys/mips/alchemy/uart_cpu_alchemy.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/apb.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/apbvar.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_bus_space_reversed.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_bus_space_reversed.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_ehci.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_ohci.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_pci.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_pci_bus_space.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_pci_bus_space.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_spi.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_wdog.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xxreg.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/files.ar71xx#1 branch .. //depot/projects/usb/src/sys/mips/atheros/if_arge.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/if_argevar.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/uart_bus_ar71xx.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/uart_cpu_ar71xx.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/asm_octeon.S#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fpa.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_ipd.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_ipd.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pip.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pko.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pko.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/driveid.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/files.octeon1#1 branch .. //depot/projects/usb/src/sys/mips/cavium/obio.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/obiovar.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_ebt3000_cf.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_ebt3000_cf.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeon_pcmap_regs.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octeonreg.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/std.octeon1#1 branch .. //depot/projects/usb/src/sys/mips/cavium/uart_bus_octeonusart.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/uart_cpu_octeonusart.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/uart_dev_oct16550.c#1 branch .. //depot/projects/usb/src/sys/mips/conf/ALCHEMY#1 branch .. //depot/projects/usb/src/sys/mips/conf/AR71XX#1 branch .. //depot/projects/usb/src/sys/mips/conf/AR71XX.hints#1 branch .. //depot/projects/usb/src/sys/mips/conf/MALTA#6 integrate .. //depot/projects/usb/src/sys/mips/conf/MALTA64#1 branch .. //depot/projects/usb/src/sys/mips/conf/OCTEON1#1 branch .. //depot/projects/usb/src/sys/mips/conf/OCTEON1-32#1 branch .. //depot/projects/usb/src/sys/mips/conf/OCTEON1.hints#1 branch .. //depot/projects/usb/src/sys/mips/conf/SENTRY5#7 integrate .. //depot/projects/usb/src/sys/mips/conf/SWARM#1 branch .. //depot/projects/usb/src/sys/mips/conf/SWARM.hints#1 branch .. //depot/projects/usb/src/sys/mips/conf/XLR#1 branch .. //depot/projects/usb/src/sys/mips/idt/files.idt#3 integrate .. //depot/projects/usb/src/sys/mips/idt/idt_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/idt/obio.c#4 integrate .. //depot/projects/usb/src/sys/mips/idt/uart_bus_rc32434.c#3 integrate .. //depot/projects/usb/src/sys/mips/idt/uart_cpu_rc32434.c#2 integrate .. //depot/projects/usb/src/sys/mips/include/_align.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/_bus.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/_types.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/asm.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/atomic.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/bus.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/bus_octeon.h#2 delete .. //depot/projects/usb/src/sys/mips/include/cache.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cache_mipsNN.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cdefs.h#1 branch .. //depot/projects/usb/src/sys/mips/include/cpu.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cpufunc.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cpuinfo.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/cpuregs.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/db_machdep.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/elf.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/endian.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/float.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/fls64.h#1 branch .. //depot/projects/usb/src/sys/mips/include/hwfunc.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/intr.h#2 delete .. //depot/projects/usb/src/sys/mips/include/intr_machdep.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/kdb.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/locore.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/md_var.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/param.h#6 integrate .. //depot/projects/usb/src/sys/mips/include/pcb.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/pltfm.h#2 delete .. //depot/projects/usb/src/sys/mips/include/pmap.h#7 integrate .. //depot/projects/usb/src/sys/mips/include/proc.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/profile.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/psl.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/pte.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/regdef.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/regnum.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/sysarch.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/trap.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/ucontext.h#2 integrate .. //depot/projects/usb/src/sys/mips/malta/files.malta#3 integrate .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#6 integrate .. //depot/projects/usb/src/sys/mips/malta/malta_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/maltareg.h#2 integrate .. //depot/projects/usb/src/sys/mips/malta/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/std.malta#3 integrate .. //depot/projects/usb/src/sys/mips/malta/uart_bus_maltausart.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/uart_cpu_maltausart.c#3 integrate .. //depot/projects/usb/src/sys/mips/malta/yamon.h#2 integrate .. //depot/projects/usb/src/sys/mips/mips/bus_space_generic.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/busdma_machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/cache.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/cache_mipsNN.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/cpu.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/db_trace.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#9 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_trampoline.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/exception.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/fp.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/gdb_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/genassym.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/in_cksum.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/inckern.S#1 branch .. //depot/projects/usb/src/sys/mips/mips/intr_machdep.c#5 integrate .. //depot/projects/usb/src/sys/mips/mips/locore.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#9 integrate .. //depot/projects/usb/src/sys/mips/mips/mainbus.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/mem.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/nexus.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/pm_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#15 integrate .. //depot/projects/usb/src/sys/mips/mips/psraccess.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/ptrace_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/support.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/swtch.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/sys_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/tick.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/tlb.S#2 integrate .. //depot/projects/usb/src/sys/mips/mips/trap.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/vm_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/Makefile.msgring#1 branch .. //depot/projects/usb/src/sys/mips/rmi/board.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/board.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/bus_space_rmi.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/clock.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/clock.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/debug.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/desc.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmilib.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmilib.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmisec.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/stats.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/atx_cpld.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/xgmac_mdio.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/ehcireg.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/ehcivar.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/files.xlr#1 branch .. //depot/projects/usb/src/sys/mips/rmi/interrupt.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/intr_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/iodi.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/iomap.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring.cfg#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring_xls.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/msgring_xls.cfg#1 branch .. //depot/projects/usb/src/sys/mips/rmi/on_chip.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/pcibus.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/pcibus.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon_kern.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon_percpu.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon_utils.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/perfmon_xlrconfig.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/pic.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/rmi_mips_exts.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/rootfs_list.txt#1 branch .. //depot/projects/usb/src/sys/mips/rmi/shared_structs.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/shared_structs_func.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/shared_structs_offsets.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/std.xlr#1 branch .. //depot/projects/usb/src/sys/mips/rmi/tick.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/uart_bus_xlr_iodi.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/uart_cpu_mips_xlr.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_boot1_console.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_csum_nocopy.S#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_i2c.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlr_pci.c#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xlrconfig.h#1 branch .. //depot/projects/usb/src/sys/mips/rmi/xls_ehci.c#1 branch .. //depot/projects/usb/src/sys/mips/sentry5/files.sentry5#2 integrate .. //depot/projects/usb/src/sys/mips/sentry5/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/sentry5/s5_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/sentry5/siba_cc.c#2 delete .. //depot/projects/usb/src/sys/mips/sentry5/siba_mips.c#2 delete .. //depot/projects/usb/src/sys/mips/sentry5/siba_sdram.c#2 delete .. //depot/projects/usb/src/sys/mips/sentry5/uart_bus_sbusart.c#3 integrate .. //depot/projects/usb/src/sys/mips/sentry5/uart_cpu_sbusart.c#3 integrate .. //depot/projects/usb/src/sys/mips/sibyte/ata_zbbus.c#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/files.sibyte#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_asm.S#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_machdep.c#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_scd.c#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_scd.h#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbbus.c#1 branch .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbpci.c#1 branch .. //depot/projects/usb/src/sys/modules/Makefile#47 integrate .. //depot/projects/usb/src/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/epic/Makefile#1 branch .. //depot/projects/usb/src/sys/net/flowtable.c#15 integrate .. //depot/projects/usb/src/sys/net/if_epair.c#4 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#28 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#14 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#27 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#26 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether.c#17 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#8 integrate .. //depot/projects/usb/src/sys/netinet/in.c#41 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#21 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#27 integrate .. //depot/projects/usb/src/sys/netinet/ip_var.h#16 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#8 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_dynamic.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_private.h#4 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_sockopt.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_table.c#3 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_db.c#10 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_mod.c#4 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#33 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#27 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#32 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#21 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#22 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#33 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs.h#12 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_fha.c#6 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#11 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptosoft.c#9 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#24 integrate .. //depot/projects/usb/src/sys/pc98/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/pci/ncr.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#10 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#9 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#18 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#26 integrate .. //depot/projects/usb/src/sys/powerpc/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/rpc/clnt_dg.c#8 integrate .. //depot/projects/usb/src/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#2 integrate .. //depot/projects/usb/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#26 integrate .. //depot/projects/usb/src/sys/sparc64/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/sparc64/ebus/epic.c#1 branch .. //depot/projects/usb/src/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#18 integrate .. //depot/projects/usb/src/sys/sun4v/conf/Makefile#2 integrate .. //depot/projects/usb/src/sys/sys/proc.h#25 integrate .. //depot/projects/usb/src/sys/sys/sleepqueue.h#8 integrate .. //depot/projects/usb/src/sys/sys/socket.h#11 integrate .. //depot/projects/usb/src/sys/sys/systm.h#21 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_dirhash.c#11 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_probe.c#7 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#7 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#18 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#10 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#9 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#21 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb20.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.6 2009/11/20 08:57:25 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.7 2010/01/10 19:18:49 thompsa Exp $ */ /*- * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#26 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.311 2009/11/04 22:39:18 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.312 2010/01/10 21:00:52 alc Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -98,12 +98,6 @@ char *nmi_stack; void *dpcpu; -/* Hotwire a 0->4MB V==P mapping */ -extern pt_entry_t *KPTphys; - -/* SMP page table page */ -extern pt_entry_t *SMPpt; - struct pcb stoppcbs[MAXCPU]; struct xpcb **stopxpcbs = NULL; ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#34 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.676 2009/11/11 14:21:31 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.677 2010/01/11 16:01:20 alc Exp $"); /* * Manages physical address maps. @@ -664,7 +664,6 @@ void pmap_init(void) { - pd_entry_t *pd; vm_page_t mpte; vm_size_t s; int i, pv_npg; @@ -673,18 +672,13 @@ * Initialize the vm page array entries for the kernel pmap's * page table pages. */ - pd = pmap_pde(kernel_pmap, KERNBASE); for (i = 0; i < NKPT; i++) { - if ((pd[i] & (PG_PS | PG_V)) == (PG_PS | PG_V)) - continue; - KASSERT((pd[i] & PG_V) != 0, - ("pmap_init: page table page is missing")); - mpte = PHYS_TO_VM_PAGE(pd[i] & PG_FRAME); + mpte = PHYS_TO_VM_PAGE(KPTphys + (i << PAGE_SHIFT)); KASSERT(mpte >= vm_page_array && mpte < &vm_page_array[vm_page_array_size], ("pmap_init: page table page is out of range")); mpte->pindex = pmap_pde_pindex(KERNBASE) + i; - mpte->phys_addr = pd[i] & PG_FRAME; + mpte->phys_addr = KPTphys + (i << PAGE_SHIFT); } /* ==== //depot/projects/usb/src/sys/amd64/amd64/sys_machdep.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.94 2009/07/09 09:34:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.95 2010/01/09 11:28:01 kib Exp $"); #include #include @@ -420,13 +420,14 @@ return (pldt); } - mdp->md_ldt = new_ldt; if (pldt != NULL) { bcopy(pldt->ldt_base, new_ldt->ldt_base, max_ldt_segment * sizeof(struct user_segment_descriptor)); user_ldt_derefl(pldt); } ssdtosyssd(&sldt, &p->p_md.md_ldt_sd); + atomic_store_rel_ptr((volatile uintptr_t *)&mdp->md_ldt, + (uintptr_t)new_ldt); if (p == curproc) set_user_ldt(mdp); ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#34 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.535 2010/01/03 20:40:54 brooks Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.536 2010/01/10 17:44:22 imp Exp $ cpu HAMMER ident GENERIC @@ -75,6 +75,7 @@ options FLOWTABLE # per-cpu routing cache #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks +options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/usb/src/sys/amd64/conf/Makefile#2 (text+ko) ==== @@ -1,3 +1,5 @@ -# $FreeBSD: src/sys/amd64/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/Makefile,v 1.10 2010/01/08 18:57:31 bz Exp $ + +TARGET=amd64 .include "${.CURDIR}/../../conf/makeLINT.mk" ==== //depot/projects/usb/src/sys/boot/common/bootstrap.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.46 2008/11/17 20:49:29 pjd Exp $ + * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.47 2010/01/09 22:54:29 marcel Exp $ */ #include @@ -45,6 +45,7 @@ #define DEVT_CD 3 #define DEVT_ZFS 4 int d_unit; + void *d_opendata; }; /* Commands and return values; nonzero return sets command_errmsg != NULL */ ==== //depot/projects/usb/src/sys/boot/common/dev_net.c#5 (text+ko) ==== @@ -1,6 +1,4 @@ -/* - * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ - */ +/* $NetBSD: dev_net.c,v 1.23 2008/04/28 20:24:06 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -17,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -39,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.19 2009/12/24 15:16:16 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.21 2010/01/09 21:23:39 marius Exp $"); /*- * This module implements a "raw device" interface suitable for @@ -80,12 +71,14 @@ int debug = 0; #endif +static char *netdev_name; static int netdev_sock = -1; static int netdev_opens; static int net_init(void); static int net_open(struct open_file *, ...); static int net_close(struct open_file *); +static void net_cleanup(void); static int net_strategy(); static void net_print(int); @@ -99,7 +92,8 @@ net_open, net_close, noioctl, - net_print + net_print, + net_cleanup }; static int @@ -125,6 +119,12 @@ devname = va_arg(args, char*); va_end(args); +#ifdef NETIF_OPEN_CLOSE_ONCE + /* Before opening another interface, close the previous one first. */ + if (netdev_sock >= 0 && strcmp(devname, netdev_name) != 0) + net_cleanup(); +#endif + /* On first open, do netif open, mount, etc. */ if (netdev_opens == 0) { /* Find network interface. */ @@ -134,6 +134,7 @@ printf("net_open: netif_open() failed\n"); return (ENXIO); } + netdev_name = strdup(devname); #ifdef NETIF_DEBUG if (debug) printf("net_open: netif_open() succeeded\n"); @@ -144,14 +145,12 @@ error = net_getparams(netdev_sock); if (error) { /* getparams makes its own noise */ + free(netdev_name); netif_close(netdev_sock); netdev_sock = -1; return (error); } } -#if defined(__sparc64__) - netdev_opens++; -#endif } netdev_opens++; f->f_devdata = &netdev_sock; @@ -161,30 +160,46 @@ static int net_close(struct open_file *f) { + #ifdef NETIF_DEBUG if (debug) printf("net_close: opens=%d\n", netdev_opens); #endif - /* On last close, do netif close, etc. */ f->f_devdata = NULL; + +#ifndef NETIF_OPEN_CLOSE_ONCE /* Extra close call? */ if (netdev_opens <= 0) return (0); netdev_opens--; /* Not last close? */ if (netdev_opens > 0) - return(0); - rootip.s_addr = 0; + return (0); + /* On last close, do netif close, etc. */ +#ifdef NETIF_DEBUG + if (debug) + printf("net_close: calling net_cleanup()\n"); +#endif + net_cleanup(); +#endif + return (0); +} + +static void +net_cleanup(void) +{ + if (netdev_sock >= 0) { #ifdef NETIF_DEBUG if (debug) - printf("net_close: calling netif_close()\n"); + printf("net_cleanup: calling netif_close()\n"); #endif + rootip.s_addr = 0; + free(netdev_name); netif_close(netdev_sock); netdev_sock = -1; } - return (0); } static int ==== //depot/projects/usb/src/sys/boot/efi/include/efilib.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.7 2010/01/09 22:54:29 marcel Exp $ */ #include @@ -34,9 +34,7 @@ extern EFI_BOOT_SERVICES *BS; extern EFI_RUNTIME_SERVICES *RS; -extern struct devsw efifs_dev; -extern struct fs_ops efifs_fsops; - +extern struct devsw efipart_dev; extern struct devsw efinet_dev; extern struct netif_driver efinetif; ==== //depot/projects/usb/src/sys/boot/efi/libefi/Makefile#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.18 2010/01/09 22:54:29 marcel Exp $ LIB= efi INTERNALLIB= -SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \ - time.c +SRCS= delay.c efi_console.c efinet.c efipart.c errno.c handles.c \ + libefi.c time.c CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} ==== //depot/projects/usb/src/sys/boot/ia64/efi/conf.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/conf.c,v 1.12 2006/11/05 22:03:04 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/conf.c,v 1.13 2010/01/09 22:54:29 marcel Exp $"); #include #include @@ -49,15 +49,16 @@ /* Exported for libstand */ struct devsw *devsw[] = { - &efifs_dev, + &efipart_dev, &efinet_dev, NULL }; struct fs_ops *file_system[] = { - &efifs_fsops, + &dosfs_fsops, + &ufs_fsops, + &cd9660_fsops, &nfs_fsops, - &ufs_fsops, &gzipfs_fsops, NULL }; ==== //depot/projects/usb/src/sys/boot/ia64/efi/main.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/main.c,v 1.27 2006/11/05 22:03:04 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/efi/main.c,v 1.28 2010/01/10 00:14:04 marcel Exp $"); #include #include @@ -127,8 +127,6 @@ /* Get our loaded image protocol interface structure. */ BS->HandleProtocol(IH, &imgid, (VOID**)&img); - printf("Image base: 0x%016lx\n", (u_long)img->ImageBase); - printf("\n"); printf("%s, Revision %s\n", bootprog_name, bootprog_rev); printf("(%s, %s)\n", bootprog_maker, bootprog_date); ==== //depot/projects/usb/src/sys/boot/ia64/efi/version#3 (text+ko) ==== @@ -1,8 +1,11 @@ -$FreeBSD: src/sys/boot/ia64/efi/version,v 1.7 2006/11/05 22:03:04 marcel Exp $ +$FreeBSD: src/sys/boot/ia64/efi/version,v 1.8 2010/01/09 22:54:29 marcel Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +2.0: Provide devices based on the block I/O protocol, rather than the + simple file services protocol. Use the FreeBSD file system code + on top of those devices to access files. 1.2: Restructured. Has some user visible differences. 1.1: Pass the HCDP table address to the kernel via bootinfo if one is present in the EFI system table. ==== //depot/projects/usb/src/sys/boot/sparc64/loader/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.23 2010/01/09 21:23:39 marius Exp $ .include MK_SSP= no @@ -51,11 +51,15 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif -# Always add MI sources +# Always add MI sources .PATH: ${.CURDIR}/../../common .include "${.CURDIR}/../../common/Makefile.inc" CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. +# Avoid the open-close-dance for every file access as some firmwares perform +# an auto-negotiation on every open of the network interface and thus causes +# netbooting to take horribly long. +CFLAGS+= -DNETIF_OPEN_CLOSE_ONCE CLEANFILES+= vers.c loader.help ==== //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.18 2009/12/07 16:23:25 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.19 2010/01/10 09:20:56 mav Exp $"); #include #include @@ -1001,7 +1001,6 @@ union ccb *request_ccb; struct ccb_pathinq *cpi; int counter; - int found; } ata_scan_bus_info; /* @@ -1049,14 +1048,11 @@ } scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; - if (scan_info->cpi->transport == XPORT_ATA) - scan_info->found = 0x0003; - else - scan_info->found = 0x8001; - scan_info->counter = 0; /* If PM supported, probe it first. */ if (scan_info->cpi->hba_inquiry & PI_SATAPM) - scan_info->counter = 15; + scan_info->counter = scan_info->cpi->max_target; + else + scan_info->counter = 0; work_ccb = xpt_alloc_ccb_nowait(); if (work_ccb == NULL) { @@ -1073,10 +1069,11 @@ /* Free the current request path- we're done with it. */ xpt_free_path(work_ccb->ccb_h.path); /* If there is PMP... */ - if (scan_info->counter == 15) { + if ((scan_info->cpi->hba_inquiry & PI_SATAPM) && + (scan_info->counter == scan_info->cpi->max_target)) { if (work_ccb->ccb_h.ppriv_field1 != 0) { /* everything else willbe probed by it */ - scan_info->found = 0x8000; + goto done; } else { struct ccb_trans_settings cts; @@ -1091,11 +1088,10 @@ xpt_action((union ccb *)&cts); } } -take_next: - /* Take next device. Wrap from 15 (PM) to 0. */ - scan_info->counter = (scan_info->counter + 1 ) & 0x0f; - if (scan_info->counter > scan_info->cpi->max_target - - ((scan_info->cpi->hba_inquiry & PI_SATAPM) ? 1 : 0)) { + if (scan_info->counter == + ((scan_info->cpi->hba_inquiry & PI_SATAPM) ? + 0 : scan_info->cpi->max_target)) { +done: xpt_free_ccb(work_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; @@ -1104,9 +1100,10 @@ xpt_done(request_ccb); break; } + /* Take next device. Wrap from max (PMP) to 0. */ + scan_info->counter = (scan_info->counter + 1 ) % + (scan_info->cpi->max_target + 1); scan_next: - if ((scan_info->found & (1 << scan_info->counter)) == 0) - goto take_next; status = xpt_create_path(&path, xpt_periph, scan_info->request_ccb->ccb_h.path_id, scan_info->counter, 0); ==== //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.42 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.43 2010/01/07 21:01:37 mbr Exp $"); #include #include @@ -1555,7 +1555,7 @@ */ static int safte_getconfig(ses_softc_t *); -static int safte_rdstat(ses_softc_t *, int);; +static int safte_rdstat(ses_softc_t *, int); static int set_objstat_sel(ses_softc_t *, ses_objstat *, int); static int wrbuf16(ses_softc_t *, uint8_t, uint8_t, uint8_t, uint8_t, int); static void wrslot_stat(ses_softc_t *, int); @@ -2257,7 +2257,7 @@ ssc->ses_objmap[oid].encstat[0] = SES_OBJSTAT_NOTAVAIL; ssc->ses_objmap[oid].encstat[1] = 0; ssc->ses_objmap[oid].encstat[2] = sdata[r]; - ssc->ses_objmap[oid].encstat[3] = 0;; + ssc->ses_objmap[oid].encstat[3] = 0; ssc->ses_objmap[oid++].svalid = 1; r++; } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_targ_bh.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.26 2009/10/23 08:27:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.27 2010/01/07 21:01:37 mbr Exp $"); #include #include @@ -429,7 +429,7 @@ switch (softc->init_level) { case 0: - panic("targdtor - impossible init level");; + panic("targdtor - impossible init level"); case 1: /* FALLTHROUGH */ default: ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 (text+ko) ==== @@ -847,6 +847,12 @@ if (err != 0 && err != ENOENT) return (EINVAL); + if (drro->drr_bonuslen) { + data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); + if (ra->err) + return (ra->err); + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 11 21:48:40 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 003751065670; Mon, 11 Jan 2010 21:48:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6C7C106566C for ; Mon, 11 Jan 2010 21:48:39 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A32E68FC1D for ; Mon, 11 Jan 2010 21:48:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BLmdVi033895 for ; Mon, 11 Jan 2010 21:48:39 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BLmbJi033893 for perforce@freebsd.org; Mon, 11 Jan 2010 21:48:37 GMT (envelope-from peter@wemm.org) Date: Mon, 11 Jan 2010 21:48:37 GMT Message-Id: <201001112148.o0BLmbJi033893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 21:48:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=172990 Change 172990 by peter@peter_daintree on 2010/01/11 21:48:24 IFC @172987 Affected files ... .. //depot/projects/hammer/Makefile#57 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#75 integrate .. //depot/projects/hammer/UPDATING#140 integrate .. //depot/projects/hammer/bin/pkill/pkill.c#6 integrate .. //depot/projects/hammer/bin/sh/error.c#8 integrate .. //depot/projects/hammer/bin/sh/eval.c#26 integrate .. //depot/projects/hammer/bin/sh/exec.c#17 integrate .. //depot/projects/hammer/bin/sh/expand.c#19 integrate .. //depot/projects/hammer/bin/sh/output.h#5 integrate .. //depot/projects/hammer/bin/sh/parser.c#20 integrate .. //depot/projects/hammer/contrib/gcc/config/mips/freebsd.h#2 integrate .. //depot/projects/hammer/contrib/one-true-awk/FIXES#9 integrate .. //depot/projects/hammer/contrib/one-true-awk/b.c#8 integrate .. //depot/projects/hammer/contrib/one-true-awk/lib.c#7 integrate .. //depot/projects/hammer/contrib/one-true-awk/mac.code#3 delete .. //depot/projects/hammer/contrib/one-true-awk/main.c#8 integrate .. //depot/projects/hammer/contrib/one-true-awk/makefile#6 integrate .. //depot/projects/hammer/contrib/one-true-awk/maketab.c#4 integrate .. //depot/projects/hammer/contrib/one-true-awk/proctab.c#4 integrate .. //depot/projects/hammer/contrib/one-true-awk/proto.h#3 integrate .. //depot/projects/hammer/contrib/one-true-awk/run.c#8 integrate .. //depot/projects/hammer/contrib/opie/libopie/getutmpentry.c#2 integrate .. //depot/projects/hammer/contrib/opie/libopie/insecure.c#2 integrate .. //depot/projects/hammer/contrib/opie/libopie/login.c#2 integrate .. //depot/projects/hammer/contrib/tcp_wrappers/hosts_access.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/kcm/connect.c#2 integrate .. //depot/projects/hammer/etc/defaults/devfs.rules#7 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#102 integrate .. //depot/projects/hammer/etc/rc.d/named#22 integrate .. //depot/projects/hammer/etc/rc.d/nsswitch#9 integrate .. //depot/projects/hammer/etc/rc.firewall#14 integrate .. //depot/projects/hammer/etc/termcap.small#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#91 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#13 integrate .. //depot/projects/hammer/games/pom/pom.6#2 integrate .. //depot/projects/hammer/games/pom/pom.c#4 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#24 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#12 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.mips#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile.tgt#9 integrate .. //depot/projects/hammer/include/Makefile#83 integrate .. //depot/projects/hammer/include/dirent.h#7 integrate .. //depot/projects/hammer/include/semaphore.h#1 branch .. //depot/projects/hammer/include/strings.h#8 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kdestroy/Makefile#7 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kpasswd/Makefile#6 integrate .. //depot/projects/hammer/lib/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/csu/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/csu/arm/Makefile#3 integrate .. //depot/projects/hammer/lib/csu/i386-elf/Makefile#6 integrate .. //depot/projects/hammer/lib/csu/mips/Makefile#3 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#57 integrate .. //depot/projects/hammer/lib/libauditd/Makefile#2 integrate .. //depot/projects/hammer/lib/libautofs/Makefile#6 integrate .. //depot/projects/hammer/lib/libbegemot/Makefile#8 integrate .. //depot/projects/hammer/lib/libbsm/Makefile#11 integrate .. //depot/projects/hammer/lib/libbz2/Makefile#9 integrate .. //depot/projects/hammer/lib/libc/Makefile#35 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#44 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#18 integrate .. //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#10 integrate .. //depot/projects/hammer/lib/libc/gen/opendir.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/scandir.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/scandir.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/sem.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/sem_init.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/sem_new.c#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_open.3#4 integrate .. //depot/projects/hammer/lib/libc/include/libc_private.h#20 integrate .. //depot/projects/hammer/lib/libc/mips/Symbol.map#3 integrate .. //depot/projects/hammer/lib/libc/mips/gen/fpgetmask.c#2 delete .. //depot/projects/hammer/lib/libc/mips/gen/fpgetround.c#2 delete .. //depot/projects/hammer/lib/libc/mips/gen/fpgetsticky.c#2 delete .. //depot/projects/hammer/lib/libc/mips/gen/fpsetmask.c#2 delete .. //depot/projects/hammer/lib/libc/mips/gen/fpsetround.c#2 delete .. //depot/projects/hammer/lib/libc/mips/gen/fpsetsticky.c#2 delete .. //depot/projects/hammer/lib/libc/mips/gen/hardfloat/fpgetmask.c#1 branch .. //depot/projects/hammer/lib/libc/mips/gen/hardfloat/fpgetround.c#1 branch .. //depot/projects/hammer/lib/libc/mips/gen/hardfloat/fpgetsticky.c#1 branch .. //depot/projects/hammer/lib/libc/mips/gen/hardfloat/fpsetmask.c#1 branch .. //depot/projects/hammer/lib/libc/mips/gen/hardfloat/fpsetround.c#1 branch .. //depot/projects/hammer/lib/libc/mips/gen/hardfloat/fpsetsticky.c#1 branch .. //depot/projects/hammer/lib/libc/mips/sys/brk.S#2 integrate .. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#16 integrate .. //depot/projects/hammer/lib/libc/rpc/getnetpath.c#7 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_auth_des.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fread.c#8 integrate .. //depot/projects/hammer/lib/libc/stdio/fwrite.c#6 integrate .. //depot/projects/hammer/lib/libc/stdio/getc.3#8 integrate .. //depot/projects/hammer/lib/libc/stdtime/localtime.c#16 integrate .. //depot/projects/hammer/lib/libc/sys/cpuset.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#16 integrate .. //depot/projects/hammer/lib/libcalendar/Makefile#2 integrate .. //depot/projects/hammer/lib/libcam/Makefile#6 integrate .. //depot/projects/hammer/lib/libcompat/Makefile#6 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#13 integrate .. //depot/projects/hammer/lib/libdevinfo/Makefile#2 integrate .. //depot/projects/hammer/lib/libdevstat/Makefile#12 integrate .. //depot/projects/hammer/lib/libdwarf/Makefile#3 integrate .. //depot/projects/hammer/lib/libedit/Makefile#10 integrate .. //depot/projects/hammer/lib/libelf/Makefile#3 integrate .. //depot/projects/hammer/lib/libexpat/Makefile#10 integrate .. //depot/projects/hammer/lib/libftpio/Makefile#9 integrate .. //depot/projects/hammer/lib/libgpib/Makefile#9 integrate .. //depot/projects/hammer/lib/libgssapi/Makefile#5 integrate .. //depot/projects/hammer/lib/libipsec/Makefile#13 integrate .. //depot/projects/hammer/lib/libipx/Makefile#3 integrate .. //depot/projects/hammer/lib/libjail/Makefile#2 integrate .. //depot/projects/hammer/lib/libkiconv/Makefile#9 integrate .. //depot/projects/hammer/lib/libkvm/Makefile#8 integrate .. //depot/projects/hammer/lib/libmagic/Makefile#14 integrate .. //depot/projects/hammer/lib/libmd/Makefile#7 integrate .. //depot/projects/hammer/lib/libmilter/Makefile#8 integrate .. //depot/projects/hammer/lib/libmp/Makefile#10 integrate .. //depot/projects/hammer/lib/libncp/Makefile#11 integrate .. //depot/projects/hammer/lib/libngatm/Makefile#11 integrate .. //depot/projects/hammer/lib/libopie/Makefile#12 integrate .. //depot/projects/hammer/lib/libpam/modules/Makefile.inc#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_exec/Makefile#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/Makefile#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/Makefile#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ssh/Makefile#10 integrate .. //depot/projects/hammer/lib/libpcap/Makefile#17 integrate .. //depot/projects/hammer/lib/libpmc/Makefile#9 integrate .. //depot/projects/hammer/lib/libproc/Makefile#3 integrate .. //depot/projects/hammer/lib/libradius/Makefile#15 integrate .. //depot/projects/hammer/lib/librpcsec_gss/Makefile#2 integrate .. //depot/projects/hammer/lib/librt/Makefile#6 integrate .. //depot/projects/hammer/lib/libsbuf/Makefile#3 integrate .. //depot/projects/hammer/lib/libsm/Makefile#12 integrate .. //depot/projects/hammer/lib/libsmdb/Makefile#4 integrate .. //depot/projects/hammer/lib/libsmutil/Makefile#4 integrate .. //depot/projects/hammer/lib/libstand/Makefile#25 integrate .. //depot/projects/hammer/lib/libstand/dosfs.c#4 integrate .. //depot/projects/hammer/lib/libtacplus/Makefile#10 integrate .. //depot/projects/hammer/lib/libthr/arch/mips/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libthr/pthread.map#22 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#17 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#31 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#45 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#11 integrate .. //depot/projects/hammer/lib/libthread_db/Makefile#14 integrate .. //depot/projects/hammer/lib/libufs/Makefile#11 integrate .. //depot/projects/hammer/lib/libugidfw/Makefile#11 integrate .. //depot/projects/hammer/lib/libulog/Makefile#2 integrate .. //depot/projects/hammer/lib/libusb/Makefile#4 integrate .. //depot/projects/hammer/lib/libusb/libusb20.c#5 integrate .. //depot/projects/hammer/lib/libutil/Makefile#24 integrate .. //depot/projects/hammer/lib/libvgl/Makefile#8 integrate .. //depot/projects/hammer/lib/libwrap/Makefile#15 integrate .. //depot/projects/hammer/lib/liby/Makefile#7 integrate .. //depot/projects/hammer/lib/libypclnt/Makefile#12 integrate .. //depot/projects/hammer/lib/libz/Makefile#5 integrate .. //depot/projects/hammer/lib/ncurses/Makefile.inc#3 integrate .. //depot/projects/hammer/libexec/Makefile.inc#2 integrate .. //depot/projects/hammer/libexec/atrun/Makefile#4 integrate .. //depot/projects/hammer/libexec/bootpd/Makefile#2 integrate .. //depot/projects/hammer/libexec/bootpd/Makefile.inc#2 integrate .. //depot/projects/hammer/libexec/bootpd/tools/Makefile.inc#2 integrate .. //depot/projects/hammer/libexec/comsat/comsat.c#4 integrate .. //depot/projects/hammer/libexec/fingerd/Makefile#3 integrate .. //depot/projects/hammer/libexec/getty/Makefile#2 integrate .. //depot/projects/hammer/libexec/mail.local/Makefile#4 integrate .. //depot/projects/hammer/libexec/mknetid/Makefile#2 integrate .. //depot/projects/hammer/libexec/pppoed/Makefile#3 integrate .. //depot/projects/hammer/libexec/rbootd/Makefile#2 integrate .. //depot/projects/hammer/libexec/revnetgroup/Makefile#2 integrate .. //depot/projects/hammer/libexec/rpc.rquotad/Makefile#3 integrate .. //depot/projects/hammer/libexec/rpc.rstatd/Makefile#4 integrate .. //depot/projects/hammer/libexec/rpc.rusersd/Makefile#3 integrate .. //depot/projects/hammer/libexec/rpc.rwalld/Makefile#3 integrate .. //depot/projects/hammer/libexec/rpc.sprayd/Makefile#2 integrate .. //depot/projects/hammer/libexec/rshd/Makefile#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#24 integrate .. //depot/projects/hammer/libexec/smrsh/Makefile#4 integrate .. //depot/projects/hammer/libexec/talkd/Makefile#3 integrate .. //depot/projects/hammer/libexec/tcpd/Makefile#7 integrate .. //depot/projects/hammer/libexec/tftp-proxy/Makefile#2 integrate .. //depot/projects/hammer/libexec/tftpd/Makefile#3 integrate .. //depot/projects/hammer/libexec/ulog-helper/Makefile#2 integrate .. //depot/projects/hammer/libexec/ypxfr/Makefile#2 integrate .. //depot/projects/hammer/release/Makefile#111 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#56 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#17 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#13 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#20 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#13 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/cache/Makefile#2 integrate .. //depot/projects/hammer/sbin/geom/class/cache/gcache.8#1 branch .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#17 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#10 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#16 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#17 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#16 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.8#10 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#26 integrate .. //depot/projects/hammer/secure/Makefile.inc#6 integrate .. //depot/projects/hammer/share/man/man3/Makefile#23 integrate .. //depot/projects/hammer/share/man/man3/pthread.3#12 integrate .. //depot/projects/hammer/share/man/man3/pthread_affinity_np.3#1 branch .. //depot/projects/hammer/share/man/man3/pthread_attr.3#4 integrate .. //depot/projects/hammer/share/man/man3/pthread_attr_affinity_np.3#1 branch .. //depot/projects/hammer/share/man/man4/bridge.4#7 integrate .. //depot/projects/hammer/share/man/man4/carp.4#8 integrate .. //depot/projects/hammer/share/man/man4/faith.4#4 integrate .. //depot/projects/hammer/share/man/man4/mfi.4#9 integrate .. //depot/projects/hammer/share/man/man4/uart.4#8 integrate .. //depot/projects/hammer/share/man/man5/devfs.rules.5#7 integrate .. //depot/projects/hammer/share/man/man7/security.7#19 integrate .. //depot/projects/hammer/share/man/man9/VFS.9#6 integrate .. //depot/projects/hammer/share/man/man9/VFS_CHECKEXP.9#6 integrate .. //depot/projects/hammer/share/man/man9/VFS_FHTOVP.9#6 integrate .. //depot/projects/hammer/share/man/man9/sleepqueue.9#13 integrate .. //depot/projects/hammer/share/man/man9/vm_page_bits.9#3 integrate .. //depot/projects/hammer/share/misc/committers-doc.dot#9 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#45 integrate .. //depot/projects/hammer/share/termcap/termcap.src#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/io.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#142 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#195 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#32 integrate .. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#16 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#126 integrate .. //depot/projects/hammer/sys/amd64/conf/Makefile#5 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#43 integrate .. //depot/projects/hammer/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#24 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#16 integrate .. //depot/projects/hammer/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/hammer/sys/arm/conf/DEFAULTS#4 integrate .. //depot/projects/hammer/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/hammer/sys/arm/econa/econa.c#1 branch .. //depot/projects/hammer/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/hammer/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/hammer/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/hammer/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/hammer/sys/arm/econa/files.econa#1 branch .. //depot/projects/hammer/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/hammer/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/hammer/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/hammer/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/hammer/sys/arm/econa/std.econa#1 branch .. //depot/projects/hammer/sys/arm/econa/timer.c#1 branch .. //depot/projects/hammer/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/hammer/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/hammer/sys/arm/include/cpuconf.h#9 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#15 integrate .. //depot/projects/hammer/sys/boot/common/bootstrap.h#11 integrate .. //depot/projects/hammer/sys/boot/common/dev_net.c#9 integrate .. //depot/projects/hammer/sys/boot/efi/include/efilib.h#5 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/Makefile#8 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/efifs.c#5 delete .. //depot/projects/hammer/sys/boot/efi/libefi/efipart.c#1 branch .. //depot/projects/hammer/sys/boot/ia64/efi/conf.c#4 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/version#3 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/selector.s#3 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/Makefile#12 integrate .. //depot/projects/hammer/sys/boot/zfs/zfsimpl.c#7 integrate .. //depot/projects/hammer/sys/cam/ata/ata_xpt.c#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#21 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#14 integrate .. //depot/projects/hammer/sys/cddl/boot/zfs/zfsimpl.h#5 integrate .. //depot/projects/hammer/sys/cddl/boot/zfs/zfssubr.c#5 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#11 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#36 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.c#13 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#30 integrate .. //depot/projects/hammer/sys/conf/Makefile.mips#2 integrate .. //depot/projects/hammer/sys/conf/NOTES#168 integrate .. //depot/projects/hammer/sys/conf/files#206 integrate .. //depot/projects/hammer/sys/conf/files.ia64#49 integrate .. //depot/projects/hammer/sys/conf/files.mips#7 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#53 integrate .. //depot/projects/hammer/sys/conf/kern.mk#30 integrate .. //depot/projects/hammer/sys/conf/ldscript.mips#4 integrate .. //depot/projects/hammer/sys/conf/ldscript.mips.mips64#1 branch .. //depot/projects/hammer/sys/conf/ldscript.mips.octeon1.32#1 branch .. //depot/projects/hammer/sys/conf/ldscript.mips.octeon1.64#1 branch .. //depot/projects/hammer/sys/conf/ldscript.mips.octeon1.n32#1 branch .. //depot/projects/hammer/sys/conf/makeLINT.mk#2 integrate .. //depot/projects/hammer/sys/conf/options#149 integrate .. //depot/projects/hammer/sys/conf/options.arm#20 integrate .. //depot/projects/hammer/sys/conf/options.mips#4 integrate .. //depot/projects/hammer/sys/contrib/ngatm/netnatm/api/cc_conn.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#25 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#56 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#18 integrate .. //depot/projects/hammer/sys/dev/ae/if_ae.c#8 integrate .. //depot/projects/hammer/sys/dev/agp/agp.c#9 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.c#7 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#18 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#47 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#78 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#47 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ahci.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ati.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-siliconimage.c#6 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#76 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#94 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_i2c.c#9 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#32 integrate .. //depot/projects/hammer/sys/dev/cfe/cfe_api.c#2 integrate .. //depot/projects/hammer/sys/dev/cfe/cfe_env.c#1 branch .. //depot/projects/hammer/sys/dev/cs/if_cs.c#24 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#17 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#33 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#21 integrate .. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#11 integrate .. //depot/projects/hammer/sys/dev/de/if_de.c#11 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt.h#7 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#19 integrate .. //depot/projects/hammer/sys/dev/e1000/if_em.c#12 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#31 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#24 integrate .. //depot/projects/hammer/sys/dev/exca/excareg.h#6 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#20 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#42 integrate .. //depot/projects/hammer/sys/dev/flash/mx25l.c#1 branch .. //depot/projects/hammer/sys/dev/flash/mx25lreg.h#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#19 integrate .. //depot/projects/hammer/sys/dev/hptmv/entry.c#17 integrate .. //depot/projects/hammer/sys/dev/ic/ns16550.h#9 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#77 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#12 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#20 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/io/iodev.c#4 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_sm.c#4 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#32 integrate .. //depot/projects/hammer/sys/dev/isp/isp_library.c#9 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwn.c#11 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwnvar.h#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.c#13 integrate .. //depot/projects/hammer/sys/dev/jme/if_jme.c#10 integrate .. //depot/projects/hammer/sys/dev/lmc/if_lmc.c#18 integrate .. //depot/projects/hammer/sys/dev/malo/if_malo.c#7 integrate .. //depot/projects/hammer/sys/dev/mge/if_mge.c#8 integrate .. //depot/projects/hammer/sys/dev/mii/tdkphy.c#13 integrate .. //depot/projects/hammer/sys/dev/mk48txx/mk48txx.c#9 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#21 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#25 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_intr.c#9 integrate .. //depot/projects/hammer/sys/dev/pccard/card_if.m#14 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#79 integrate .. //depot/projects/hammer/sys/dev/pci/pci_private.h#20 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fea.c#10 integrate .. //depot/projects/hammer/sys/dev/safe/safe.c#13 integrate .. //depot/projects/hammer/sys/dev/siba/siba_cc.c#1 branch .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#18 integrate .. //depot/projects/hammer/sys/dev/ste/if_ste.c#6 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/controller/musb_otg.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/controller/uhci.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/quirk/usb_quirk.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/serial/u3g.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/storage/umass.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usb_msctest.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_msctest.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#126 integrate .. //depot/projects/hammer/sys/dev/xl/if_xl.c#7 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clstate.c#6 integrate .. //depot/projects/hammer/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#21 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#13 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#27 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#40 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#25 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#18 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#32 integrate .. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#13 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#12 integrate .. //depot/projects/hammer/sys/i386/conf/DEFAULTS#17 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#85 integrate .. //depot/projects/hammer/sys/i386/conf/Makefile#3 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#29 integrate .. //depot/projects/hammer/sys/i386/i386/io.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/locore.s#20 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#126 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#22 integrate .. //depot/projects/hammer/sys/i386/include/iodev.h#3 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#43 integrate .. //depot/projects/hammer/sys/i386/xen/locore.s#5 integrate .. //depot/projects/hammer/sys/i386/xen/mp_machdep.c#10 integrate .. //depot/projects/hammer/sys/i386/xen/pmap.c#12 integrate .. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#11 integrate .. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#13 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#43 integrate .. //depot/projects/hammer/sys/ia64/conf/Makefile#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/iodev_machdep.c#1 branch .. //depot/projects/hammer/sys/ia64/ia64/sys_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/include/bus.h#20 integrate .. //depot/projects/hammer/sys/ia64/include/iodev.h#1 branch .. //depot/projects/hammer/sys/ia64/include/sysarch.h#4 integrate .. //depot/projects/hammer/sys/isa/pnp.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_cpu.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_fail.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#37 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#67 integrate .. //depot/projects/hammer/sys/kern/subr_acl_nfs4.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_firmware.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#39 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#32 integrate .. //depot/projects/hammer/sys/kern/tty.c#76 integrate .. //depot/projects/hammer/sys/kern/tty_compat.c#10 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#24 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#26 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#96 integrate .. //depot/projects/hammer/sys/mips/adm5120/adm5120_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/adm5120/files.adm5120#2 integrate .. //depot/projects/hammer/sys/mips/adm5120/if_admsw.c#6 integrate .. //depot/projects/hammer/sys/mips/adm5120/obio.c#4 integrate .. //depot/projects/hammer/sys/mips/adm5120/uart_cpu_adm5120.c#3 integrate .. //depot/projects/hammer/sys/mips/alchemy/alchemy_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/alchemy/aureg.h#1 branch .. //depot/projects/hammer/sys/mips/alchemy/files.alchemy#1 branch .. //depot/projects/hammer/sys/mips/alchemy/obio.c#1 branch .. //depot/projects/hammer/sys/mips/alchemy/std.alchemy#1 branch .. //depot/projects/hammer/sys/mips/alchemy/uart_bus_alchemy.c#1 branch .. //depot/projects/hammer/sys/mips/alchemy/uart_cpu_alchemy.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/apb.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/apbvar.h#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_bus_space_reversed.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_bus_space_reversed.h#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_ehci.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_ohci.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_pci.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_pci_bus_space.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_pci_bus_space.h#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_spi.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xx_wdog.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/ar71xxreg.h#1 branch .. //depot/projects/hammer/sys/mips/atheros/files.ar71xx#1 branch .. //depot/projects/hammer/sys/mips/atheros/if_arge.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/if_argevar.h#1 branch .. //depot/projects/hammer/sys/mips/atheros/uart_bus_ar71xx.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/uart_cpu_ar71xx.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/asm_octeon.S#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fau.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fau.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fpa.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fpa.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_ipd.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_ipd.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pip.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pko.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_pko.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/driveid.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/files.octeon1#1 branch .. //depot/projects/hammer/sys/mips/cavium/obio.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/octeon_ebt3000_cf.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/octeon_ebt3000_cf.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/octeon_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/octeon_pcmap_regs.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/octeonreg.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/std.octeon1#1 branch .. //depot/projects/hammer/sys/mips/cavium/uart_bus_octeonusart.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/uart_cpu_octeonusart.c#1 branch .. //depot/projects/hammer/sys/mips/cavium/uart_dev_oct16550.c#1 branch .. //depot/projects/hammer/sys/mips/conf/ALCHEMY#1 branch .. //depot/projects/hammer/sys/mips/conf/AR71XX#1 branch .. //depot/projects/hammer/sys/mips/conf/AR71XX.hints#1 branch .. //depot/projects/hammer/sys/mips/conf/DEFAULTS#4 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA#6 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA64#1 branch .. //depot/projects/hammer/sys/mips/conf/OCTEON1#1 branch .. //depot/projects/hammer/sys/mips/conf/OCTEON1-32#1 branch .. //depot/projects/hammer/sys/mips/conf/OCTEON1.hints#1 branch .. //depot/projects/hammer/sys/mips/conf/SENTRY5#7 integrate .. //depot/projects/hammer/sys/mips/conf/SWARM#1 branch .. //depot/projects/hammer/sys/mips/conf/SWARM.hints#1 branch .. //depot/projects/hammer/sys/mips/conf/XLR#1 branch .. //depot/projects/hammer/sys/mips/idt/files.idt#3 integrate .. //depot/projects/hammer/sys/mips/idt/idt_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/idt/obio.c#4 integrate .. //depot/projects/hammer/sys/mips/idt/uart_bus_rc32434.c#3 integrate .. //depot/projects/hammer/sys/mips/idt/uart_cpu_rc32434.c#2 integrate .. //depot/projects/hammer/sys/mips/include/_align.h#2 integrate .. //depot/projects/hammer/sys/mips/include/_bus.h#2 integrate .. //depot/projects/hammer/sys/mips/include/_types.h#2 integrate .. //depot/projects/hammer/sys/mips/include/asm.h#2 integrate .. //depot/projects/hammer/sys/mips/include/atomic.h#3 integrate .. //depot/projects/hammer/sys/mips/include/bus.h#3 integrate .. //depot/projects/hammer/sys/mips/include/bus_octeon.h#2 delete .. //depot/projects/hammer/sys/mips/include/cache.h#2 integrate .. //depot/projects/hammer/sys/mips/include/cache_mipsNN.h#2 integrate .. //depot/projects/hammer/sys/mips/include/cdefs.h#1 branch .. //depot/projects/hammer/sys/mips/include/cpu.h#2 integrate .. //depot/projects/hammer/sys/mips/include/cpufunc.h#2 integrate .. //depot/projects/hammer/sys/mips/include/cpuinfo.h#2 integrate .. //depot/projects/hammer/sys/mips/include/cpuregs.h#2 integrate .. //depot/projects/hammer/sys/mips/include/db_machdep.h#2 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#6 integrate .. //depot/projects/hammer/sys/mips/include/endian.h#2 integrate .. //depot/projects/hammer/sys/mips/include/float.h#3 integrate .. //depot/projects/hammer/sys/mips/include/fls64.h#1 branch .. //depot/projects/hammer/sys/mips/include/hwfunc.h#2 integrate .. //depot/projects/hammer/sys/mips/include/intr.h#2 delete .. //depot/projects/hammer/sys/mips/include/intr_machdep.h#2 integrate .. //depot/projects/hammer/sys/mips/include/kdb.h#2 integrate .. //depot/projects/hammer/sys/mips/include/locore.h#2 integrate .. //depot/projects/hammer/sys/mips/include/md_var.h#2 integrate .. //depot/projects/hammer/sys/mips/include/param.h#7 integrate .. //depot/projects/hammer/sys/mips/include/pcb.h#3 integrate .. //depot/projects/hammer/sys/mips/include/pltfm.h#2 delete .. //depot/projects/hammer/sys/mips/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/mips/include/proc.h#2 integrate .. //depot/projects/hammer/sys/mips/include/profile.h#2 integrate .. //depot/projects/hammer/sys/mips/include/psl.h#2 integrate .. //depot/projects/hammer/sys/mips/include/pte.h#3 integrate .. //depot/projects/hammer/sys/mips/include/regdef.h#2 integrate .. //depot/projects/hammer/sys/mips/include/regnum.h#2 integrate .. //depot/projects/hammer/sys/mips/include/sysarch.h#2 integrate .. //depot/projects/hammer/sys/mips/include/trap.h#2 integrate .. //depot/projects/hammer/sys/mips/include/ucontext.h#2 integrate .. //depot/projects/hammer/sys/mips/malta/files.malta#3 integrate .. //depot/projects/hammer/sys/mips/malta/gt_pci.c#6 integrate .. //depot/projects/hammer/sys/mips/malta/malta_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/malta/maltareg.h#2 integrate .. //depot/projects/hammer/sys/mips/malta/obio.c#3 integrate .. //depot/projects/hammer/sys/mips/malta/std.malta#3 integrate .. //depot/projects/hammer/sys/mips/malta/uart_bus_maltausart.c#3 integrate .. //depot/projects/hammer/sys/mips/malta/uart_cpu_maltausart.c#3 integrate .. //depot/projects/hammer/sys/mips/malta/yamon.h#2 integrate .. //depot/projects/hammer/sys/mips/mips/bus_space_generic.c#1 branch .. //depot/projects/hammer/sys/mips/mips/busdma_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/cache.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/cache_mipsNN.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/hammer/sys/mips/mips/cpu.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/db_trace.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#9 integrate .. //depot/projects/hammer/sys/mips/mips/elf_trampoline.c#1 branch .. //depot/projects/hammer/sys/mips/mips/exception.S#2 integrate .. //depot/projects/hammer/sys/mips/mips/fp.S#2 integrate .. //depot/projects/hammer/sys/mips/mips/gdb_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/genassym.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/in_cksum.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/inckern.S#1 branch .. //depot/projects/hammer/sys/mips/mips/intr_machdep.c#5 integrate .. //depot/projects/hammer/sys/mips/mips/locore.S#2 integrate .. //depot/projects/hammer/sys/mips/mips/machdep.c#9 integrate .. //depot/projects/hammer/sys/mips/mips/mainbus.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/mem.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/nexus.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/pm_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/pmap.c#14 integrate .. //depot/projects/hammer/sys/mips/mips/psraccess.S#2 integrate .. //depot/projects/hammer/sys/mips/mips/ptrace_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/support.S#3 integrate .. //depot/projects/hammer/sys/mips/mips/swtch.S#2 integrate .. //depot/projects/hammer/sys/mips/mips/sys_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/tick.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/tlb.S#2 integrate .. //depot/projects/hammer/sys/mips/mips/trap.c#5 integrate .. //depot/projects/hammer/sys/mips/mips/vm_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/rmi/Makefile.msgring#1 branch .. //depot/projects/hammer/sys/mips/rmi/board.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/board.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/bus_space_rmi.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/clock.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/clock.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/debug.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/sec/desc.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/sec/rmilib.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/sec/rmilib.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/sec/rmisec.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/sec/stats.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/xlr/atx_cpld.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/xlr/rge.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/xlr/rge.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/dev/xlr/xgmac_mdio.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/ehcireg.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/ehcivar.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/files.xlr#1 branch .. //depot/projects/hammer/sys/mips/rmi/interrupt.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/intr_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/iodi.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/iomap.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/msgring.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/msgring.cfg#1 branch .. //depot/projects/hammer/sys/mips/rmi/msgring.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/msgring_xls.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/msgring_xls.cfg#1 branch .. //depot/projects/hammer/sys/mips/rmi/on_chip.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/pcibus.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/pcibus.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/perfmon.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/perfmon_kern.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/perfmon_percpu.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/perfmon_utils.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/perfmon_xlrconfig.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/pic.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/rmi_mips_exts.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/rootfs_list.txt#1 branch .. //depot/projects/hammer/sys/mips/rmi/shared_structs.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/shared_structs_func.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/shared_structs_offsets.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/std.xlr#1 branch .. //depot/projects/hammer/sys/mips/rmi/tick.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/uart_bus_xlr_iodi.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/uart_cpu_mips_xlr.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/xlr_boot1_console.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/xlr_csum_nocopy.S#1 branch .. //depot/projects/hammer/sys/mips/rmi/xlr_i2c.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/xlr_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/xlr_pci.c#1 branch .. //depot/projects/hammer/sys/mips/rmi/xlrconfig.h#1 branch .. //depot/projects/hammer/sys/mips/rmi/xls_ehci.c#1 branch .. //depot/projects/hammer/sys/mips/sentry5/files.sentry5#2 integrate .. //depot/projects/hammer/sys/mips/sentry5/obio.c#3 integrate .. //depot/projects/hammer/sys/mips/sentry5/s5_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/sentry5/siba_cc.c#2 delete .. //depot/projects/hammer/sys/mips/sentry5/siba_mips.c#2 delete .. //depot/projects/hammer/sys/mips/sentry5/siba_sdram.c#2 delete .. //depot/projects/hammer/sys/mips/sentry5/uart_bus_sbusart.c#3 integrate .. //depot/projects/hammer/sys/mips/sentry5/uart_cpu_sbusart.c#3 integrate .. //depot/projects/hammer/sys/mips/sibyte/ata_zbbus.c#1 branch .. //depot/projects/hammer/sys/mips/sibyte/files.sibyte#1 branch .. //depot/projects/hammer/sys/mips/sibyte/sb_asm.S#1 branch .. //depot/projects/hammer/sys/mips/sibyte/sb_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/sibyte/sb_scd.c#1 branch .. //depot/projects/hammer/sys/mips/sibyte/sb_scd.h#1 branch .. //depot/projects/hammer/sys/mips/sibyte/sb_zbbus.c#1 branch .. //depot/projects/hammer/sys/mips/sibyte/sb_zbpci.c#1 branch .. //depot/projects/hammer/sys/modules/Makefile#148 integrate .. //depot/projects/hammer/sys/modules/crypto/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/epic/Makefile#1 branch .. //depot/projects/hammer/sys/net/flowtable.c#7 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#54 integrate .. //depot/projects/hammer/sys/net/if_epair.c#3 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#85 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#57 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#46 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#38 integrate .. //depot/projects/hammer/sys/netgraph/ng_ipfw.c#9 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#62 integrate .. //depot/projects/hammer/sys/netinet/in.c#47 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#38 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#55 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.h#4 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.h#22 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#39 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_dummynet.c#4 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw2.c#7 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_log.c#2 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_nat.c#4 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_pfil.c#6 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_private.h#2 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_table.c#2 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#12 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_mod.c#4 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#69 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#23 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#34 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#40 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#50 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#49 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#71 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#77 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#21 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_fha.c#5 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvkrpc.c#7 integrate .. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#18 integrate .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#11 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#67 integrate .. //depot/projects/hammer/sys/pc98/conf/Makefile#2 integrate .. //depot/projects/hammer/sys/pci/ncr.c#22 integrate .. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#12 integrate .. //depot/projects/hammer/sys/powerpc/aim/mmu_oea64.c#6 integrate .. //depot/projects/hammer/sys/powerpc/booke/pmap.c#13 integrate .. //depot/projects/hammer/sys/powerpc/conf/DEFAULTS#9 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#54 integrate .. //depot/projects/hammer/sys/powerpc/conf/Makefile#2 integrate .. //depot/projects/hammer/sys/rpc/clnt_dg.c#8 integrate .. //depot/projects/hammer/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#2 integrate .. //depot/projects/hammer/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#5 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#42 integrate .. //depot/projects/hammer/sys/sparc64/conf/DEFAULTS#9 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#76 integrate .. //depot/projects/hammer/sys/sparc64/conf/Makefile#2 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#24 integrate .. //depot/projects/hammer/sys/sparc64/ebus/epic.c#1 branch .. //depot/projects/hammer/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#48 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#16 integrate .. //depot/projects/hammer/sys/sparc64/pci/schizo.c#9 integrate .. //depot/projects/hammer/sys/sparc64/pci/schizovar.h#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#14 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#61 integrate .. //depot/projects/hammer/sys/sun4v/conf/DEFAULTS#6 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#19 integrate .. //depot/projects/hammer/sys/sun4v/conf/Makefile#2 integrate .. //depot/projects/hammer/sys/sys/_semaphore.h#2 integrate .. //depot/projects/hammer/sys/sys/_umtx.h#1 branch .. //depot/projects/hammer/sys/sys/copyright.h#11 integrate .. //depot/projects/hammer/sys/sys/param.h#136 integrate .. //depot/projects/hammer/sys/sys/proc.h#136 integrate .. //depot/projects/hammer/sys/sys/semaphore.h#3 delete .. //depot/projects/hammer/sys/sys/sleepqueue.h#17 integrate .. //depot/projects/hammer/sys/sys/socket.h#32 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#41 integrate .. //depot/projects/hammer/sys/sys/systm.h#65 integrate .. //depot/projects/hammer/sys/sys/tty.h#33 integrate .. //depot/projects/hammer/sys/sys/umtx.h#20 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#39 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#61 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#16 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#18 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#32 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_probe.c#7 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#16 integrate .. //depot/projects/hammer/tools/regression/acct/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/acct/regress.t#2 integrate .. //depot/projects/hammer/tools/regression/bin/date/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/bin/mv/regress.sh#3 integrate .. //depot/projects/hammer/tools/regression/bin/sh/builtins/builtin1.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/expansion/arith2.0#1 branch .. //depot/projects/hammer/tools/regression/bin/sh/expansion/cmdsubst1.0#1 branch .. //depot/projects/hammer/tools/regression/posixsem2/Makefile#1 branch .. //depot/projects/hammer/tools/regression/posixsem2/semtest.c#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/Makefile#7 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.sh#3 integrate .. //depot/projects/hammer/tools/regression/usr.bin/jot/regress.sh#6 integrate .. //depot/projects/hammer/tools/regression/usr.bin/lastcomm/values.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/common.sh#3 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/directive-t0/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/directive-t0/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-t.t#3 integrate .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-t.t#3 integrate .. //depot/projects/hammer/tools/regression/usr.bin/sed/multitest.t#6 integrate .. //depot/projects/hammer/usr.bin/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.bin/apply/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ar/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/ar/acpyacc.y#3 integrate .. //depot/projects/hammer/usr.bin/ar/ar.c#8 integrate .. //depot/projects/hammer/usr.bin/at/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/at/at.c#3 integrate .. //depot/projects/hammer/usr.bin/atm/sscop/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/awk/Makefile#9 integrate .. //depot/projects/hammer/usr.bin/awk/b.c.diff#3 delete .. //depot/projects/hammer/usr.bin/awk/main.c.diff#4 delete .. //depot/projects/hammer/usr.bin/awk/run.c.diff#2 delete .. //depot/projects/hammer/usr.bin/banner/banner.c#3 integrate .. //depot/projects/hammer/usr.bin/biff/biff.c#2 integrate .. //depot/projects/hammer/usr.bin/bluetooth/bthost/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/bsdiff/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.bin/bzip2/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/calendar/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/catman/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/catman/catman.c#12 integrate .. //depot/projects/hammer/usr.bin/chkey/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/chpass/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/colldef/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/compile_et/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/compress/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/cpio/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/cpio/test/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/cpuset/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ctags/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ctags/ctags.c#4 integrate .. //depot/projects/hammer/usr.bin/ctags/fortran.c#3 integrate .. //depot/projects/hammer/usr.bin/dig/Makefile#8 integrate .. //depot/projects/hammer/usr.bin/du/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/elf2aout/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/elfdump/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/env/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/fetch/Makefile#9 integrate .. //depot/projects/hammer/usr.bin/file2c/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/find/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/finger/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/fstat/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/fsync/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/ftp/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/gcore/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/gencat/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/getent/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/gprof/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/gprof/aout.c#5 integrate .. //depot/projects/hammer/usr.bin/gzip/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/head/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/hexdump/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/host/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/id/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/ipcrm/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/ipcs/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/kdump/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/keylogin/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ktrace/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ktrdump/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/lam/lam.c#4 integrate .. //depot/projects/hammer/usr.bin/last/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/lastcomm/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/lastcomm/lastcomm.c#10 integrate .. //depot/projects/hammer/usr.bin/ldd/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/leave/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/less/Makefile.common#3 integrate .. //depot/projects/hammer/usr.bin/lex/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/lex/lib/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/limits/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/locate/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.bin/locate/locate/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/lock/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/logger/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/login/Makefile#9 integrate .. //depot/projects/hammer/usr.bin/login/login.c#15 integrate .. //depot/projects/hammer/usr.bin/login/login_fbtab.c#5 integrate .. //depot/projects/hammer/usr.bin/logins/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/logname/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/look/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/lsvfs/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/m4/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/mail/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#25 integrate .. //depot/projects/hammer/usr.bin/make/dir.c#17 integrate .. //depot/projects/hammer/usr.bin/make/dir.h#11 integrate .. //depot/projects/hammer/usr.bin/make/job.c#40 integrate .. //depot/projects/hammer/usr.bin/make/main.c#50 integrate .. //depot/projects/hammer/usr.bin/make/make.1#39 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#39 integrate .. //depot/projects/hammer/usr.bin/makewhatis/makewhatis.c#6 integrate .. //depot/projects/hammer/usr.bin/minigzip/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/mkfifo/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/mklocale/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/mkstr/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/mkuzip/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/msgs/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/nc/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ncplist/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/netstat/if.c#18 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#35 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.1#23 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#29 integrate .. //depot/projects/hammer/usr.bin/newkey/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/nfsstat/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/nl/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/nohup/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/nslookup/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/nsupdate/Makefile#8 integrate .. //depot/projects/hammer/usr.bin/opieinfo/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/opiekey/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/opiepasswd/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/passwd/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/passwd/passwd.c#4 integrate .. //depot/projects/hammer/usr.bin/pr/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/printf/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/procstat/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/renice/renice.c#4 integrate .. //depot/projects/hammer/usr.bin/revoke/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/rlogin/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/rpcgen/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_hout.c#7 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_main.c#12 integrate .. //depot/projects/hammer/usr.bin/rpcinfo/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/rsh/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/rup/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ruptime/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/rusers/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/rwho/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/script/script.c#6 integrate .. //depot/projects/hammer/usr.bin/sed/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/showmount/showmount.c#8 integrate .. //depot/projects/hammer/usr.bin/smbutil/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/sockstat/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/sockstat/sockstat.c#15 integrate .. //depot/projects/hammer/usr.bin/su/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/systat/Makefile#8 integrate .. //depot/projects/hammer/usr.bin/tail/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/tail/misc.c#5 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#33 integrate .. //depot/projects/hammer/usr.bin/tar/test/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/tcopy/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/tcopy/tcopy.c#2 integrate .. //depot/projects/hammer/usr.bin/telnet/Makefile#12 integrate .. //depot/projects/hammer/usr.bin/tftp/tftp.c#5 integrate .. //depot/projects/hammer/usr.bin/time/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/top/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/tr/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/truss/Makefile#11 integrate .. //depot/projects/hammer/usr.bin/unifdef/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/unzip/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/unzip/unzip.c#5 integrate .. //depot/projects/hammer/usr.bin/users/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/uudecode/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/uuencode/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/vacation/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/vgrind/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/vi/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/vmstat/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/w/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/w/w.c#10 integrate .. //depot/projects/hammer/usr.bin/wall/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/wc/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/whereis/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/who/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/write/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/xargs/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/xinstall/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/xlint/xlint/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/xlint/xlint/xlint.c#6 integrate .. //depot/projects/hammer/usr.bin/yacc/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ypcat/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ypmatch/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/ypwhich/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.sbin/ac/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/accton/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/accton/accton.c#4 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/acpi/iasl/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/amd/Makefile.inc#8 integrate .. //depot/projects/hammer/usr.sbin/ancontrol/ancontrol.c#9 integrate .. //depot/projects/hammer/usr.sbin/apm/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/apmd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/asf/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/asf/asf_kld.c#2 integrate .. //depot/projects/hammer/usr.sbin/audit/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/auditd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/auditreduce/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/authpf/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/bootparamd/Makefile.inc#3 integrate .. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/bootparamd.c#6 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/Makefile#12 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/gensnmptree/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/btxld/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/burncd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/cdcontrol/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/cdcontrol/cdcontrol.c#14 integrate .. //depot/projects/hammer/usr.sbin/chkgrp/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/chown/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/chroot/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/chroot/chroot.c#7 integrate .. //depot/projects/hammer/usr.sbin/clear_locks/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/config/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/cpucontrol/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/cron/cron/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/crunch/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_dequeue/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_rmail/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_smail/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/daemon/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/dconschat/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/devinfo/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/digictl/Makefile#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 11 23:01:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2921D10656B8; Mon, 11 Jan 2010 23:01:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE02210656A4 for ; Mon, 11 Jan 2010 23:00:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C51C8FC12 for ; Mon, 11 Jan 2010 23:00:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0BN0xwt040359 for ; Mon, 11 Jan 2010 23:00:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0BN0xl9040357 for perforce@freebsd.org; Mon, 11 Jan 2010 23:00:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Jan 2010 23:00:59 GMT Message-Id: <201001112300.o0BN0xl9040357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 23:01:00 -0000 http://p4web.freebsd.org/chv.cgi?CH=173002 Change 173002 by hselasky@hselasky_laptop001 on 2010/01/11 23:00:40 USB controller: - optimise EHCI ISOC HS done check. - patch by HPS. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#47 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#47 (text+ko) ==== @@ -1340,25 +1340,22 @@ } } else if (methods == &ehci_device_isoc_hs_methods) { ehci_itd_t *td; + uint8_t n = (xfer->nframes & 7); /* isochronous high speed transfer */ + /* check last transfer */ td = xfer->td_transfer_last; usb_pc_cpu_invalidate(td->page_cache); - status = - td->itd_status[0] | td->itd_status[1] | - td->itd_status[2] | td->itd_status[3] | - td->itd_status[4] | td->itd_status[5] | - td->itd_status[6] | td->itd_status[7]; + if (n == 0) + status = td->itd_status[7]; + else + status = td->itd_status[n-1]; /* also check first transfer */ td = xfer->td_transfer_first; usb_pc_cpu_invalidate(td->page_cache); - status |= - td->itd_status[0] | td->itd_status[1] | - td->itd_status[2] | td->itd_status[3] | - td->itd_status[4] | td->itd_status[5] | - td->itd_status[6] | td->itd_status[7]; + status |= td->itd_status[0]; /* if no transactions are active we continue */ if (!(status & htohc32(sc, EHCI_ITD_ACTIVE))) { From owner-p4-projects@FreeBSD.ORG Tue Jan 12 15:00:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FF411065692; Tue, 12 Jan 2010 15:00:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D89B810656A6 for ; Tue, 12 Jan 2010 15:00:40 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4EA08FC0A for ; Tue, 12 Jan 2010 15:00:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CF0egG071739 for ; Tue, 12 Jan 2010 15:00:40 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CF0eAx071737 for perforce@freebsd.org; Tue, 12 Jan 2010 15:00:40 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 12 Jan 2010 15:00:40 GMT Message-Id: <201001121500.o0CF0eAx071737@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 15:00:41 -0000 http://p4web.freebsd.org/chv.cgi?CH=173021 Change 173021 by pgj@beehive on 2010/01/12 15:00:34 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/delphij.key#2 integrate .. //depot/projects/docproj_hu/doc/share/sgml/trademarks.ent#5 integrate .. //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#7 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#24 integrate .. //depot/projects/docproj_hu/www/en/java/dists/16.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/java/news.xml#5 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#18 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#16 integrate .. //depot/projects/docproj_hu/www/share/sgml/common.ent#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/notices.xml#6 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -11,7 +11,8 @@ UNIX is a registered trademark of The Open Group in the US and other countries. - Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks + Sun, Sun Microsystems, SunOS, Solaris, + Java, JDK, and OpenJDK are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. ==== //depot/projects/docproj_hu/doc/share/pgpkeys/delphij.key#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + uid Xin LI -pub 1024D/18EDEBA0 2008-01-02 [expires: 2010-01-02] +pub 1024D/18EDEBA0 2008-01-02 [expired: 2010-01-02] Key fingerprint = 79A6 CF42 F917 DDCA F1C2 C926 8BEB DB04 18ED EBA0 uid Xin LI uid Xin LI uid Xin LI -sub 4096g/8ED8F128 2008-01-02 [expires: 2010-01-02] + +pub 2048R/3FCA37C1 2010-01-10 [expires: 2012-01-10] + Key fingerprint = 27EA 5D6C 9398 BA7F B205 8F70 04CE F812 3FCA 37C1 +uid Xin LI +uid Xin LI +uid Xin LI +sub 2048R/F956339F 2010-01-10 [expires: 2012-01-10] ]]> ==== //depot/projects/docproj_hu/doc/share/sgml/trademarks.ent#5 (text+ko) ==== @@ -8,7 +8,7 @@ Please keep this file sorted. - $FreeBSD: doc/share/sgml/trademarks.ent,v 1.46 2009/07/19 20:31:50 manolis Exp $ + $FreeBSD: doc/share/sgml/trademarks.ent,v 1.47 2010/01/09 05:21:49 linimon Exp $ --> 3Com and HomeConnect are registered @@ -328,7 +328,7 @@ Sun, Sun Microsystems, Java, Java - Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, + Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK, Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, Ultra and VirtualBox are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries."> @@ -340,6 +340,7 @@ JSP"> JVM"> Netra"> +OpenJDK"> Solaris"> StarOffice"> Sun"> ==== //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#7 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.110 2009/05/21 10:04:51 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.112 2010/01/08 20:38:41 brueffer Exp $ # # @@ -107,7 +107,6 @@ safe i386,pc98,amd64 sbp i386,sparc64,ia64,amd64 sis i386,pc98,ia64,amd64 -sk i386,sparc64,pc98,amd64 sn i386,amd64 snc pc98 snd_ad1816 i386,amd64 @@ -135,13 +134,11 @@ snd_sbc i386,amd64 snd_solo i386,amd64 snd_spicds i386,amd64 -snd_t4dwave i386,amd64 +snd_t4dwave i386,amd64,sparc64 snd_via8233 i386,amd64 snd_via82c686 i386,amd64 snd_vibes i386,amd64 -ste i386,pc98,amd64 stg i386,pc98 -stge i386,amd64,sparc64 ti i386,pc98,amd64,sparc64 tl i386,pc98,amd64 trm i386,amd64 @@ -162,7 +159,6 @@ urio i386,pc98,amd64,powerpc uvisor i386,pc98,amd64 uvscom i386,pc98,amd64 -vge i386,pc98,amd64 vpo i386 vx i386,pc98,ia64,amd64 wb i386,pc98,amd64 ==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#24 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2657,6 +2657,20 @@ miwi (for pkg build cluster) Received + + + Gareth Randall + USB card + gj + Received + + + + Kyle Anderson (tummy.com) + 6 SuperMicro servers + brd (firewalls and infrastructure servers
+ for the new NYC FreeBSD co-location) + Received &footer; ==== //depot/projects/docproj_hu/www/en/java/dists/16.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -14,21 +14,21 @@

May 5, 2009: Brian Gardner's update to Build 16 of the -OpenJDK 6 port is committed. +&openjdk; 6 port is committed. This update also fixes a problem with the port using the HotSpot JVM from the bootstrap JDK rather building and installing it's version of HotSpot.

February 23, 2009: Brian -Gardner's port of OpenJDK 6 is +Gardner's port of &openjdk; 6 is committed to the &os; Ports Collection.

February 6, 2009: Brian Gardner has announced a port of -OpenJDK 6 to &os; 7.0. The patch +&openjdk; 6 to &os; 7.0. The patch can be found at http://beta.experts-exchange.com/articles/OS/Unix/BSD/Patch-for-OpenJDK6-on-BSD.html.

==== //depot/projects/docproj_hu/www/en/java/news.xml#5 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/en/java/news.xml,v 1.9 2009/12/28 05:58:29 glewis Exp $ + $FreeBSD: www/en/java/news.xml,v 1.10 2010/01/09 15:55:30 glewis Exp $ @@ -34,12 +34,12 @@ 5 - <a href="http://openjdk.java.net/">OpenJDK</a> 6 updated + <title><a href="http://openjdk.java.net/">&openjdk;</a> 6 updated to Build 16.

Brian Gardner has released an update of the - OpenJDK 6 port to Build 16. + &openjdk; 6 port to Build 16. See the JDK 1.6.x page for more details.

 @@ -71,11 +71,11 @@ 23 - Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6 + <title>Port of <a href="http://openjdk.java.net/">&openjdk;</a> 6 committed

Brian Gardner's - port of OpenJDK 6 is + port of &openjdk; 6 is committed to the Ports Collection as java/openjdk6. See the JDK 1.6.x page for more details.

@@ -86,11 +86,11 @@ 6 - Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6 + <title>Port of <a href="http://openjdk.java.net/">&openjdk;</a> 6 announced

Brian Gardner has - announced a port of OpenJDK + announced a port of &openjdk; 6 to FreeBSD 7.x. See the JDK 1.6.x page for more details.

==== //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#18 (text+ko) ==== @@ -1,5 +1,5 @@ - + + @@ -57,6 +57,7 @@ + ==== //depot/projects/docproj_hu/www/share/sgml/notices.xml#6 (text+ko) ==== @@ -2,11 +2,27 @@ - $FreeBSD: www/share/sgml/notices.xml,v 1.15 2009/10/02 20:15:49 simon Exp $ + $FreeBSD: www/share/sgml/notices.xml,v 1.16 2010/01/06 23:01:23 simon Exp $ + 2010 + + + 1 + + + 6 + + + FreeBSD-EN-10:01.freebsd + + + + + + 2009 From owner-p4-projects@FreeBSD.ORG Tue Jan 12 15:24:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB7CD1065670; Tue, 12 Jan 2010 15:24:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 701CF106566C for ; Tue, 12 Jan 2010 15:24:04 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 435698FC1B for ; Tue, 12 Jan 2010 15:24:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CFO4HS074552 for ; Tue, 12 Jan 2010 15:24:04 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CFO411074550 for perforce@freebsd.org; Tue, 12 Jan 2010 15:24:04 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 12 Jan 2010 15:24:04 GMT Message-Id: <201001121524.o0CFO411074550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 15:24:04 -0000 http://p4web.freebsd.org/chv.cgi?CH=173022 Change 173022 by pgj@Binturong on 2010/01/12 15:24:03 MFen (doc): 1.200 -> 1.201 hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml 1.46 -> 1.47 hu_HU.ISO8859-2/share/sgml/trademarks.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#24 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#13 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#24 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -1321,8 +1321,9 @@ elérhetõ az Xft-re felkészített alkalmazások számára. A mostanság megjelenõ legtöbb alkalmazás, mint - például a KDE, GNOME és Firefox, ismeri az - Xft-t. + például a KDE, + GNOME és + Firefox, ismeri az Xft-t. A betûtípusok élsimításának be- és ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#13 (text+ko) ==== @@ -14,7 +14,7 @@ A 3Com és HomeConnect a 3Com Corporation @@ -347,7 +347,7 @@ A Sun, Sun Microsystems, Java, Java - Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, + Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK, Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, Ultra és VirtualBox a Sun Microsystems, Inc. védjegyei vagy bejegyzett védjegyei az Egyesült Államokban és más @@ -360,6 +360,7 @@ JSP"> JVM"> Netra"> +OpenJDK"> Solaris"> StarOffice"> Sun"> From owner-p4-projects@FreeBSD.ORG Tue Jan 12 18:59:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4CE8106568B; Tue, 12 Jan 2010 18:59:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A91CB1065676 for ; Tue, 12 Jan 2010 18:59:40 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95A528FC0A for ; Tue, 12 Jan 2010 18:59:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CIxeKq004710 for ; Tue, 12 Jan 2010 18:59:40 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CIxeom004708 for perforce@freebsd.org; Tue, 12 Jan 2010 18:59:40 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 12 Jan 2010 18:59:40 GMT Message-Id: <201001121859.o0CIxeom004708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173030 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 18:59:41 -0000 http://p4web.freebsd.org/chv.cgi?CH=173030 Change 173030 by rene@rene_self on 2010/01/12 18:58:39 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#43 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#67 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/delphij.key#2 integrate .. //depot/projects/docproj_nl/share/sgml/trademarks.ent#5 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#23 integrate .. //depot/projects/docproj_nl/www/en/java/dists/16.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/java/news.xml#5 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#16 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#15 integrate .. //depot/projects/docproj_nl/www/share/sgml/common.ent#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/notices.xml#5 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#43 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -176,7 +176,8 @@ The Configuration File - Some users may wish to tweak the configuration file, + Some users may wish to tweak the default configuration file + in /etc/freebsd-update.conf, allowing better control of the process. The options are very well documented, but the following few may require a bit more explanation: ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#67 (text+ko) ==== @@ -1,7 +1,7 @@ java - Software related to the Java language. + Software related to the Java™ language. The java category shall not be the only one for a port. Save for ports directly related to the Java language, porters are also encouraged not to @@ -5929,7 +5929,7 @@ Variable definitions - If your port needs a Java™ Development Kit (JDK) to + If your port needs a Java™ Development Kit (JDK™) to either build, run or even extract the distfile, then it should define USE_JAVA. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -11,7 +11,8 @@ UNIX is a registered trademark of The Open Group in the US and other countries. - Sun, Sun Microsystems, SunOS, Solaris, and Java are trademarks + Sun, Sun Microsystems, SunOS, Solaris, + Java, JDK, and OpenJDK are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. ==== //depot/projects/docproj_nl/share/pgpkeys/delphij.key#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + uid Xin LI -pub 1024D/18EDEBA0 2008-01-02 [expires: 2010-01-02] +pub 1024D/18EDEBA0 2008-01-02 [expired: 2010-01-02] Key fingerprint = 79A6 CF42 F917 DDCA F1C2 C926 8BEB DB04 18ED EBA0 uid Xin LI uid Xin LI uid Xin LI -sub 4096g/8ED8F128 2008-01-02 [expires: 2010-01-02] + +pub 2048R/3FCA37C1 2010-01-10 [expires: 2012-01-10] + Key fingerprint = 27EA 5D6C 9398 BA7F B205 8F70 04CE F812 3FCA 37C1 +uid Xin LI +uid Xin LI +uid Xin LI +sub 2048R/F956339F 2010-01-10 [expires: 2012-01-10] ]]> ==== //depot/projects/docproj_nl/share/sgml/trademarks.ent#5 (text+ko) ==== @@ -8,7 +8,7 @@ Please keep this file sorted. - $FreeBSD: doc/share/sgml/trademarks.ent,v 1.46 2009/07/19 20:31:50 manolis Exp $ + $FreeBSD: doc/share/sgml/trademarks.ent,v 1.47 2010/01/09 05:21:49 linimon Exp $ --> 3Com and HomeConnect are registered @@ -328,7 +328,7 @@ Sun, Sun Microsystems, Java, Java - Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, + Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK, Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, Ultra and VirtualBox are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries."> @@ -340,6 +340,7 @@ JSP"> JVM"> Netra"> +OpenJDK"> Solaris"> StarOffice"> Sun"> ==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#23 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2657,6 +2657,20 @@ miwi (for pkg build cluster) Received + + + Gareth Randall + USB card + gj + Received + + + + Kyle Anderson (tummy.com) + 6 SuperMicro servers + brd (firewalls and infrastructure servers
+ for the new NYC FreeBSD co-location) + Received &footer; ==== //depot/projects/docproj_nl/www/en/java/dists/16.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -14,21 +14,21 @@

May 5, 2009: Brian Gardner's update to Build 16 of the -OpenJDK 6 port is committed. +&openjdk; 6 port is committed. This update also fixes a problem with the port using the HotSpot JVM from the bootstrap JDK rather building and installing it's version of HotSpot.

February 23, 2009: Brian -Gardner's port of OpenJDK 6 is +Gardner's port of &openjdk; 6 is committed to the &os; Ports Collection.

February 6, 2009: Brian Gardner has announced a port of -OpenJDK 6 to &os; 7.0. The patch +&openjdk; 6 to &os; 7.0. The patch can be found at http://beta.experts-exchange.com/articles/OS/Unix/BSD/Patch-for-OpenJDK6-on-BSD.html.

==== //depot/projects/docproj_nl/www/en/java/news.xml#5 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/en/java/news.xml,v 1.9 2009/12/28 05:58:29 glewis Exp $ + $FreeBSD: www/en/java/news.xml,v 1.10 2010/01/09 15:55:30 glewis Exp $ @@ -34,12 +34,12 @@ 5 - <a href="http://openjdk.java.net/">OpenJDK</a> 6 updated + <title><a href="http://openjdk.java.net/">&openjdk;</a> 6 updated to Build 16.

Brian Gardner has released an update of the - OpenJDK 6 port to Build 16. + &openjdk; 6 port to Build 16. See the JDK 1.6.x page for more details.

 @@ -71,11 +71,11 @@ 23 - Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6 + <title>Port of <a href="http://openjdk.java.net/">&openjdk;</a> 6 committed

Brian Gardner's - port of OpenJDK 6 is + port of &openjdk; 6 is committed to the Ports Collection as java/openjdk6. See the JDK 1.6.x page for more details.

@@ -86,11 +86,11 @@ 6 - Port of <a href="http://openjdk.java.net/">OpenJDK</a> 6 + <title>Port of <a href="http://openjdk.java.net/">&openjdk;</a> 6 announced

Brian Gardner has - announced a port of OpenJDK + announced a port of &openjdk; 6 to FreeBSD 7.x. See the JDK 1.6.x page for more details.

==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#16 (text+ko) ==== @@ -1,4 +1,4 @@ - ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#15 (text+ko) ==== @@ -2,11 +2,35 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.235 2009/12/03 10:38:32 brueffer Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.236 2010/01/06 23:01:23 simon Exp $ + 2010 + + + 1 + + + 6 + + + FreeBSD-SA-10:03.zfs + + + + FreeBSD-SA-10:02.ntpd + + + + FreeBSD-SA-10:01.bind + + + + + + 2009 ==== //depot/projects/docproj_nl/www/share/sgml/common.ent#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -57,6 +57,7 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/notices.xml#5 (text+ko) ==== @@ -2,11 +2,27 @@ - $FreeBSD: www/share/sgml/notices.xml,v 1.15 2009/10/02 20:15:49 simon Exp $ + $FreeBSD: www/share/sgml/notices.xml,v 1.16 2010/01/06 23:01:23 simon Exp $ + 2010 + + + 1 + + + 6 + + + FreeBSD-EN-10:01.freebsd + + + + + + 2009 From owner-p4-projects@FreeBSD.ORG Tue Jan 12 20:12:59 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03AC61065679; Tue, 12 Jan 2010 20:12:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A42551065676 for ; Tue, 12 Jan 2010 20:12:58 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 88A098FC25 for ; Tue, 12 Jan 2010 20:12:58 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CKCwEI012297 for ; Tue, 12 Jan 2010 20:12:58 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CKCwRO012295 for perforce@freebsd.org; Tue, 12 Jan 2010 20:12:58 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 12 Jan 2010 20:12:58 GMT Message-Id: <201001122012.o0CKCwRO012295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 20:12:59 -0000 http://p4web.freebsd.org/chv.cgi?CH=173036 Change 173036 by rene@rene_self on 2010/01/12 20:12:55 MFen: * handbook/cutting-edge 1.245 -> 1.246 * trademarks.ent 1.46 -> 1.47 * trademarks.sgml 1.6 -> 1.7 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#30 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#8 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#30 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.19 2009/10/04 14:06:59 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml - %SRCID% 1.245 + %SRCID% 1.246 --> @@ -207,7 +207,7 @@ Het configuratiebestand - Sommige gebruikers willen het configuratiebestand + Sommige gebruikers willen het standaard configuratiebestand optimaliseren, waardoor het proces beter gecontroleerd kan worden. De opties zijn goed gedocumenteerd, maar voor de volgenden is wat extra uitleg nodig: ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#8 (text+ko) ==== @@ -11,7 +11,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/trademarks.ent,v 1.4 2009/07/24 19:13:28 rene Exp $ %SOURCE% share/sgml/trademarks.ent - %SRCID% 1.46 + %SRCID% 1.47 --> 3Com en HomeConnect zijn geregistreerde @@ -334,7 +334,7 @@ Sun, Sun Microsystems, Java, Java - Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, + Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK, Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, Ultra en VirtualBox zijn handelsmerken of geregistreerde handelsmerken van Sun Microsystems, Inc. in de Verenigde Staten en andere landen."> @@ -346,6 +346,7 @@ JSP"> JVM"> Netra"> +OpenJDK"> Solaris"> StarOffice"> Sun"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.sgml#3 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -13,7 +13,7 @@ UNIX is een geregistreerd handelsmerk van The Open Group in de Verenigde Staten en andere landen. - Sun, Sun Microsystems, SunOS, Solaris, en Java zijn + Sun, Sun Microsystems, SunOS, Solaris, Java, JDK, en OpenJDK zijn handelsmerken of geregistreerde handelsmerken van Sun Microsystems, Inc. in de Verenigde Staten en andere landen. From owner-p4-projects@FreeBSD.ORG Tue Jan 12 22:02:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80DD91065676; Tue, 12 Jan 2010 22:02:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 453C71065670 for ; Tue, 12 Jan 2010 22:02:49 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 330C28FC17 for ; Tue, 12 Jan 2010 22:02:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CM2nF7033899 for ; Tue, 12 Jan 2010 22:02:49 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CM2nnY033897 for perforce@freebsd.org; Tue, 12 Jan 2010 22:02:49 GMT (envelope-from raj@freebsd.org) Date: Tue, 12 Jan 2010 22:02:49 GMT Message-Id: <201001122202.o0CM2nnY033897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 22:02:49 -0000 http://p4web.freebsd.org/chv.cgi?CH=173043 Change 173043 by raj@raj_fdt on 2010/01/12 22:02:04 Move to a more natural logic flow in simplebus_probe(). Affected files ... .. //depot/projects/fdt/sys/dev/fdt/simplebus.c#3 edit Differences ... ==== //depot/projects/fdt/sys/dev/fdt/simplebus.c#3 (text+ko) ==== @@ -141,12 +141,11 @@ simplebus_probe(device_t dev) { - if (ofw_bus_is_compatible(dev, "simple-bus")) { - device_set_desc(dev, "Flattened device tree simple bus"); - return (BUS_PROBE_DEFAULT); - } + if (!ofw_bus_is_compatible(dev, "simple-bus")) + return (ENXIO); - return (ENXIO); + device_set_desc(dev, "Flattened device tree simple bus"); + return (BUS_PROBE_DEFAULT); } static void From owner-p4-projects@FreeBSD.ORG Tue Jan 12 22:14:01 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A3541065695; Tue, 12 Jan 2010 22:14:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB4951065676 for ; Tue, 12 Jan 2010 22:14:00 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B8C3B8FC08 for ; Tue, 12 Jan 2010 22:14:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CME0I8036144 for ; Tue, 12 Jan 2010 22:14:00 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CME0kc036142 for perforce@freebsd.org; Tue, 12 Jan 2010 22:14:00 GMT (envelope-from raj@freebsd.org) Date: Tue, 12 Jan 2010 22:14:00 GMT Message-Id: <201001122214.o0CME0kc036142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 22:14:01 -0000 http://p4web.freebsd.org/chv.cgi?CH=173045 Change 173045 by raj@raj_fdt on 2010/01/12 22:13:55 loader(8) cleanups. - Prevent endianess when modifying DT property. - Supply '/chosen/stdin' property if not present (this will be required by the reworked uart console FDT attachment). - Assorted minor typos and cosmetic fixes. Affected files ... .. //depot/projects/fdt/sys/boot/uboot/common/main.c#3 edit .. //depot/projects/fdt/sys/boot/uboot/lib/fdt.c#3 edit Differences ... ==== //depot/projects/fdt/sys/boot/uboot/common/main.c#3 (text+ko) ==== @@ -53,6 +53,8 @@ extern unsigned char __sbss_end[]; extern unsigned char _end[]; +extern int command_fdt_internal(int argc, char *argv[]); + static void dump_sig(struct api_signature *sig) { @@ -259,4 +261,17 @@ return (CMD_OK); } +/* + * Since proper fdt command handling function is defined in fdt.c, and + * declaring it as extern is in contradiction with COMMAND_SET() macro + * (which uses static pointer), we're defining wrapper function, which + * calls the proper fdt handling routine. + */ +static int +command_fdt(int argc, char *argv[]) +{ + + return (command_fdt_internal(argc, argv)); +} + COMMAND_SET(fdt, "fdt", "flattened device tree handling", command_fdt); ==== //depot/projects/fdt/sys/boot/uboot/lib/fdt.c#3 (text+ko) ==== @@ -100,7 +100,7 @@ int err; /* - * Find the device tree blob + * Find the device tree blob. */ bfp = file_findfile(NULL, "dtb"); if (bfp == NULL) { @@ -110,7 +110,7 @@ fdtp = (struct fdt_header *)bfp->f_addr; /* - * Validate the blob + * Validate the blob. */ err = fdt_check_header(fdtp); if (err < 0) { @@ -127,7 +127,6 @@ return (CMD_OK); } - #define fdt_strtovect(str, cellbuf, lim, cellsize) _fdt_strtovect((str), \ (cellbuf), (lim), (cellsize), 0); @@ -160,7 +159,8 @@ buf++; if (u32buf != NULL) - u32buf[cnt] = (uint32_t)strtol(buf, NULL, base); + u32buf[cnt] = + cpu_to_fdt32((uint32_t)strtol(buf, NULL, base)); else u8buf[cnt] = (uint8_t)strtol(buf, NULL, base); @@ -260,7 +260,6 @@ lo = MIN(o, o2); } - } void @@ -331,13 +330,14 @@ void fixup_stdout(const char *env) { - const char *str = ub_env_get(env); + const char *str; char *ptr; int serialno; int len, no, sero; const struct fdt_property *prop; char *tmp[10]; + str = ub_env_get(env); ptr = (char *)str + strlen(str) - 1; while (ptr > str && isdigit(*(str - 1))) str--; @@ -351,6 +351,8 @@ return; prop = fdt_get_property(fdtp, no, "stdout", &len); + + /* If /chosen/stdout does not extist, create it */ if (prop == NULL || (prop != NULL && len == 0)) { bzero(tmp, 10 * sizeof(char)); @@ -370,6 +372,8 @@ fdt_setprop(fdtp, no, "stdout", &tmp, strlen((char *)&tmp) + 1); + fdt_setprop(fdtp, no, "stdin", &tmp, + strlen((char *)&tmp) + 1); } } @@ -446,7 +450,7 @@ } int -command_fdt(int argc, char *argv[]) +command_fdt_internal(int argc, char *argv[]) { cmdf_t *cmdh; char *cmd; @@ -458,7 +462,7 @@ } /* - * Validate fdt + * Validate fdt . */ cmd = strdup(argv[1]); i = 0; @@ -486,7 +490,7 @@ fdt_fixup(); /* - * Call command handler + * Call command handler. */ err = (*cmdh)(argc, argv); @@ -1045,8 +1049,7 @@ rv = fdt_modprop(o, propname, value, 0); if (rv) return (CMD_ERROR); - else - return (CMD_OK); + return (CMD_OK); } /* User wants to display properties */ From owner-p4-projects@FreeBSD.ORG Tue Jan 12 22:16:03 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F8D41065672; Tue, 12 Jan 2010 22:16:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0422E106566C for ; Tue, 12 Jan 2010 22:16:03 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5B058FC0C for ; Tue, 12 Jan 2010 22:16:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CMG2VT036358 for ; Tue, 12 Jan 2010 22:16:02 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CMG2IV036356 for perforce@freebsd.org; Tue, 12 Jan 2010 22:16:02 GMT (envelope-from raj@freebsd.org) Date: Tue, 12 Jan 2010 22:16:02 GMT Message-Id: <201001122216.o0CMG2IV036356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 22:16:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=173046 Change 173046 by raj@raj_fdt on 2010/01/12 22:15:44 Enable FDT support for ARM loader(8). We are now able to load, read and modify the device tree blob in FreeBSD loader(8) on ARM (Marvell). Affected files ... .. //depot/projects/fdt/sys/boot/arm/uboot/Makefile#2 edit Differences ... ==== //depot/projects/fdt/sys/boot/arm/uboot/Makefile#2 (text+ko) ==== @@ -18,6 +18,7 @@ LOADER_TFTP_SUPPORT?= no LOADER_GZIP_SUPPORT?= no LOADER_BZIP2_SUPPORT?= no +LOADER_FDT_SUPPORT?= yes .if ${LOADER_DISK_SUPPORT} == "yes" CFLAGS+= -DLOADER_DISK_SUPPORT @@ -46,6 +47,9 @@ .if ${LOADER_TFTP_SUPPORT} == "yes" CFLAGS+= -DLOADER_TFTP_SUPPORT .endif +.if ${LOADER_FDT_SUPPORT} == "yes" +CFLAGS+= -DLOADER_FDT_SUPPORT +.endif .if !defined(NO_FORTH) # Enable BootForth @@ -60,6 +64,11 @@ CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. +# FDT support library +LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a +CFLAGS+= -I${.CURDIR}/../../fdt +CFLAGS+= -I${.OBJDIR}/../../fdt + CLEANFILES+= vers.c loader.help CFLAGS+= -ffreestanding @@ -79,8 +88,8 @@ # where to get libstand from CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBUBOOT} -lstand +DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} From owner-p4-projects@FreeBSD.ORG Tue Jan 12 22:39:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69B23106568B; Tue, 12 Jan 2010 22:39:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DF09106566C for ; Tue, 12 Jan 2010 22:39:27 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02A228FC12 for ; Tue, 12 Jan 2010 22:39:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CMdQPj038602 for ; Tue, 12 Jan 2010 22:39:26 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CMdQj2038600 for perforce@freebsd.org; Tue, 12 Jan 2010 22:39:26 GMT (envelope-from raj@freebsd.org) Date: Tue, 12 Jan 2010 22:39:26 GMT Message-Id: <201001122239.o0CMdQj2038600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 22:39:27 -0000 http://p4web.freebsd.org/chv.cgi?CH=173051 Change 173051 by raj@raj_fdt on 2010/01/12 22:38:38 Be a bit more strict in fdt_data_verify() check. Affected files ... .. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#4 edit Differences ... ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.c#4 (text+ko) ==== @@ -127,7 +127,7 @@ if (cells > 1) { d64 = fdt64_to_cpu(*((uint64_t *)data)); - if (((d64 >> 32) & 0xffffffffull) != 0) + if (((d64 >> 32) & 0xffffffffull) != 0 || cells > 2) return (ERANGE); } From owner-p4-projects@FreeBSD.ORG Tue Jan 12 22:43:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 822431065694; Tue, 12 Jan 2010 22:43:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 466CB1065692 for ; Tue, 12 Jan 2010 22:43:31 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33B368FC17 for ; Tue, 12 Jan 2010 22:43:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CMhVfU038930 for ; Tue, 12 Jan 2010 22:43:31 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0CMhVMV038928 for perforce@freebsd.org; Tue, 12 Jan 2010 22:43:31 GMT (envelope-from raj@freebsd.org) Date: Tue, 12 Jan 2010 22:43:31 GMT Message-Id: <201001122243.o0CMhVMV038928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2010 22:43:31 -0000 http://p4web.freebsd.org/chv.cgi?CH=173052 Change 173052 by raj@raj_fdt on 2010/01/12 22:43:18 Convert uart(4) console 'attachment' to FDT conventions. Affected files ... .. //depot/projects/fdt/sys/dev/uart/uart_cpu_powerpc.c#2 edit Differences ... ==== //depot/projects/fdt/sys/dev/uart/uart_cpu_powerpc.c#2 (text) ==== @@ -36,8 +36,16 @@ #include -#ifndef MPC85XX +#ifdef FDT +#include +#include +#include +#include +#endif + #include + +#ifndef FDT #include #endif @@ -62,22 +70,6 @@ #endif } -#ifdef MPC85XX -int -uart_cpu_getdev(int devtype, struct uart_devinfo *di) -{ - struct uart_class *class; - - class = &uart_ns8250_class; - if (class == NULL) - class = &uart_quicc_class; - if (class == NULL) - return (ENXIO); - - /* Check the environment. */ - return (uart_getenv(devtype, di, class)); -} -#else static int ofw_get_uart_console(phandle_t opts, phandle_t *result, const char *inputdev, const char *outputdev) @@ -99,6 +91,145 @@ return (0); } +#ifdef FDT +/* + * Since ofw_bus_is_compatible() cannot be used at this early stage, we need + * a similar function locally. Note the buffer has to be on the stack since + * malloc() is not yet available. + */ +static int +fdt_is_compatible(phandle_t node, const char *compatstr) +{ +#define FDT_COMPAT_LEN 255 + char *buf[FDT_COMPAT_LEN]; + char *compat; + int len, onelen, l, rv; + + if ((len = OF_getproplen(node, "compatible")) <= 0) + return (0); + + compat = (char *)&buf; + bzero(compat, FDT_COMPAT_LEN); + + if (OF_getprop(node, "compatible", compat, len) < 0) + return (0); + + onelen = strlen(compatstr); + rv = 0; + while (len > 0) { + if (strncasecmp(compat, compatstr, onelen) == 0) { + /* Found it. */ + rv = 1; + break; + } + /* Slide to the next sub-string. */ + l = strlen(compat) + 1; + compat += l; + len -= l; + } + + return (rv); +} + +static int +fdt_uart_addr(phandle_t node, bus_space_tag_t *tag, bus_space_handle_t *handle) +{ + pcell_t prop[4]; + u_long start, size; + pcell_t par_addr_cells, par_size_cells; + int rv, tuples, tuple_size; + ssize_t len; + + if (node == 0) + return (EINVAL); + if (tag == NULL || handle == NULL) + return (EINVAL); + if ((len = OF_getproplen(node, "reg")) <= 0) + return (EINVAL); + if (len > sizeof(prop)) + return (ERANGE); + + par_addr_cells = fdt_parent_addr_cells(node); + if (par_addr_cells > 0) { + rv = OF_searchprop(OF_parent(node), "#size-cells", + &par_size_cells, sizeof(par_size_cells)); + if (rv <= 0) + par_size_cells = 1; + } else + par_size_cells = 0; + + tuple_size = sizeof(pcell_t) * (par_addr_cells + par_size_cells); + len = OF_getprop(node, "reg", prop, sizeof(prop)); + if (len % tuple_size) + return (ENXIO); + + tuples = len / tuple_size; + if (tuples <= 0) + return (ENXIO); + + start = size = 0; + rv = 0; + *tag = uart_bus_space_io; + + /* + * Get address/size. XXX we assume only first 'reg' tuple is used: + * uart nodes usually have only one, so this will break if the range + * to be used is specified in other tuples. + */ + rv = fdt_data_to_res(prop, par_addr_cells, par_size_cells, + &start, &size); + + /* XXX this is an MPC85XX specific hack and needs to go away. */ + start += CCSRBAR_VA; + + rv = bus_space_map(*tag, start, size, 0, handle); + if (rv) + return (ERANGE); + + return (0); +} + +int +uart_cpu_getdev(int devtype, struct uart_devinfo *di) +{ + struct uart_class *class; + phandle_t input, opts; + int error; + + if (devtype != UART_DEV_CONSOLE) + return (ENXIO); + + if ((opts = OF_finddevice("/chosen")) == 0) + return (ENXIO); + + if (ofw_get_uart_console(opts, &input, "stdin", "stdout")) + return (EINVAL); + + class = &uart_quicc_class; + if (fdt_is_compatible(input, "ns16550")) + class = &uart_ns8250_class; + + if (OF_getprop(input, "reg-shift", &di->bas.regshft, + di->bas.regshft) <= 0) + di->bas.regshft = 0; + + di->ops = uart_getops(class); + + if (OF_getprop(input, "current-speed", &di->baudrate, + sizeof(di->baudrate)) <= 0) + di->baudrate = 0; + + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + + error = fdt_uart_addr(input, &di->bas.bst, &di->bas.bsh); + if (error) + return (error); + + return (0); +} +#else int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { From owner-p4-projects@FreeBSD.ORG Wed Jan 13 07:55:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6254106568B; Wed, 13 Jan 2010 07:55:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79CD71065676 for ; Wed, 13 Jan 2010 07:55:50 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 65F7B8FC1D for ; Wed, 13 Jan 2010 07:55:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0D7tonH010515 for ; Wed, 13 Jan 2010 07:55:50 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0D7thdt010509 for perforce@freebsd.org; Wed, 13 Jan 2010 07:55:43 GMT (envelope-from mav@freebsd.org) Date: Wed, 13 Jan 2010 07:55:43 GMT Message-Id: <201001130755.o0D7thdt010509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 07:55:51 -0000 http://p4web.freebsd.org/chv.cgi?CH=173059 Change 173059 by mav@mav_mavbook on 2010/01/13 07:54:56 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/FIXES#3 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/b.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/mac.code#2 delete .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/main.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/makefile#3 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/maketab.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/proctab.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/proto.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/one-true-awk/run.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/opie/libopie/getutmpentry.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opie/libopie/insecure.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/opie/libopie/login.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall#7 integrate .. //depot/projects/scottl-camlock/src/etc/termcap.small#5 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/freebsd-tips#3 integrate .. //depot/projects/scottl-camlock/src/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/kerberos5/usr.bin/kpasswd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_open.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_bindx.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_connectx.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getaddrlen.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getassocid.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getpaddrs.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_opt_info.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_recvmsg.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_send.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_sendmsg.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/rpc/svc_auth_des.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/fread.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/fwrite.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sctp_generic_recvmsg.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sctp_generic_sendmsg.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sctp_peeloff.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/libpmc.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/dosfs.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/pass2.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#9 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_affinity_np.3#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_attr_affinity_np.3#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#18 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ath.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/uhso.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/vge.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/devfs.rules.5#3 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.libnames.mk#6 integrate .. //depot/projects/scottl-camlock/src/share/termcap/termcap.src#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#30 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/bootstrap.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efilib.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efifs.c#3 delete .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efipart.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#22 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/conf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/version#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#68 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.mips#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#47 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#61 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#19 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.mips#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#17 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.mips64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.octeon1.32#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.octeon1.64#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.octeon1.n32#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.mips#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#92 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#46 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cfe/cfe_api.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cfe/cfe_env.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ct/ct_isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/flash/mx25l.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/flash/mx25lreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ic/ns16550.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siba/siba_cc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac_private.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/uhso.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#39 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_status.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#29 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/io.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/locore.s#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#39 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_misc.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/iodev.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/mp_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#14 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#20 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/iodev_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sys_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/iodev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_environment.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_param.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/files.adm5120#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/if_admsw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/alchemy_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/aureg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/files.alchemy#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/obio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/std.alchemy#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/uart_bus_alchemy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/uart_cpu_alchemy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/asm_octeon.S#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_ipd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_ipd.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pip.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pko.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pko.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/driveid.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/files.octeon1#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/obio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/obiovar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_ebt3000_cf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_ebt3000_cf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeonreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/std.octeon1#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_bus_octeonusart.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_cpu_octeonusart.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_dev_oct16550.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/ALCHEMY#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA64#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/idt/files.idt#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/idt/idt_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/idt/obio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/idt/uart_cpu_rc32434.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/_align.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/_bus.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/_types.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/asm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/atomic.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/bus.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/bus_octeon.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/cache.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cache_mipsNN.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cdefs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpufunc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpuinfo.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpuregs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/db_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/elf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/endian.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/float.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/fls64.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/include/hwfunc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/intr.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/intr_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/kdb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/locore.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/md_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pcb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pltfm.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/proc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/profile.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/psl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pte.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/regdef.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/regnum.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/trap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/ucontext.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/maltareg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/obio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/std.malta#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/yamon.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/bus_space_generic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/mips/busdma_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/cache.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/cache_mipsNN.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/db_trace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_trampoline.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/fp.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/gdb_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/genassym.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/inckern.S#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/locore.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mainbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/psraccess.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/ptrace_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/swtch.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/sys_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/tlb.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/desc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/rmilib.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/rmilib.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/rmisec.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/stats.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/atx_cpld.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/xgmac_mdio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/ehcireg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/ehcivar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pcibus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pcibus.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/uart_bus_xlr_iodi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_i2c.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xls_ehci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/files.sentry5#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/siba_cc.c#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/siba_mips.c#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/siba_sdram.c#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbpci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#40 integrate .. //depot/projects/scottl-camlock/src/sys/modules/epic/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#13 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/uhso/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if_epair.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#23 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#25 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_arg.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#28 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/ebus/epic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socket.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/fs.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#14 integrate .. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate .. //depot/projects/scottl-camlock/src/tools/tools/ath/athdecode/main.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/awk/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/awk/b.c.diff#3 delete .. //depot/projects/scottl-camlock/src/usr.bin/awk/main.c.diff#3 delete .. //depot/projects/scottl-camlock/src/usr.bin/awk/run.c.diff#2 delete .. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/lastcomm.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/job.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/if.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/main.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.1#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.h#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/uhsoctl/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/uhsoctl/uhsoctl.1#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/uhsoctl/uhsoctl.c#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/usbconfig.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.359 2010/01/08 19:01:50 bz Exp $ +# $FreeBSD: src/Makefile,v 1.361 2010/01/11 17:58:15 bz Exp $ # # The user-driven targets are: # @@ -321,8 +321,9 @@ @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs -BUILD_ARCH!= uname -p -TARGET?= ${BUILD_ARCH} +.if !defined(TARGET) +TARGET!= uname -m +.endif KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name NOTES ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/FIXES#3 (text+ko) ==== @@ -25,6 +25,23 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Nov 26, 2009: + fixed a long-standing issue with when FS takes effect. a + change to FS is now noticed immediately for subsequent splits. + + changed the name getline() to awkgetline() to avoid yet another + name conflict somewhere. + +Feb 11, 2009: + temporarily for now defined HAS_ISBLANK, since that seems to + be the best way through the thicket. isblank arrived in C99, + but seems to be arriving at different systems at different + times. + +Oct 8, 2008: + fixed typo in b.c that set tmpvec wrongly. no one had ever + run into the problem, apparently. thanks to alistair crooks. + Oct 23, 2007: minor fix in lib.c: increase inputFS to 100, change malloc for fields to n+1. ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/b.c#3 (text+ko) ==== @@ -24,6 +24,9 @@ /* lasciate ogne speranza, voi ch'intrate. */ +#include +__FBSDID("$FreeBSD: src/contrib/one-true-awk/b.c,v 1.3 2010/01/10 08:02:07 ru Exp $"); + #define DEBUG #include @@ -285,9 +288,21 @@ return c; } +static int collate_range_cmp(int a, int b) +{ + static char s[2][2]; + + if ((uschar)a == (uschar)b) + return 0; + s[0][0] = a; + s[1][0] = b; + return (strcoll(s[0], s[1])); +} + char *cclenter(const char *argp) /* add a character class */ { int i, c, c2; + int j; uschar *p = (uschar *) argp; uschar *op, *bp; static uschar *buf = 0; @@ -306,15 +321,18 @@ c2 = *p++; if (c2 == '\\') c2 = quoted((char **) &p); - if (c > c2) { /* empty; ignore */ + if (collate_range_cmp(c, c2) > 0) { bp--; i--; continue; } - while (c < c2) { + for (j = 0; j < NCHARS; j++) { + if ((collate_range_cmp(c, j) > 0) || + collate_range_cmp(j, c2) > 0) + continue; if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, "cclenter1")) FATAL("out of space for character class [%.10s...] 2", p); - *bp++ = ++c; + *bp++ = j; i++; } continue; @@ -731,6 +749,7 @@ * to nelson beebe for the suggestion; let's see if it works everywhere. */ +/* #define HAS_ISBLANK */ #ifndef HAS_ISBLANK int (isblank)(int c) @@ -876,7 +895,7 @@ if (q[j] >= maxsetvec) { maxsetvec *= 4; setvec = (int *) realloc(setvec, maxsetvec * sizeof(int)); - tmpset = (int *) realloc(setvec, maxsetvec * sizeof(int)); + tmpset = (int *) realloc(tmpset, maxsetvec * sizeof(int)); if (setvec == 0 || tmpset == 0) overflo("cgoto overflow"); } ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/lib.c#3 (text+ko) ==== @@ -274,6 +274,7 @@ } fr = fields; i = 0; /* number of fields accumulated here */ + strcpy(inputFS, *FS); if (strlen(inputFS) > 1) { /* it's a regular expression */ i = refldbld(r, inputFS); } else if ((sep = *inputFS) == ' ') { /* default whitespace */ ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/main.c#3 (text+ko) ==== @@ -22,7 +22,10 @@ THIS SOFTWARE. ****************************************************************/ -const char *version = "version 20070501"; +#include +__FBSDID("$FreeBSD: src/contrib/one-true-awk/main.c,v 1.3 2010/01/10 08:02:07 ru Exp $"); + +const char *version = "version 20091126 (FreeBSD)"; #define DEBUG #include @@ -58,6 +61,7 @@ const char *fs = NULL; setlocale(LC_CTYPE, ""); + setlocale(LC_COLLATE, ""); setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */ cmdname = argv[0]; if (argc == 1) { @@ -86,13 +90,18 @@ safe = 1; break; case 'f': /* next argument is program filename */ - argc--; - argv++; - if (argc <= 1) - FATAL("no program filename"); - if (npfile >= MAX_PFILE - 1) - FATAL("too many -f options"); - pfile[npfile++] = argv[1]; + if (argv[1][2] != 0) { /* arg is -fsomething */ + if (npfile >= MAX_PFILE - 1) + FATAL("too many -f options"); + pfile[npfile++] = &argv[1][2]; + } else { /* arg is -f something */ + argc--; argv++; + if (argc <= 1) + FATAL("no program filename"); + if (npfile >= MAX_PFILE - 1) + FATAL("too many -f options"); + pfile[npfile++] = argv[1]; + } break; case 'F': /* set field separator */ if (argv[1][2] != 0) { /* arg is -Fsomething */ @@ -111,8 +120,14 @@ WARNING("field separator FS is empty"); break; case 'v': /* -v a=1 to be done NOW. one -v for each */ - if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1])) - setclvar(argv[1]); + if (argv[1][2] != 0) { /* arg is -vsomething */ + if (argv[1][2] != 0) + setclvar(&argv[1][2]); + } else { /* arg is -v something */ + argc--; argv++; + if (argc > 1 && isclvar(argv[1])) + setclvar(argv[1]); + } break; case 'd': dbg = atoi(&argv[1][2]); ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/makefile#3 (text+ko) ==== @@ -31,7 +31,6 @@ CC = gcc -Wall -g CC = cc CC = gcc -O4 -CC = gcc -Wall -g YACC = bison -y ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/maketab.c#3 (text+ko) ==== @@ -102,7 +102,7 @@ { CALL, "call", "call" }, { ARG, "arg", "arg" }, { VARNF, "getnf", "NF" }, - { GETLINE, "getline", "getline" }, + { GETLINE, "awkgetline", "getline" }, { 0, "", "" }, }; ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/proctab.c#3 (text+ko) ==== @@ -180,7 +180,7 @@ nullproc, /* NUMBER */ nullproc, /* STRING */ nullproc, /* REGEXPR */ - getline, /* GETLINE */ + awkgetline, /* GETLINE */ substr, /* SUBSTR */ split, /* SPLIT */ jump, /* RETURN */ ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/proto.h#2 (text+ko) ==== @@ -149,7 +149,7 @@ extern Cell *copycell(Cell *); extern Cell *arg(Node **, int); extern Cell *jump(Node **, int); -extern Cell *getline(Node **, int); +extern Cell *awkgetline(Node **, int); extern Cell *getnf(Node **, int); extern Cell *array(Node **, int); extern Cell *awkdelete(Node **, int); ==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/run.c#3 (text+ko) ==== @@ -22,6 +22,9 @@ THIS SOFTWARE. ****************************************************************/ +#include +__FBSDID("$FreeBSD: src/contrib/one-true-awk/run.c,v 1.3 2010/01/10 08:02:07 ru Exp $"); + #define DEBUG #include #include @@ -388,7 +391,7 @@ return 0; /* not reached */ } -Cell *getline(Node **a, int n) /* get next line from specific input */ +Cell *awkgetline(Node **a, int n) /* get next line from specific input */ { /* a[0] is variable, a[1] is operator, a[2] is filename */ Cell *r, *x; extern Cell **fldtab; @@ -653,7 +656,7 @@ j = x->fval - y->fval; i = j<0? -1: (j>0? 1: 0); } else { - i = strcmp(getsval(x), getsval(y)); + i = strcoll(getsval(x), getsval(y)); } tempfree(x); tempfree(y); @@ -1159,11 +1162,11 @@ x->sval, y->sval); strcpy(s, x->sval); strcpy(s+n1, y->sval); + tempfree(x); tempfree(y); z = gettemp(); z->sval = s; z->tval = STR; - tempfree(x); return(z); } ==== //depot/projects/scottl-camlock/src/contrib/opie/libopie/getutmpentry.c#2 (text+ko) ==== @@ -15,13 +15,14 @@ #include "opie_cfg.h" #include #include -#include #if DOUTMPX #include #define setutent setutxent #define getutline(x) getutxline(x) #define utmp utmpx +#else +#include #endif /* DOUTMPX */ #if HAVE_STRING_H ==== //depot/projects/scottl-camlock/src/contrib/opie/libopie/insecure.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ Created at NRL for OPIE 2.2 from opiesubr.c. Fixed pointer assignment that should have been a comparison. -$FreeBSD: src/contrib/opie/libopie/insecure.c,v 1.3 2002/03/21 23:42:52 markm Exp $ +$FreeBSD: src/contrib/opie/libopie/insecure.c,v 1.4 2010/01/11 16:27:56 ed Exp $ */ #include "opie_cfg.h" @@ -39,11 +39,12 @@ #include #include -#include #if DOUTMPX #include #define utmp utmpx #define endutent endutxent +#else +#include #endif /* DOUTMPX */ #if HAVE_SYS_UTSNAME_H ==== //depot/projects/scottl-camlock/src/contrib/opie/libopie/login.c#2 (text+ko) ==== @@ -21,13 +21,14 @@ #include "opie_cfg.h" #include #include -#include #if DOUTMPX #include #define pututline(x) pututxline(x) #define endutent endutxent #define utmp utmpx +#else +#include #endif /* DOUTMPX */ #if HAVE_STRING_H ==== //depot/projects/scottl-camlock/src/etc/rc.firewall#7 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.63 2010/01/07 17:46:25 ume Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.64 2010/01/09 19:16:27 ume Exp $ # # @@ -220,6 +220,8 @@ # Allow any link-local multicast traffic ${fwcmd} add pass all from fe80::/10 to ff02::/16 ${fwcmd} add pass all from ${net6} to ff02::/16 + # Allow DHCPv6 + ${fwcmd} add pass udp from fe80::/10 to me6 546 fi # Allow TCP through if setup succeeded ==== //depot/projects/scottl-camlock/src/etc/termcap.small#5 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 5.88 (Berkeley) 4/30/91 -# $FreeBSD: src/etc/termcap.small,v 1.32 2009/12/14 07:18:31 dougb Exp $ +# $FreeBSD: src/etc/termcap.small,v 1.33 2010/01/10 21:41:37 ed Exp $ # # for syscons # common entry without semigraphics @@ -294,9 +294,9 @@ # $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $ # xterm-new|modern xterm:\ - :*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\ + :@7=\EOF:@8=\EOM:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\ - :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\ + :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kI=\E[2~:\ :kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\ :tc=xterm-basic: # ==== //depot/projects/scottl-camlock/src/games/fortune/datfiles/freebsd-tips#3 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.47 2009/01/12 19:17:43 simon Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.48 2010/01/11 21:17:49 gavin Exp $ % Any user that is a member of the wheel group can use "su -" to simulate a root login. You can add a user to the wheel group by editing /etc/group. @@ -50,18 +50,6 @@ be able to run it unless you first type "rehash". -- Dru % -If you are running xterm, the default TERM variable will be 'xterm'. If you -set this environment variable to 'xterm-color' instead, a lot of programs will -use colors. You can do this by - - TERM=xterm-color; export TERM - -in Bourne-derived shells, and - - setenv TERM xterm-color - -in csh-derived shells. -% If you do not want to get beeps in X11 (X Windows), you can turn them off with xset b off ==== //depot/projects/scottl-camlock/src/kerberos5/usr.bin/kdestroy/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.16 2008/05/07 13:53:08 dfr Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.17 2010/01/09 18:51:50 antoine Exp $ PROG= kdestroy CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509) ${LIBROKEN} ${LIBVERS} \ +DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} LDADD= -lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ==== //depot/projects/scottl-camlock/src/kerberos5/usr.bin/kpasswd/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.15 2008/05/07 13:53:08 dfr Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.16 2010/01/09 18:53:03 antoine Exp $ PROG= kpasswd CFLAGS+=-I${KRB5DIR}/lib/roken -DPADD= ${LIBKRB5} ${LIBHX509 ${LIBROKEN} ${LIBVERS} \ +DPADD= ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} LDADD= -lkrb5 -lhx509 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#4 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.21 2010/01/09 05:40:46 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.22 2010/01/12 01:30:05 davidxu Exp $ .\" -.Dd January 7, 2010 +.Dd January 9, 2010 .Dt SEM_INIT 3 .Os .Sh NAME @@ -52,7 +52,7 @@ specifies a shared semaphore that can be used by multiple processes, the semaphore should be located in shared memory region (see .Xr mmap 2 , -.Xr shm_open 2 , +.Xr shm_open 2 , and .Xr shmget 2 ) , any process having read and write access to address ==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_open.3#4 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.14 2010/01/09 05:40:46 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.15 2010/01/12 01:30:05 davidxu Exp $ .\" -.Dd January 15, 2003 +.Dd January 9, 2010 .Dt SEM_OPEN 3 .Os .Sh NAME @@ -61,8 +61,8 @@ This implementation places strict requirements on the value of .Fa name : it must begin with a slash -.Pq Ql / , -contain no other slash characters. +.Pq Ql / +and contain no other slash characters. .Pp The following bits may be set in the .Fa oflag ==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_bindx.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/net/sctp_bindx.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_bindx.3,v 1.4 2010/01/12 21:45:03 brueffer Exp $ .\" .Dd December 15, 2006 .Dt SCTP_BINDX 3 @@ -90,7 +90,7 @@ .Sh ERRORS The .Fn sctp_bindx -can return the following errors. +function can return the following errors: .Bl -tag -width Er .It Bq Er EINVAL This value is returned if the ==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_connectx.3#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.6 2007/09/25 16:48:08 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.7 2010/01/12 21:45:03 brueffer Exp $ .\" .Dd June 19, 2007 .Dt SCTP_CONNECTX 3 @@ -44,7 +44,7 @@ .In sys/socket.h .In netinet/sctp.h .Ft int -.Fn sctp_connectx "int s" "struct sockaddr *" "int addrcnt" "sctp_assoc_t *" +.Fn sctp_connectx "int sd" "struct sockaddr *addrs" "int addrcnt" "sctp_assoc_t *id" .Sh DESCRIPTION The .Fn sctp_connectx @@ -75,7 +75,7 @@ call will be silently discarded from the association. On successful completion the provided -.Fa "sctp_assoc_t *" +.Fa id will be filled in with the association identification of the newly forming association. @@ -84,7 +84,7 @@ .Sh ERRORS The .Fn sctp_connectx -can return the following errors. +function can return the following errors: .Bl -tag -width Er .It Bq Er EINVAL An address listed has an invalid family or no ==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getaddrlen.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/net/sctp_getaddrlen.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_getaddrlen.3,v 1.4 2010/01/12 21:45:03 brueffer Exp $ .\" .Dd December 15, 2006 .Dt SCTP_GETADDRLEN 3 @@ -76,7 +76,7 @@ .Sh ERRORS The .Fn sctp_getaddrlen -function can return the following errors. +function can return the following errors: .Bl -tag -width Er .It Bq Er EINVAL The address family specified does NOT exist. ==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getassocid.3#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/sctp_getassocid.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_getassocid.3,v 1.4 2010/01/12 21:45:03 brueffer Exp $ .\" .Dd December 15, 2006 .Dt SCTP_GETASSOCID 3 @@ -58,7 +58,7 @@ .Sh ERRORS The .Fn sctp_getassocid -function can return the following errors. +function can return the following errors: .Bl -tag -width Er .It Bq Er ENOENT The address does not have an association setup to it. ==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getpaddrs.3#3 (text+ko) ==== @@ -30,10 +30,10 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/net/sctp_getpaddrs.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_getpaddrs.3,v 1.4 2010/01/12 21:45:03 brueffer Exp $ .\" .Dd December 15, 2006 -.Dt SCTP_GETPADDR 3 +.Dt SCTP_GETPADDRS 3 .Os .Sh NAME .Nm sctp_getpaddrs , @@ -64,7 +64,7 @@ .Fa addrs upon success. .Pp -After the caller is through the function +After the caller is finished, the function .Fn sctp_freepaddrs or .Fn sctp_freeladdrs @@ -76,7 +76,7 @@ .Fa addrs upon success. .Sh ERRORS -The functions can return the following errors. +The functions can return the following errors: .Bl -tag -width Er .It Bq Er EINVAL An address listed has an invalid family or no ==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_opt_info.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.5 2010/01/12 21:45:03 brueffer Exp $ .\" .Dd December 15, 2006 .Dt SCTP_OPT_INFO 3 @@ -45,7 +45,7 @@ .In sys/socket.h >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 13 08:29:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57DE4106568B; Wed, 13 Jan 2010 08:29:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AB651065672 for ; Wed, 13 Jan 2010 08:29:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 077FE8FC1D for ; Wed, 13 Jan 2010 08:29:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0D8TNRg014348 for ; Wed, 13 Jan 2010 08:29:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0D8TNhK014346 for perforce@freebsd.org; Wed, 13 Jan 2010 08:29:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 13 Jan 2010 08:29:23 GMT Message-Id: <201001130829.o0D8TNhK014346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 08:29:24 -0000 http://p4web.freebsd.org/chv.cgi?CH=173060 Change 173060 by hselasky@hselasky_laptop001 on 2010/01/13 08:28:28 USB wlan: - patch for RUN driver - patch done by: Akinori Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#3 (text+ko) ==== @@ -701,10 +701,6 @@ ieee80211_vap_setup(ic, vap, name, unit, opmode, flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); - /* - * I couldn't make these func work. - * Let me know if you can. - */ vap->iv_key_update_begin = run_key_update_begin; vap->iv_key_update_end = run_key_update_end; vap->iv_key_delete = run_key_delete; @@ -869,7 +865,7 @@ return error; if (tmp & RT2860_MCU_READY) break; - run_delay(sc, 1000); + run_delay(sc, 10); } if (ntries == 1000) { printf("%s: timeout waiting for MCU to initialize\n", @@ -1726,11 +1722,10 @@ /* map net80211 cipher to RT2860 security mode */ switch (k->wk_cipher->ic_cipher) { case IEEE80211_CIPHER_WEP: - if(k->wk_keylen < 8){ + if(k->wk_keylen < 8) mode = RT2860_MODE_WEP40; - }else{ + else mode = RT2860_MODE_WEP104; - } break; case IEEE80211_CIPHER_TKIP: mode = RT2860_MODE_TKIP; @@ -1908,11 +1903,26 @@ struct run_vap *rvp = arg; struct ieee80211vap *vap = &rvp->vap; struct ieee80211com *ic = vap->iv_ic; + struct run_softc *sc = ic->ic_ifp->if_softc; if (ic->ic_opmode == IEEE80211_M_STA) run_iter_func(rvp, vap->iv_bss); - else + else { + /* + * run_reset_livelock() doesn't do anything with AMRR, + * but Ralink wants us to call it every 1 sec. So, we + * piggyback here rather than creating another callout. + * Livelock may occur only in HOSTAP or IBSS mode + * (when h/w is sending beacons). + */ + RUN_LOCK(sc); + run_reset_livelock(sc); + RUN_UNLOCK(sc); ieee80211_iterate_nodes(&ic->ic_sta, run_iter_func, rvp); + } + + if(rvp->amrr_run == RUN_AMRR_ON) + usb_callout_reset(&rvp->amrr_ch, hz, run_amrr_to, rvp); } @@ -1936,7 +1946,7 @@ if(ic->ic_opmode != IEEE80211_M_STA){ /* drain Tx status FIFO (maxsize = 16) */ - run_read_region_1(sc, RT2860_TX_STAT_FIFO, (uint8_t *)&stat, sizeof stat); + run_read(sc, RT2860_TX_STAT_FIFO, &stat); while (stat & RT2860_TXQ_VLD) { DPRINTFN(4, "tx stat 0x%08x\n", stat); @@ -2002,9 +2012,6 @@ ieee80211_amrr_choose(ni, amn); skip:; - if(rvp->amrr_run == RUN_AMRR_ON) - usb_callout_reset(&rvp->amrr_ch, hz, run_amrr_to, rvp); - RUN_UNLOCK(sc); if(ic->ic_opmode != IEEE80211_M_STA) @@ -2335,7 +2342,9 @@ struct mbuf *m; usb_frlength_t size; unsigned int len; - int actlen, sumlen; + int actlen; + int sumlen; + int timeout; usbd_xfer_status(xfer, &actlen, &sumlen, NULL, NULL); @@ -2347,6 +2356,7 @@ data = usbd_xfer_get_priv(xfer); run_tx_free(pq, data, 0); + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; usbd_xfer_set_priv(xfer, NULL); @@ -2404,10 +2414,19 @@ usbd_transfer_submit(xfer); + /* avoid doing the USB timeout from this function */ + + timeout = sc->sc_usb_timeout; + sc->sc_usb_timeout = 0; + RUN_UNLOCK(sc); + run_start(ifp); + RUN_LOCK(sc); + sc->sc_usb_timeout = timeout; + break; default: @@ -2429,9 +2448,6 @@ /* defer until later */ sc->sc_usb_timeout = 1; - - /* XXX this should be in a separate task! */ - run_usb_timeout(sc); } /* @@ -2625,7 +2641,7 @@ /* reserve slots for mgmt packets, just in case */ if (sc->sc_epq[qid].tx_nfree < 3) { - DPRINTF("tx ring %d is full\n", qid); + DPRINTFN(10, "tx ring %d is full\n", qid); return (-1); } @@ -2766,7 +2782,8 @@ mprot = ieee80211_alloc_cts(ic, ni->ni_vap->iv_myaddr, dur); } if (mprot == NULL) { - /* XXX stat + msg */ + sc->sc_ifp->if_oerrors++; + DPRINTF("could not allocate mbuf\n"); return (ENOBUFS); } @@ -2884,6 +2901,10 @@ goto bad; } + /* Device is in trouble. Fix it before sending more frame. */ + if(sc->sc_usb_timeout == 1) + run_usb_timeout(sc); + if (params == NULL) { /* tx mgt packet */ if ((error = run_tx_mgt(sc, m, ni)) != 0){ @@ -2930,6 +2951,10 @@ } for (;;) { + /* Device is in trouble. Fix it before sending more frame. */ + if(sc->sc_usb_timeout == 1) + run_usb_timeout(sc); + /* send data frames */ IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) @@ -3082,14 +3107,14 @@ run_rt2870_rf_write(sc, RT2860_RF3, r3); run_rt2870_rf_write(sc, RT2860_RF4, r4); - run_delay(sc, 200); + run_delay(sc, 10); run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1); run_rt2870_rf_write(sc, RT2860_RF2, r2); run_rt2870_rf_write(sc, RT2860_RF3, r3 | 1); run_rt2870_rf_write(sc, RT2860_RF4, r4); - run_delay(sc, 200); + run_delay(sc, 10); run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1); run_rt2870_rf_write(sc, RT2860_RF2, r2); @@ -3201,7 +3226,7 @@ /* XXX necessary only when group has changed! */ run_select_chan_group(sc, group); - run_delay(sc, 1000); + run_delay(sc, 10); return 0; } @@ -3359,18 +3384,21 @@ sc->sc_usb_timeout = 0; - if(vap->iv_state == IEEE80211_S_SCAN){ + if(vap->iv_state == IEEE80211_S_RUN && + vap->iv_opmode != IEEE80211_M_STA) + run_reset_livelock(sc); + else if(vap->iv_state == IEEE80211_S_SCAN){ DPRINTF("timeout caused by scan\n"); /* cancel bgscan */ ieee80211_cancel_scan(vap); - } else if(vap->iv_state == IEEE80211_S_RUN) - run_reset_livelock(sc); + } else + DPRINTF("timeout by unknown cause\n"); } static void run_reset_livelock(struct run_softc *sc) { - struct ieee80211vap *vap = &sc->sc_rvp->vap; + uint32_t tmp; /* * In IBSS or HostAP modes (when the hardware sends beacons), the @@ -3378,10 +3406,11 @@ * like crazy if protection is enabled. * Reset MAC/BBP for a while */ - if (vap->iv_opmode != IEEE80211_M_STA) { + run_read(sc, RT2860_DEBUG, &tmp); + if((tmp & (1 << 29)) && (tmp & (1 << 7 | 1 << 5))){ DPRINTF("CTS-to-self livelock detected\n"); run_write(sc, RT2860_MAC_SYS_CTRL, RT2860_MAC_SRST); - run_delay(sc, 4); + run_delay(sc, 1); run_write(sc, RT2860_MAC_SYS_CTRL, RT2860_MAC_RX_EN | RT2860_MAC_TX_EN); } @@ -3623,7 +3652,7 @@ run_rt3070_rf_read(sc, 30, &rf); /* toggle RF R30 bit 7 */ run_rt3070_rf_write(sc, 30, rf | 0x80); - run_delay(sc, 1000); + run_delay(sc, 10); run_rt3070_rf_write(sc, 30, rf & ~0x80); /* initialize RF registers to default value */ @@ -3747,7 +3776,7 @@ for (ntries = 0; ntries < 100; ntries++) { /* transmit test tone */ run_bbp_write(sc, 25, 0x90); - run_delay(sc, 1000); + run_delay(sc, 10); /* read received power */ run_bbp_read(sc, 55, &bbp55_pb); if (bbp55_pb != 0) @@ -3761,7 +3790,7 @@ for (ntries = 0; ntries < 100; ntries++) { /* transmit test tone */ run_bbp_write(sc, 25, 0x90); - run_delay(sc, 1000); + run_delay(sc, 10); /* read received power */ run_bbp_read(sc, 55, &bbp55_sb); @@ -3803,7 +3832,7 @@ return error; if ((tmp & (RT2860_TX_DMA_BUSY | RT2860_RX_DMA_BUSY)) == 0) break; - run_delay(sc, 1000); + run_delay(sc, 50); } if (ntries == 200) return ETIMEDOUT; @@ -3870,7 +3899,7 @@ goto fail; if ((tmp & (RT2860_TX_DMA_BUSY | RT2860_RX_DMA_BUSY)) == 0) break; - run_delay(sc, 1000); + run_delay(sc, 10); } if (ntries == 100) { printf("%s: timeout waiting for DMA engine\n", @@ -3924,7 +3953,7 @@ goto fail; if (!(tmp & (RT2860_RX_STATUS_BUSY | RT2860_TX_STATUS_BUSY))) break; - run_delay(sc, 1000); + run_delay(sc, 10); } if (ntries == 100) goto fail; @@ -3932,7 +3961,7 @@ /* clear Host to MCU mailbox */ run_write(sc, RT2860_H2M_BBPAGENT, 0); run_write(sc, RT2860_H2M_MAILBOX, 0); - run_delay(sc, 1000); + run_delay(sc, 10); if (run_bbp_init(sc) != 0) { printf("%s: could not initialize BBP\n", @@ -4094,11 +4123,11 @@ DPRINTF("All Tx cleared\n"); break; } - run_delay(sc, 1000); + run_delay(sc, 10); } if(ntries >= 100) DPRINTF("There are still pending Tx\n"); - run_delay(sc, 1000); + run_delay(sc, 10); run_write(sc, RT2860_USB_DMA_CFG, 0); run_write(sc, RT2860_MAC_SYS_CTRL, RT2860_BBP_HRST | RT2860_MAC_SRST); From owner-p4-projects@FreeBSD.ORG Wed Jan 13 12:46:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0E2A106568F; Wed, 13 Jan 2010 12:46:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 852041065670 for ; Wed, 13 Jan 2010 12:46:41 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 716D98FC18 for ; Wed, 13 Jan 2010 12:46:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DCkf3E047815 for ; Wed, 13 Jan 2010 12:46:41 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DCkf5n047811 for perforce@freebsd.org; Wed, 13 Jan 2010 12:46:41 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 13 Jan 2010 12:46:41 GMT Message-Id: <201001131246.o0DCkf5n047811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 12:46:42 -0000 http://p4web.freebsd.org/chv.cgi?CH=173064 Change 173064 by rene@rene_self on 2010/01/13 12:46:22 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#44 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#19 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#31 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.ent#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2009-10-2009-12.xml#1 branch Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#44 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -2078,6 +2078,25 @@ + Using both wired and wireless connection + + Wired connection provides better performance and reliability, + while wireless connection provides flexibility and mobility, + users of laptop computers usually want to combine these together + and roam seamlessly between the two. + + On &os;, it is possible to combine two or even more network + interfaces together in a failover fashion, that + is, to use the most preferred and available connection from a + group of network interfaces, and have the operating system to + switch automatically when the link state changes. + + We will cover link aggregation and failover in + where an example for using both wired and wireless connection + is also provided at . + + + Troubleshooting If you are having trouble with wireless networking, there @@ -3401,6 +3420,85 @@ become the active link. If the link is restored on the master interface then it will once again become the active link. + + Failover mode between wired and wireless interfaces + + For laptop users, it is usually desirable to make wireless as a + secondary interface, which is to be used when the wired connection + is not available. With &man.lagg.4;, it is possible to use one + IP address, prefer the wired connection for both performance and + security reasons, while maintaining the ability to transfer data + over the wireless connection. + + In this setup, we will need to override the underlying + wireless interface's MAC address to match the &man.lagg.4;'s, + which is inherited from the master interface being used, the + wired interface. + + In this setup, we will treat the wired interface, + bge0, as the master, and the wireless + interface, + wlan0, as the failover interface. The + wlan0 was created from + iwn0 which we will set up with + the wired connection's MAC address. The first step would be + to obtain the MAC address from the wired interface: + + &prompt.root; ifconfig bge0 +bge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=19b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM,TSO4> + ether 00:21:70:da:ae:37 + inet6 fe80::221:70ff:feda:ae37%bge0 prefixlen 64 scopeid 0x2 + nd6 options=29<PERFORMNUD,IFDISABLED,AUTO_LINKLOCAL> + media: Ethernet autoselect (1000baseT <full-duplex>) + status: active + + You can replace the bge0 to match + your reality, and will get a different ether + line which is the MAC address of your wired interface. Now, + we change the underlying wireless interface, + iwn0: + + &prompt.root; ifconfig iwn0 ether 00:21:70:da:ae:37 + + Bring up the wireless interface but don't set up any IP + address on it: + + &prompt.root; ifconfig create wlan0 wlandev iwn0 ssid my_router up + + Create the &man.lagg.4; interface with bge0 + as master, and failover to wlan0 if + necessary: + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto failover laggport bge0 laggport wlan0 + + The interface will look something like this, the major + differences will be the MAC address and the + device names: + + &prompt.root; ifconfig lagg0 +lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=8<VLAN_MTU> + ether 00:21:70:da:ae:37 + media: Ethernet autoselect + status: active + laggproto failover + laggport: wlan0 flags=0<> + laggport: bge0 flags=5<MASTER,ACTIVE> + + To avoid having to do this after every reboot, one can add + something like the following lines to the + /etc/rc.conf file: + + ifconfig_bge0="up" +ifconfig_iwn0="ether 00:21:70:da:ae:37" +wlans_iwn0="wlan0" +ifconfig_wlan0="WPA" +cloned_interfaces="lagg0" +ifconfig_lagg0="laggproto failover laggport bge0 laggport wlan0 DHCP" + + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#31 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ From owner-p4-projects@FreeBSD.ORG Wed Jan 13 19:44:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E3151065695; Wed, 13 Jan 2010 19:44:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31CA31065692 for ; Wed, 13 Jan 2010 19:44:16 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DDDD8FC16 for ; Wed, 13 Jan 2010 19:44:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DJiGOG008090 for ; Wed, 13 Jan 2010 19:44:16 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DJi9bx008084 for perforce@freebsd.org; Wed, 13 Jan 2010 19:44:09 GMT (envelope-from peter@wemm.org) Date: Wed, 13 Jan 2010 19:44:09 GMT Message-Id: <201001131944.o0DJi9bx008084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 19:44:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=173075 Change 173075 by peter@peter_daintree on 2010/01/13 19:43:16 IFC @173074 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#76 integrate .. //depot/projects/hammer/UPDATING#141 integrate .. //depot/projects/hammer/bin/csh/config.h#10 integrate .. //depot/projects/hammer/bin/csh/config_p.h#5 integrate .. //depot/projects/hammer/bin/date/Makefile#4 integrate .. //depot/projects/hammer/bin/date/date.c#10 integrate .. //depot/projects/hammer/bin/pax/gen_subs.c#5 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/sys_term.c#5 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/telnetd.c#7 integrate .. //depot/projects/hammer/crypto/openssh/config.h#18 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#15 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#16 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#20 integrate .. //depot/projects/hammer/etc/newsyslog.conf#13 integrate .. //depot/projects/hammer/etc/periodic/monthly/200.accounting#3 integrate .. //depot/projects/hammer/etc/rc.d/cleanvar#13 integrate .. //depot/projects/hammer/etc/rc.d/var#10 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#19 integrate .. //depot/projects/hammer/include/Makefile#84 integrate .. //depot/projects/hammer/include/utmp.h#3 integrate .. //depot/projects/hammer/include/utmpx.h#1 branch .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#45 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#19 integrate .. //depot/projects/hammer/lib/libc/gen/getutxent.3#1 branch .. //depot/projects/hammer/lib/libc/gen/getutxent.c#1 branch .. //depot/projects/hammer/lib/libc/gen/pututxline.c#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_init.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/sem_new.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/sem_open.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/utxdb.c#1 branch .. //depot/projects/hammer/lib/libc/gen/utxdb.h#1 branch .. //depot/projects/hammer/lib/libc/net/sctp_bindx.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_connectx.3#4 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getaddrlen.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getassocid.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getpaddrs.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_opt_info.3#4 integrate .. //depot/projects/hammer/lib/libc/net/sctp_recvmsg.3#4 integrate .. //depot/projects/hammer/lib/libc/net/sctp_send.3#5 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sendmsg.3#5 integrate .. //depot/projects/hammer/lib/libc/sys/sctp_generic_recvmsg.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/sctp_generic_sendmsg.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sctp_peeloff.2#5 integrate .. //depot/projects/hammer/lib/libelf/elf.3#4 integrate .. //depot/projects/hammer/lib/libopie/Makefile#13 integrate .. //depot/projects/hammer/lib/libopie/config.h#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#11 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#18 integrate .. //depot/projects/hammer/lib/libulog/Makefile#3 integrate .. //depot/projects/hammer/lib/libulog/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libulog/ulog.h#3 integrate .. //depot/projects/hammer/lib/libulog/ulog_getutxent.3#2 delete .. //depot/projects/hammer/lib/libulog/ulog_getutxent.c#3 delete .. //depot/projects/hammer/lib/libulog/ulog_internal.h#2 delete .. //depot/projects/hammer/lib/libulog/ulog_login.3#2 integrate .. //depot/projects/hammer/lib/libulog/ulog_login.c#2 integrate .. //depot/projects/hammer/lib/libulog/ulog_login_pseudo.c#2 integrate .. //depot/projects/hammer/lib/libulog/ulog_pututxline.c#3 delete .. //depot/projects/hammer/lib/libulog/ulog_setutxfile.3#3 delete .. //depot/projects/hammer/lib/libulog/ulog_util.c#2 delete .. //depot/projects/hammer/lib/libulog/utempter.c#2 integrate .. //depot/projects/hammer/lib/libulog/utempter_add_record.3#2 integrate .. //depot/projects/hammer/lib/libutil/Makefile#25 integrate .. //depot/projects/hammer/lib/libutil/libutil.h#14 integrate .. //depot/projects/hammer/lib/libutil/login.3#3 delete .. //depot/projects/hammer/lib/libutil/login.c#4 delete .. //depot/projects/hammer/lib/libutil/logout.3#4 delete .. //depot/projects/hammer/lib/libutil/logout.c#6 delete .. //depot/projects/hammer/lib/libutil/logwtmp.3#2 delete .. //depot/projects/hammer/lib/libutil/logwtmp.c#7 delete .. //depot/projects/hammer/libexec/comsat/comsat.c#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#34 integrate .. //depot/projects/hammer/libexec/ftpd/logwtmp.c#4 integrate .. //depot/projects/hammer/libexec/rlogind/rlogind.c#5 integrate .. //depot/projects/hammer/libexec/rpc.rusersd/Makefile#4 integrate .. //depot/projects/hammer/libexec/rpc.rusersd/rusers_proc.c#4 integrate .. //depot/projects/hammer/libexec/talkd/Makefile#4 integrate .. //depot/projects/hammer/libexec/talkd/process.c#4 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#10 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#44 integrate .. //depot/projects/hammer/sbin/init/Makefile#11 integrate .. //depot/projects/hammer/sbin/init/init.c#16 integrate .. //depot/projects/hammer/sbin/reboot/Makefile#8 integrate .. //depot/projects/hammer/sbin/reboot/reboot.c#13 integrate .. //depot/projects/hammer/share/man/man3/pthread_affinity_np.3#2 integrate .. //depot/projects/hammer/share/man/man3/pthread_attr_affinity_np.3#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#126 integrate .. //depot/projects/hammer/share/man/man4/ath.4#40 integrate .. //depot/projects/hammer/share/man/man4/cpufreq.4#14 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#17 integrate .. //depot/projects/hammer/share/man/man4/uhso.4#1 branch .. //depot/projects/hammer/share/man/man4/vge.4#9 integrate .. //depot/projects/hammer/share/man/man5/Makefile#27 integrate .. //depot/projects/hammer/share/man/man5/utmp.5#5 delete .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#90 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#51 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#63 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#16 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#37 integrate .. //depot/projects/hammer/sys/conf/NOTES#169 integrate .. //depot/projects/hammer/sys/conf/files#207 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#77 integrate .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#12 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#22 integrate .. //depot/projects/hammer/sys/dev/mxge/eth_z8e.h#7 integrate .. //depot/projects/hammer/sys/dev/mxge/ethp_z8e.h#7 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#26 integrate .. //depot/projects/hammer/sys/dev/mxge/rss_eth_z8e.h#5 integrate .. //depot/projects/hammer/sys/dev/mxge/rss_ethp_z8e.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#37 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac_private.h#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#40 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#29 integrate .. //depot/projects/hammer/sys/dev/usb/net/uhso.c#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#127 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#13 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#47 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#39 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#25 integrate .. //depot/projects/hammer/sys/mips/conf/AR71XX#2 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA64#2 integrate .. //depot/projects/hammer/sys/mips/conf/SWARM#2 integrate .. //depot/projects/hammer/sys/mips/rmi/ehcireg.h#2 integrate .. //depot/projects/hammer/sys/mips/rmi/ehcivar.h#2 integrate .. //depot/projects/hammer/sys/mips/rmi/pcibus.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/pcibus.h#2 integrate .. //depot/projects/hammer/sys/mips/rmi/uart_bus_xlr_iodi.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/xlr_i2c.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/xls_ehci.c#2 integrate .. //depot/projects/hammer/sys/modules/usb/Makefile#16 integrate .. //depot/projects/hammer/sys/modules/usb/uhso/Makefile#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/hammer/sys/rpc/authunix_prot.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#21 integrate .. //depot/projects/hammer/sys/sys/param.h#137 integrate .. //depot/projects/hammer/sys/sys/systm.h#66 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#40 integrate .. //depot/projects/hammer/tools/tools/ath/athdecode/main.c#2 integrate .. //depot/projects/hammer/usr.bin/finger/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/finger/finger.c#10 integrate .. //depot/projects/hammer/usr.bin/finger/lprint.c#7 integrate .. //depot/projects/hammer/usr.bin/finger/net.c#8 integrate .. //depot/projects/hammer/usr.bin/finger/sprint.c#6 integrate .. //depot/projects/hammer/usr.bin/finger/util.c#7 integrate .. //depot/projects/hammer/usr.bin/getent/getent.1#3 integrate .. //depot/projects/hammer/usr.bin/getent/getent.c#3 integrate .. //depot/projects/hammer/usr.bin/last/last.c#7 integrate .. //depot/projects/hammer/usr.bin/systat/Makefile#9 integrate .. //depot/projects/hammer/usr.bin/systat/vmstat.c#14 integrate .. //depot/projects/hammer/usr.bin/users/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/users/users.c#4 integrate .. //depot/projects/hammer/usr.bin/w/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/w/w.c#11 integrate .. //depot/projects/hammer/usr.bin/wall/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/wall/wall.c#7 integrate .. //depot/projects/hammer/usr.bin/who/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/who/who.c#9 integrate .. //depot/projects/hammer/usr.bin/write/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/write/write.c#6 integrate .. //depot/projects/hammer/usr.sbin/Makefile#105 integrate .. //depot/projects/hammer/usr.sbin/ac/ac.c#5 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#3 integrate .. //depot/projects/hammer/usr.sbin/lastlogin/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/lastlogin/lastlogin.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/id.c#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/id.h#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/physical.c#11 integrate .. //depot/projects/hammer/usr.sbin/ppp/physical.h#5 integrate .. //depot/projects/hammer/usr.sbin/rwhod/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/rwhod/rwhod.c#8 integrate .. //depot/projects/hammer/usr.sbin/syslogd/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#40 integrate .. //depot/projects/hammer/usr.sbin/timed/timed/master.c#3 integrate .. //depot/projects/hammer/usr.sbin/timed/timed/slave.c#3 integrate .. //depot/projects/hammer/usr.sbin/uhsoctl/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/uhsoctl/uhsoctl.1#1 branch .. //depot/projects/hammer/usr.sbin/uhsoctl/uhsoctl.c#1 branch Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#76 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.218 2010/01/05 02:37:59 davidxu Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.221 2010/01/13 19:03:48 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,21 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100113: remove utmp.h, replace it by utmpx.h +OLD_FILES+=usr/share/man/man3/login.3.gz +OLD_FILES+=usr/share/man/man3/logout.3.gz +OLD_FILES+=usr/share/man/man3/logwtmp.3.gz +OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz +OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz +OLD_FILES+=usr/share/man/man5/lastlog.5.gz +OLD_FILES+=usr/share/man/man5/utmp.5.gz +OLD_FILES+=usr/share/man/man5/wtmp.5.gz +OLD_LIBS+=lib/libutil.so.8 # 20100105: new userland semaphore implementation OLD_FILES+=usr/include/sys/semaphore.h # 20100103: ntptrace(8) removed ==== //depot/projects/hammer/UPDATING#141 (text+ko) ==== @@ -22,6 +22,23 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100113: + The utmp user accounting database has been replaced with utmpx, + the user accounting interface standardized by POSIX. + Unfortunately the semantics of utmp and utmpx don't match, + making it practically impossible to support both interfaces. + The user accounting database is used by tools like finger(1), + last(1), talk(1), w(1) and ac(8). + + All applications in the base system use utmpx. This means only + local binaries (e.g. from the ports tree) may still use these + utmp database files. These applications must be rebuilt to make + use of utmpx. + + After the system has been upgraded, it is safe to remove the old + log files (/var/run/utmp, /var/log/lastlog and /var/log/wtmp*), + assuming their contents is of no importance anymore. + 20100108: Introduce the kernel thread "deadlock resolver" (which can be enabled via the DEADLKRES option, see NOTES for more details) and the @@ -1094,4 +1111,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.651 2010/01/09 01:46:38 attilio Exp $ +$FreeBSD: src/UPDATING,v 1.652 2010/01/13 19:25:03 ed Exp $ ==== //depot/projects/hammer/bin/csh/config.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.15 2007/05/16 21:22:38 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.16 2010/01/13 17:49:35 ed Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -54,7 +54,7 @@ #define HAVE_GETPWENT 1 /* Define to 1 if you have the `getutent' function. */ -/* #undef HAVE_GETUTENT */ +#define HAVE_GETUTENT 1 /* Define if you have the iconv() function. */ /* #undef HAVE_ICONV */ @@ -130,10 +130,10 @@ #define HAVE_STRUCT_UTMP_UT_HOST 1 /* Define to 1 if `ut_tv' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_TV */ +#define HAVE_STRUCT_UTMP_UT_TV 1 /* Define to 1 if `ut_user' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_USER */ +#define HAVE_STRUCT_UTMP_UT_USER 1 /* Define to 1 if `ut_xtime' is member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_XTIME */ @@ -159,10 +159,10 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_UTMPX_H */ +#define HAVE_UTMPX_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_UTMP_H 1 +/* #undef HAVE_UTMP_H */ /* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 ==== //depot/projects/hammer/bin/csh/config_p.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config_p.h,v 1.14 2007/05/16 21:22:38 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config_p.h,v 1.15 2010/01/13 17:49:35 ed Exp $ */ /* * config.h -- configure various defines for tcsh * @@ -85,6 +85,7 @@ /* Use LC_MESSAGES locale category to open the message catalog */ #define MCLoadBySet NL_CAT_LOCALE #define BUFSIZE 8192 +#define UTMPX_FILE "/var/run/utx.active" #endif #if defined(__bsdi__) ==== //depot/projects/hammer/bin/date/Makefile#4 (text+ko) ==== @@ -1,9 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/date/Makefile,v 1.12 2009/12/05 20:09:50 ed Exp $ +# $FreeBSD: src/bin/date/Makefile,v 1.13 2010/01/13 17:56:54 ed Exp $ PROG= date SRCS= date.c netdate.c vary.c -DPADD= ${LIBULOG} -LDADD= -lulog .include ==== //depot/projects/hammer/bin/date/date.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.49 2009/12/05 20:09:50 ed Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.50 2010/01/13 17:56:54 ed Exp $"); #include #include @@ -52,9 +52,8 @@ #include #include #include -#define _ULOG_POSIX_NAMES -#include #include +#include #include "extern.h" #include "vary.h" ==== //depot/projects/hammer/bin/pax/gen_subs.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.24 2010/01/13 17:56:54 ed Exp $"); #include #include @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -66,10 +65,6 @@ #define OLDFRMTM "%b %e %Y" #define CURFRMTD "%e %b %H:%M" #define OLDFRMTD "%e %b %Y" -#ifndef UT_NAMESIZE -#define UT_NAMESIZE 8 -#endif -#define UT_GRPSIZE 6 static int d_first = -1; @@ -116,9 +111,8 @@ */ if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0) f_date[0] = '\0'; - (void)fprintf(fp, "%s%2u %-*s %-*s ", f_mode, sbp->st_nlink, - UT_NAMESIZE, name_uid(sbp->st_uid, 1), UT_GRPSIZE, - name_gid(sbp->st_gid, 1)); + (void)fprintf(fp, "%s%2u %-12s %-12s ", f_mode, sbp->st_nlink, + name_uid(sbp->st_uid, 1), name_gid(sbp->st_gid, 1)); /* * print device id's for devices, or sizes for other nodes ==== //depot/projects/hammer/contrib/telnet/telnetd/sys_term.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/sys_term.c,v 1.22 2009/12/27 11:56:32 ed Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/sys_term.c,v 1.23 2010/01/13 18:37:42 ed Exp $"); #include #include @@ -1303,24 +1303,7 @@ void cleanup(int sig __unused) { - char *p; - sigset_t mask; - p = line + sizeof(_PATH_DEV) - 1; - /* - * Block all signals before clearing the utmp entry. We don't want to - * be called again after calling logout() and then not add the wtmp - * entry because of not finding the corresponding entry in utmp. - */ - sigfillset(&mask); - sigprocmask(SIG_SETMASK, &mask, NULL); - if (logout(p)) - logwtmp(p, "", ""); - (void)chmod(line, 0666); - (void)chown(line, 0, 0); - *p = 'p'; - (void)chmod(line, 0666); - (void)chown(line, 0, 0); - (void) shutdown(net, 2); + (void) shutdown(net, SHUT_RDWR); _exit(1); } ==== //depot/projects/hammer/contrib/telnet/telnetd/telnetd.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.30 2008/07/28 18:58:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.32 2010/01/13 18:46:50 ed Exp $"); #include "telnetd.h" #include "pathnames.h" @@ -47,7 +47,6 @@ #include #include #include -#include #include @@ -693,7 +692,6 @@ Please contact your net administrator"); remote_hostname[sizeof(remote_hostname) - 1] = '\0'; - trimdomain(remote_hostname, UT_HOSTSIZE); if (!isdigit(remote_hostname[0]) && strlen(remote_hostname) > utmp_len) err_ = getnameinfo(who, who->sa_len, remote_hostname, sizeof(remote_hostname), NULL, 0, ==== //depot/projects/hammer/crypto/openssh/config.h#18 (text+ko) ==== @@ -85,13 +85,13 @@ /* #undef CONF_UTMPX_FILE */ /* Define if you want to specify the path to your utmp file */ -#define CONF_UTMP_FILE "/var/run/utmp" +/* #undef CONF_UTMP_FILE */ /* Define if you want to specify the path to your wtmpx file */ /* #undef CONF_WTMPX_FILE */ /* Define if you want to specify the path to your wtmp file */ -#define CONF_WTMP_FILE "/var/log/wtmp" +/* #undef CONF_WTMP_FILE */ /* Define if your platform needs to skip post auth file descriptor passing */ /* #undef DISABLE_FD_PASSING */ @@ -112,13 +112,13 @@ /* #undef DISABLE_SHADOW */ /* Define if you don't want to use utmp */ -/* #undef DISABLE_UTMP */ +#define DISABLE_UTMP 1 /* Define if you don't want to use utmpx */ -#define DISABLE_UTMPX 1 +/* #undef DISABLE_UTMPX */ /* Define if you don't want to use wtmp */ -/* #undef DISABLE_WTMP */ +#define DISABLE_WTMP 1 /* Define if you don't want to use wtmpx */ #define DISABLE_WTMPX 1 @@ -319,7 +319,7 @@ /* #undef HAVE_ENDUTENT */ /* Define to 1 if you have the `endutxent' function. */ -/* #undef HAVE_ENDUTXENT */ +#define HAVE_ENDUTXENT 1 /* Define if your system has /etc/default/login */ /* #undef HAVE_ETC_DEFAULT_LOGIN */ @@ -445,13 +445,13 @@ /* #undef HAVE_GETUTLINE */ /* Define to 1 if you have the `getutxent' function. */ -/* #undef HAVE_GETUTXENT */ +#define HAVE_GETUTXENT 1 /* Define to 1 if you have the `getutxid' function. */ -/* #undef HAVE_GETUTXID */ +#define HAVE_GETUTXID 1 /* Define to 1 if you have the `getutxline' function. */ -/* #undef HAVE_GETUTXLINE */ +#define HAVE_GETUTXLINE 1 /* Define to 1 if you have the `get_default_context_with_level' function. */ /* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */ @@ -484,10 +484,10 @@ #define HAVE_HEADER_AD 1 /* Define if you have ut_host in utmp.h */ -#define HAVE_HOST_IN_UTMP 1 +/* #undef HAVE_HOST_IN_UTMP */ /* Define if you have ut_host in utmpx.h */ -/* #undef HAVE_HOST_IN_UTMPX */ +#define HAVE_HOST_IN_UTMPX 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_IAF_H */ @@ -499,7 +499,7 @@ /* #undef HAVE_ID_IN_UTMP */ /* Define if you have ut_id in utmpx.h */ -/* #undef HAVE_ID_IN_UTMPX */ +#define HAVE_ID_IN_UTMPX 1 /* Define to 1 if you have the `inet_aton' function. */ #define HAVE_INET_ATON 1 @@ -574,7 +574,7 @@ /* #undef HAVE_LINUX_IF_TUN_H */ /* Define if your libraries define login() */ -#define HAVE_LOGIN 1 +/* #undef HAVE_LOGIN */ /* Define to 1 if you have the header file. */ #define HAVE_LOGIN_CAP_H 1 @@ -586,10 +586,10 @@ /* #undef HAVE_LOGIN_H */ /* Define to 1 if you have the `logout' function. */ -#define HAVE_LOGOUT 1 +/* #undef HAVE_LOGOUT */ /* Define to 1 if you have the `logwtmp' function. */ -#define HAVE_LOGWTMP 1 +/* #undef HAVE_LOGWTMP */ /* Define to 1 if the system has the type `long double'. */ #define HAVE_LONG_DOUBLE 1 @@ -704,7 +704,7 @@ /* #undef HAVE_PUTUTLINE */ /* Define to 1 if you have the `pututxline' function. */ -/* #undef HAVE_PUTUTXLINE */ +#define HAVE_PUTUTXLINE 1 /* Define if your password has a pw_change field */ #define HAVE_PW_CHANGE_IN_PASSWD 1 @@ -800,7 +800,7 @@ /* #undef HAVE_SETUTENT */ /* Define to 1 if you have the `setutxent' function. */ -/* #undef HAVE_SETUTXENT */ +#define HAVE_SETUTXENT 1 /* Define to 1 if you have the `setvbuf' function. */ #define HAVE_SETVBUF 1 @@ -1025,7 +1025,7 @@ #define HAVE_TIME_H 1 /* Define if you have ut_time in utmp.h */ -#define HAVE_TIME_IN_UTMP 1 +/* #undef HAVE_TIME_IN_UTMP */ /* Define if you have ut_time in utmpx.h */ /* #undef HAVE_TIME_IN_UTMPX */ @@ -1043,13 +1043,13 @@ /* #undef HAVE_TV_IN_UTMP */ /* Define if you have ut_tv in utmpx.h */ -/* #undef HAVE_TV_IN_UTMPX */ +#define HAVE_TV_IN_UTMPX 1 /* Define if you have ut_type in utmp.h */ /* #undef HAVE_TYPE_IN_UTMP */ /* Define if you have ut_type in utmpx.h */ -/* #undef HAVE_TYPE_IN_UTMPX */ +#define HAVE_TYPE_IN_UTMPX 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_UCRED_H */ @@ -1091,10 +1091,10 @@ /* #undef HAVE_UTMPXNAME */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_UTMPX_H */ +#define HAVE_UTMPX_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_UTMP_H 1 +/* #undef HAVE_UTMP_H */ /* define if you have u_char data type */ #define HAVE_U_CHAR 1 ==== //depot/projects/hammer/crypto/openssh/defines.h#15 (text+ko) ==== @@ -674,7 +674,7 @@ #else /* Simply select your favourite login types. */ /* Can't do if-else because some systems use several... */ -# if defined(UTMPX_FILE) && !defined(DISABLE_UTMPX) +# if !defined(DISABLE_UTMPX) # define USE_UTMPX # endif # if defined(UTMP_FILE) && !defined(DISABLE_UTMP) ==== //depot/projects/hammer/crypto/openssh/loginrec.c#16 (text+ko) ==== @@ -207,6 +207,7 @@ int getlast_entry(struct logininfo *li); int lastlog_get_entry(struct logininfo *li); +int utmpx_get_entry(struct logininfo *li); int wtmp_get_entry(struct logininfo *li); int wtmpx_get_entry(struct logininfo *li); @@ -509,6 +510,10 @@ return(lastlog_get_entry(li)); #else /* !USE_LASTLOG */ +#if 1 + return (utmpx_get_entry(li)); +#endif + #if defined(DISABLE_LASTLOG) /* On some systems we shouldn't even try to obtain last login * time, e.g. AIX */ @@ -758,8 +763,8 @@ utx->ut_pid = li->pid; /* strncpy(): Don't necessarily want null termination */ - strncpy(utx->ut_name, li->username, - MIN_SIZEOF(utx->ut_name, li->username)); + strncpy(utx->ut_user, li->username, + MIN_SIZEOF(utx->ut_user, li->username)); if (li->type == LTYPE_LOGOUT) return; @@ -1608,6 +1613,31 @@ #endif /* HAVE_GETLASTLOGXBYNAME */ #endif /* USE_LASTLOG */ +#if 1 +int +utmpx_get_entry(struct logininfo *li) +{ + struct utmpx *utx; + + if (setutxdb(UTXDB_LASTLOGIN, NULL) != 0) + return (0); + utx = getutxuser(li->username); + if (utx == NULL) { + endutxent(); + return (0); + } + + line_fullname(li->line, utx->ut_line, + MIN_SIZEOF(li->line, utx->ut_line)); + strlcpy(li->hostname, utx->ut_host, + MIN_SIZEOF(li->hostname, utx->ut_host)); + li->tv_sec = utx->ut_tv.tv_sec; + li->tv_usec = utx->ut_tv.tv_usec; + endutxent(); + return (1); +} +#endif + #ifdef USE_BTMP /* * Logs failed login attempts in _PATH_BTMP if that exists. ==== //depot/projects/hammer/crypto/openssh/sshd.c#20 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.50 2009/11/25 15:12:24 attilio Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.51 2010/01/13 18:43:32 ed Exp $"); #include #include @@ -73,7 +73,6 @@ #include #include #include -#include #include #include @@ -240,7 +239,7 @@ u_int session_id2_len = 0; /* record remote hostname or ip */ -u_int utmp_len = UT_HOSTSIZE; +u_int utmp_len = MAXHOSTNAMELEN; /* options.max_startup sized array of fd ints */ int *startup_pipes = NULL; ==== //depot/projects/hammer/etc/newsyslog.conf#13 (text+ko) ==== @@ -1,5 +1,5 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.52 2008/12/02 16:46:01 kensmith Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.53 2010/01/13 19:07:48 ed Exp $ # # Entries which do not specify the '/pid_file' field will cause the # syslogd process to be signalled when that log file is rotated. This @@ -33,6 +33,6 @@ /var/log/ppp.log root:network 640 3 100 * JC /var/log/security 600 10 100 * JC /var/log/sendmail.st 640 10 * 168 B +/var/log/utx.log 644 3 * @01T05 B /var/log/weekly.log 640 5 1 $W6D0 JN -/var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * JC ==== //depot/projects/hammer/etc/periodic/monthly/200.accounting#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.10 2002/09/24 18:53:46 ache Exp $ +# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.11 2010/01/13 19:07:48 ed Exp $ # # If there is a global system configuration file, suck it in. @@ -15,7 +15,7 @@ umask 066 case "$monthly_accounting_enable" in [Yy][Ee][Ss]) - W=/var/log/wtmp + W=/var/log/utx.log rc=0 remove=NO if [ ! -f $W.0 ] ==== //depot/projects/hammer/etc/rc.d/cleanvar#13 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.13 2007/05/24 05:58:20 rse Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.14 2010/01/13 19:07:48 ed Exp $ # # PROVIDE: cleanvar @@ -58,8 +58,8 @@ { if [ -d /var/run -a ! -f /var/run/clean_var ]; then purgedir /var/run - # And an initial utmp file - (cd /var/run && cp /dev/null utmp && chmod 644 utmp) + # And an initial utmpx active session file + (cd /var/run && cp /dev/null utx.active && chmod 644 utx.active) >/var/run/clean_var fi if [ -d /var/spool/lock -a ! -f /var/spool/lock/clean_var ]; then ==== //depot/projects/hammer/etc/rc.d/var#10 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.44 2007/12/08 23:00:28 dougb Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.45 2010/01/13 19:07:48 ed Exp $ # # PROVIDE: var @@ -98,12 +98,12 @@ ;; esac -# Make sure we have /var/log/lastlog and /var/log/wtmp files -if [ ! -f /var/log/lastlog ]; then - cp /dev/null /var/log/lastlog - chmod 644 /var/log/lastlog +# Make sure we have /var/log/utx.lastlogin and /var/log/utx.log files +if [ ! -f /var/log/utx.lastlogin ]; then + cp /dev/null /var/log/utx.lastlogin + chmod 644 /var/log/utx.lastlogin fi -if [ ! -f /var/log/wtmp ]; then - cp /dev/null /var/log/wtmp - chmod 644 /var/log/wtmp +if [ ! -f /var/log/utx.log ]; then + cp /dev/null /var/log/utx.log + chmod 644 /var/log/utx.log fi ==== //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#19 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.47 2009/01/12 19:17:43 simon Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.48 2010/01/11 21:17:49 gavin Exp $ % Any user that is a member of the wheel group can use "su -" to simulate a root login. You can add a user to the wheel group by editing /etc/group. @@ -50,18 +50,6 @@ be able to run it unless you first type "rehash". -- Dru % -If you are running xterm, the default TERM variable will be 'xterm'. If you -set this environment variable to 'xterm-color' instead, a lot of programs will -use colors. You can do this by - - TERM=xterm-color; export TERM - -in Bourne-derived shells, and - - setenv TERM xterm-color - -in csh-derived shells. -% If you do not want to get beeps in X11 (X Windows), you can turn them off with xset b off ==== //depot/projects/hammer/include/Makefile#84 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.293 2010/01/05 02:37:59 davidxu Exp $ +# $FreeBSD: src/include/Makefile,v 1.294 2010/01/13 17:29:55 ed Exp $ # # Doing a "make install" builds /usr/include. @@ -24,8 +24,8 @@ stdarg.h stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h termios.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ - ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ - wctype.h wordexp.h + ulimit.h unistd.h utime.h utmp.h utmpx.h uuid.h varargs.h vis.h \ + wchar.h wctype.h wordexp.h PHDRS= sched.h _semaphore.h ==== //depot/projects/hammer/include/utmp.h#3 (text+ko) ==== @@ -1,73 +1,2 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)utmp.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/include/utmp.h,v 1.11 2008/11/16 14:43:33 ed Exp $ - */ - -#ifndef _UTMP_H_ -#define _UTMP_H_ - -#define _PATH_UTMP "/var/run/utmp" -#define _PATH_WTMP "/var/log/wtmp" -#define _PATH_LASTLOG "/var/log/lastlog" - -/* - * XXX: These values are too low, but cannot be changed without breaking - * the file format. Right now pts(4) is limited to 1000 instances, - * because /dev/pts/1000 would require UT_LINESIZE to be bigger. - * UT_HOSTSIZE is also too small to hold most common hostnames or IPv6 - * addresses. - */ -#define UT_NAMESIZE 16 /* see MAXLOGNAME in */ -#define UT_LINESIZE 8 -#define UT_HOSTSIZE 16 - -struct lastlog { - int32_t ll_time; - char ll_line[UT_LINESIZE]; - char ll_host[UT_HOSTSIZE]; -}; - -struct utmp { - char ut_line[UT_LINESIZE]; - char ut_name[UT_NAMESIZE]; - char ut_host[UT_HOSTSIZE]; - int32_t ut_time; -}; - -#endif /* !_UTMP_H_ */ +/* $FreeBSD: src/include/utmp.h,v 1.12 2010/01/13 19:03:48 ed Exp $ */ +#error " has been replaced by " ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#45 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.150 2010/01/05 02:37:59 davidxu Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.151 2010/01/13 17:29:55 ed Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -18,12 +18,12 @@ gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \ getosreldate.c getpagesize.c getpagesizes.c \ getpeereid.c getprogname.c getpwent.c getttyent.c \ - getusershell.c getvfsbyname.c glob.c \ + getusershell.c getutxent.c getvfsbyname.c glob.c \ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ pause.c pmadvise.c popen.c posix_spawn.c \ - psignal.c pw_scan.c pwcache.c \ + psignal.c pututxline.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c sem_new.c semctl.c \ setdomainname.c sethostname.c setjmperr.c setmode.c \ @@ -32,7 +32,7 @@ sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ syslog.c telldir.c termios.c time.c times.c timezone.c tls.c \ ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis.c \ - usleep.c utime.c valloc.c vis.c wait.c wait3.c waitpid.c \ + usleep.c utime.c utxdb.c valloc.c vis.c wait.c wait3.c waitpid.c \ wordexp.c SYM_MAPS+=${.CURDIR}/gen/Symbol.map @@ -54,7 +54,7 @@ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ getmntinfo.3 getnetgrent.3 getosreldate.3 getpagesize.3 \ getpagesizes.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ - getttyent.3 getusershell.3 getvfsbyname.3 \ + getttyent.3 getusershell.3 getutxent.3 getvfsbyname.3 \ glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \ modf.3 \ nice.3 nlist.3 pause.3 popen.3 \ @@ -126,6 +126,10 @@ getttyent.3 isdialuptty.3 getttyent.3 isnettty.3 \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 13 20:25:59 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59B1C106568F; Wed, 13 Jan 2010 20:25:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E3B9106566B for ; Wed, 13 Jan 2010 20:25:59 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0BBBA8FC15 for ; Wed, 13 Jan 2010 20:25:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DKPwxH012493 for ; Wed, 13 Jan 2010 20:25:58 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DKPw6g012491 for perforce@freebsd.org; Wed, 13 Jan 2010 20:25:58 GMT (envelope-from mav@freebsd.org) Date: Wed, 13 Jan 2010 20:25:58 GMT Message-Id: <201001132025.o0DKPw6g012491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 20:25:59 -0000 http://p4web.freebsd.org/chv.cgi?CH=173079 Change 173079 by mav@mav_mavtest on 2010/01/13 20:25:44 Clean XPT initialization a bit, preparing to boot scan refactoring. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#46 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#25 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#135 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#46 (text+ko) ==== @@ -84,6 +84,7 @@ u_int32_t *timeout); static int nperiph_drivers; +static int initialized = 0; struct periph_driver **periph_drivers; MALLOC_DEFINE(M_CAMPERIPH, "CAM periph", "CAM peripheral buffers"); @@ -99,6 +100,7 @@ void periphdriver_register(void *data) { + struct periph_driver *drv = (struct periph_driver *)data; struct periph_driver **newdrivers, **old; int ndrivers; @@ -108,13 +110,30 @@ if (periph_drivers) bcopy(periph_drivers, newdrivers, sizeof(*newdrivers) * nperiph_drivers); - newdrivers[nperiph_drivers] = (struct periph_driver *)data; + newdrivers[nperiph_drivers] = drv; newdrivers[nperiph_drivers + 1] = NULL; old = periph_drivers; periph_drivers = newdrivers; if (old) free(old, M_CAMPERIPH); nperiph_drivers++; + /* If driver marked as early or it is late now, initialize it. */ + if (((drv->flags & CAM_PERIPH_DRV_EARLY) != 0 && initialized > 0) || + initialized > 1) + (*drv->init)(); +} + +void +periphdriver_init(int level) +{ + int i, early; + + initialized = max(initialized, level); + for (i = 0; periph_drivers[i] != NULL; i++) { + early = (periph_drivers[i]->flags & CAM_PERIPH_DRV_EARLY) ? 1 : 2; + if (early == initialized) + (*periph_drivers[i]->init)(); + } } cam_status ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#25 (text+ko) ==== @@ -42,6 +42,7 @@ extern struct periph_driver **periph_drivers; void periphdriver_register(void *); +void periphdriver_init(int level); #include #define PERIPHDRIVER_DECLARE(name, driver) \ ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#135 (text+ko) ==== @@ -939,7 +939,8 @@ path, NULL, 0, xpt_sim); xpt_free_path(path); mtx_unlock(&xsoftc.xpt_lock); - + /* Install our software interrupt handlers */ + swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); /* * Register a callback for when interrupts are enabled. */ @@ -951,7 +952,6 @@ "- failing attach\n"); return (ENOMEM); } - xsoftc.xpt_config_hook->ich_func = xpt_config; if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) { free (xsoftc.xpt_config_hook, M_CAMXPT); @@ -959,13 +959,6 @@ "- failing attach\n"); } - /* fire up rescan thread */ - if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) { - printf("xpt_init: failed to create rescan thread\n"); - } - /* Install our software interrupt handlers */ - swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); - return (0); } @@ -4736,9 +4729,6 @@ static void xpt_config(void *arg) { - struct periph_driver **p_drv; - int i; - /* * Now that interrupts are enabled, go find our devices */ @@ -4772,13 +4762,11 @@ #endif /* CAM_DEBUG_BUS */ #endif /* CAMDEBUG */ - /* Register early peripheral drivers */ - /* XXX This will have to change when we have loadable modules */ - p_drv = periph_drivers; - for (i = 0; p_drv[i] != NULL; i++) { - if ((p_drv[i]->flags & CAM_PERIPH_DRV_EARLY) != 0) - (*p_drv[i]->init)(); + /* Fire up rescan thread. */ + if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) { + printf("xpt_init: failed to create rescan thread\n"); } + periphdriver_init(1); /* * Scan all installed busses. */ @@ -4821,18 +4809,9 @@ static void xpt_finishconfig_task(void *context, int pending) { - struct periph_driver **p_drv; - int i; if (busses_to_config == 0) { - /* Register all the peripheral drivers */ - /* XXX This will have to change when we have loadable modules */ - p_drv = periph_drivers; - for (i = 0; p_drv[i] != NULL; i++) { - if ((p_drv[i]->flags & CAM_PERIPH_DRV_EARLY) == 0) - (*p_drv[i]->init)(); - } - + periphdriver_init(2); /* * Check for devices with no "standard" peripheral driver * attached. For any devices like that, announce the From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:08:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64FC31065679; Wed, 13 Jan 2010 22:08:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29736106566C for ; Wed, 13 Jan 2010 22:08:44 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1FCD8FC08 for ; Wed, 13 Jan 2010 22:08:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DM8hHn033128 for ; Wed, 13 Jan 2010 22:08:43 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DM8hYC033126 for perforce@freebsd.org; Wed, 13 Jan 2010 22:08:43 GMT (envelope-from raj@freebsd.org) Date: Wed, 13 Jan 2010 22:08:43 GMT Message-Id: <201001132208.o0DM8hYC033126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:08:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=173094 Change 173094 by raj@raj_fdt on 2010/01/13 22:08:26 Introduce the 'FDT' option on ARM. Affected files ... .. //depot/projects/fdt/sys/conf/options.arm#3 edit Differences ... ==== //depot/projects/fdt/sys/conf/options.arm#3 (text+ko) ==== @@ -17,6 +17,7 @@ CPU_XSCALE_IXP425 opt_global.h CPU_XSCALE_IXP435 opt_global.h CPU_XSCALE_PXA2X0 opt_global.h +FDT opt_platform.h FLASHADDR opt_global.h IXP4XX_FLASH_SIZE opt_global.h KERNPHYSADDR opt_global.h From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:10:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 979C210657D6; Wed, 13 Jan 2010 22:10:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BF2D106578C for ; Wed, 13 Jan 2010 22:10:46 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 498EB8FC1E for ; Wed, 13 Jan 2010 22:10:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DMAk0u033321 for ; Wed, 13 Jan 2010 22:10:46 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DMAk9F033319 for perforce@freebsd.org; Wed, 13 Jan 2010 22:10:46 GMT (envelope-from raj@freebsd.org) Date: Wed, 13 Jan 2010 22:10:46 GMT Message-Id: <201001132210.o0DMAk9F033319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:10:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=173095 Change 173095 by raj@raj_fdt on 2010/01/13 22:09:45 Let basic FDT support components build on ARM. - libfdt - /dev/openfirm char device Affected files ... .. //depot/projects/fdt/sys/conf/Makefile.arm#3 edit .. //depot/projects/fdt/sys/conf/files.arm#3 edit Differences ... ==== //depot/projects/fdt/sys/conf/Makefile.arm#3 (text+ko) ==== @@ -30,6 +30,8 @@ .endif .include "$S/conf/kern.pre.mk" +INCLUDES+= -I$S/contrib/dtc/libfdt + SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M} SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M} ==== //depot/projects/fdt/sys/conf/files.arm#3 (text+ko) ==== @@ -47,7 +47,19 @@ arm/fpe-arm/armfpe_glue.S optional armfpe arm/fpe-arm/armfpe_init.c optional armfpe arm/fpe-arm/armfpe.S optional armfpe +contrib/dtc/libfdt/fdt.c optional fdt +contrib/dtc/libfdt/fdt_ro.c optional fdt +contrib/dtc/libfdt/fdt_rw.c optional fdt +contrib/dtc/libfdt/fdt_strerror.c optional fdt +contrib/dtc/libfdt/fdt_sw.c optional fdt +contrib/dtc/libfdt/fdt_wip.c optional fdt dev/hwpmc/hwpmc_arm.c optional hwpmc +dev/ofw/openfirm.c optional fdt +dev/ofw/openfirmio.c optional fdt +dev/ofw/ofw_bus_if.m optional fdt +dev/ofw/ofw_if.m optional fdt +dev/ofw/ofw_bus_subr.c optional fdt +dev/ofw/ofw_fdt.c optional fdt geom/geom_bsd.c optional geom_bsd geom/geom_bsd_enc.c optional geom_bsd geom/geom_mbr.c optional geom_mbr @@ -62,6 +74,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memchr.c optional fdt libkern/moddi3.c standard libkern/qdivrem.c standard libkern/udivdi3.c standard From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:11:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4E511065695; Wed, 13 Jan 2010 22:11:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79946106568D for ; Wed, 13 Jan 2010 22:11:47 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E1E68FC14 for ; Wed, 13 Jan 2010 22:11:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DMBlAn033425 for ; Wed, 13 Jan 2010 22:11:47 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DMBlPM033423 for perforce@freebsd.org; Wed, 13 Jan 2010 22:11:47 GMT (envelope-from raj@freebsd.org) Date: Wed, 13 Jan 2010 22:11:47 GMT Message-Id: <201001132211.o0DMBlPM033423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:11:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=173096 Change 173096 by raj@raj_fdt on 2010/01/13 22:11:00 Build the 'ofwdump' tool on ARM as well. Affected files ... .. //depot/projects/fdt/usr.sbin/Makefile#3 edit Differences ... ==== //depot/projects/fdt/usr.sbin/Makefile#3 (text+ko) ==== @@ -493,6 +493,10 @@ _zzz= zzz .endif +.if ${MACHINE_ARCH} == "arm" +_ofwdump= ofwdump +.endif + .if ${MACHINE_ARCH} == "ia64" .if ${MK_ACPI} != "no" _acpi= acpi From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:12:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B35C1065672; Wed, 13 Jan 2010 22:12:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3CF31065679 for ; Wed, 13 Jan 2010 22:12:48 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97FD78FC14 for ; Wed, 13 Jan 2010 22:12:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DMCmBX033491 for ; Wed, 13 Jan 2010 22:12:48 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DMCm9W033489 for perforce@freebsd.org; Wed, 13 Jan 2010 22:12:48 GMT (envelope-from raj@freebsd.org) Date: Wed, 13 Jan 2010 22:12:48 GMT Message-Id: <201001132212.o0DMCm9W033489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:12:49 -0000 http://p4web.freebsd.org/chv.cgi?CH=173098 Change 173098 by raj@raj_fdt on 2010/01/13 22:12:13 Preliminary hooks for FDT handling on ARM (Marvell). Affected files ... .. //depot/projects/fdt/sys/arm/conf/DB-88F5XXX#2 edit .. //depot/projects/fdt/sys/arm/mv/mv_machdep.c#3 edit Differences ... ==== //depot/projects/fdt/sys/arm/conf/DB-88F5XXX#2 (text+ko) ==== @@ -13,6 +13,7 @@ #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" +options FDT #Flattened device tree support options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols ==== //depot/projects/fdt/sys/arm/mv/mv_machdep.c#3 (text+ko) ==== @@ -66,6 +66,8 @@ #include #include +#include + #include #include #include @@ -361,7 +363,7 @@ { struct pv_addr kernel_l1pt; struct pv_addr dpcpu; - vm_offset_t freemempos, l2_start, lastaddr; + vm_offset_t dtbp, freemempos, l2_start, lastaddr; uint32_t memsize, l2size; struct bi_mem_region *mr; void *kmdp; @@ -371,6 +373,7 @@ kmdp = NULL; lastaddr = 0; memsize = 0; + dtbp = (vm_offset_t)NULL; set_cpufuncs(); @@ -392,6 +395,7 @@ boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); + dtbp = MD_FETCH(kmdp, MODINFOMD_DTBP, vm_offset_t); lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t); } @@ -424,6 +428,12 @@ if (memsize == 0) while (1); + if (OF_install(OFW_FDT, 0) == FALSE) + while (1); + + if (OF_init((void *)dtbp) != 0) + while (1); + /* Platform-specific initialisation */ pmap_bootstrap_lastaddr = MV_BASE - ARM_NOCACHE_KVA_SIZE; pmap_devmap_bootstrap_table = &pmap_devmap[0]; @@ -553,6 +563,7 @@ debugf("initarm: console initialized\n"); debugf(" arg1 mdp = 0x%08x\n", (uint32_t)mdp); debugf(" boothowto = 0x%08x\n", boothowto); + printf(" dtbp = 0x%08x\n", (uint32_t)dtbp); print_bootinfo(); print_kernel_section_addr(); print_kenv(); From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:16:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 580AB1065672; Wed, 13 Jan 2010 22:16:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BE7D106566C for ; Wed, 13 Jan 2010 22:16:32 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C73438FC2B for ; Wed, 13 Jan 2010 22:16:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DMGWrt033755 for ; Wed, 13 Jan 2010 22:16:32 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DMFp29033716 for perforce@freebsd.org; Wed, 13 Jan 2010 22:15:51 GMT (envelope-from gabor@freebsd.org) Date: Wed, 13 Jan 2010 22:15:51 GMT Message-Id: <201001132215.o0DMFp29033716@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:16:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=173099 Change 173099 by gabor@gabor_aspire on 2010/01/13 22:14:54 MFHg: LIBRARY ===================================================================== - Fix segfault of BIG5 module [1] - Fix some mapping problems of Big5-family, so these encodings can be used now - Some more mapping improvements for other encodings - GNU: Implement ICONV_HOOKS for iconvctl() - GNU: Initial implementation of ICONV_FALLBACKS for iconvctl() (these also seem to be incomplete in GNU) - GNU: Correct prototype of iconv_canonicalize() - Fix segfaults in iconv_none - Eliminate icconv.dir lookup facility; use iconv_none for identical conversions and iconv_std for the rest - GNU: Add _libiconv_version variable - Eliminate ABI versioning, we will not need it - Excessive reduce in warnings, higher WARNS levels - Add ISCII-DEV alias for MACDEVANAGARI - Fix 1 -> 2, 1 -> 3 and 1 -> 4 mappings in NONE module, which makes it possible to use more accurate transliteration, just like GNU - Improved transliteration for the following encodings: ARMSCII-8, ISO8859-2, ISO8859-3, ISO8859-4, ISO8859-5, ISO8859-6, ISO8859-7, ISO8859-8, ISO8859-9, ISO8859-10, ISO8859-11, ISO8859-13, ISO8859-14, ISO8859-15, ISO8859-16, KOI8-R, KOI8-U, KOI8-RU, PT154, VISCII, CP1131, CP1251, CP866 - Rename _iconv.c to iconv.c - GNU: Add support for iconv_open_into() - GNU: Add libiconv_open_into alias BIN ===================================================================== - iconv: Add support for "-" as an alias of stdin per POSIX - iconv: Rename -ll to -L per POSIX.1-2008 Utility Syntax Guidelines REGRESSION-TEST ===================================================================== - gnu/posix: Some new test cases - tablegen: Add -d for diagnostical output - tablegen: skip illegal Unicode input, which only works in GNU - Remove check between UTF-x, it is not necessary - tablegen: Add -c to generate Citrus-like tables DOCS ===================================================================== - MLINKS for iconv_open.3 and iconv_close.3 - Added manpages: - iconvlist.3 - iconv_canonicalize.3 - __iconv_get_list.3 - MLINKS for __iconv_free_list.3 - iconv.3: Document POSIX.1-2008 conformance - mkesdb.3: Document -m - esdb.5: Improved description - csmapper.5: Improved description MISC ===================================================================== - Cleanup of redundant alias names (duplicates) - Cleanup of unused code parts - Axe out unused interfaces - Provide a freshinstall target for first-time install - Add my copyright to some files I have touched Submitted by: Kuang-Chung Chiu Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/Makefile#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/TESTING-HOWTO#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/include/iconv.h#3 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/Makefile#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/_iconv.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_fallback.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_fallback.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_local.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_template.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_esdb.h#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv.h#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_iconv_local.h#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_mapper.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_mapper.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_mapper_local.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_none.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_none.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_prop.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_prop.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_stdenc.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_stdenc.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_stdenc_local.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_stdenc_template.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/iconvctl.3#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/citrus_big5.c#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/BIG5/citrus_big5.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/DECHanyu/citrus_dechanyu.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/citrus_euc.c#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUC/citrus_euc.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/citrus_euctw.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/EUCTW/citrus_euctw.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/citrus_gbk2k.c#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/GBK2K/citrus_gbk2k.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/HZ/citrus_hz.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/HZ/citrus_hz.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/citrus_iso2022.c#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ISO2022/citrus_iso2022.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/JOHAB/citrus_johab.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/JOHAB/citrus_johab.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/citrus_mskanji.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/MSKanji/citrus_mskanji.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/citrus_ues.c#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UES/citrus_ues.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF7/citrus_utf7.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF7/citrus_utf7.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/citrus_utf8.c#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/UTF8/citrus_utf8.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/citrus_viqr.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/VIQR/citrus_viqr.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/citrus_zw.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/ZW/citrus_zw.h#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/Makefile#9 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_none/citrus_iconv_none.c#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/Makefile#9 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/iconv_std/citrus_iconv_std.c#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_646/citrus_mapper_646.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_none/Makefile#9 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_none/citrus_mapper_none.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_std/Makefile#9 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_std/citrus_mapper_std.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/BIG5/mapper.dir.BIG5.src#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/CNS/mapper.dir.CNS.src#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/JIS/mapper.dir.JIS.src#8 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/APPLE/MAC.alias#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/BIG5/Big5.alias#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/EBCDIC/EBCDIC.alias#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/EUC/EUC.alias#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/GB/GB.alias#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/ISO-2022/ISO-2022.alias#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/ISO-8859/ISO-8859.alias#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/ISO646/ISO646.alias#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/TCVN/TCVN.alias#4 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/iconv/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/iconv/iconv.dir#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/man/man5/Makefile#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/man/man5/csmapper.5#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/share/man/man5/esdb.5#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/Makefile#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/gnu/Makefile#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/gnu/gnu.c#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/posix/posix.c#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ARMSCII-8-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ASCII-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/BIG5#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/BIG5-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1131#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1131-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1251-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP866-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP949#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP949-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-CN-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-JP#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-JP-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-KR#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-KR-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/GB18030-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/GB2312-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/GBK-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-1-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-10-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-11-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-13-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-14-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-15-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-16-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-2-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-3-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-4-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-5-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-6-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-7-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-8-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO8859-9-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/KOI8-R-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/KOI8-U-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/PT154-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/SHIFT_JIS#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/SHIFT_JIS-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/UTF-7#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/UTF-7-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/UTF-8-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/VISCII-rev#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/refgen/Makefile#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/tablegen/Makefile#3 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/tablegen/tablegen.c#4 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.1#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.c#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/mkesdb.1#2 edit Differences ... ==== //depot/projects/soc2009/gabor_iconv/extracted/Makefile#2 (text+ko) ==== @@ -7,4 +7,10 @@ usr.bin \ share +freshinstall: + cd include && make install + cd lib && make all install clean + cd usr.bin && make all install clean + cd share && make all install clean + .include ==== //depot/projects/soc2009/gabor_iconv/extracted/TESTING-HOWTO#7 (text+ko) ==== @@ -1,36 +1,12 @@ -The following instructions describe how you can try out Citrus iconv on -your system. +To install tthe library, the utility and the necessary pieces of metadata +on your system, jusr run "make freshinstall" in the top-level directory +(where this file is located). -You have to accomplish the following steps: +Now, you have the iconv utility installed in /usr/bin, and the library +in /usr/lib. The library is installed as libiconv.so, just like the GNU +version, so in some cases, they might interfere. Use this software for +your own responsability. -1, Install includes. - - cd include - make install - -2, Install the library. - - cd lib/libiconv - make all - make install LIBDIR=/usr/lib - -2, Install library modules. - - cd lib/libiconv_modules - make all - mkdir /usr/lib/i18n - make install - -3, Install the utilities. - - cd usr.bin - make all - make install BINDIR=/usr/bin - -2, Install conversion tables. - - cd share/i18n - make all install - -Now, you have the iconv utility installed in /usr/bin, and the library -in /usr/lib. +-- +Gabor Kovesdan +gabor@FreeBSD.org ==== //depot/projects/soc2009/gabor_iconv/extracted/include/iconv.h#3 (text+ko) ==== @@ -1,7 +1,8 @@ /* $NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */ /*- - * Copyright (c)2003 Citrus Project, + * Copyright (c) 2003 Citrus Project, + * Copyright (c) 2009, 2010 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -64,13 +65,21 @@ */ /* Historical versions */ -#define libiconv_open iconv_open -#define libiconv_close iconv_close -#define libiconv iconv +#define libiconv_open iconv_open +#define libiconv_open_into iconv_open_into +#define libiconv_close iconv_close +#define libiconv iconv /* We have iconvctl() */ #define _LIBICONV_VERSION 0x0108 +extern int _libiconv_version; +typedef struct { + void *spaceholder[8]; +} iconv_allocation_t; + +int iconv_open_into(const char *, const char *, iconv_allocation_t *); + /* * iconvctl() request macros */ @@ -91,9 +100,31 @@ void *data; }; +typedef void (*iconv_unicode_mb_to_uc_fallback) (const char*, + size_t, void (*write_replacement) (const unsigned int *, + size_t, void*), void*, void*); +typedef void (*iconv_unicode_uc_to_mb_fallback) (unsigned int, + void (*write_replacement) (const char *, size_t, void*), + void*, void*); +typedef void (*iconv_wchar_mb_to_wc_fallback) (const char*, size_t, + void (*write_replacement) (const wchar_t *, size_t, void*), + void*, void*); +typedef void (*iconv_wchar_wc_to_mb_fallback) (wchar_t, + void (*write_replacement) (const char *, size_t, void*), + void*, void*); + +struct iconv_fallbacks { + iconv_unicode_mb_to_uc_fallback mb_to_uc_fallback; + iconv_unicode_uc_to_mb_fallback uc_to_mb_fallback; + iconv_wchar_mb_to_wc_fallback mb_to_wc_fallback; + iconv_wchar_wc_to_mb_fallback wc_to_mb_fallback; + void *data; +}; + + void iconvlist(int (*do_one) (unsigned int, const char * const *, void *), void *); -const char *_iconv_canonalize(const char *); +const char *iconv_canonicalize(const char *); int iconvctl(iconv_t, int, void *); __END_DECLS ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/Makefile#8 (text+ko) ==== @@ -3,14 +3,17 @@ LIB= iconv SHLIB_MAJOR= 4 MAN= iconv.3 \ - iconvctl.3 -SRCS= _iconv.c \ - citrus_bcs.c \ + iconvctl.3 \ + iconv_canonicalize.3 \ + iconvlist.3 \ + __iconv_get_list.3 +MLINKS= iconv.3 iconv_open.3 \ + iconv.3 iconv_close.3 \ + __iconv_get_list.3 __iconv_free_list.3 +SRCS= citrus_bcs.c \ citrus_bcs_strtol.c \ citrus_bcs_strtoul.c \ citrus_csmapper.c \ - citrus_ctype.c \ - citrus_ctype_fallback.c \ citrus_db.c \ citrus_db_factory.c \ citrus_db_hash.c \ @@ -26,9 +29,11 @@ citrus_none.c \ citrus_pivot_factory.c \ citrus_prop.c \ - citrus_stdenc.c + citrus_stdenc.c \ + citrus_stdenc_fallbacks.c \ + iconv.c CFLAGS+= --param max-inline-insns-single=128 -I ${.CURDIR}/../../include -WARNS?= 3 +WARNS?= 6 .include ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/_iconv.c#7 (text+ko) ==== @@ -1,256 +1,0 @@ -/* $NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $ */ - -/*- - * Copyright (c)2003 Citrus Project, - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include -#include -#include -#include -#include -#include - -#include "netbsdism.h" - -#ifdef __weak_alias -__weak_alias(iconv, _iconv) -__weak_alias(iconv_open, _iconv_open) -__weak_alias(iconv_close, _iconv_close) -#endif - -#include -#include -#include -#include "citrus_types.h" -#include "citrus_module.h" -#include "citrus_esdb.h" -#include "citrus_hash.h" -#include "citrus_iconv.h" - -#define ISBADF(_h_) (!(_h_) || (_h_) == (iconv_t)-1) - -iconv_t -iconv_open(const char *out, const char *in) -{ - int ret; - struct _citrus_iconv *handle; - char *out_truncated; - char *p; - - /* - * Remove anything following a //, as these are options (like - * //ignore, //translate, etc) and we just don't handle them. - * This is for compatibilty with software that uses thees - * blindly. - */ - out_truncated = strdup(out); - if (out_truncated == NULL) { - errno = ENOMEM; - return ((iconv_t)-1); - } - - p = out_truncated; - while (*p != 0) { - if (p[0] == '/' && p[1] == '/') { - *p = '\0'; - break; - } - p++; - } - - ret = _citrus_iconv_open(&handle, _PATH_ICONV, in, out_truncated); - free(out_truncated); - if (ret) { - errno = ret == ENOENT ? EINVAL : ret; - return ((iconv_t)-1); - } - - if (strcasestr(out, "//IGNORE")) - handle->cv_shared->ci_discard_ilseq = true; - else - handle->cv_shared->ci_discard_ilseq = false; - - return ((iconv_t)(void *)handle); -} - -int -iconv_close(iconv_t handle) -{ - if (ISBADF(handle)) { - errno = EBADF; - return (-1); - } - - _citrus_iconv_close((struct _citrus_iconv *)(void *)handle); - - return (0); -} - -size_t -iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout) -{ - int err; - size_t ret; - - if (ISBADF(handle)) { - errno = EBADF; - return ((size_t)-1); - } - - err = _citrus_iconv_convert( - (struct _citrus_iconv *)(void *)handle, in, szin, out, szout, - 0, &ret); - if (err) { - errno = err; - ret = (size_t)-1; - } - - return (ret); -} - -size_t -__iconv(iconv_t handle, const char **in, size_t *szin, char **out, - size_t *szout, u_int32_t flags, size_t *invalids) -{ - int err; - size_t ret; - - if (ISBADF(handle)) { - errno = EBADF; - return ((size_t)-1); - } - - err = _citrus_iconv_convert( - (struct _citrus_iconv *)(void *)handle, in, szin, out, szout, - flags, &ret); - if (invalids) - *invalids = ret; - if (err) { - errno = err; - ret = (size_t)-1; - } - - return (ret); -} - -int -__iconv_get_list(char ***rlist, size_t *rsz, bool l) -{ - int ret; - - ret = _citrus_esdb_get_list(rlist, rsz, l); - if (ret) { - errno = ret; - return -1; - } - - return 0; -} - -void -__iconv_free_list(char **list, size_t sz) -{ - _citrus_esdb_free_list(list, sz); -} - -/* - * GNU-compatibile non-standard interfaces. - */ -void -iconvlist(int (*do_one) (unsigned int, const char * const *, - void *), void *data) -{ - char **list; - size_t sz; - - if (__iconv_get_list(&list, &sz, true)) - list = NULL; - - const char * const * names = (const char * const *)list; - unsigned int i = sz; - do_one(i, names, data); - - __iconv_free_list(list, sz); -} - -__inline const char -*_iconv_canonalize(const char *name) -{ - return (_citrus_iconv_canonalize(name)); -} - -int -iconvctl(iconv_t cd, int request, void *argument) -{ - int *i = (int *)argument; - struct iconv_hooks *hooks = (struct iconv_hooks *)argument; - struct _citrus_iconv *cv = (struct _citrus_iconv *)(void *)cd; - const char *convname; - char *src, *dst; - - if (ISBADF(cd)) { - errno = EBADF; - return (-1); - } - - switch (request) { - case ICONV_TRIVIALP: - convname = cv->cv_shared->ci_convname; - dst = strchr(convname, '/'); - - strlcpy(src, convname, dst - convname + 1); - dst++; - if ((convname == NULL) || (src == NULL) || (dst == NULL)) - return (-1); - *i = strcmp(src, dst) == 0 ? 1 : 0; - return (0); - case ICONV_GET_TRANSLITERATE: - *i = 1; - return (0); - case ICONV_SET_TRANSLITERATE: - return ((*i == 1) ? 0 : -1); - case ICONV_GET_DISCARD_ILSEQ: - *i = cv->cv_shared->ci_discard_ilseq ? 1 : 0; - return (0); - case ICONV_SET_DISCARD_ILSEQ: - cv->cv_shared->ci_discard_ilseq = *i; - return (0); - case ICONV_SET_HOOKS: - if (hooks != NULL) - cv->cv_shared->ci_hooks = *hooks; - else { - cv->cv_shared->ci_hooks.uc_hook = NULL; - cv->cv_shared->ci_hooks.wc_hook = NULL; - cv->cv_shared->ci_hooks.data = NULL; - } - return (0); - default: - errno = EINVAL; - return (-1); - } -} ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype.c#6 (text+ko) ==== @@ -1,173 +1,0 @@ -/* $NetBSD: citrus_ctype.c,v 1.5 2008/06/14 16:01:07 tnozaki Exp $ */ - -/*- - * Copyright (c)1999, 2000, 2001, 2002 Citrus Project, - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "citrus_module.h" -#include "citrus_ctype.h" -#include "citrus_ctype_fallback.h" -#include "citrus_none.h" -#include _CITRUS_DEFAULT_CTYPE_HEADER - -_citrus_ctype_rec_t _citrus_ctype_default = { - &_CITRUS_DEFAULT_CTYPE_OPS, /* cc_ops */ - NULL, /* cc_closure */ - NULL /* cc_module */ -}; - -static int _initctypemodule(_citrus_ctype_t, char const *, _citrus_module_t, - void *, size_t, size_t); - -static int -_initctypemodule(_citrus_ctype_t cc, char const *modname, - _citrus_module_t handle, void *variable, size_t lenvar, - size_t szpriv) -{ - int ret; - _citrus_ctype_getops_t getops; - - cc->cc_module = handle; - - getops = (_citrus_ctype_getops_t)_citrus_find_getops(cc->cc_module, - modname, - "ctype"); - if (getops == NULL) - return (EINVAL); - - cc->cc_ops = (_citrus_ctype_ops_rec_t *)malloc(sizeof(*cc->cc_ops)); - if (cc->cc_ops == NULL) - return (ENOMEM); - - ret = (*getops)(cc->cc_ops, sizeof(*cc->cc_ops), - _CITRUS_CTYPE_ABI_VERSION); - if (ret) - goto bad; - - /* If return ABI version is not expected, fixup it here*/ - switch (cc->cc_ops->co_abi_version) { - case 0x00000001: - cc->cc_ops->co_btowc = &_citrus_ctype_btowc_fallback; - cc->cc_ops->co_wctob = &_citrus_ctype_wctob_fallback; - /* FALLTHROUGH */ - case 0x00000002: - /* FALLTHROUGH */ - default: - break; - } - - /* validation check */ - if (cc->cc_ops->co_init == NULL || - cc->cc_ops->co_uninit == NULL || - cc->cc_ops->co_get_mb_cur_max == NULL || - cc->cc_ops->co_mblen == NULL || - cc->cc_ops->co_mbrlen == NULL || - cc->cc_ops->co_mbrtowc == NULL || - cc->cc_ops->co_mbsinit == NULL || - cc->cc_ops->co_mbsrtowcs == NULL || - cc->cc_ops->co_mbstowcs == NULL || - cc->cc_ops->co_mbtowc == NULL || - cc->cc_ops->co_wcrtomb == NULL || - cc->cc_ops->co_wcsrtombs == NULL || - cc->cc_ops->co_wcstombs == NULL || - cc->cc_ops->co_wctomb == NULL || - cc->cc_ops->co_btowc == NULL || - cc->cc_ops->co_wctob == NULL) - goto bad; - - /* init and get closure */ - ret = (*cc->cc_ops->co_init)( - &cc->cc_closure, variable, lenvar, szpriv); - if (ret) - goto bad; - - return (0); - -bad: - if (cc->cc_ops) - free(cc->cc_ops); - cc->cc_ops = NULL; - - return (ret); -} - -int -_citrus_ctype_open(_citrus_ctype_t *rcc, - char const *encname, void *variable, size_t lenvar, - size_t szpriv) -{ - int ret; - _citrus_module_t handle; - _citrus_ctype_t cc; - - if (!strcmp(encname, _CITRUS_DEFAULT_CTYPE_NAME)) { - *rcc = &_citrus_ctype_default; - return (0); - } - ret = _citrus_load_module(&handle, encname); - if (ret) - return (ret); - - cc = calloc(1, sizeof(*cc)); - if (!cc) { - _citrus_unload_module(handle); - return (errno); - } - - ret = _initctypemodule(cc, encname, handle, variable, lenvar, szpriv); - if (ret) { - _citrus_unload_module(cc->cc_module); - free(cc); - return (ret); - } - - *rcc = cc; - - return (0); -} - -void -_citrus_ctype_close(_citrus_ctype_t cc) -{ - - if (cc == &_citrus_ctype_default) - return; - (*cc->cc_ops->co_uninit)(cc->cc_closure); - free(cc->cc_ops); - _citrus_unload_module(cc->cc_module); - free(cc); -} ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype.h#6 (text+ko) ==== @@ -1,156 +1,0 @@ -/* $NetBSD: citrus_ctype.h,v 1.2 2003/03/05 20:18:15 tshiozak Exp $ */ - -/*- - * Copyright (c)2002 Citrus Project, - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#ifndef _CITRUS_CTYPE_H_ -#define _CITRUS_CTYPE_H_ - -#include "citrus_ctype_local.h" - -typedef struct _citrus_ctype_rec *_citrus_ctype_t; - -__BEGIN_DECLS -int _citrus_ctype_open(_citrus_ctype_t * __restrict, - char const * __restrict, void * __restrict, - size_t, size_t); -void _citrus_ctype_close(_citrus_ctype_t); -__END_DECLS - -static __inline unsigned -_citrus_ctype_get_mb_cur_max(_citrus_ctype_t cc) -{ - - return (*cc->cc_ops->co_get_mb_cur_max)(cc->cc_closure); -} - -static __inline int -_citrus_ctype_mblen(_citrus_ctype_t cc, const char *s, size_t n, int *nresult) -{ - - return (*cc->cc_ops->co_mblen)(cc->cc_closure, s, n, nresult); -} - -static __inline int -_citrus_ctype_mbrlen(_citrus_ctype_t cc, const char *s, size_t n, - void *pspriv, size_t *nresult) -{ - - return (*cc->cc_ops->co_mbrlen)(cc->cc_closure, s, n, pspriv, nresult); -} - -static __inline int -_citrus_ctype_mbrtowc(_citrus_ctype_t cc, wchar_t *pwc, const char *s, - size_t n, void *pspriv, size_t *nresult) -{ - - return (*cc->cc_ops->co_mbrtowc)(cc->cc_closure, pwc, s, n, pspriv, - nresult); -} - -static __inline int -_citrus_ctype_mbsinit(_citrus_ctype_t cc, void const *pspriv, int *nresult) -{ - - return (*cc->cc_ops->co_mbsinit)(cc->cc_closure, pspriv, nresult); -} - -static __inline int -_citrus_ctype_mbsrtowcs(_citrus_ctype_t cc, wchar_t *pwcs, const char **s, - size_t n, void *pspriv, size_t *nresult) -{ - - return (*cc->cc_ops->co_mbsrtowcs)(cc->cc_closure, pwcs, s, n, pspriv, - nresult); -} - -static __inline int -_citrus_ctype_mbstowcs(_citrus_ctype_t cc, wchar_t *pwcs, const char *s, - size_t n, size_t *nresult) -{ - - return (*cc->cc_ops->co_mbstowcs)(cc->cc_closure, pwcs, s, n, nresult); -} - -static __inline int -_citrus_ctype_mbtowc(_citrus_ctype_t cc, wchar_t *pw, const char *s, size_t n, - int *nresult) -{ - - return (*cc->cc_ops->co_mbtowc)(cc->cc_closure, pw, s, n, nresult); -} - -static __inline int -_citrus_ctype_wcrtomb(_citrus_ctype_t cc, char *s, wchar_t wc, - void *pspriv, size_t *nresult) -{ - - return (*cc->cc_ops->co_wcrtomb)(cc->cc_closure, s, wc, pspriv, - nresult); -} - -static __inline int -_citrus_ctype_wcsrtombs(_citrus_ctype_t cc, char *s, const wchar_t **ppwcs, - size_t n, void *pspriv, size_t *nresult) -{ - - return (*cc->cc_ops->co_wcsrtombs)(cc->cc_closure, s, ppwcs, n, - pspriv, nresult); -} - -static __inline int -_citrus_ctype_wcstombs(_citrus_ctype_t cc, char *s, const wchar_t *wcs, - size_t n, size_t *nresult) -{ - - return (*cc->cc_ops->co_wcstombs)(cc->cc_closure, s, wcs, n, nresult); -} - -static __inline int -_citrus_ctype_wctomb(_citrus_ctype_t cc, char *s, wchar_t wc, int *nresult) -{ - - return (*cc->cc_ops->co_wctomb)(cc->cc_closure, s, wc, nresult); -} - -static __inline int -_citrus_ctype_btowc(_citrus_ctype_t cc, int c, wint_t *wcresult) -{ - - return (*cc->cc_ops->co_btowc)(cc, c, wcresult); -} - -static __inline int -_citrus_ctype_wctob(_citrus_ctype_t cc, wint_t c, int *cresult) -{ - - return (*cc->cc_ops->co_wctob)(cc, c, cresult); -} - -extern _citrus_ctype_rec_t _citrus_ctype_default; - -#endif ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_fallback.c#6 (text+ko) ==== @@ -1,101 +1,0 @@ -/* $NetBSD: citrus_ctype_fallback.c,v 1.2 2003/06/27 14:52:25 yamt Exp $ */ - -/*- - * Copyright (c)2003 Citrus Project, - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:17:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 473641065694; Wed, 13 Jan 2010 22:17:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BB48106568F for ; Wed, 13 Jan 2010 22:17:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED9E58FC12 for ; Wed, 13 Jan 2010 22:17:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DMHXDE033812 for ; Wed, 13 Jan 2010 22:17:33 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DMHXSN033810 for perforce@freebsd.org; Wed, 13 Jan 2010 22:17:33 GMT (envelope-from gabor@freebsd.org) Date: Wed, 13 Jan 2010 22:17:33 GMT Message-Id: <201001132217.o0DMHXSN033810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:17:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=173100 Change 173100 by gabor@gabor_aspire on 2010/01/13 22:16:32 MFhg: - Follow-up to delete unnecessary files Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/_iconv.c#8 delete .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype.c#7 delete .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype.h#7 delete .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_fallback.c#7 delete .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_fallback.h#7 delete .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_local.h#7 delete .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_ctype_template.h#7 delete .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/iconv/Makefile#8 delete .. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/iconv/iconv.dir#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:17:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39813106575E; Wed, 13 Jan 2010 22:17:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 381EF1065692 for ; Wed, 13 Jan 2010 22:17:34 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 249438FC1F for ; Wed, 13 Jan 2010 22:17:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DMHYFJ033817 for ; Wed, 13 Jan 2010 22:17:34 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DMHXhI033815 for perforce@freebsd.org; Wed, 13 Jan 2010 22:17:33 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 13 Jan 2010 22:17:33 GMT Message-Id: <201001132217.o0DMHXhI033815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:17:35 -0000 http://p4web.freebsd.org/chv.cgi?CH=173101 Change 173101 by rene@rene_self on 2010/01/13 22:16:40 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#68 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2009-10-2009-12.xml#2 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -506,8 +506,10 @@ system are the suid-root and sgid binaries installed on the system. Most of these binaries, such as rlogin, reside - in /bin, /sbin, - /usr/bin, or /usr/sbin. + in /bin, /sbin, /usr/bin, or /usr/sbin. While nothing is 100% safe, the system-default suid and sgid binaries can be considered reasonably safe. Still, root holes are occasionally found in these @@ -650,7 +652,8 @@ the system at a higher secure level but skip setting the schg flag for every system file and directory under the sun. Another possibility is to simply - mount / and /usr read-only. + mount / and /usr read-only. It should be noted that being too draconian about what is permitted may prevent the all-important detection of an intrusion. @@ -663,9 +666,10 @@ system configuration and control files so much before the convenience factor rears its ugly head. For example, using chflags to set the schg bit - on most of the files in / and - /usr is probably counterproductive, because - while it may protect the files, it also closes a detection window. + on most of the files in / and + /usr is probably + counterproductive, because while it may protect the files, it also + closes a detection window. The last layer of your security onion is perhaps the most important — detection. The rest of your security is pretty much useless (or, worse, presents you with a false sense of @@ -702,14 +706,14 @@ scripts out of simple system utilities such as &man.find.1; and &man.md5.1;. It is best to physically md5 the client-box files at least once a day, and to test control files such as those - found in /etc and - /usr/local/etc even more often. When + found in /etc and /usr/local/etc even more often. When mismatches are found, relative to the base md5 information the limited-access machine knows is valid, it should scream at a sysadmin to go check it out. A good security script will also check for inappropriate suid binaries and for new or deleted files - on system partitions such as / and - /usr. + on system partitions such as / + and /usr. When using ssh rather than NFS, writing the security script is much more difficult. You @@ -1620,8 +1624,8 @@ This is done on the Kerberos server only. First make sure that you do not have any old Kerberos databases around. You should change - to the directory /etc/kerberosIV and check that - only the following files are present: + to the directory /etc/kerberosIV + and check that only the following files are present: &prompt.root; cd /etc/kerberosIV &prompt.root; ls @@ -1789,11 +1793,10 @@ We now have to extract all the instances which define the services on each machine. For this we use the ext_srvtab command. This will create a file - which must be copied or moved by secure - means to each Kerberos client's - /etc directory. This file must - be present on each server and client, and is crucial to the - operation of Kerberos. + which must be copied or moved by secure means to + each Kerberos client's /etc + directory. This file must be present on each server and client, and is + crucial to the operation of Kerberos. &prompt.root; ext_srvtab grunt @@ -1815,8 +1818,8 @@ safe, then copy the client-new-srvtab to removable media and transport it by secure physical means. Be sure to - rename it to srvtab in the client's - /etc directory, and make sure it is + rename it to srvtab in the client's /etc directory, and make sure it is mode 600: &prompt.root; mv grumble-new-srvtab srvtab @@ -1866,8 +1869,8 @@ have correctly edited your /etc/rc.conf then this will happen automatically when you reboot. This is only necessary on the Kerberos server. Kerberos clients will automatically get what - they need from the /etc/kerberosIV - directory. + they need from the /etc/kerberosIV directory. &prompt.root; kerberos & Kerberos server starting @@ -2669,8 +2672,8 @@ Kerberos web site () is recommended. Be careful of path issues: the - MIT port installs into - /usr/local/ by default, and the + MIT port installs into /usr/local/ by default, and the normal system applications may be run instead of MIT if your PATH environment variable lists the system directories first. @@ -2728,9 +2731,9 @@ In a multi-user environment, Kerberos is less secure. - This is because it stores the tickets in the - /tmp directory, which is readable by all - users. If a user is sharing a computer with several other + This is because it stores the tickets in the /tmp directory, which is readable by + all users. If a user is sharing a computer with several other people simultaneously (i.e. multi-user), it is possible that the user's tickets can be stolen (copied) by another user. @@ -3662,7 +3665,8 @@ The system-wide configuration files for both the OpenSSH daemon and client reside - within the /etc/ssh directory. + within the /etc/ssh + directory. ssh_config configures the client settings, while sshd_config configures the @@ -4053,10 +4057,12 @@ drwxrwx---+ 2 robert robert 512 Dec 27 11:57 directory3 drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_html - Here we see that the directory1, - directory2, and directory3 - directories are all taking advantage of ACLs. The - public_html directory is not. + Here we see that the directory1, directory2, and directory3 directories are all taking + advantage of ACLs. The public_html directory is not. Making Use of <acronym>ACL</acronym>s @@ -4310,9 +4316,10 @@ look over the output from ident on the affected files will help in determining the revision. For ports, the version number is listed after the port name - in /var/db/pkg. If the system does not - sync with the &os; CVS repository and rebuild - daily, chances are that it is affected. + in /var/db/pkg. If the + system does not sync with the &os; CVS + repository and rebuild daily, chances are that it is + affected. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#68 (text+ko) ==== @@ -1,7 +1,7 @@ alphasort(3) prototypes to conform to SUSv4. + + 900007 + January 13, 2010 + 9.0-CURRENT after the removal of utmp(5) and + the addition of utmpx (see + getutxent(3)) for improved + logging of user logins and system events. + ==== //depot/projects/docproj_nl/www/en/news/status/report-2009-10-2009-12.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - + October-December @@ -87,6 +87,12 @@ Miscellaneous + + bin + + Userland utilities + + DAHDI (Zaptel) support for &os; @@ -613,6 +619,91 @@ + + The FreeBSD Spanish Documentation Project + + + + + Gábor + Kövesdán + + gabor@FreeBSD.org + + + + + http://www.freebsd.org/doc/es/articles/fdp-es/ + + https://listas.es.freebsd.org/mailman/listinfo/doc + + + +

There is one article translation pending review. Apart from this, + neither translation nor maintainance work has been done. We need + more volunteers, mostly translators but we are glad to have + more reviewers, as well. One can join by simply subscribing to + the translators' mailing list, where all the work is done.

+ + + + Update Handbook translation + + Update webpage translation + + Add more article translations + + + + + The FreeBSD Hungarian Documentation Project + + + + + Gábor + Kövesdán + + gabor@FreeBSD.org + + + + + Gábor + Páli + + pgj@FreeBSD.org + + + + + Hungarian Web Page for FreeBSD + + Hungarian Documentation + for FreeBSD + + The + FreeBSD Hungarian Documentation Project's Wiki Page + + Perforce + Depot for the FreeBSD Hungarian Documentation Project + + + +

In the last months, no new translation has been added. + Lacking human resources, we can only manage the existing + documentation and web page translations. If you are interested + in helping us, please contact us via the the email addresses + noted above.

+ + + + Translate release notes + + Add more article translations + + + The &os; Forums @@ -743,6 +834,40 @@ + + Group Limit Increase + + + + + Brooks + Davis + + brooks@freebsd.org + + + + + + +

Historically, FreeBSD has limited the number of supplemental + groups per process to 15 (NGROUPS_MAX was incorrectly declared to be + 16). In FreeBSD 8.0 we raised the limit to 1023, which should be + sufficient for most users and will be acceptably efficient for + incorrectly written applications that statically allocate + NGROUPS_MAX + 1 entries.

+ +

Because some systems such as Linux 2.6 support a larger + group limit, we have further relaxed this restriction in -CURRENT and + made kern.ngroups a tunable value, which supports values between 1023 + and INT_MAX - 1. We plan to merge this to 8-STABLE before + 8.1-RELEASE.

+ + + + + + Syncing pf(4) with OpenBSD 4.5 @@ -972,6 +1097,97 @@ + + Flattened Device Tree for embedded FreeBSD + + + + + Rafal + Jaworowski + + raj@semihalf.com + + + + + Project wiki pages + + Project P4 branch + + + +

The purpose of this project is to provide FreeBSD with support for the + Flattened Device Tree (FDT) technology, the mechanism for describing + computer hardware resources, which cannot be probed or self enumerated, in + a uniform and portable way. The primary consumer of this technology are + embedded FreeBSD platforms (ARM, AVR32, MIPS, PowerPC), where a lot of + designs are based on similar chips, but have different assignment of pins, + memory layout, addresses bindings, interrupts routing and other resources.

+ +

Current state highlights:

+ +
    +
  • Environment, support tools
    • + +
      +
    • integrated device tree compiler (dtc) and libfdt into FreeBSD + userspace, kernel and loader build
      • +
    + +
  • loader(8)
    • + +
      +
    • full support for device tree blob handling
      • + +
    • load, traverse, modify (including add/remove) device tree + nodes and properties
      • + +
    • pass the device tree blob to the kernel
      • + +
    • both ARM and PowerPC loader(8) supported
      • +
    + +
  • kernel side FDT support (common)
    • + +
      +
    • developed OF interface for FDT-backed platforms
      • + +
    • ofw_bus I/F (and /dev/openfirm) available with FDT
      • + +
    • integrated FDT resources representation with newbus (fdtbus + and simplebus drivers)
      • +
    + +
  • PowerPC kernel (Freescale MPC85XX SOC)
    • + +
      +
    • MPC8555CDS and MPC8572DS successfully converted to FDT + conventions
      • +
    + +
  • ARM kernel (Marvell Orion, Kirkwood and Discovery SOC)
    • + +
      +
    • work in progress on integrating FDT infrastructure with ARM + platform code
      • +
    +
+ +

Work on this project is sponsored by the FeeBSD Foundation.

+ + + + Complete missing pieces for PowerPC (PCI bridge driver conversion to + FDT) + + Complete ARM support + + Merge to SVN + + + + HAST - Highly Available Storage @@ -1026,5 +1242,100 @@ Thank you!

 + + + Wireless mesh networking + + + + + Rui + Paulo + + rpaulo@FreeBSD.org + + + + + + + + +

Development of the FreeBSD 802.11s stack continues. The code in + FreeBSD HEAD has been updated to comply with draft 4.0. Merge to + FreeBSD 8-STABLE will be done soon.

+ +

The developer is looking for funding to be able to implement mesh + link security algorithms and/or coordinated channel access + (performance improvement).

+ + + + + + + BSD-licensed iconv + + + + + Gábor + Kövesdán + + gabor@FreeBSD.org + + + + + Sources in the Perforce repository + + + +

Good compatibility has been ensured and there are only few pending + items, which have to be reviewed/enhanced. Recently, an enhacement + has been completed, which makes it possible to accomplish better + transliteration, just like in the GNU version. An initial testing + patch is expected at the beginning of February.

+ + + + Enhance conversion tables to make use of enhanced + transliteration. + + A performance optimization might be done later. + + + + + BSD-licensed text processing tools + + + + + Gábor + Kövesdán + + gabor@FreeBSD.org + + + + + Perforce repository + + + +

As 8.0-RELEASE is out, BSD bc/dc can be now committed, we are + only waiting for the portbuild exp-run to make sure there are no + regressions after this change. BSD grep is stalled because of + some regex library issues. We need first a fast and modern regex + library so that we can change to BSD grep. BSD sort has few + incomplete features and needs some performance review.

+ + + + Commit BSD bc/dc + + Implement remaining features for sort and optimize performance + + - From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:18:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B9A4106568F; Wed, 13 Jan 2010 22:18:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 475DD106566C for ; Wed, 13 Jan 2010 22:18:35 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 332FD8FC18 for ; Wed, 13 Jan 2010 22:18:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DMIZGP033883 for ; Wed, 13 Jan 2010 22:18:35 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DMIZh7033881 for perforce@freebsd.org; Wed, 13 Jan 2010 22:18:35 GMT (envelope-from gabor@freebsd.org) Date: Wed, 13 Jan 2010 22:18:35 GMT Message-Id: <201001132218.o0DMIZh7033881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:18:35 -0000 http://p4web.freebsd.org/chv.cgi?CH=173102 Change 173102 by gabor@gabor_aspire on 2010/01/13 22:18:15 MFhg: - Follow-up to add new files Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/gnu/usr.bin/Makefile#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/gnu/usr.bin/config.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/gnu/usr.bin/gnuiconv.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/__iconv_get_list.3#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_stdenc_fallbacks.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/citrus_stdenc_fallbacks.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/iconv.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/iconv_canonicalize.3#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/iconvlist.3#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ATARIST#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ATARIST-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/BIG5-2003#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/BIG5-2003-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/BIG5-HKSCS#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/BIG5-HKSCS-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/C99#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/C99-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1046#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1046-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1124#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1124-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1125#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1125-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1129#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1129-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1133#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1133-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1161#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1161-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1162#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1162-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1163#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1163-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1250#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1250-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1252#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1252-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1253#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1253-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1254#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1254-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1255#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1255-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1256#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1256-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1257#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1257-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1258#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP1258-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP437#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP437-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP737#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP737-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP775#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP775-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP850#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP850-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP852#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP852-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP853#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP853-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP855#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP855-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP856#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP856-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP857#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP857-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP858#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP858-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP860#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP860-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP861#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP861-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP862#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP862-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP863#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP863-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP864#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP864-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP865#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP865-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP869#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP869-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP874#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP874-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP922#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP922-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP932#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP932-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP936#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP936-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP943#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP943-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP950#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/CP950-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/DEC-HANYU#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/DEC-HANYU-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-JIS-2004#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-JIS-2004-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-TW#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/EUC-TW-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/GEORGIAN-ACADEMY#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/GEORGIAN-ACADEMY-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/GEORGIAN-PS#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/GEORGIAN-PS-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/HP-ROMAN8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/HP-ROMAN8-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/HZ#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/HZ-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-CN#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-CN-EXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-CN-EXT-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-CN-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-JP#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-JP-1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-JP-1-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-JP-2#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-JP-2-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-JP-2004#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-JP-2004-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-JP-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-KR#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-2022-KR-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-IR-14#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-IR-14-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-IR-165#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-IR-165-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-IR-57#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/ISO-IR-57-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/JAVA#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/JAVA-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/JIS_X0201#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/JIS_X0201-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/JIS_X0208-1990#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/JIS_X0208-1990-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/JOHAB#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/JOHAB-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/KOI8-RU#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/KOI8-RU-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/KOI8-T#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/KOI8-T-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/KZ-1048#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/KZ-1048-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACARABIC#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACARABIC-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACCENTRALEUROPE#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACCENTRALEUROPE-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACCROATIAN#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACCROATIAN-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACCYRILLIC#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACCYRILLIC-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACGREEK#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACGREEK-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACHEBREW#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACHEBREW-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACICELAND#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACICELAND-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACROMAN#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACROMAN-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACROMANIA#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACROMANIA-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACTHAI#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACTHAI-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACTURKISH#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACTURKISH-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACUKRAINE#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MACUKRAINE-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MULELAO-1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/MULELAO-1-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/NEXTSTEP#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/NEXTSTEP-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/RISCOS-LATIN1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/RISCOS-LATIN1-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/TCVN5712-1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/TCVN5712-1-rev#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/TDS565#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tools/test/iconv/ref/TDS565-rev#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 13 22:45:02 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86A861065692; Wed, 13 Jan 2010 22:45:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D8F0106568B for ; Wed, 13 Jan 2010 22:45:02 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2AFA38FC14 for ; Wed, 13 Jan 2010 22:45:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DMj2Ji035927 for ; Wed, 13 Jan 2010 22:45:02 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DMj2N9035925 for perforce@freebsd.org; Wed, 13 Jan 2010 22:45:02 GMT (envelope-from raj@freebsd.org) Date: Wed, 13 Jan 2010 22:45:02 GMT Message-Id: <201001132245.o0DMj2N9035925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 22:45:02 -0000 http://p4web.freebsd.org/chv.cgi?CH=173106 Change 173106 by raj@raj_fdt on 2010/01/13 22:44:12 Add a missing module type for device tree blob in ARM metadata. This fixes build. We are now able to access the /dev/openfirm char device from userspace, i.e. traverse FDT-backed device tree contents on ARM! Affected files ... .. //depot/projects/fdt/sys/arm/include/metadata.h#2 edit Differences ... ==== //depot/projects/fdt/sys/arm/include/metadata.h#2 (text+ko) ==== @@ -30,5 +30,6 @@ #define _MACHINE_METADATA_H_ #define MODINFOMD_BOOTINFO 0x1001 +#define MODINFOMD_DTBP 0x1002 #endif /* !_MACHINE_METADATA_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jan 13 23:11:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 167E41065692; Wed, 13 Jan 2010 23:11:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB038106566C for ; Wed, 13 Jan 2010 23:11:28 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A88C48FC13 for ; Wed, 13 Jan 2010 23:11:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DNBSvq038779 for ; Wed, 13 Jan 2010 23:11:28 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DNBSOO038777 for perforce@freebsd.org; Wed, 13 Jan 2010 23:11:28 GMT (envelope-from raj@freebsd.org) Date: Wed, 13 Jan 2010 23:11:28 GMT Message-Id: <201001132311.o0DNBSOO038777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 23:11:29 -0000 http://p4web.freebsd.org/chv.cgi?CH=173107 Change 173107 by raj@raj_fdt on 2010/01/13 23:10:30 Clean up #includes. Affected files ... .. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#5 edit .. //depot/projects/fdt/sys/dev/ofw/openfirm.h#3 edit .. //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#3 edit Differences ... ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.c#5 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include +#include #include #include ==== //depot/projects/fdt/sys/dev/ofw/openfirm.h#3 (text+ko) ==== @@ -73,8 +73,6 @@ #ifdef _KERNEL #include -#include - MALLOC_DECLARE(M_OFWPROP); /* ==== //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#3 (text+ko) ==== @@ -35,6 +35,8 @@ #include #include +#include + #include #include #include From owner-p4-projects@FreeBSD.ORG Thu Jan 14 08:22:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 689FE1065676; Thu, 14 Jan 2010 08:22:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12EC01065670 for ; Thu, 14 Jan 2010 08:22:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0048D8FC0A for ; Thu, 14 Jan 2010 08:22:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0E8MeVH010096 for ; Thu, 14 Jan 2010 08:22:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0E8MeV2010094 for perforce@freebsd.org; Thu, 14 Jan 2010 08:22:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Jan 2010 08:22:40 GMT Message-Id: <201001140822.o0E8MeV2010094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2010 08:22:41 -0000 http://p4web.freebsd.org/chv.cgi?CH=173119 Change 173119 by hselasky@hselasky_laptop001 on 2010/01/14 08:22:03 USB WLAN: - final patches for RUN driver. - link RUN driver into kernel module build - patch by: Akinori Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#3 edit .. //depot/projects/usb/src/sys/modules/usb/Makefile#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#4 (text+ko) ==== @@ -347,7 +347,7 @@ static void run_update_beacon(struct ieee80211vap *, int); static void run_update_beacon_locked(struct ieee80211vap *, int); static void run_updateprot(struct ieee80211com *ic); -static void run_usb_timeout(struct run_softc *); +static void run_usb_timeout_cb(void *, int); static void run_reset_livelock(struct run_softc *); static void run_enable_tsf_sync(struct run_softc *); static void run_enable_mrr(struct run_softc *); @@ -713,6 +713,7 @@ TASK_INIT(&rvp->amrr_task, 0, run_amrr_cb, rvp); TASK_INIT(&sc->wme_task, 0, run_wme_update_cb, ic); + TASK_INIT(&sc->usb_timeout_task, 0, run_usb_timeout_cb, sc); callout_init((struct callout *)&rvp->amrr_ch, 1); ieee80211_amrr_init(&rvp->amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, @@ -2344,7 +2345,6 @@ unsigned int len; int actlen; int sumlen; - int timeout; usbd_xfer_status(xfer, &actlen, &sumlen, NULL, NULL); @@ -2414,19 +2414,10 @@ usbd_transfer_submit(xfer); - /* avoid doing the USB timeout from this function */ - - timeout = sc->sc_usb_timeout; - sc->sc_usb_timeout = 0; - RUN_UNLOCK(sc); - run_start(ifp); - RUN_LOCK(sc); - sc->sc_usb_timeout = timeout; - break; default: @@ -2445,9 +2436,7 @@ if (error != USB_ERR_CANCELLED) { if (error == USB_ERR_TIMEOUT) { device_printf(sc->sc_dev, "device timeout\n"); - - /* defer until later */ - sc->sc_usb_timeout = 1; + ieee80211_runtask(ifp->if_l2com, &sc->usb_timeout_task); } /* @@ -2901,10 +2890,6 @@ goto bad; } - /* Device is in trouble. Fix it before sending more frame. */ - if(sc->sc_usb_timeout == 1) - run_usb_timeout(sc); - if (params == NULL) { /* tx mgt packet */ if ((error = run_tx_mgt(sc, m, ni)) != 0){ @@ -2951,10 +2936,6 @@ } for (;;) { - /* Device is in trouble. Fix it before sending more frame. */ - if(sc->sc_usb_timeout == 1) - run_usb_timeout(sc); - /* send data frames */ IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) @@ -3373,17 +3354,13 @@ } static void -run_usb_timeout(struct run_softc *sc) +run_usb_timeout_cb(void *arg, int pending) { - struct ieee80211vap *vap = &sc->sc_rvp->vap; + struct run_softc *sc = arg; + struct ieee80211vap *vap = &sc->sc_rvp->vap; RUN_LOCK_ASSERT(sc, MA_OWNED); - if (sc->sc_usb_timeout == 0) - return; - - sc->sc_usb_timeout = 0; - if(vap->iv_state == IEEE80211_S_RUN && vap->iv_opmode != IEEE80211_M_STA) run_reset_livelock(sc); @@ -4100,6 +4077,7 @@ ieee80211_draintask(ic, &sc->wme_task); for(i = 0; i < RUN_N_XFER; i++) usbd_transfer_drain(sc->sc_xfer[i]); + ieee80211_draintask(ic, &sc->usb_timeout_task); RUN_LOCK(sc); ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#3 (text+ko) ==== @@ -190,6 +190,7 @@ struct run_endpoint_queue sc_epq[RUN_EP_QUEUES]; struct task wme_task; + struct task usb_timeout_task; struct usb_xfer *sc_xfer[RUN_N_XFER]; @@ -210,8 +211,6 @@ } sc_txtapu; #define sc_txtap sc_txtapu.th int sc_txtap_len; - - uint8_t sc_usb_timeout; }; #define RUN_LOCK(sc) mtx_lock(&(sc)->sc_mtx) ==== //depot/projects/usb/src/sys/modules/usb/Makefile#25 (text+ko) ==== @@ -27,7 +27,7 @@ SUBDIR = usb SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci} -SUBDIR += rum uath upgt ural zyd ${_urtw} +SUBDIR += rum run uath upgt ural zyd ${_urtw} SUBDIR += atp uhid ukbd ums udbp ufm SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umodem umoscom uplcom uslcom uvisor uvscom From owner-p4-projects@FreeBSD.ORG Thu Jan 14 08:23:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7582D106568B; Thu, 14 Jan 2010 08:23:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A4971065676 for ; Thu, 14 Jan 2010 08:23:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 283678FC0C for ; Thu, 14 Jan 2010 08:23:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0E8Ngfi010159 for ; Thu, 14 Jan 2010 08:23:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0E8Ng5A010157 for perforce@freebsd.org; Thu, 14 Jan 2010 08:23:42 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Jan 2010 08:23:42 GMT Message-Id: <201001140823.o0E8Ng5A010157@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2010 08:23:42 -0000 http://p4web.freebsd.org/chv.cgi?CH=173120 Change 173120 by hselasky@hselasky_laptop001 on 2010/01/14 08:23:04 USB WLAN: - add kernel config option for RUN driver. - patch by: HPS Affected files ... .. //depot/projects/usb/src/sys/conf/files#91 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#91 (text+ko) ==== @@ -1691,6 +1691,7 @@ # USB WLAN drivers # dev/usb/wlan/if_rum.c optional rum +dev/usb/wlan/if_run.c optional run dev/usb/wlan/if_uath.c optional uath dev/usb/wlan/if_upgt.c optional upgt dev/usb/wlan/if_ural.c optional ural From owner-p4-projects@FreeBSD.ORG Thu Jan 14 13:55:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25F001065676; Thu, 14 Jan 2010 13:55:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C668F106566C for ; Thu, 14 Jan 2010 13:55:13 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB70C8FC16 for ; Thu, 14 Jan 2010 13:55:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0EDtDpk060165 for ; Thu, 14 Jan 2010 13:55:13 GMT (envelope-from marinosi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0EDtD84060163 for perforce@freebsd.org; Thu, 14 Jan 2010 13:55:13 GMT (envelope-from marinosi@FreeBSD.org) Date: Thu, 14 Jan 2010 13:55:13 GMT Message-Id: <201001141355.o0EDtD84060163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marinosi@FreeBSD.org using -f From: Ilias Marinos To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2010 13:55:14 -0000 http://p4web.freebsd.org/chv.cgi?CH=173125 Change 173125 by marinosi@revolver on 2010/01/14 13:54:45 - Fix a bad syscall assignment in freebsd32 compatibility, used from arch amd64 systems. Affected files ... .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_proto.h#7 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscall.h#7 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_sysent.c#7 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/syscalls.master#8 edit Differences ... ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ==== ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ==== @@ -382,6 +382,6 @@ #define FREEBSD32_SYS_freebsd32_msgctl 511 #define FREEBSD32_SYS_freebsd32_shmctl 512 #define FREEBSD32_SYS_lpathconf 513 -#define FREEBSD32_SYS_auditon 514 +#define FREEBSD32_SYS_auditon_slice 514 #define FREEBSD32_SYS_auditctl_slice 515 #define FREEBSD32_SYS_MAXSYSCALL 516 ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ==== @@ -521,6 +521,6 @@ "freebsd32_msgctl", /* 511 = freebsd32_msgctl */ "freebsd32_shmctl", /* 512 = freebsd32_shmctl */ "lpathconf", /* 513 = lpathconf */ - "auditon", /* 514 = auditon */ + "auditon_slice", /* 514 = auditon_slice */ "auditctl_slice", /* 515 = auditctl_slice */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ==== @@ -558,6 +558,6 @@ { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0, 0 }, /* 511 = freebsd32_msgctl */ { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0, 0 }, /* 512 = freebsd32_shmctl */ { AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 }, /* 513 = lpathconf */ - { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0, 0 }, /* 514 = auditon */ + { AS(auditon_slice_args), (sy_call_t *)auditon_slice, AUE_AUDITON, NULL, 0, 0, 0 }, /* 514 = auditon_slice */ { AS(auditctl_slice_args), (sy_call_t *)auditctl_slice, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 515 = auditctl_slice */ }; ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/compat/freebsd32/syscalls.master#8 (text+ko) ==== @@ -901,6 +901,6 @@ 512 AUE_SHMCTL STD { int freebsd32_shmctl(int shmid, int cmd, \ struct shmid_ds32 *buf); } 513 AUE_LPATHCONF NOPROTO { int lpathconf(char *path, int name); } -514 AUE_AUDITON NOPROTO { int auditon(int cmd, char *name, \ +514 AUE_AUDITON NOPROTO { int auditon_slice(int cmd, char *name, \ void *data, u_int length); } 515 AUE_AUDITCTL NOPROTO { int auditctl_slice(char *as_name, char *path); } From owner-p4-projects@FreeBSD.ORG Fri Jan 15 18:25:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B36C1106568D; Fri, 15 Jan 2010 18:25:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76DA6106566C for ; Fri, 15 Jan 2010 18:25:44 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63F518FC18 for ; Fri, 15 Jan 2010 18:25:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0FIPin6001308 for ; Fri, 15 Jan 2010 18:25:44 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0FIPiEh001306 for perforce@freebsd.org; Fri, 15 Jan 2010 18:25:44 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 15 Jan 2010 18:25:44 GMT Message-Id: <201001151825.o0FIPiEh001306@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2010 18:25:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=173190 Change 173190 by rene@rene_self on 2010/01/15 18:25:26 MFen: * handbook/security 1.334 -> 1.335 * handbook/advanced-networking 1.425 -> 1.426 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#41 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#41 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.17 2009/09/09 21:55:35 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.425 + %SRCID% 1.426 --> @@ -2216,6 +2216,27 @@ + Zowel de bekabelde als de draadloze verbinding gebruiken + + Een bekabelde verbinding biedt betere prestaties en betrouwbaarheid, + terwijl een draadloze verbinding meer flexibiliteit en mobiliteit + biedt; laptop-gebruikers zullen dit willen combineren en naadloos tussen + de twee overschakelen. + + In &os; is het mogelijk om twee of meer netwerkinterfaces te + combineren in een failover-opstelling, dit houdt in dat + de meest geprefereerde en best beschikbare verbinding van een groep van + netwerkinterfaces wordt gebruikt, en het besturingssysteem automatisch + te laten overschakelen wanneer de status van de verbinding + verandert. + + Link-aggregatie en failover worden behandeld in , een voorbeeld voor het gebruik van + zowel een bekabelde als een draadloze verbinding wordt gegeven in + . + + + Problemen verhelpen Indien er problemen met het draadloos netwerk zijn, zijn er @@ -3689,6 +3710,88 @@ Indien de verbinding op de meesterinterface hersteld is, zal het weer de actieve verbinding worden. + + + Failover-modus tussen bekabelde en draadloze interfaces + + Voor laptop-gebruikers is het normaliter wenselijk om het + draadloze interface als secundair interface te gebruiken indien het + bekabelde interface niet beschikbaar is. Met &man.lagg.4; is het + mogelijk om één IP-adres te gebruiken en het bekabelde + interface voor zowel prestatie als veiligheid te prefereren terwijl de + mogelijkheid behouden blijft om de draadloze verbinding te + gebruiken. + + In deze opstelling dient het MAC-adres van het onderliggende + draadloze interface overschreven te worden om met dat van &man.lagg.4; + overeen te komen, welke afkomstig is van het primaire interface dat + wordt gebruikt, het bekabelde interface. + + In deze opstelling wordt het bekabelde interface, + bge0 als meester gebruikt, en het draadloze + interface, wlan0, als het + failover-interface. wlan0 was aangemaakt + vanuit iwn0 voor welke het + MAC-adres van de bekabelde verbinding zal worden + gebruikt. De eerste stap is om het MAC-adres van + het bekabelde interface te verkrijgen: + + &prompt.root; ifconfig bge0 +bge0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=19b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM,TSO4> + ether 00:21:70:da:ae:37 + inet6 fe80::221:70ff:feda:ae37%bge0 prefixlen 64 scopeid 0x2 + nd6 options=29<PERFORMNUD,IFDISABLED,AUTO_LINKLOCAL> + media: Ethernet autoselect (1000baseT <full-duplex>) + status: active + + bge0 kan vervangen worden door het + eigenlijke interface, er zal een andere regel met + ether verschijnen, dit is het + MAC-adres van het bekabelde interface. Om het + onderliggende draadloze interface, iwn0 te + wijzigen: + + &prompt.root; ifconfig iwn0 ether 00:21:70:da:ae:37 + + Activeer het draadloze interface maar geef er nog geen IP-adres + aan: + + &prompt.root; ifconfig create wlan0 wlandev iwn0 ssid mijn_router up + + Maak het &man.lagg.4;-interface aan met + bge0 als meester, en met failover naar + wlan0 indien nodig: + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto failover laggport bge0 laggport wlan0 + + Het interface zal er ongeveer als volgt uitzien, de grootste + verschillen zullen het MAC-adres en de + apparaatnamen zijn: + + &prompt.root; ifconfig lagg0 +lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + options=8<VLAN_MTU> + ether 00:21:70:da:ae:37 + media: Ethernet autoselect + status: active + laggproto failover + laggport: wlan0 flags=0<> + laggport: bge0 flags=5<MASTER,ACTIVE> + + Om dit niet telkens bij het opstarten te hoeven doen, kan zoiets + als het volgende aan /etc/rc.conf worden + toegevoegd: + + ifconfig_bge0="up" +ifconfig_iwn0="ether 00:21:70:da:ae:37" +wlans_iwn0="wlan0" +ifconfig_wlan0="WPA" +cloned_interfaces="lagg0" +ifconfig_lagg0="laggproto failover laggport bge0 laggport wlan0 DHCP" + + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#12 (text+ko) ==== @@ -2,10 +2,9 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.17 2009/01/28 20:45:24 rene Exp $ - $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.80 2006/01/05 21:13:24 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.sgml - %SRCID% 1.334 + %SRCID% 1.335 --> @@ -566,11 +565,12 @@ De andere grote mogelijkheid voor root gaten in een systeem zijn de suid-root en sgid-binaire bestanden die geïnstalleerd zijn op een systeem. Veel van - die bestanden, zoals rlogin, staan - in /bin, /sbin, - /usr/bin of - /usr/sbin. Hoewel het niet 100% veilig - is, mag aangenomen worden dat de suid- en sgid-binaire bestanden + die bestanden, zoals rlogin, staan in + /bin, + /sbin, + /usr/bin of + /usr/sbin. Hoewel het niet 100% + veilig is, mag aangenomen worden dat de suid- en sgid-binaire bestanden van een standaardsysteem redelijk veilig zijn. Toch worden er nog wel eens root gaten gevonden in deze bestanden. Zo is er in 1998 een root gat @@ -738,9 +738,9 @@ het systeem op een hoger veiligheidsniveau te draaien maar het aanzetten van de vlag schg voor elk systeembestand en -map onder de zon over te slaan. Een andere - mogelijkheid is om / en - /usr simpelweg als alleen-lezen aan te - koppelen. Het dient opgemerkt te worden dat het te draconisch + mogelijkheid is om / en + /usr simpelweg als alleen-lezen + aan te koppelen. Het dient opgemerkt te worden dat het te draconisch zijn over wat is toegestaan het belangrijke detecteren van een inbraak kan verhinderen. @@ -753,9 +753,9 @@ maar tot een bepaald punt beveiligd worden zonder dat het minder prettig werken wordt. Zo werk het zetten van de schg bit met chflags op - de meeste bestanden in / en - /usr waarschijnlijk averechts, omdat, - hoewel de bestanden beschermd zijn, ook het venster waarin + de meeste bestanden in / en + /usr waarschijnlijk averechts, + omdat, hoewel de bestanden beschermd zijn, ook het venster waarin detectie plaats kan vinden is gesloten. De laatste laag van beveiliging is waarschijnlijk de meest belangrijke: detectie. Alle overige beveiliging is vrijwel waardeloos (of nog erger: @@ -798,15 +798,15 @@ als &man.find.1; en &man.md5.1;. We adviseren minstens één keer per dag een md5 te maken van alle bestanden op de cliëntmachine en van instellingenbestanden - als in /etc en - /usr/local/etc zelfs vaker. Als er - verschillen worden aangetroffen ten opzichte van de basis md5 + als in /etc en + /usr/local/etc zelfs vaker. + Als er verschillen worden aangetroffen ten opzichte van de basis md5 informatie op het systeem met beperkte toegang, dan hoort het script te gillen om een beheerder die het moet gaan uitzoeken. Een goed beveiligingsscript controleert ook op onverwachte suid-bestanden en op nieuwe en verwijderde bestanden op - systeempartities als / en - /usr. + systeempartities als / en + /usr. Als ssh in plaats van NFS wordt gebruikt, dan is het schrijven van het script lastiger. Dan @@ -1780,7 +1780,8 @@ Dit hoeft alleen op de Kerberos gedaan te worden. Er dienen geen oude Kerberos databases rond te slingeren. - Controleer in de map /etc/kerberosIV of de + Controleer in de map /etc/kerberosIV of de volgende bestanden aanwezig zijn: &prompt.root; cd /etc/kerberosIV @@ -1960,8 +1961,8 @@ definiëren geëxtraheerd worden. Dat kan met het commando ext_srvtab. Dit commando maakt een bestand aan dat veilig gekopieerd moet - worden naar de map /etc van iedere - Kerberos-cliënt. Dit bestand moet aanwezig zijn op iedere + worden naar de map /etc van + iedere Kerberos-cliënt. Dit bestand moet aanwezig zijn op iedere server en op iedere cliënt en is van doorslaggevend belang voor de werking van Kerberos. @@ -1985,8 +1986,8 @@ client-new-srvtab dan naar een verwijderbaar medium gekopieerd worden en dan fysiek veilig getransporteerd worden. Op de cliënt dient - het bestand srvtab te heten in de map - /etc en in modus 600 te staan: + het bestand srvtab te heten in de map /etc en in modus 600 te staan: &prompt.root; mv grumble-new-srvtab srvtab &prompt.root; chmod 600 srvtab @@ -2037,7 +2038,7 @@ gemaakt, dan gebeurt dit automatisch na een herstart. Dit hoeft alleen ingesteld te worden op de Kerberos server. Kerberos cliënten vinden automatisch wat ze zoeken in de - map /etc/kerberosIV. + map /etc/kerberosIV. &prompt.root; kerberos & Kerberos server starting @@ -2893,7 +2894,7 @@ url="http://web.mit.edu/Kerberos/www/">) te volgen. Wees voorzichtig met paden: de MIT-port installeert standaard in - /usr/local/ en dus kunnen de + /usr/local/ en dus kunnen de normale systeemapplicaties gestart worden in plaats van die van MIT als de PATH omgevingsvariabele de systeemmappen als @@ -2962,8 +2963,8 @@ In een meergebruikersomgeving is Kerberos minder veilig. Dit komt doordat de tickets worden opgeslagen in de map - /tmp, waar gelezen kan worden door - alle gebruikers. Als een gebruiker een computer deelt met + /tmp, waar gelezen kan worden + door alle gebruikers. Als een gebruiker een computer deelt met andere gebruikers op hetzelfde moment (dus multi-user), dan is het mogelijk dat een ticket van een gebruiker wordt gestolen (gekopieerd) door een andere gebruiker. @@ -3967,7 +3968,8 @@ Het instellingenbestand dat voor het hele systeem geldt voor zowel de OpenSSH daemon als - cliënt staat in de map /etc/ssh. + cliënt staat in de map /etc/ssh. ssh_config bevat de instellingen voor de cliënt en sshd_config bevat ze voor @@ -4414,10 +4416,11 @@ drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_html Hierboven is te zien dat mappen - directory1, directory2 - en directory3 allemaal gebruik maken van - ACLs. De map public_html - doet dat niet. + directory1, + directory2 en + directory3 allemaal gebruik maken + van ACLs. De map public_html doet dat niet. Gebruik maken van <acronym>ACL</acronym>s @@ -4684,8 +4687,8 @@ uitgaven van &os; door deze kwetsbaarheid worden getroffen. Voor de kernel kan snel gekeken worden naar de uitvoer van ident voor de betreffende bestanden om - te bepalen welke revisie ze hebben. Voor ports is het - versienummer te zien in /var/db/pkg. + te bepalen welke revisie ze hebben. Voor ports is het versienummer + te zien in /var/db/pkg. Als het systeem niet gelijk op loopt met het &os; CVS depot en dagelijks herbouwd wordt, dan is de kans groot dat het systeem kwetsbaar is. From owner-p4-projects@FreeBSD.ORG Fri Jan 15 20:04:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE48A106568B; Fri, 15 Jan 2010 20:04:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92D551065676 for ; Fri, 15 Jan 2010 20:04:23 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 80AB18FC08 for ; Fri, 15 Jan 2010 20:04:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0FK4N0n010771 for ; Fri, 15 Jan 2010 20:04:23 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0FK4NYl010769 for perforce@freebsd.org; Fri, 15 Jan 2010 20:04:23 GMT (envelope-from raj@freebsd.org) Date: Fri, 15 Jan 2010 20:04:23 GMT Message-Id: <201001152004.o0FK4NYl010769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2010 20:04:24 -0000 http://p4web.freebsd.org/chv.cgi?CH=173195 Change 173195 by raj@raj_fdt on 2010/01/15 20:04:03 Revert the last #includes reorg and simply introduce ARM specific ofw_machdep.h as there is for PowerPC. Previous changes broke AIM PowerPC build. Affected files ... .. //depot/projects/fdt/sys/arm/include/ofw_machdep.h#1 add .. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#6 edit .. //depot/projects/fdt/sys/dev/ofw/openfirm.h#4 edit .. //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#4 edit Differences ... ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.c#6 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include -#include #include #include ==== //depot/projects/fdt/sys/dev/ofw/openfirm.h#4 (text+ko) ==== @@ -73,6 +73,8 @@ #ifdef _KERNEL #include +#include + MALLOC_DECLARE(M_OFWPROP); /* ==== //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#4 (text+ko) ==== @@ -35,8 +35,6 @@ #include #include -#include - #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Jan 15 20:38:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C35621065672; Fri, 15 Jan 2010 20:38:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8670F106566B for ; Fri, 15 Jan 2010 20:38:06 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 723008FC1D for ; Fri, 15 Jan 2010 20:38:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0FKc6nq013317 for ; Fri, 15 Jan 2010 20:38:06 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0FKbxHe013302 for perforce@freebsd.org; Fri, 15 Jan 2010 20:37:59 GMT (envelope-from raj@freebsd.org) Date: Fri, 15 Jan 2010 20:37:59 GMT Message-Id: <201001152037.o0FKbxHe013302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2010 20:38:07 -0000 http://p4web.freebsd.org/chv.cgi?CH=173199 Change 173199 by raj@raj_fdt on 2010/01/15 20:37:26 IFC @173196 Affected files ... .. //depot/projects/fdt/Makefile#3 integrate .. //depot/projects/fdt/Makefile.inc1#7 integrate .. //depot/projects/fdt/ObsoleteFiles.inc#6 integrate .. //depot/projects/fdt/UPDATING#7 integrate .. //depot/projects/fdt/bin/csh/config.h#2 integrate .. //depot/projects/fdt/bin/csh/config_p.h#2 integrate .. //depot/projects/fdt/bin/date/Makefile#3 integrate .. //depot/projects/fdt/bin/date/date.c#3 integrate .. //depot/projects/fdt/bin/pax/gen_subs.c#2 integrate .. //depot/projects/fdt/contrib/groff/font/devutf8/R.proto#2 integrate .. //depot/projects/fdt/contrib/groff/tmac/an-old.tmac#2 integrate .. //depot/projects/fdt/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/fdt/contrib/groff/tmac/doc-old.tmac#2 integrate .. //depot/projects/fdt/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/fdt/contrib/groff/tmac/doc.tmac#2 integrate .. //depot/projects/fdt/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/mac.code#2 delete .. //depot/projects/fdt/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/makefile#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/maketab.c#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/proctab.c#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/proto.h#2 integrate .. //depot/projects/fdt/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/fdt/contrib/opie/libopie/getutmpentry.c#2 integrate .. //depot/projects/fdt/contrib/opie/libopie/insecure.c#2 integrate .. //depot/projects/fdt/contrib/opie/libopie/login.c#2 integrate .. //depot/projects/fdt/contrib/telnet/telnetd/sys_term.c#3 integrate .. //depot/projects/fdt/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/fdt/crypto/openssh/config.h#2 integrate .. //depot/projects/fdt/crypto/openssh/defines.h#2 integrate .. //depot/projects/fdt/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/fdt/crypto/openssh/sshd.c#3 integrate .. //depot/projects/fdt/etc/newsyslog.conf#2 integrate .. //depot/projects/fdt/etc/periodic/monthly/200.accounting#2 integrate .. //depot/projects/fdt/etc/rc.d/cleanvar#2 integrate .. //depot/projects/fdt/etc/rc.d/var#2 integrate .. //depot/projects/fdt/etc/termcap.small#3 integrate .. //depot/projects/fdt/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/fdt/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/fdt/include/Makefile#4 integrate .. //depot/projects/fdt/include/unistd.h#2 integrate .. //depot/projects/fdt/include/utmp.h#2 integrate .. //depot/projects/fdt/include/utmpx.h#1 branch .. //depot/projects/fdt/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/fdt/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/fdt/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/getutxent.3#1 branch .. //depot/projects/fdt/lib/libc/gen/getutxent.c#1 branch .. //depot/projects/fdt/lib/libc/gen/pututxline.c#1 branch .. //depot/projects/fdt/lib/libc/gen/sem_init.3#4 integrate .. //depot/projects/fdt/lib/libc/gen/sem_new.c#3 integrate .. //depot/projects/fdt/lib/libc/gen/sem_open.3#3 integrate .. //depot/projects/fdt/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/ttyslot.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/utxdb.c#1 branch .. //depot/projects/fdt/lib/libc/gen/utxdb.h#1 branch .. //depot/projects/fdt/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/fdt/lib/libc/net/sctp_send.3#3 integrate .. //depot/projects/fdt/lib/libc/net/sctp_sendmsg.3#3 integrate .. //depot/projects/fdt/lib/libc/rpc/svc_auth_des.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/fwrite.c#2 integrate .. //depot/projects/fdt/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/fdt/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/fdt/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/fdt/lib/libelf/elf.3#2 integrate .. //depot/projects/fdt/lib/libopie/Makefile#3 integrate .. //depot/projects/fdt/lib/libopie/config.h#2 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_lastlog/pam_lastlog.c#4 integrate .. //depot/projects/fdt/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/fdt/lib/libstand/dosfs.c#2 integrate .. //depot/projects/fdt/lib/libulog/Makefile#4 integrate .. //depot/projects/fdt/lib/libulog/Symbol.map#3 integrate .. //depot/projects/fdt/lib/libulog/ulog.h#4 integrate .. //depot/projects/fdt/lib/libulog/ulog_getutxent.3#3 delete .. //depot/projects/fdt/lib/libulog/ulog_getutxent.c#4 delete .. //depot/projects/fdt/lib/libulog/ulog_internal.h#3 delete .. //depot/projects/fdt/lib/libulog/ulog_login.3#3 integrate .. //depot/projects/fdt/lib/libulog/ulog_login.c#3 integrate .. //depot/projects/fdt/lib/libulog/ulog_login_pseudo.c#2 integrate .. //depot/projects/fdt/lib/libulog/ulog_pututxline.c#3 delete .. //depot/projects/fdt/lib/libulog/ulog_setutxfile.3#3 delete .. //depot/projects/fdt/lib/libulog/ulog_util.c#2 delete .. //depot/projects/fdt/lib/libulog/utempter.c#2 integrate .. //depot/projects/fdt/lib/libulog/utempter_add_record.3#2 integrate .. //depot/projects/fdt/lib/libusb/libusb20.c#4 integrate .. //depot/projects/fdt/lib/libutil/Makefile#3 integrate .. //depot/projects/fdt/lib/libutil/libutil.h#3 integrate .. //depot/projects/fdt/lib/libutil/login.3#2 delete .. //depot/projects/fdt/lib/libutil/login.c#2 delete .. //depot/projects/fdt/lib/libutil/logout.3#2 delete .. //depot/projects/fdt/lib/libutil/logout.c#2 delete .. //depot/projects/fdt/lib/libutil/logwtmp.3#2 delete .. //depot/projects/fdt/lib/libutil/logwtmp.c#2 delete .. //depot/projects/fdt/libexec/comsat/comsat.c#3 integrate .. //depot/projects/fdt/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/fdt/libexec/ftpd/logwtmp.c#2 integrate .. //depot/projects/fdt/libexec/getty/ttys.5#2 integrate .. //depot/projects/fdt/libexec/rlogind/rlogind.c#2 integrate .. //depot/projects/fdt/libexec/rpc.rusersd/Makefile#3 integrate .. //depot/projects/fdt/libexec/rpc.rusersd/rusers_proc.c#3 integrate .. //depot/projects/fdt/libexec/talkd/Makefile#3 integrate .. //depot/projects/fdt/libexec/talkd/process.c#3 integrate .. //depot/projects/fdt/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/fdt/sbin/ifconfig/af_inet.c#2 integrate .. //depot/projects/fdt/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/fdt/sbin/init/Makefile#3 integrate .. //depot/projects/fdt/sbin/init/init.c#3 integrate .. //depot/projects/fdt/sbin/reboot/Makefile#3 integrate .. //depot/projects/fdt/sbin/reboot/reboot.c#5 integrate .. //depot/projects/fdt/sbin/setkey/setkey.8#2 integrate .. //depot/projects/fdt/share/man/man3/pthread_affinity_np.3#2 integrate .. //depot/projects/fdt/share/man/man3/pthread_attr_affinity_np.3#2 integrate .. //depot/projects/fdt/share/man/man4/Makefile#6 integrate .. //depot/projects/fdt/share/man/man4/acpi.4#2 integrate .. //depot/projects/fdt/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/fdt/share/man/man4/ath.4#2 integrate .. //depot/projects/fdt/share/man/man4/aue.4#2 integrate .. //depot/projects/fdt/share/man/man4/axe.4#2 integrate .. //depot/projects/fdt/share/man/man4/cdce.4#2 integrate .. //depot/projects/fdt/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/fdt/share/man/man4/dc.4#2 integrate .. //depot/projects/fdt/share/man/man4/gif.4#2 integrate .. //depot/projects/fdt/share/man/man4/hme.4#2 integrate .. //depot/projects/fdt/share/man/man4/ipwfw.4#1 branch .. //depot/projects/fdt/share/man/man4/iwifw.4#1 branch .. //depot/projects/fdt/share/man/man4/lge.4#2 integrate .. //depot/projects/fdt/share/man/man4/mac.4#2 integrate .. //depot/projects/fdt/share/man/man4/man4.i386/vpd.4#2 integrate .. //depot/projects/fdt/share/man/man4/man4.sparc64/ebus.4#2 integrate .. //depot/projects/fdt/share/man/man4/mpt.4#2 integrate .. //depot/projects/fdt/share/man/man4/ndis.4#2 integrate .. //depot/projects/fdt/share/man/man4/nge.4#2 integrate .. //depot/projects/fdt/share/man/man4/pcm.4#2 integrate .. //depot/projects/fdt/share/man/man4/pcn.4#2 integrate .. //depot/projects/fdt/share/man/man4/psm.4#3 integrate .. //depot/projects/fdt/share/man/man4/pts.4#2 integrate .. //depot/projects/fdt/share/man/man4/ral.4#2 integrate .. //depot/projects/fdt/share/man/man4/re.4#2 integrate .. //depot/projects/fdt/share/man/man4/rl.4#2 integrate .. //depot/projects/fdt/share/man/man4/rue.4#2 integrate .. //depot/projects/fdt/share/man/man4/rum.4#2 integrate .. //depot/projects/fdt/share/man/man4/sf.4#2 integrate .. //depot/projects/fdt/share/man/man4/siba.4#1 branch .. //depot/projects/fdt/share/man/man4/sis.4#2 integrate .. //depot/projects/fdt/share/man/man4/sk.4#2 integrate .. //depot/projects/fdt/share/man/man4/smbus.4#2 integrate .. //depot/projects/fdt/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/fdt/share/man/man4/snd_uaudio.4#2 integrate .. //depot/projects/fdt/share/man/man4/ste.4#3 integrate .. //depot/projects/fdt/share/man/man4/targ.4#2 integrate .. //depot/projects/fdt/share/man/man4/udav.4#2 integrate .. //depot/projects/fdt/share/man/man4/uhso.4#1 branch .. //depot/projects/fdt/share/man/man4/ural.4#2 integrate .. //depot/projects/fdt/share/man/man4/urio.4#2 integrate .. //depot/projects/fdt/share/man/man4/urtw.4#2 integrate .. //depot/projects/fdt/share/man/man4/vge.4#3 integrate .. //depot/projects/fdt/share/man/man4/vr.4#2 integrate .. //depot/projects/fdt/share/man/man4/wi.4#3 integrate .. //depot/projects/fdt/share/man/man4/wlan.4#2 integrate .. //depot/projects/fdt/share/man/man5/Makefile#2 integrate .. //depot/projects/fdt/share/man/man5/devfs.rules.5#2 integrate .. //depot/projects/fdt/share/man/man5/utmp.5#2 delete .. //depot/projects/fdt/share/man/man7/release.7#2 integrate .. //depot/projects/fdt/share/man/man9/Makefile#3 integrate .. //depot/projects/fdt/share/man/man9/ifnet.9#3 integrate .. //depot/projects/fdt/share/man/man9/mac.9#2 integrate .. //depot/projects/fdt/share/man/man9/namei.9#2 integrate .. //depot/projects/fdt/share/man/man9/pci.9#2 integrate .. //depot/projects/fdt/share/termcap/termcap.src#3 integrate .. //depot/projects/fdt/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/fdt/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/fdt/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/fdt/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/fdt/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/fdt/sys/amd64/include/iodev.h#2 integrate .. //depot/projects/fdt/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/fdt/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/fdt/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/fdt/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/fdt/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/fdt/sys/boot/efi/libefi/efifs.c#2 delete .. //depot/projects/fdt/sys/boot/efi/libefi/efipart.c#1 branch .. //depot/projects/fdt/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/fdt/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/fdt/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/fdt/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/fdt/sys/cam/ata/ata_xpt.c#6 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/fdt/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/fdt/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/fdt/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/fdt/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/fdt/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/fdt/sys/conf/Makefile.mips#2 integrate .. //depot/projects/fdt/sys/conf/NOTES#8 integrate .. //depot/projects/fdt/sys/conf/files#9 integrate .. //depot/projects/fdt/sys/conf/files.ia64#4 integrate .. //depot/projects/fdt/sys/conf/files.mips#2 integrate .. //depot/projects/fdt/sys/conf/files.sparc64#2 integrate .. //depot/projects/fdt/sys/conf/ldscript.mips#2 integrate .. //depot/projects/fdt/sys/conf/ldscript.mips.mips64#1 branch .. //depot/projects/fdt/sys/conf/ldscript.mips.octeon1.32#1 branch .. //depot/projects/fdt/sys/conf/ldscript.mips.octeon1.64#1 branch .. //depot/projects/fdt/sys/conf/ldscript.mips.octeon1.n32#1 branch .. //depot/projects/fdt/sys/conf/options.i386#2 integrate .. //depot/projects/fdt/sys/conf/options.mips#2 integrate .. //depot/projects/fdt/sys/dev/ae/if_ae.c#3 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.c#7 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-ati.c#3 integrate .. //depot/projects/fdt/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/fdt/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/fdt/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/fdt/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/fdt/sys/dev/cfe/cfe_api.c#2 integrate .. //depot/projects/fdt/sys/dev/cfe/cfe_env.c#1 branch .. //depot/projects/fdt/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/fdt/sys/dev/flash/mx25l.c#1 branch .. //depot/projects/fdt/sys/dev/flash/mx25lreg.h#1 branch .. //depot/projects/fdt/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/fdt/sys/dev/io/iodev.c#2 integrate .. //depot/projects/fdt/sys/dev/isp/isp.c#4 integrate .. //depot/projects/fdt/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/fdt/sys/dev/mii/miidevs#3 integrate .. //depot/projects/fdt/sys/dev/mly/mly.c#3 integrate .. //depot/projects/fdt/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/fdt/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/fdt/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/fdt/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/fdt/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/fdt/sys/dev/siba/siba_cc.c#1 branch .. //depot/projects/fdt/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/fdt/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/fdt/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/fdt/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/fdt/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/fdt/sys/dev/sound/pcm/sndstat.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/net/uhso.c#1 branch .. //depot/projects/fdt/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/fdt/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/fdt/sys/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_dinode.h#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_dir.h#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/ext2fs.h#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/fs.h#1 branch .. //depot/projects/fdt/sys/fs/ext2fs/inode.h#1 branch .. //depot/projects/fdt/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/fdt/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/fdt/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/fdt/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_alloc.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_balloc.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_bitops.h#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_bmap.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_extern.h#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_fs.h#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_inode.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#3 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_lookup.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_mount.h#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_readwrite.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_subr.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_vnops.c#3 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/fs.h#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/i386-bitops.h#2 delete .. //depot/projects/fdt/sys/gnu/fs/ext2fs/inode.h#2 delete .. //depot/projects/fdt/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/fdt/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/fdt/sys/i386/i386/io.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/locore.s#3 integrate .. //depot/projects/fdt/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/fdt/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/fdt/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/fdt/sys/i386/include/iodev.h#2 integrate .. //depot/projects/fdt/sys/i386/isa/clock.c#2 integrate .. //depot/projects/fdt/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/fdt/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/fdt/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/fdt/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/fdt/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/iodev_machdep.c#1 branch .. //depot/projects/fdt/sys/ia64/ia64/sys_machdep.c#3 integrate .. //depot/projects/fdt/sys/ia64/include/efi.h#2 integrate .. //depot/projects/fdt/sys/ia64/include/iodev.h#1 branch .. //depot/projects/fdt/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/fdt/sys/kern/kern_environment.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_jail.c#6 integrate .. //depot/projects/fdt/sys/kern/kern_mib.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_prot.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/fdt/sys/kern/subr_param.c#2 integrate .. //depot/projects/fdt/sys/kern/tty_pts.c#3 integrate .. //depot/projects/fdt/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/fdt/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/adm5120/files.adm5120#2 integrate .. //depot/projects/fdt/sys/mips/adm5120/if_admsw.c#5 integrate .. //depot/projects/fdt/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/fdt/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/fdt/sys/mips/alchemy/alchemy_machdep.c#1 branch .. //depot/projects/fdt/sys/mips/alchemy/aureg.h#1 branch .. //depot/projects/fdt/sys/mips/alchemy/files.alchemy#1 branch .. //depot/projects/fdt/sys/mips/alchemy/obio.c#1 branch .. //depot/projects/fdt/sys/mips/alchemy/std.alchemy#1 branch .. //depot/projects/fdt/sys/mips/alchemy/uart_bus_alchemy.c#1 branch .. //depot/projects/fdt/sys/mips/alchemy/uart_cpu_alchemy.c#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_fpa.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_ipd.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_pko.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/files.octeon1#2 integrate .. //depot/projects/fdt/sys/mips/cavium/obio.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/octeon_ebt3000_cf.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/octeon_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/std.octeon1#2 integrate .. //depot/projects/fdt/sys/mips/cavium/uart_bus_octeonusart.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/uart_cpu_octeonusart.c#2 integrate .. //depot/projects/fdt/sys/mips/cavium/uart_dev_oct16550.c#2 integrate .. //depot/projects/fdt/sys/mips/conf/ALCHEMY#1 branch .. //depot/projects/fdt/sys/mips/conf/AR71XX#2 integrate .. //depot/projects/fdt/sys/mips/conf/MALTA#2 integrate .. //depot/projects/fdt/sys/mips/conf/MALTA64#2 integrate .. //depot/projects/fdt/sys/mips/conf/OCTEON1#2 integrate .. //depot/projects/fdt/sys/mips/conf/OCTEON1-32#2 integrate .. //depot/projects/fdt/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/fdt/sys/mips/conf/SWARM#2 integrate .. //depot/projects/fdt/sys/mips/idt/files.idt#2 integrate .. //depot/projects/fdt/sys/mips/idt/idt_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/idt/obio.c#2 integrate .. //depot/projects/fdt/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/fdt/sys/mips/idt/uart_cpu_rc32434.c#2 integrate .. //depot/projects/fdt/sys/mips/include/_align.h#2 integrate .. //depot/projects/fdt/sys/mips/include/_bus.h#2 integrate .. //depot/projects/fdt/sys/mips/include/_types.h#2 integrate .. //depot/projects/fdt/sys/mips/include/asm.h#2 integrate .. //depot/projects/fdt/sys/mips/include/atomic.h#2 integrate .. //depot/projects/fdt/sys/mips/include/bus.h#2 integrate .. //depot/projects/fdt/sys/mips/include/bus_octeon.h#2 delete .. //depot/projects/fdt/sys/mips/include/cache.h#2 integrate .. //depot/projects/fdt/sys/mips/include/cache_mipsNN.h#2 integrate .. //depot/projects/fdt/sys/mips/include/cdefs.h#1 branch .. //depot/projects/fdt/sys/mips/include/cpu.h#2 integrate .. //depot/projects/fdt/sys/mips/include/cpufunc.h#2 integrate .. //depot/projects/fdt/sys/mips/include/cpuinfo.h#2 integrate .. //depot/projects/fdt/sys/mips/include/cpuregs.h#2 integrate .. //depot/projects/fdt/sys/mips/include/db_machdep.h#2 integrate .. //depot/projects/fdt/sys/mips/include/elf.h#2 integrate .. //depot/projects/fdt/sys/mips/include/endian.h#2 integrate .. //depot/projects/fdt/sys/mips/include/float.h#2 integrate .. //depot/projects/fdt/sys/mips/include/fls64.h#1 branch .. //depot/projects/fdt/sys/mips/include/hwfunc.h#2 integrate .. //depot/projects/fdt/sys/mips/include/intr.h#2 delete .. //depot/projects/fdt/sys/mips/include/intr_machdep.h#2 integrate .. //depot/projects/fdt/sys/mips/include/kdb.h#2 integrate .. //depot/projects/fdt/sys/mips/include/locore.h#2 integrate .. //depot/projects/fdt/sys/mips/include/md_var.h#2 integrate .. //depot/projects/fdt/sys/mips/include/param.h#2 integrate .. //depot/projects/fdt/sys/mips/include/pcb.h#3 integrate .. //depot/projects/fdt/sys/mips/include/pltfm.h#2 delete .. //depot/projects/fdt/sys/mips/include/pmap.h#2 integrate .. //depot/projects/fdt/sys/mips/include/proc.h#2 integrate .. //depot/projects/fdt/sys/mips/include/profile.h#2 integrate .. //depot/projects/fdt/sys/mips/include/psl.h#2 integrate .. //depot/projects/fdt/sys/mips/include/pte.h#2 integrate .. //depot/projects/fdt/sys/mips/include/regdef.h#2 integrate .. //depot/projects/fdt/sys/mips/include/regnum.h#2 integrate .. //depot/projects/fdt/sys/mips/include/trap.h#2 integrate .. //depot/projects/fdt/sys/mips/include/ucontext.h#2 integrate .. //depot/projects/fdt/sys/mips/malta/files.malta#2 integrate .. //depot/projects/fdt/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/fdt/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/malta/maltareg.h#2 integrate .. //depot/projects/fdt/sys/mips/malta/obio.c#2 integrate .. //depot/projects/fdt/sys/mips/malta/std.malta#2 integrate .. //depot/projects/fdt/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/fdt/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/fdt/sys/mips/malta/yamon.h#2 integrate .. //depot/projects/fdt/sys/mips/mips/bus_space_generic.c#1 branch .. //depot/projects/fdt/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/cache.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/cache_mipsNN.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/fdt/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/db_trace.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/elf_trampoline.c#1 branch .. //depot/projects/fdt/sys/mips/mips/exception.S#2 integrate .. //depot/projects/fdt/sys/mips/mips/fp.S#2 integrate .. //depot/projects/fdt/sys/mips/mips/gdb_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/genassym.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/inckern.S#1 branch .. //depot/projects/fdt/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/locore.S#2 integrate .. //depot/projects/fdt/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/mainbus.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/mem.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/pm_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/psraccess.S#2 integrate .. //depot/projects/fdt/sys/mips/mips/ptrace_machdep.c#1 branch .. //depot/projects/fdt/sys/mips/mips/support.S#2 integrate .. //depot/projects/fdt/sys/mips/mips/swtch.S#2 integrate .. //depot/projects/fdt/sys/mips/mips/sys_machdep.c#1 branch .. //depot/projects/fdt/sys/mips/mips/tick.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/tlb.S#2 integrate .. //depot/projects/fdt/sys/mips/mips/trap.c#4 integrate .. //depot/projects/fdt/sys/mips/mips/vm_machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/rmi/dev/sec/desc.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/dev/sec/rmilib.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/dev/sec/rmilib.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/dev/sec/rmisec.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/dev/sec/stats.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/dev/xlr/atx_cpld.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/dev/xlr/rge.c#1 branch .. //depot/projects/fdt/sys/mips/rmi/dev/xlr/rge.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/dev/xlr/xgmac_mdio.h#1 branch .. //depot/projects/fdt/sys/mips/rmi/ehcireg.h#2 integrate .. //depot/projects/fdt/sys/mips/rmi/ehcivar.h#2 integrate .. //depot/projects/fdt/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/fdt/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/pcibus.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/pcibus.h#2 integrate .. //depot/projects/fdt/sys/mips/rmi/uart_bus_xlr_iodi.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/xlr_i2c.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/xls_ehci.c#2 integrate .. //depot/projects/fdt/sys/mips/sentry5/files.sentry5#2 integrate .. //depot/projects/fdt/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/fdt/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/sentry5/siba_cc.c#2 delete .. //depot/projects/fdt/sys/mips/sentry5/siba_mips.c#2 delete .. //depot/projects/fdt/sys/mips/sentry5/siba_sdram.c#2 delete .. //depot/projects/fdt/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/fdt/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/fdt/sys/mips/sibyte/sb_zbbus.c#2 integrate .. //depot/projects/fdt/sys/mips/sibyte/sb_zbpci.c#2 integrate .. //depot/projects/fdt/sys/modules/Makefile#3 integrate .. //depot/projects/fdt/sys/modules/epic/Makefile#1 branch .. //depot/projects/fdt/sys/modules/ext2fs/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/usb/Makefile#3 integrate .. //depot/projects/fdt/sys/modules/usb/uhso/Makefile#1 branch .. //depot/projects/fdt/sys/net/if_epair.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/fdt/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/fdt/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/fdt/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/fdt/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/fdt/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/fdt/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/fdt/sys/sparc64/ebus/epic.c#1 branch .. //depot/projects/fdt/sys/sparc64/pci/fire.c#2 integrate .. //depot/projects/fdt/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/fdt/sys/sys/param.h#8 integrate .. //depot/projects/fdt/sys/sys/socket.h#2 integrate .. //depot/projects/fdt/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/fdt/sys/sys/systm.h#2 integrate .. //depot/projects/fdt/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/fdt/sys/ufs/ffs/fs.h#3 integrate .. //depot/projects/fdt/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/fdt/tools/tools/ath/athdecode/main.c#2 integrate .. //depot/projects/fdt/usr.bin/Makefile#3 integrate .. //depot/projects/fdt/usr.bin/awk/Makefile#3 integrate .. //depot/projects/fdt/usr.bin/awk/b.c.diff#2 delete .. //depot/projects/fdt/usr.bin/awk/main.c.diff#2 delete .. //depot/projects/fdt/usr.bin/awk/run.c.diff#2 delete .. //depot/projects/fdt/usr.bin/brandelf/brandelf.1#2 integrate .. //depot/projects/fdt/usr.bin/chpass/chpass.1#2 integrate .. //depot/projects/fdt/usr.bin/elfdump/elfdump.1#2 integrate .. //depot/projects/fdt/usr.bin/finger/Makefile#3 integrate .. //depot/projects/fdt/usr.bin/finger/finger.c#3 integrate .. //depot/projects/fdt/usr.bin/finger/lprint.c#4 integrate .. //depot/projects/fdt/usr.bin/finger/net.c#4 integrate .. //depot/projects/fdt/usr.bin/finger/sprint.c#3 integrate .. //depot/projects/fdt/usr.bin/finger/util.c#4 integrate .. //depot/projects/fdt/usr.bin/getent/getent.1#2 integrate .. //depot/projects/fdt/usr.bin/getent/getent.c#2 integrate .. //depot/projects/fdt/usr.bin/last/last.c#2 integrate .. //depot/projects/fdt/usr.bin/lastcomm/lastcomm.c#3 integrate .. //depot/projects/fdt/usr.bin/make/job.c#4 integrate .. //depot/projects/fdt/usr.bin/netstat/if.c#5 integrate .. //depot/projects/fdt/usr.bin/netstat/main.c#4 integrate .. //depot/projects/fdt/usr.bin/netstat/netstat.1#3 integrate .. //depot/projects/fdt/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/fdt/usr.bin/systat/Makefile#5 integrate .. //depot/projects/fdt/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/fdt/usr.bin/users/Makefile#5 integrate .. //depot/projects/fdt/usr.bin/users/users.c#4 integrate .. //depot/projects/fdt/usr.bin/w/Makefile#5 integrate .. //depot/projects/fdt/usr.bin/w/w.c#5 integrate .. //depot/projects/fdt/usr.bin/wall/Makefile#4 integrate .. //depot/projects/fdt/usr.bin/wall/wall.c#4 integrate .. //depot/projects/fdt/usr.bin/who/Makefile#4 integrate .. //depot/projects/fdt/usr.bin/who/who.c#4 integrate .. //depot/projects/fdt/usr.bin/whois/whois.1#2 integrate .. //depot/projects/fdt/usr.bin/whois/whois.c#2 integrate .. //depot/projects/fdt/usr.bin/write/Makefile#4 integrate .. //depot/projects/fdt/usr.bin/write/write.c#3 integrate .. //depot/projects/fdt/usr.bin/wtmpcvt/Makefile#1 branch .. //depot/projects/fdt/usr.bin/wtmpcvt/wtmpcvt.1#1 branch .. //depot/projects/fdt/usr.bin/wtmpcvt/wtmpcvt.c#1 branch .. //depot/projects/fdt/usr.sbin/Makefile#4 integrate .. //depot/projects/fdt/usr.sbin/ac/ac.c#2 integrate .. //depot/projects/fdt/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#3 integrate .. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#3 integrate .. //depot/projects/fdt/usr.sbin/faithd/faithd.8#3 integrate .. //depot/projects/fdt/usr.sbin/lastlogin/Makefile#4 integrate .. //depot/projects/fdt/usr.sbin/lastlogin/lastlogin.c#4 integrate .. //depot/projects/fdt/usr.sbin/mergemaster/mergemaster.8#4 integrate .. //depot/projects/fdt/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/fdt/usr.sbin/ppp/id.c#2 integrate .. //depot/projects/fdt/usr.sbin/ppp/id.h#2 integrate .. //depot/projects/fdt/usr.sbin/ppp/physical.c#2 integrate .. //depot/projects/fdt/usr.sbin/ppp/physical.h#2 integrate .. //depot/projects/fdt/usr.sbin/rwhod/Makefile#3 integrate .. //depot/projects/fdt/usr.sbin/rwhod/rwhod.c#3 integrate .. //depot/projects/fdt/usr.sbin/smbmsg/smbmsg.8#2 integrate .. //depot/projects/fdt/usr.sbin/syslogd/Makefile#3 integrate .. //depot/projects/fdt/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/fdt/usr.sbin/timed/timed/master.c#2 integrate .. //depot/projects/fdt/usr.sbin/timed/timed/slave.c#2 integrate .. //depot/projects/fdt/usr.sbin/uhsoctl/Makefile#1 branch .. //depot/projects/fdt/usr.sbin/uhsoctl/uhsoctl.1#1 branch .. //depot/projects/fdt/usr.sbin/uhsoctl/uhsoctl.c#1 branch .. //depot/projects/fdt/usr.sbin/usbconfig/usbconfig.c#3 integrate Differences ... ==== //depot/projects/fdt/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.359 2010/01/08 19:01:50 bz Exp $ +# $FreeBSD: src/Makefile,v 1.361 2010/01/11 17:58:15 bz Exp $ # # The user-driven targets are: # @@ -321,8 +321,9 @@ @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs -BUILD_ARCH!= uname -p -TARGET?= ${BUILD_ARCH} +.if !defined(TARGET) +TARGET!= uname -m +.endif KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/conf && \ find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name NOTES ==== //depot/projects/fdt/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.636 2009/12/31 00:07:26 ed Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.637 2010/01/14 23:27:23 jilles Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1271,7 +1271,7 @@ fi; \ done # Remove catpages without corresponding manpages. - @3<&0; \ + @exec 3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ while read catpage; do \ ==== //depot/projects/fdt/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.218 2010/01/05 02:37:59 davidxu Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.222 2010/01/14 05:35:32 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,23 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100114: removal of ttyslot(3) +OLD_FILES+=usr/share/man/man3/ttyslot.3.gz +# 20100113: remove utmp.h, replace it by utmpx.h +OLD_FILES+=usr/share/man/man3/login.3.gz +OLD_FILES+=usr/share/man/man3/logout.3.gz +OLD_FILES+=usr/share/man/man3/logwtmp.3.gz +OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz +OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz +OLD_FILES+=usr/share/man/man5/lastlog.5.gz +OLD_FILES+=usr/share/man/man5/utmp.5.gz +OLD_FILES+=usr/share/man/man5/wtmp.5.gz +OLD_LIBS+=lib/libutil.so.8 # 20100105: new userland semaphore implementation OLD_FILES+=usr/include/sys/semaphore.h # 20100103: ntptrace(8) removed ==== //depot/projects/fdt/UPDATING#7 (text+ko) ==== @@ -22,6 +22,25 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100113: + The utmp user accounting database has been replaced with utmpx, + the user accounting interface standardized by POSIX. + Unfortunately the semantics of utmp and utmpx don't match, + making it practically impossible to support both interfaces. + The user accounting database is used by tools like finger(1), + last(1), talk(1), w(1) and ac(8). + + All applications in the base system use utmpx. This means only + local binaries (e.g. from the ports tree) may still use these + utmp database files. These applications must be rebuilt to make + use of utmpx. + + After the system has been upgraded, it is safe to remove the old + log files (/var/run/utmp, /var/log/lastlog and /var/log/wtmp*), + assuming their contents is of no importance anymore. Old wtmp + databases can only be used by last(1) and ac(8) after they have + been converted to the new format using wtmpcvt(1). + 20100108: Introduce the kernel thread "deadlock resolver" (which can be enabled via the DEADLKRES option, see NOTES for more details) and the @@ -1094,4 +1113,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.651 2010/01/09 01:46:38 attilio Exp $ +$FreeBSD: src/UPDATING,v 1.653 2010/01/14 20:58:45 ed Exp $ ==== //depot/projects/fdt/bin/csh/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.15 2007/05/16 21:22:38 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.16 2010/01/13 17:49:35 ed Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -54,7 +54,7 @@ #define HAVE_GETPWENT 1 /* Define to 1 if you have the `getutent' function. */ -/* #undef HAVE_GETUTENT */ +#define HAVE_GETUTENT 1 /* Define if you have the iconv() function. */ /* #undef HAVE_ICONV */ @@ -130,10 +130,10 @@ #define HAVE_STRUCT_UTMP_UT_HOST 1 /* Define to 1 if `ut_tv' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_TV */ +#define HAVE_STRUCT_UTMP_UT_TV 1 /* Define to 1 if `ut_user' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_USER */ +#define HAVE_STRUCT_UTMP_UT_USER 1 /* Define to 1 if `ut_xtime' is member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_XTIME */ @@ -159,10 +159,10 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_UTMPX_H */ +#define HAVE_UTMPX_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_UTMP_H 1 +/* #undef HAVE_UTMP_H */ /* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 ==== //depot/projects/fdt/bin/csh/config_p.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config_p.h,v 1.14 2007/05/16 21:22:38 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config_p.h,v 1.15 2010/01/13 17:49:35 ed Exp $ */ /* * config.h -- configure various defines for tcsh * @@ -85,6 +85,7 @@ /* Use LC_MESSAGES locale category to open the message catalog */ #define MCLoadBySet NL_CAT_LOCALE #define BUFSIZE 8192 +#define UTMPX_FILE "/var/run/utx.active" #endif #if defined(__bsdi__) ==== //depot/projects/fdt/bin/date/Makefile#3 (text+ko) ==== @@ -1,9 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/date/Makefile,v 1.12 2009/12/05 20:09:50 ed Exp $ +# $FreeBSD: src/bin/date/Makefile,v 1.13 2010/01/13 17:56:54 ed Exp $ PROG= date SRCS= date.c netdate.c vary.c -DPADD= ${LIBULOG} -LDADD= -lulog .include ==== //depot/projects/fdt/bin/date/date.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.49 2009/12/05 20:09:50 ed Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.50 2010/01/13 17:56:54 ed Exp $"); #include #include @@ -52,9 +52,8 @@ #include #include #include -#define _ULOG_POSIX_NAMES -#include #include +#include #include "extern.h" #include "vary.h" ==== //depot/projects/fdt/bin/pax/gen_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.24 2010/01/13 17:56:54 ed Exp $"); #include #include @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -66,10 +65,6 @@ #define OLDFRMTM "%b %e %Y" #define CURFRMTD "%e %b %H:%M" #define OLDFRMTD "%e %b %Y" -#ifndef UT_NAMESIZE -#define UT_NAMESIZE 8 -#endif -#define UT_GRPSIZE 6 static int d_first = -1; @@ -116,9 +111,8 @@ */ if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0) f_date[0] = '\0'; - (void)fprintf(fp, "%s%2u %-*s %-*s ", f_mode, sbp->st_nlink, - UT_NAMESIZE, name_uid(sbp->st_uid, 1), UT_GRPSIZE, - name_gid(sbp->st_gid, 1)); + (void)fprintf(fp, "%s%2u %-12s %-12s ", f_mode, sbp->st_nlink, + name_uid(sbp->st_uid, 1), name_gid(sbp->st_gid, 1)); /* * print device id's for devices, or sizes for other nodes ==== //depot/projects/fdt/contrib/groff/font/devutf8/R.proto#2 (text+ko) ==== @@ -726,7 +726,7 @@ product 24 0 0x220F coproduct 24 0 0x2210 sum 24 0 0x2211 -\- 24 0 0x002D +\- 24 0 0x2212 mi " -+ 24 0 0x2213 ** 24 0 0x2217 ==== //depot/projects/fdt/contrib/groff/tmac/an-old.tmac#2 (text+ko) ==== @@ -630,6 +630,18 @@ . hy \n[HY] .\} . +.\" For UTF-8, map some characters conservatively for the sake +.\" of easy cut and paste. +. +.if '\*[.T]'utf8' \{\ +. rchar \- - ' ` +. +. char \- \N'45' +. char - \N'45' +. char ' \N'39' +. char ` \N'96' +.\} +. .\" Load local modifications. .mso man.local . ==== //depot/projects/fdt/contrib/groff/tmac/doc-common#2 (text+ko) ==== @@ -46,6 +46,7 @@ .nr %Q 1 .nr %R 1 .nr %T 1 +.nr %U 1 .nr %V 1 .nr Ac 3 .nr Ad 12n @@ -77,6 +78,7 @@ .nr Dq 12n .nr Ds 6n\" many manpages still use this as a -width value .nr Dv 12n +.nr Dx 1 .nr Ec 3 .nr Ef 8n\" ? .nr Ek 8n\" ? @@ -219,6 +221,7 @@ .\" NS doc-document-title .\" NS doc-section .\" NS doc-volume +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-volume-as-XXX @@ -319,6 +322,7 @@ . ds doc-document-title UNTITLED . ds doc-volume LOCAL . ds doc-section Null +. ds doc-command-name . . if !"\$1"" \ . ds doc-document-title "\$1 @@ -357,6 +361,12 @@ . if !"\$3"" \ . if "\*[doc-volume]"LOCAL" \ . ds doc-volume \$3 +. +. if !\n[cR] \ +. if \n[nl] \{\ + . doc-setup-header +. bp +. \} .. . . @@ -379,6 +389,7 @@ .\" NS .\" NS modifies: .\" NS doc-operating-system +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-operating-system-XXX-XXX @@ -435,9 +446,14 @@ .ds doc-operating-system-NetBSD-2.0 2.0 .ds doc-operating-system-NetBSD-2.0.1 2.0.1 .ds doc-operating-system-NetBSD-2.0.2 2.0.2 +.ds doc-operating-system-NetBSD-2.0.3 2.0.3 .ds doc-operating-system-NetBSD-2.1 2.1 .ds doc-operating-system-NetBSD-3.0 3.0 +.ds doc-operating-system-NetBSD-3.0.1 3.0.1 +.ds doc-operating-system-NetBSD-3.0.2 3.0.2 +.ds doc-operating-system-NetBSD-3.1 3.1 .ds doc-operating-system-NetBSD-4.0 4.0 +.ds doc-operating-system-NetBSD-4.0.1 4.0.1 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -486,23 +502,48 @@ .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.2 6.2 +.ds doc-operating-system-FreeBSD-6.3 6.3 +.ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.0 7.0 +.ds doc-operating-system-FreeBSD-7.1 7.1 . -.ds doc-operating-system-Darwin-8.0.0 8.0.0 -.ds doc-operating-system-Darwin-8.1.0 8.1.0 -.ds doc-operating-system-Darwin-8.2.0 8.2.0 -.ds doc-operating-system-Darwin-8.3.0 8.3.0 -.ds doc-operating-system-Darwin-8.4.0 8.4.0 -.ds doc-operating-system-Darwin-8.5.0 8.5.0 +.ds doc-operating-system-Darwin-8.0.0 8.0.0 +.ds doc-operating-system-Darwin-8.1.0 8.1.0 +.ds doc-operating-system-Darwin-8.2.0 8.2.0 +.ds doc-operating-system-Darwin-8.3.0 8.3.0 +.ds doc-operating-system-Darwin-8.4.0 8.4.0 +.ds doc-operating-system-Darwin-8.5.0 8.5.0 +.ds doc-operating-system-Darwin-8.6.0 8.6.0 +.ds doc-operating-system-Darwin-8.7.0 8.7.0 +.ds doc-operating-system-Darwin-8.8.0 8.8.0 +.ds doc-operating-system-Darwin-8.9.0 8.9.0 +.ds doc-operating-system-Darwin-8.10.0 8.10.0 +.ds doc-operating-system-Darwin-8.11.0 8.11.0 +.ds doc-operating-system-Darwin-9.0.0 9.0.0 +.ds doc-operating-system-Darwin-9.1.0 9.1.0 +.ds doc-operating-system-Darwin-9.2.0 9.2.0 +.ds doc-operating-system-Darwin-9.3.0 9.3.0 +.ds doc-operating-system-Darwin-9.4.0 9.4.0 +.ds doc-operating-system-Darwin-9.5.0 9.5.0 +.ds doc-operating-system-Darwin-9.6.0 9.6.0 . -.ds doc-operating-system-DragonFly-1.0 1.0 -.ds doc-operating-system-DragonFly-1.1 1.1 -.ds doc-operating-system-DragonFly-1.2 1.2 -.ds doc-operating-system-DragonFly-1.3 1.3 -.ds doc-operating-system-DragonFly-1.4 1.4 -.ds doc-operating-system-DragonFly-1.5 1.5 +.ds doc-operating-system-DragonFly-1.0 1.0 +.ds doc-operating-system-DragonFly-1.1 1.1 +.ds doc-operating-system-DragonFly-1.2 1.2 +.ds doc-operating-system-DragonFly-1.3 1.3 +.ds doc-operating-system-DragonFly-1.4 1.4 +.ds doc-operating-system-DragonFly-1.5 1.5 +.ds doc-operating-system-DragonFly-1.6 1.6 +.ds doc-operating-system-DragonFly-1.8 1.8 +.ds doc-operating-system-DragonFly-1.8.1 1.8.1 +.ds doc-operating-system-DragonFly-1.10 1.10 +.ds doc-operating-system-DragonFly-1.12 1.12 +.ds doc-operating-system-DragonFly-1.12.2 1.12.2 +.ds doc-operating-system-DragonFly-2.0 2.0 . .de Os +. ds doc-command-name +. . ie "\$1"" \ . ds doc-operating-system "\*[doc-default-operating-system] . el \{ .ie "\$1"ATT" \{\ @@ -563,6 +604,7 @@ .\" NS .\" NS modifies: .\" NS doc-date-string +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-date-XXX @@ -583,6 +625,8 @@ .ds doc-date-12 December . .de Dd +. ds doc-command-name +. . ie \n[.$] \{\ . ie (\n[.$] == 3) \ . ds doc-date-string \$1\~\$2 \$3 @@ -1128,6 +1172,8 @@ . tm doc-reference-title-count == \n[doc-reference-title-count] >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 16 11:43:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD0C71065672; Sat, 16 Jan 2010 11:43:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 510691065692 for ; Sat, 16 Jan 2010 11:43:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DD1E8FC08 for ; Sat, 16 Jan 2010 11:43:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0GBhCEA036807 for ; Sat, 16 Jan 2010 11:43:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0GBhCMZ036805 for perforce@freebsd.org; Sat, 16 Jan 2010 11:43:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 16 Jan 2010 11:43:12 GMT Message-Id: <201001161143.o0GBhCMZ036805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2010 11:43:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=173214 Change 173214 by hselasky@hselasky_laptop001 on 2010/01/16 11:42:50 USB input: - try to fix USB keyboard polling during boot when not in KDB. - patch by: HPS PR: kern/141011 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#40 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#40 (text+ko) ==== @@ -174,9 +174,10 @@ #define UKBD_FLAG_APPLE_SWAP 0x0100 #define UKBD_FLAG_TIMER_RUNNING 0x0200 - int32_t sc_mode; /* input mode (K_XLATE,K_RAW,K_CODE) */ - int32_t sc_state; /* shift/lock key state */ - int32_t sc_accents; /* accent key index (> 0) */ + int sc_mode; /* input mode (K_XLATE,K_RAW,K_CODE) */ + int sc_state; /* shift/lock key state */ + int sc_accents; /* accent key index (> 0) */ + int sc_poll_tick_last; uint16_t sc_inputs; uint16_t sc_inputhead; @@ -187,6 +188,7 @@ uint8_t sc_iface_no; uint8_t sc_kbd_id; uint8_t sc_led_id; + uint8_t sc_poll_detected; }; #define KEY_ERROR 0x01 @@ -281,6 +283,7 @@ static int ukbd_enable(keyboard_t *); static int ukbd_disable(keyboard_t *); static void ukbd_interrupt(struct ukbd_softc *); +static int ukbd_is_polling(struct ukbd_softc *sc); static device_probe_t ukbd_probe; static device_attach_t ukbd_attach; @@ -331,8 +334,11 @@ { DPRINTFN(2, "polling\n"); - if (kdb_active == 0) + if (kdb_active == 0) { + /* make sure the USB code gets a chance to run */ + pause("UKBD", 1); return; /* Only poll if KDB is active */ + } while (sc->sc_inputs == 0) { @@ -471,12 +477,11 @@ bcopy(sc->sc_ntime, sc->sc_otime, sizeof(sc->sc_otime)); - if (sc->sc_inputs == 0) { + if (ukbd_is_polling(sc)) goto done; - } - if (sc->sc_flags & UKBD_FLAG_POLLING) { + if (sc->sc_inputs == 0) goto done; - } + if (KBD_IS_ACTIVE(&sc->sc_kbd) && KBD_IS_BUSY(&sc->sc_kbd)) { /* let the callback function process the input */ @@ -499,9 +504,8 @@ mtx_assert(&Giant, MA_OWNED); - if (!(sc->sc_flags & UKBD_FLAG_POLLING)) { - sc->sc_time_ms += 25; /* milliseconds */ - } + sc->sc_time_ms += 25; /* milliseconds */ + ukbd_interrupt(sc); if (ukbd_any_key_pressed(sc)) { @@ -880,10 +884,14 @@ /* ignore if SETIDLE fails, hence it is not crucial */ err = usbd_req_set_idle(sc->sc_udev, NULL, sc->sc_iface_index, 0, 0); + mtx_lock(&Giant); + ukbd_ioctl(kbd, KDSETLED, (caddr_t)&sc->sc_state); KBD_INIT_DONE(kbd); + mtx_unlock(&Giant); + if (kbd_register(kbd) < 0) { goto detach; } @@ -925,9 +933,8 @@ DPRINTF("\n"); - if (sc->sc_flags & UKBD_FLAG_POLLING) { - panic("cannot detach polled keyboard\n"); - } + mtx_lock(&Giant); + sc->sc_flags |= UKBD_FLAG_GONE; usb_callout_stop(&sc->sc_callout); @@ -954,6 +961,8 @@ } sc->sc_kbd.kb_flags = 0; + mtx_unlock(&Giant); + usbd_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER); usb_callout_drain(&sc->sc_callout); @@ -969,8 +978,12 @@ { struct ukbd_softc *sc = device_get_softc(dev); + mtx_lock(&Giant); + ukbd_clear_state(&sc->sc_kbd); + mtx_unlock(&Giant); + return (0); } @@ -1455,7 +1468,8 @@ case K_RAW: case K_CODE: if (sc->sc_mode != *(int *)arg) { - ukbd_clear_state(kbd); + if (ukbd_is_polling(sc) == 0) + ukbd_clear_state(kbd); sc->sc_mode = *(int *)arg; } break; @@ -1598,6 +1612,26 @@ } static int +ukbd_is_polling(struct ukbd_softc *sc) +{ + int delta; + + if (sc->sc_flags & UKBD_FLAG_POLLING) { + sc->sc_poll_tick_last = ticks; + sc->sc_poll_detected = 1; + return (1); /* polling */ + } + + delta = ticks - sc->sc_poll_tick_last; + if ((delta < 0) || (delta >= hz)) { + sc->sc_poll_detected = 0; + return (0); /* not polling */ + } + + return (sc->sc_poll_detected); +} + +static int ukbd_poll(keyboard_t *kbd, int on) { struct ukbd_softc *sc = kbd->kb_data; @@ -1613,6 +1647,7 @@ if (on) { sc->sc_flags |= UKBD_FLAG_POLLING; + ukbd_is_polling(sc); /* update state */ } else { sc->sc_flags &= ~UKBD_FLAG_POLLING; } From owner-p4-projects@FreeBSD.ORG Sat Jan 16 13:33:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C9CF106566C; Sat, 16 Jan 2010 13:33:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 608531065679 for ; Sat, 16 Jan 2010 13:33:58 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D2188FC0C for ; Sat, 16 Jan 2010 13:33:58 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0GDXwYh057419 for ; Sat, 16 Jan 2010 13:33:58 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0GDXwOp057417 for perforce@freebsd.org; Sat, 16 Jan 2010 13:33:58 GMT (envelope-from mav@freebsd.org) Date: Sat, 16 Jan 2010 13:33:58 GMT Message-Id: <201001161333.o0GDXwOp057417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2010 13:33:58 -0000 http://p4web.freebsd.org/chv.cgi?CH=173220 Change 173220 by mav@mav_mavtest on 2010/01/16 13:33:47 Unify bus scanning process. Instead of centralized call of reset and rescan for every bus registered at the moment on boot and every SIM later attach routine, schedule scanning every time bus registered and execute it as soon as system can do this. Move reset call from common to transport-specic code. Now each transport may decide whether it needs bus reset before scan. This change gives now several benefits: - simplifies SIM attach routines, - allows to avoid duplicate scan in some cases, - gives all SIM's, registering their buses after boot scan started, enough time to complete it, before boot will continue. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#69 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#136 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#27 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#21 edit .. //depot/projects/scottl-camlock/src/sys/dev/hptiop/hptiop.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#14 edit .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#17 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#69 (text+ko) ==== @@ -1019,7 +1019,7 @@ { struct cam_path *path; ata_scan_bus_info *scan_info; - union ccb *work_ccb; + union ccb *work_ccb, *reset_ccb; cam_status status; CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE, @@ -1044,6 +1044,26 @@ return; } + /* We may need to reset bus first, if we haven't done it yet. */ + if ((work_ccb->cpi.hba_inquiry & + (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE)) && + !(work_ccb->cpi.hba_misc & PIM_NOBUSRESET) && + !timevalisset(&request_ccb->ccb_h.path->bus->last_reset)) { + reset_ccb = xpt_alloc_ccb_nowait(); + xpt_setup_ccb(&reset_ccb->ccb_h, request_ccb->ccb_h.path, + CAM_PRIORITY_NONE); + reset_ccb->ccb_h.func_code = XPT_RESET_BUS; + xpt_action(reset_ccb); + if (reset_ccb->ccb_h.status != CAM_REQ_CMP) { + request_ccb->ccb_h.status = reset_ccb->ccb_h.status; + xpt_free_ccb(reset_ccb); + xpt_free_ccb(work_ccb); + xpt_done(request_ccb); + return; + } + xpt_free_ccb(reset_ccb); + } + /* Save some state for use while we probe for devices */ scan_info = (ata_scan_bus_info *) malloc(sizeof(ata_scan_bus_info), M_CAMXPT, M_NOWAIT); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#136 (text+ko) ==== @@ -102,6 +102,8 @@ /* queue for handling async rescan requests. */ TAILQ_HEAD(, ccb_hdr) ccb_scanq; + int buses_to_config; + int buses_config_done; /* Registered busses */ TAILQ_HEAD(,cam_eb) xpt_busses; @@ -225,11 +227,8 @@ xpt_find_target(struct cam_eb *bus, target_id_t target_id); static struct cam_ed* xpt_find_device(struct cam_et *target, lun_id_t lun_id); -static xpt_busfunc_t xptconfigbuscountfunc; -static xpt_busfunc_t xptconfigfunc; static void xpt_config(void *arg); static xpt_devicefunc_t xptpassannouncefunc; -static void xpt_finishconfig(struct cam_periph *periph, union ccb *ccb); static void xptaction(struct cam_sim *sim, union ccb *work_ccb); static void xptpoll(struct cam_sim *sim); static void camisr(void *); @@ -271,6 +270,7 @@ static xpt_targetfunc_t xptdeftargetfunc; static xpt_devicefunc_t xptdefdevicefunc; static xpt_periphfunc_t xptdefperiphfunc; +static void xpt_finishconfig_task(void *context, int pending); static int xpt_for_all_busses(xpt_busfunc_t *tr_func, void *arg); static int xpt_for_all_devices(xpt_devicefunc_t *tr_func, void *arg); @@ -808,45 +808,63 @@ return 0; } +static void +xpt_rescan_done(struct cam_periph *periph, union ccb *done_ccb) +{ + + xpt_lock_buses(); + xsoftc.buses_to_config--; + if (xsoftc.buses_to_config == 0 && xsoftc.buses_config_done == 0) { + struct xpt_task *task; + + xsoftc.buses_config_done = 1; + xpt_unlock_buses(); + /* Call manually because we don't have any busses */ + task = malloc(sizeof(struct xpt_task), M_CAMXPT, M_NOWAIT); + if (task != NULL) { + TASK_INIT(&task->task, 0, xpt_finishconfig_task, task); + taskqueue_enqueue(taskqueue_thread, &task->task); + } + } else + xpt_unlock_buses(); + if (done_ccb->ccb_h.ppriv_ptr1 == NULL) { + xpt_free_path(done_ccb->ccb_h.path); + xpt_free_ccb(done_ccb); + } else { + done_ccb->ccb_h.cbfcnp = done_ccb->ccb_h.ppriv_ptr1; + (*done_ccb->ccb_h.cbfcnp)(periph, done_ccb); + } +} + /* thread to handle bus rescans */ static void xpt_scanner_thread(void *dummy) { - cam_isrq_t queue; union ccb *ccb; struct cam_sim *sim; + xpt_lock_buses(); for (;;) { - /* - * Wait for a rescan request to come in. When it does, splice - * it onto a queue from local storage so that the xpt lock - * doesn't need to be held while the requests are being - * processed. - */ - xpt_lock_buses(); if (TAILQ_EMPTY(&xsoftc.ccb_scanq)) msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_topo_lock, PRIBIO, "ccb_scanq", 0); - TAILQ_INIT(&queue); - TAILQ_CONCAT(&queue, &xsoftc.ccb_scanq, sim_links.tqe); - xpt_unlock_buses(); - - while ((ccb = (union ccb *)TAILQ_FIRST(&queue)) != NULL) { - TAILQ_REMOVE(&queue, &ccb->ccb_h, sim_links.tqe); + if ((ccb = (union ccb *)TAILQ_FIRST(&xsoftc.ccb_scanq)) != NULL) { + TAILQ_REMOVE(&xsoftc.ccb_scanq, &ccb->ccb_h, sim_links.tqe); + xpt_unlock_buses(); sim = ccb->ccb_h.path->bus->sim; CAM_SIM_LOCK(sim); - if( ccb->ccb_h.path->target->target_id == CAM_TARGET_WILDCARD ) ccb->ccb_h.func_code = XPT_SCAN_BUS; else ccb->ccb_h.func_code = XPT_SCAN_LUN; - ccb->ccb_h.cbfcnp = xptdone; + ccb->ccb_h.ppriv_ptr1 = ccb->ccb_h.cbfcnp; + ccb->ccb_h.cbfcnp = xpt_rescan_done; xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, CAM_PRIORITY_XPT); - cam_periph_runccb(ccb, NULL, 0, 0, NULL); - xpt_free_path(ccb->ccb_h.path); - xpt_free_ccb(ccb); + xpt_action(ccb); CAM_SIM_UNLOCK(sim); + + xpt_lock_buses(); } } } @@ -860,17 +878,20 @@ * Don't make duplicate entries for the same paths. */ xpt_lock_buses(); - TAILQ_FOREACH(hdr, &xsoftc.ccb_scanq, sim_links.tqe) { - if (xpt_path_comp(hdr->path, ccb->ccb_h.path) == 0) { - wakeup(&xsoftc.ccb_scanq); - xpt_unlock_buses(); - xpt_print(ccb->ccb_h.path, "rescan already queued\n"); - xpt_free_path(ccb->ccb_h.path); - xpt_free_ccb(ccb); - return; + if (ccb->ccb_h.cbfcnp == NULL) { + TAILQ_FOREACH(hdr, &xsoftc.ccb_scanq, sim_links.tqe) { + if (xpt_path_comp(hdr->path, ccb->ccb_h.path) == 0) { + wakeup(&xsoftc.ccb_scanq); + xpt_unlock_buses(); + xpt_print(ccb->ccb_h.path, "rescan already queued\n"); + xpt_free_path(ccb->ccb_h.path); + xpt_free_ccb(ccb); + return; + } } } TAILQ_INSERT_TAIL(&xsoftc.ccb_scanq, &ccb->ccb_h, sim_links.tqe); + xsoftc.buses_to_config++; wakeup(&xsoftc.ccb_scanq); xpt_unlock_buses(); } @@ -917,6 +938,7 @@ mtx_lock(&xsoftc.xpt_lock); if ((status = xpt_bus_register(xpt_sim, NULL, 0)) != CAM_SUCCESS) { + mtx_unlock(&xsoftc.xpt_lock); printf("xpt_init: xpt_bus_register failed with status %#x," " failing attach\n", status); return (EINVAL); @@ -930,6 +952,7 @@ if ((status = xpt_create_path(&path, NULL, CAM_XPT_PATH_ID, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD)) != CAM_REQ_CMP) { + mtx_unlock(&xsoftc.xpt_lock); printf("xpt_init: xpt_create_path failed with status %#x," " failing attach\n", status); return (EINVAL); @@ -3814,7 +3837,7 @@ struct cam_eb *new_bus; struct cam_eb *old_bus; struct ccb_pathinq cpi; - struct cam_path path; + struct cam_path *path; cam_status status; mtx_assert(sim->mtx, MA_OWNED); @@ -3826,6 +3849,11 @@ /* Couldn't satisfy request */ return (CAM_RESRC_UNAVAIL); } + path = (struct cam_path *)malloc(sizeof(*path), M_CAMXPT, M_NOWAIT); + if (path == NULL) { + free(new_bus, M_CAMXPT); + return (CAM_RESRC_UNAVAIL); + } if (strcmp(sim->sim_name, "xpt") != 0) { sim->path_id = @@ -3860,13 +3888,12 @@ */ new_bus->xport = &xport_default; - bzero(&path, sizeof(path)); - status = xpt_compile_path(&path, /*periph*/NULL, sim->path_id, + status = xpt_compile_path(path, /*periph*/NULL, sim->path_id, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); if (status != CAM_REQ_CMP) printf("xpt_compile_path returned %d\n", status); - xpt_setup_ccb(&cpi.ccb_h, &path, CAM_PRIORITY_NORMAL); + xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NORMAL); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -3892,9 +3919,17 @@ /* Notify interested parties */ if (sim->path_id != CAM_XPT_PATH_ID) { - xpt_async(AC_PATH_REGISTERED, &path, &cpi); - } - xpt_release_path(&path); + union ccb *scan_ccb; + + xpt_async(AC_PATH_REGISTERED, path, &cpi); + /* Initiate bus rescan. */ + scan_ccb = xpt_alloc_ccb_nowait(); + scan_ccb->ccb_h.path = path; + scan_ccb->ccb_h.func_code = XPT_SCAN_BUS; + scan_ccb->crcn.flags = 0; + xpt_rescan(scan_ccb); + } else + xpt_free_path(path); return (CAM_SUCCESS); } @@ -4634,98 +4669,6 @@ xpt_action((union ccb *)&crs); } -static int busses_to_config; -static int busses_to_reset; - -static int -xptconfigbuscountfunc(struct cam_eb *bus, void *arg) -{ - - mtx_assert(bus->sim->mtx, MA_OWNED); - - if (bus->path_id != CAM_XPT_PATH_ID) { - struct cam_path path; - struct ccb_pathinq cpi; - int can_negotiate; - - busses_to_config++; - xpt_compile_path(&path, NULL, bus->path_id, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - xpt_setup_ccb(&cpi.ccb_h, &path, CAM_PRIORITY_NORMAL); - cpi.ccb_h.func_code = XPT_PATH_INQ; - xpt_action((union ccb *)&cpi); - can_negotiate = cpi.hba_inquiry; - can_negotiate &= (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE); - if ((cpi.hba_misc & PIM_NOBUSRESET) == 0 - && can_negotiate) - busses_to_reset++; - xpt_release_path(&path); - } - - return(1); -} - -static int -xptconfigfunc(struct cam_eb *bus, void *arg) -{ - struct cam_path *path; - union ccb *work_ccb; - - mtx_assert(bus->sim->mtx, MA_OWNED); - - if (bus->path_id != CAM_XPT_PATH_ID) { - cam_status status; - int can_negotiate; - - work_ccb = xpt_alloc_ccb_nowait(); - if (work_ccb == NULL) { - busses_to_config--; - xpt_finishconfig(xpt_periph, NULL); - return(0); - } - if ((status = xpt_create_path(&path, xpt_periph, bus->path_id, - CAM_TARGET_WILDCARD, - CAM_LUN_WILDCARD)) !=CAM_REQ_CMP){ - printf("xptconfigfunc: xpt_create_path failed with " - "status %#x for scbus%d\n", status, bus->path_id); - printf("xptconfigfunc: halting bus configuration\n"); - xpt_free_ccb(work_ccb); - busses_to_config--; - xpt_finishconfig(xpt_periph, NULL); - return(0); - } - xpt_setup_ccb(&work_ccb->ccb_h, path, CAM_PRIORITY_NORMAL); - work_ccb->ccb_h.func_code = XPT_PATH_INQ; - xpt_action(work_ccb); - if (work_ccb->ccb_h.status != CAM_REQ_CMP) { - printf("xptconfigfunc: CPI failed on scbus%d " - "with status %d\n", bus->path_id, - work_ccb->ccb_h.status); - xpt_finishconfig(xpt_periph, work_ccb); - return(1); - } - - can_negotiate = work_ccb->cpi.hba_inquiry; - can_negotiate &= (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE); - if ((work_ccb->cpi.hba_misc & PIM_NOBUSRESET) == 0 - && (can_negotiate != 0)) { - xpt_setup_ccb(&work_ccb->ccb_h, path, CAM_PRIORITY_NORMAL); - work_ccb->ccb_h.func_code = XPT_RESET_BUS; - work_ccb->ccb_h.cbfcnp = NULL; - CAM_DEBUG(path, CAM_DEBUG_SUBTRACE, - ("Resetting Bus\n")); - xpt_action(work_ccb); - xpt_finishconfig(xpt_periph, work_ccb); - } else { - /* Act as though we performed a successful BUS RESET */ - work_ccb->ccb_h.func_code = XPT_RESET_BUS; - xpt_finishconfig(xpt_periph, work_ccb); - } - } - - return(1); -} - static void xpt_config(void *arg) { @@ -4762,25 +4705,25 @@ #endif /* CAM_DEBUG_BUS */ #endif /* CAMDEBUG */ - /* Fire up rescan thread. */ - if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) { - printf("xpt_init: failed to create rescan thread\n"); - } periphdriver_init(1); - /* - * Scan all installed busses. - */ - xpt_for_all_busses(xptconfigbuscountfunc, NULL); + xpt_lock_buses(); + if (xsoftc.buses_to_config == 0 && xsoftc.buses_config_done == 0) { + struct xpt_task *task; - if (busses_to_config == 0) { + xsoftc.buses_config_done = 1; + xpt_unlock_buses(); /* Call manually because we don't have any busses */ - xpt_finishconfig(xpt_periph, NULL); - } else { - if (busses_to_reset > 0 && scsi_delay >= 2000) { - printf("Waiting %d seconds for SCSI " - "devices to settle\n", scsi_delay/1000); + task = malloc(sizeof(struct xpt_task), M_CAMXPT, M_NOWAIT); + if (task != NULL) { + TASK_INIT(&task->task, 0, xpt_finishconfig_task, task); + taskqueue_enqueue(taskqueue_thread, &task->task); } - xpt_for_all_busses(xptconfigfunc, NULL); + } else { + xpt_unlock_buses(); + } + /* Fire up rescan thread. */ + if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) { + printf("xpt_init: failed to create rescan thread\n"); } } @@ -4810,62 +4753,22 @@ xpt_finishconfig_task(void *context, int pending) { - if (busses_to_config == 0) { - periphdriver_init(2); - /* - * Check for devices with no "standard" peripheral driver - * attached. For any devices like that, announce the - * passthrough driver so the user will see something. - */ - xpt_for_all_devices(xptpassannouncefunc, NULL); + periphdriver_init(2); + /* + * Check for devices with no "standard" peripheral driver + * attached. For any devices like that, announce the + * passthrough driver so the user will see something. + */ + xpt_for_all_devices(xptpassannouncefunc, NULL); - /* Release our hook so that the boot can continue. */ - config_intrhook_disestablish(xsoftc.xpt_config_hook); - free(xsoftc.xpt_config_hook, M_CAMXPT); - xsoftc.xpt_config_hook = NULL; - } + /* Release our hook so that the boot can continue. */ + config_intrhook_disestablish(xsoftc.xpt_config_hook); + free(xsoftc.xpt_config_hook, M_CAMXPT); + xsoftc.xpt_config_hook = NULL; free(context, M_CAMXPT); } -static void -xpt_finishconfig(struct cam_periph *periph, union ccb *done_ccb) -{ - struct xpt_task *task; - - if (done_ccb != NULL) { - CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, - ("xpt_finishconfig\n")); - switch(done_ccb->ccb_h.func_code) { - case XPT_RESET_BUS: - if (done_ccb->ccb_h.status == CAM_REQ_CMP) { - done_ccb->ccb_h.func_code = XPT_SCAN_BUS; - done_ccb->ccb_h.cbfcnp = xpt_finishconfig; - done_ccb->crcn.flags = 0; - xpt_action(done_ccb); - return; - } - /* FALLTHROUGH */ - case XPT_SCAN_BUS: - default: - xpt_free_path(done_ccb->ccb_h.path); - busses_to_config--; - break; - } - } - - if (busses_to_config == 0) { - task = malloc(sizeof(struct xpt_task), M_CAMXPT, M_NOWAIT); - if (task != NULL) { - TASK_INIT(&task->task, 0, xpt_finishconfig_task, task); - taskqueue_enqueue(taskqueue_thread, &task->task); - } - } - - if (done_ccb != NULL) - xpt_free_ccb(done_ccb); -} - cam_status xpt_register_async(int event, ac_callback_t *cbfunc, void *cbarg, struct cam_path *path) ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#27 (text+ko) ==== @@ -1498,7 +1498,7 @@ case XPT_SCAN_BUS: { scsi_scan_bus_info *scan_info; - union ccb *work_ccb; + union ccb *work_ccb, *reset_ccb; struct cam_path *path; u_int i; u_int max_target; @@ -1533,6 +1533,26 @@ return; } + /* We may need to reset bus first, if we haven't done it yet. */ + if ((work_ccb->cpi.hba_inquiry & + (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE)) && + !(work_ccb->cpi.hba_misc & PIM_NOBUSRESET) && + !timevalisset(&request_ccb->ccb_h.path->bus->last_reset)) { + reset_ccb = xpt_alloc_ccb_nowait(); + xpt_setup_ccb(&reset_ccb->ccb_h, request_ccb->ccb_h.path, + CAM_PRIORITY_NONE); + reset_ccb->ccb_h.func_code = XPT_RESET_BUS; + xpt_action(reset_ccb); + if (reset_ccb->ccb_h.status != CAM_REQ_CMP) { + request_ccb->ccb_h.status = reset_ccb->ccb_h.status; + xpt_free_ccb(reset_ccb); + xpt_free_ccb(work_ccb); + xpt_done(request_ccb); + return; + } + xpt_free_ccb(reset_ccb); + } + /* Save some state for use while we probe for devices */ scan_info = (scsi_scan_bus_info *) malloc(sizeof(scsi_scan_bus_info), M_CAMXPT, M_NOWAIT); ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#21 (text+ko) ==== @@ -315,6 +315,7 @@ switch (reason) { case BOOT_ATTACH: + case ATTACH: break; case RESET: xpt_async(AC_BUS_RESET, scp->path, NULL); @@ -322,8 +323,6 @@ if (!dev_changed) break; - /*FALLTHROUGH*/ - case ATTACH: cam_rescan(scp->sim); break; } ==== //depot/projects/scottl-camlock/src/sys/dev/hptiop/hptiop.c#5 (text+ko) ==== @@ -1539,8 +1539,6 @@ hba->ioctl_dev->si_drv1 = hba; #endif - hptiop_rescan_bus(hba); - return 0; ==== //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#12 (text+ko) ==== @@ -83,9 +83,6 @@ /* cam related functions */ static void vpo_action(struct cam_sim *sim, union ccb *ccb); static void vpo_poll(struct cam_sim *sim); -static void vpo_cam_rescan_callback(struct cam_periph *periph, - union ccb *ccb); -static void vpo_cam_rescan(struct vpo_data *vpo); static void vpo_identify(driver_t *driver, device_t parent) @@ -176,44 +173,10 @@ return (ENXIO); } ppb_unlock(ppbus); - vpo_cam_rescan(vpo); /* have CAM rescan the bus */ return (0); } -static void -vpo_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb) -{ - - free(ccb, M_TEMP); -} - -static void -vpo_cam_rescan(struct vpo_data *vpo) -{ - device_t ppbus = device_get_parent(vpo->vpo_dev); - struct cam_path *path; - union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO); - - ppb_lock(ppbus); - if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0) - != CAM_REQ_CMP) { - /* A failure is benign as the user can do a manual rescan */ - ppb_unlock(ppbus); - free(ccb, M_TEMP); - return; - } - - xpt_setup_ccb(&ccb->ccb_h, path, 5/*priority (low)*/); - ccb->ccb_h.func_code = XPT_SCAN_BUS; - ccb->ccb_h.cbfcnp = vpo_cam_rescan_callback; - ccb->crcn.flags = CAM_FLAG_NONE; - xpt_action(ccb); - ppb_unlock(ppbus); - - /* The scan is in progress now. */ -} - /* * vpo_intr() */ ==== //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#14 (text+ko) ==== @@ -747,15 +747,6 @@ xpt_done(pccb); break; /* - * (Re)Scan the SCSI Bus - * Rescan the given bus, or bus/target/lun - */ - case XPT_SCAN_BUS: - TRM_DPRINTF(" XPT_SCAN_BUS \n"); - pccb->ccb_h.status = CAM_REQ_INVALID; - xpt_done(pccb); - break; - /* * Get EDT entries matching the given pattern */ case XPT_DEV_MATCH: ==== //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#17 (text+ko) ==== @@ -469,8 +469,6 @@ static void umass_t_cbi_data_clear_stall_callback(struct usb_xfer *, uint8_t, uint8_t, usb_error_t); static int umass_cam_attach_sim(struct umass_softc *); -static void umass_cam_rescan_callback(struct cam_periph *, union ccb *); -static void umass_cam_rescan(struct umass_softc *); static void umass_cam_attach(struct umass_softc *); static void umass_cam_detach_sim(struct umass_softc *); static void umass_cam_action(struct cam_sim *, union ccb *); @@ -2145,68 +2143,6 @@ } static void -umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb) -{ -#if USB_DEBUG - struct umass_softc *sc = NULL; - - if (ccb->ccb_h.status != CAM_REQ_CMP) { - DPRINTF(sc, UDMASS_SCSI, "%s:%d Rescan failed, 0x%04x\n", - periph->periph_name, periph->unit_number, - ccb->ccb_h.status); - } else { - DPRINTF(sc, UDMASS_SCSI, "%s%d: Rescan succeeded\n", - periph->periph_name, periph->unit_number); - } -#endif - - xpt_free_path(ccb->ccb_h.path); - free(ccb, M_USBDEV); -} - -static void -umass_cam_rescan(struct umass_softc *sc) -{ - struct cam_path *path; - union ccb *ccb; - - DPRINTF(sc, UDMASS_SCSI, "scbus%d: scanning for %d:%d:%d\n", - cam_sim_path(sc->sc_sim), - cam_sim_path(sc->sc_sim), - sc->sc_unit, CAM_LUN_WILDCARD); - - ccb = malloc(sizeof(*ccb), M_USBDEV, M_WAITOK | M_ZERO); - - if (ccb == NULL) { - return; - } -#if (__FreeBSD_version >= 700037) - mtx_lock(&sc->sc_mtx); -#endif - - if (xpt_create_path(&path, xpt_periph, cam_sim_path(sc->sc_sim), - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) - != CAM_REQ_CMP) { -#if (__FreeBSD_version >= 700037) - mtx_unlock(&sc->sc_mtx); -#endif - free(ccb, M_USBDEV); - return; - } - xpt_setup_ccb(&ccb->ccb_h, path, 5 /* priority (low) */ ); - ccb->ccb_h.func_code = XPT_SCAN_BUS; - ccb->ccb_h.cbfcnp = &umass_cam_rescan_callback; - ccb->crcn.flags = CAM_FLAG_NONE; - xpt_action(ccb); - -#if (__FreeBSD_version >= 700037) - mtx_unlock(&sc->sc_mtx); -#endif - - /* The scan is in progress now. */ -} - -static void umass_cam_attach(struct umass_softc *sc) { #ifndef USB_DEBUG @@ -2216,19 +2152,6 @@ sc->sc_name, cam_sim_path(sc->sc_sim), sc->sc_unit, CAM_LUN_WILDCARD, cam_sim_path(sc->sc_sim)); - - if (!cold) { - /* - * Notify CAM of the new device after a short delay. Any - * failure is benign, as the user can still do it by hand - * (camcontrol rescan ). Only do this if we are not - * booting, because CAM does a scan after booting has - * completed, when interrupts have been enabled. - */ - - /* scan the new sim */ - umass_cam_rescan(sc); - } } /* umass_cam_detach