From 1a96bf60a6b9227444199581bdccccf87e84b308 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Mon, 1 May 2017 15:10:06 +0300 Subject: 8133 bootadm: is_ramdisk test is not functional Reviewed by: Peter Tribble Reviewed by: Hans Rosenfeld Approved by: Robert Mustacchi --- usr/src/cmd/boot/bootadm/bootadm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c index 2b62f49100..b2bfc4e849 100644 --- a/usr/src/cmd/boot/bootadm/bootadm.c +++ b/usr/src/cmd/boot/bootadm/bootadm.c @@ -113,7 +113,7 @@ typedef enum { #define GRUB_MENU "/boot/grub/menu.lst" #define MENU_TMP "/boot/grub/menu.lst.tmp" #define GRUB_BACKUP_MENU "/etc/lu/GRUB_backup_menu" -#define RAMDISK_SPECIAL "/dev/ramdisk/" +#define RAMDISK_SPECIAL "/devices/ramdisk" #define STUBBOOT "/stubboot" #define MULTIBOOT "/platform/i86pc/multiboot" #define GRUBSIGN_DIR "/boot/grub/bootsign" -- cgit v1.2.3 From 903134fe16f881063d995b98c1abaa8151f102b6 Mon Sep 17 00:00:00 2001 From: Dan McDonald Date: Wed, 3 May 2017 10:57:58 -0400 Subject: 8146 Update hwdata - 20170502 Reviewed by: Toomas Soome Approved by: Robert Mustacchi --- usr/src/data/hwdata/pci.ids | 774 ++++++++++++++++++++++++++++++++++---------- usr/src/data/hwdata/usb.ids | 179 +++++++++- 2 files changed, 774 insertions(+), 179 deletions(-) diff --git a/usr/src/data/hwdata/pci.ids b/usr/src/data/hwdata/pci.ids index 4bf2919ad9..962da7b80a 100644 --- a/usr/src/data/hwdata/pci.ids +++ b/usr/src/data/hwdata/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2016.10.15 -# Date: 2016-10-15 03:15:02 +# Version: 2017.04.23 +# Date: 2017-04-23 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at http://pci-ids.ucw.cz/. @@ -48,9 +48,11 @@ 021b Compaq Computer Corporation 8139 HNE-300 (RealTek RTL8139c) [iPaq Networking] 0270 Hauppauge computer works Inc. (Wrong ID) +0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company 02ac SpeedStream 1012 1012 PCMCIA 10/100 Ethernet Card [RTL81xx] +02e0 XFX Pine Group Inc. (Wrong ID) 0303 Hewlett-Packard Company (Wrong ID) 0308 ZyXEL Communications Corporation (Wrong ID) 0315 SK-Electronics Co., Ltd. @@ -72,16 +74,16 @@ 0925 VIA Technologies, Inc. (Wrong ID) 0a89 BREA Technologies Inc 0b0b Rhino Equipment Corp. - 0105 Rhino R1T1 - 0205 Rhino R4FXO + 0105 R1T1 + 0205 R4FXO 0206 RCB4FXO 4-channel FXO analog telphony card - 0305 Rhino R4T1 - 0405 Rhino R8FXX + 0305 R4T1 + 0405 R8FXX 0406 RCB8FXX 8-channel modular analog telphony card - 0505 Rhino R24FXX + 0505 R24FXX 0506 RCB24FXS 24-Channel FXS analog telphony card - 0605 Rhino R2T1 - 0705 Rhino R24FXS + 0605 R2T1 + 0705 R24FXS 0706 RCB24FXO 24-Channel FXO analog telphony card 0905 R1T3 Single T3 Digital Telephony Card 0906 RCB24FXX 24-channel modular analog telphony card @@ -245,6 +247,8 @@ 0014 MegaRAID Tri-Mode SAS3516 1028 1fd4 PERC H745P MX 1d49 0602 ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter + 1d49 0604 ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter + 0015 MegaRAID Tri-Mode SAS3416 0016 MegaRAID Tri-Mode SAS3508 1028 1fc9 PERC H840 Adapter 1028 1fcb PERC H740P Adapter @@ -544,14 +548,15 @@ 1028 1f53 HBA330 Mini 1028 1fd2 HBA330 MX 1028 1fd3 HBA330 MMZ + 1bd4 0011 Inspur 12Gb 8i-3008 IT SAS HBA 00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00ac SAS3416 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) - 1d49 0201 ThinkSystem 9400-16i PCIe 12Gb HBA - 1d49 0203 ThinkSystem 9400-16e PCIe 12Gb HBA + 1d49 0201 ThinkSystem 430-16i SAS/SATA 12Gb HBA + 1d49 0203 ThinkSystem 430-16e SAS/SATA 12Gb HBA 00ae SAS3508 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00af SAS3408 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) - 1d49 0200 ThinkSystem 9400-8i PCIe 12Gb HBA - 1d49 0202 ThinkSystem 9400-8e PCIe 12Gb HBA + 1d49 0200 ThinkSystem 430-8i SAS/SATA 12Gb HBA + 1d49 0202 ThinkSystem 430-8e SAS/SATA 12Gb HBA 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1094,7 +1099,7 @@ 1028 0085 Rage 3D LT Pro 4c46 Rage Mobility 128 AGP 2X/Mobility M3 1002 0155 IBM Thinkpad A22p - 1014 0155 IBM Thinkpad A22p + 1014 0155 Thinkpad A22p 1028 00b1 Latitude C600 4c47 3D Rage IIC PCI / Mobility Radeon 7500/7500C 4c49 3D Rage LT PRO PCI @@ -2197,11 +2202,17 @@ 67b9 Vesuvius [Radeon R9 295X2] 67be Hawaii LE 67c0 Ellesmere [Polaris10] + 67c4 Ellesmere [Radeon Pro WX 7100] + 67c7 Ellesmere [Radeon Pro WX 5100] + 67ca Ellesmere [Polaris10] + 67cc Ellesmere [Polaris10] + 67cf Ellesmere [Polaris10] 67df Ellesmere [Radeon RX 470/480] 1002 0b37 Radeon RX 480 1043 04a8 Radeon RX 480 1043 04b0 Radeon RX 470 1043 04fb Radeon RX 480 + 1043 04fd Radeon RX 480 8GB 1462 3411 Radeon RX 470 1462 3413 Radeon RX 480 148c 2372 Radeon RX 480 @@ -2214,6 +2225,7 @@ 1787 a480 Radeon RX 480 67e0 Baffin [Polaris11] 67e1 Baffin [Polaris11] + 67e3 Baffin [Radeon Pro WX 4100] 67e8 Baffin [Polaris11] 67e9 Baffin [Polaris11] 67eb Baffin [Polaris11] @@ -2242,6 +2254,7 @@ 1043 2016 Trinidad PRO [Radeon R9 370 OEM] 1458 2016 Trinidad PRO [Radeon R9 370 OEM] 1462 2016 Trinidad PRO [Radeon R9 370 OEM] + 1462 3050 R9 270 Gaming OC 148c 2016 Trinidad PRO [Radeon R9 370 OEM] 1682 2015 Trinidad PRO [Radeon R7 370] 174b 2016 Trinidad PRO [Radeon R9 370 OEM] @@ -2413,6 +2426,7 @@ 144d c0c7 Radeon HD 7550M 6842 Thames LE [Radeon HD 7000M Series] 6843 Thames [Radeon HD 7670M] + 687f Vega [Radeon RX Vega] 6888 Cypress XT [FirePro V8800] 6889 Cypress PRO [FirePro V7800] 1002 0301 FirePro V7800P @@ -2920,6 +2934,12 @@ 148c 9380 Radeon R9 380 # Make naming scheme consistent 174b e308 Radeon R9 380 Nitro 4G D5 + 6980 Polaris12 + 6981 Polaris12 + 6985 Polaris12 + 6986 Polaris12 + 6987 Polaris12 + 699f Lexa PRO [Radeon RX 550] 700f RS100 AGP Bridge 7010 RS200/RS250 AGP Bridge 7100 R520 [Radeon X1800 XT] @@ -5091,6 +5111,7 @@ 0675 1704 ISDN Adapter (PCI Bus, D, C) 0675 1707 ISDN Adapter (PCI Bus, DV, W) 10cf 105e ISDN Adapter (PCI Bus, DV, W) + 13a0 Transformer Book T101HA-GR030R # Should be 1022:9602 9602 AMD RS780/RS880 PCI to PCI bridge (int gfx) 1043 83a2 M4A785TD Motherboard @@ -5501,6 +5522,10 @@ 8056 Rockwell HCF 56K modem 808a Memory Stick Controller 81ce SxS Pro memory card +# 2nd ID + 905c SxS Pro memory card +# 2nd ID + 907f SxS Pro+ memory card 908f Aeolia ACPI 909e Aeolia Ethernet Controller (Marvell Yukon 2 Family) 909f Aeolia SATA AHCI Controller @@ -5509,6 +5534,7 @@ 90a2 Aeolia DMA Controller 90a3 Aeolia Memory (DDR3/SPM) 90a4 Aeolia USB 3.0 xHCI Host Controller + 90bc SxS Pro+ memory card 104e Oak Technology, Inc 0017 OTI-64017 0107 OTI-107 [Spitfire] @@ -5999,9 +6025,9 @@ 1077 e4f8 FastLinQ QL45611H 100GbE Adapter (SR-IOV VF) 2020 ISP2020A Fast!SCSI Basic Adapter 2031 ISP8324-based 16Gb Fibre Channel to PCI Express Adapter - 103c 17e7 HP SN1000Q 16Gb Single Port Fibre Channel Adapter - 103c 17e8 HP SN1000Q 16Gb Dual Port Fibre Channel Adapter - 103c 1939 HP QMH2672 16Gb Dual Port Fibre Channel Adapter + 103c 17e7 SN1000Q 16Gb Single Port Fibre Channel Adapter + 103c 17e8 SN1000Q 16Gb Dual Port Fibre Channel Adapter + 103c 1939 QMH2672 16Gb Dual Port Fibre Channel Adapter 103c 8002 3830C 16G Fibre Channel Host Bus Adapter 2071 ISP2714-based 16/32Gb Fibre Channel to PCIe Adapter 1077 0283 QLE2764 Quad Port 32Gb Fibre Channel to PCIe Adapter @@ -6021,10 +6047,10 @@ 1077 02a8 QLE2692 Dual Port 16Gb FC to PCIe Gen3 x8 Adapter 1077 02ab QLE2740 Single Port 32Gb FC to PCIe Gen3 x8 Adapter 1077 02ac QLE2742 Dual Port 32Gb FC to PCIe Gen3 x8 Adapter - 1590 00f9 HPE StoreFabric SN1100Q 16Gb Single Port Fibre Channel Host Bus Adapter - 1590 00fa HPE StoreFabric SN1100Q 16Gb Dual Port Fibre Channel Host Bus Adapter - 1590 0203 HPE StoreFabric SN1600Q 32Gb Single Port Fibre Channel Host Bus Adapter - 1590 0204 HPE StoreFabric SN1600Q 32Gb Dual Port Fibre Channel Host Bus Adapter + 1590 00f9 StoreFabric SN1100Q 16Gb Single Port Fibre Channel Host Bus Adapter + 1590 00fa StoreFabric SN1100Q 16Gb Dual Port Fibre Channel Host Bus Adapter + 1590 0203 StoreFabric SN1600Q 32Gb Single Port Fibre Channel Host Bus Adapter + 1590 0204 StoreFabric SN1600Q 32Gb Dual Port Fibre Channel Host Bus Adapter 2300 QLA2300 64-bit Fibre Channel Adapter 2312 ISP2312-based 2Gb Fibre Channel to PCI-X HBA 103c 0131 2Gb Fibre Channel - Single port [A7538A] @@ -6039,7 +6065,7 @@ 103c 3262 StorageWorks 81Q 103c 3263 StorageWorks 82Q 1077 0167 QME2572 Dual Port FC8 HBA Mezzanine - 1590 00fc HPE StoreFabric 84Q 8Gb Quad Port Fibre Channel Host Bus Adapter + 1590 00fc StoreFabric 84Q 8Gb Quad Port Fibre Channel Host Bus Adapter 3022 ISP4022-based Ethernet NIC 3032 ISP4032-based Ethernet IPv6 NIC 4010 ISP4010-based iSCSI TOE HBA @@ -6074,6 +6100,20 @@ 1077 0246 8300 Series Dual Port 10GbE Converged Network Adapter (TCP/IP Networking) 8031 8300 Series 10GbE Converged Network Adapter (FCoE) 8032 8300 Series 10GbE Converged Network Adapter (iSCSI) + 8070 FastLinQ QL41000 Series 10/25/40/50GbE Controller + 1077 0011 FastLinQ QL41212H 25GbE Adapter + 1077 0012 FastLinQ QL41112H 10GbE Adapter + 8080 FastLinQ QL41000 Series 10/25/40/50GbE Controller (FCoE) + 1077 000d FastLinQ QL41262H 25GbE FCoE Adapter + 1077 000e FastLinQ QL41162H 10GbE FCoE Adapter + 8084 FastLinQ QL41000 Series 10/25/40/50GbE Controller (iSCSI) + 1077 000d FastLinQ QL41262H 25GbE iSCSI Adapter + 1077 000e FastLinQ QL41162H 10GbE iSCSI Adapter + 8090 FastLinQ QL41000 Series Gigabit Ethernet Controller (SR-IOV VF) + 1077 000d FastLinQ QL41262H 25GbE FCoE Adapter (SR-IOV VF) + 1077 000e FastLinQ QL41162H 10GbE iSCSI Adapter (SR-IOV VF) + 1077 0011 FastLinQ QL41212H 25GbE Adapter (SR-IOV VF) + 1077 0012 FastLinQ QL41112H 10GbE Adapter (SR-IOV VF) 8430 ISP8324 1/10GbE Converged Network Controller (NIC VF) 8431 8300 Series 10GbE Converged Network Adapter (FCoE VF) 8432 ISP2432M-based 10GbE Converged Network Adapter (CNA) @@ -7529,7 +7569,7 @@ 1885 0700 Tsunami FPGA PMC with Altera Stratix S40 1885 0701 Tsunami FPGA PMC with Altera Stratix S30 9733 PEX 9733 33-lane, 9-port PCI Express Gen 3 (8.0 GT/s) Switch - 1d49 0001 ThinkSystem P310W-4P NVMe Switch Card + 1d49 0001 ThinkSystem 1610-4P NVMe Switch Adapter 9749 PEX 9749 49-lane, 13-port PCI Express Gen 3 (8.0 GT/s) Switch a100 Blackmagic Design DeckLink bb04 B&B 3PCIOSD1A Isolated PCI Serial @@ -8375,6 +8415,7 @@ 1048 0c45 GLoria II 1048 0c4a GLoria II-64 Pro 1048 0c4b GLoria II-64 Pro DVII + 10a9 9002 VPro VR3 0110 NV11 [GeForce2 MX/MX 400] 1043 4015 AGP-V7100 Pro 1043 4021 V7100 Deluxe Combo @@ -8913,7 +8954,7 @@ 0396 G73 0397 G73M [GeForce Go 7700] 0398 G73M [GeForce Go 7600] - 1025 006c Acer 9814 WKMI + 1025 006c Aspire 9814WKMi 0399 G73M [GeForce Go 7600 GT] 039a G73M [Quadro NVS 300M] 039b G73M [GeForce Go 7900 SE] @@ -9871,6 +9912,7 @@ 0dfa GF108GLM [Quadro 1000M] 0dfc GF108GLM [NVS 5200M] 0e08 GF119 HDMI Audio Controller + 1043 83a0 ENGT520 SILENT # 1024MB with passive cooling (heatsink) 10b0 104a Gainward GeForce GT 610 0e09 GF110 High Definition Audio Controller @@ -10004,6 +10046,7 @@ 103a GK110GL [Quadro K6000] 103c GK110GL [Quadro K5200] 1040 GF119 [GeForce GT 520] + 1043 83a0 ENGT520 SILENT 1042 GF119 [GeForce 510] 1048 GF119 [GeForce 605] 1049 GF119 [GeForce GT 620 OEM] @@ -10072,7 +10115,9 @@ 10c3 GT218 [GeForce 8400 GS Rev. 3] 10c5 GT218 [GeForce 405] 10d8 GT218 [NVS 300] + 10ef GP102 HDMI Audio Controller 10f0 GP104 High Definition Audio Controller + 10f1 GP106 High Definition Audio Controller 1140 GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M] 1019 0799 GeForce 820M 1019 999f GeForce GT 720M @@ -10563,6 +10608,7 @@ 1347 GM108M [GeForce 940M] 1348 GM108M [GeForce 945M / 945A] 1349 GM108M [GeForce 930M] + 134b GM108M [GeForce 940MX] 134d GM108M [GeForce 940MX] 134e GM108M [GeForce 930MX] 134f GM108M [GeForce 920MX] @@ -10595,6 +10641,8 @@ 13b1 GM107GLM [Quadro M1000M] 13b2 GM107GLM [Quadro M600M] 13b3 GM107GLM [Quadro K2200M] + 13b4 GM107GLM [Quadro M620 Mobile] + 13b6 GM107GLM [Quadro M1200 Mobile] 13b9 GM107GL [NVS 810] 13ba GM107GL [Quadro K2200] 13bb GM107GL [Quadro K620] @@ -10615,7 +10663,7 @@ 13f1 GM204GL [Quadro M4000] 13f2 GM204GL [Tesla M60] 13f3 GM204GL [Tesla M6] - 13f8 GM204GLM [Quadro M5000M] + 13f8 GM204GLM [Quadro M5000M / M5000 SE] 13f9 GM204GLM [Quadro M4000M] 13fa GM204GLM [Quadro M3000M] 10de 11c9 Quadro M3000 SE @@ -10627,10 +10675,12 @@ 1427 GM206M [GeForce GTX 965M] 1430 GM206GL [Quadro M2000] 1431 GM206GL [Tesla M4] - 15f0 GP100GL + 1436 GM206GLM [Quadro M2200 Mobile] + 15f0 GP100GL [Quadro GP100] 15f1 GP100GL - 15f8 GP100GL - 15f9 GP100GL + 15f7 GP100GL [Tesla P100 PCIe 12GB] + 15f8 GP100GL [Tesla P100 PCIe 16GB] + 15f9 GP100GL [Tesla P100 SMX2 16GB] 1617 GM204M [GeForce GTX 980M] 1618 GM204M [GeForce GTX 970M] 1619 GM204M [GeForce GTX 965M] @@ -10646,35 +10696,52 @@ 17fd GM200GL [Tesla M40] 1b00 GP102 [TITAN X] 1b01 GP102 + 1b06 GP102 [GeForce GTX 1080 Ti] 1b30 GP102GL [Quadro P6000] + 1b38 GP102GL [Tesla P40] 1b70 GP102GL 1b78 GP102GL 1b80 GP104 [GeForce GTX 1080] 1b81 GP104 [GeForce GTX 1070] 1b82 GP104 1b83 GP104 - 1ba0 GP104M [GeForce GTX 1080] - 1ba1 GP104M [GeForce GTX 1070] + 1b84 GP104 [GeForce GTX 1060 3GB] + 1ba0 GP104M [GeForce GTX 1080 Mobile] + 1ba1 GP104M [GeForce GTX 1070 Mobile] 1bb0 GP104GL [Quadro P5000] - 1bb1 GP104GL + 1bb1 GP104GL [Quadro P4000] + 1bb3 GP104GL [Tesla P4] 1bb4 GP104GL - 1be0 GP104M [GeForce GTX 1080] - 1be1 GP104M [GeForce GTX 1070] + 1bb6 GP104GLM [Quadro P5000 Mobile] + 1bb7 GP104GLM [Quadro P4000 Mobile] + 1bb8 GP104GLM [Quadro P3000 Mobile] + 1be0 GP104M [GeForce GTX 1080 Mobile] + 1be1 GP104M [GeForce GTX 1070 Mobile] 1c00 GP106 1c01 GP106 1c02 GP106 [GeForce GTX 1060 3GB] 1c03 GP106 [GeForce GTX 1060 6GB] - 1c20 GP106M [GeForce GTX 1060] - 1c30 GP106GL - 1c60 GP106M [GeForce GTX 1060] + 1c20 GP106M [GeForce GTX 1060 Mobile] + 1c30 GP106GL [Quadro P2000] + 1c35 GP106 + 1c60 GP106M [GeForce GTX 1060 Mobile] + 1c61 GP106M [GeForce GTX 1050 Ti Mobile] + 1c62 GP106M [GeForce GTX 1050 Mobile] 1c70 GP106GL 1c80 GP107 - 1c81 GP107 + 1c81 GP107 [GeForce GTX 1050] 1c82 GP107 [GeForce GTX 1050 Ti] + 1c8c GP107M [GeForce GTX 1050 Ti Mobile] + 1c8d GP107M [GeForce GTX 1050 Mobile] + 1c8e GP107M 1ca7 GP107GL 1ca8 GP107GL 1caa GP107GL + 1cb1 GP107GL [Quardo P1000] + 1cb2 GP107GL [Quardo P600] + 1cb3 GP107GL [Quardo P400] 1d01 GP108 + 1d81 GV100 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 103c 1934 FlexFabric 20Gb 2-port 650M Adapter @@ -10706,6 +10773,9 @@ e260 OneConnect FCoE Initiator (Lancer) e268 OneConnect 10Gb FCoE Converged Network Adapter (Lancer-VF) e300 Lancer Gen6: LPe32000 Fibre Channel Host Adapter + 10df e310 Lancer Gen6: LPe31000 Fibre Channel Host Adapter + 10df e311 Lancer Gen6: LPe31000 Fibre Channel Host Adapter + 10df e312 Lancer Gen6: LPe31000 Fibre Channel Host Adapter f011 Saturn: LightPulse Fibre Channel Host Adapter f015 Saturn: LightPulse Fibre Channel Host Adapter f085 LP850 Fibre Channel Host Adapter @@ -10994,6 +11064,7 @@ 8813 RTL8813AE 802.11ac PCIe Wireless Network Adapter 8821 RTL8821AE 802.11ac PCIe Wireless Network Adapter b723 RTL8723BE PCIe Wireless Network Adapter + 10ec 8739 Dell Wireless 1801 10ed Ascii Corporation 7310 V7310 10ee Xilinx Corporation @@ -11496,8 +11567,8 @@ 1043 8095 A7V8X Motherboard (Realtek ALC650 codec) 1043 80a1 A7V8X-X Motherboard 1043 80b0 A7V600/K8V-X/K8V Deluxe motherboard (ADI AD1980 codec [SoundMAX]) - 1043 80f3 ASUSTek SK8V motherboard - 1043 810d Asus P5VD1-X (AD1888 codec [SoundMax]) + 1043 80f3 SK8V motherboard + 1043 810d P5VD1-X (AD1888 codec [SoundMax]) 1043 812a A8V Deluxe motherboard (Realtek ALC850 codec) 10ec 8168 High Definition Audio 1106 3059 L7VMM2 Motherboard @@ -12096,7 +12167,11 @@ 111f Precision Digital Images 4a47 Precision MX Video engine interface 5243 Frame capture bus interface -1120 EMC Corporation +# formerly EMC Corporation +1120 Dell EMC + 2306 Unity Fibre Channel Controller + 2501 Unity Ethernet Controller + 2505 Unity Fibre Channel Controller 1121 Zilog 1122 Multi-tech Systems, Inc. 1123 Excellent Design, Inc. @@ -12178,7 +12253,7 @@ 0070 6701 WinTV HVR-1110 1019 4cb5 Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM) 1043 0210 FlyTV mini Asus Digimatrix - 1043 4843 ASUS TV-FM 7133 + 1043 4843 TV-FM 7133 1043 4845 TV-FM 7135 1043 4862 P7131 Dual 1043 4876 My Cinema-P7131 Hybrid @@ -12252,7 +12327,7 @@ 0000 4071 Behold TV 407 FM 1019 4cb4 Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM) 1043 0210 Digimatrix TV - 1043 4840 ASUS TV-FM 7134 + 1043 4840 TV-FM 7134 1043 4842 TV-FM 7134 1131 0000 SAA713x-based TV tuner card 1131 2004 EUROPA V3 reference design @@ -12969,7 +13044,7 @@ 103c 30c1 Compaq 6910p 1043 1237 A6J-Q008 1043 1967 V6800V - 1043 1987 Asus A4K and Z81K notebooks, possibly others ( mid-2005 machines ) + 1043 1987 A4K and Z81K notebooks, possibly others ( mid-2005 machines ) 104d 80df Vaio PCG-FX403 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 104d 814e VAIO GRZ390Z @@ -13028,7 +13103,7 @@ 103c 30cc Pavilion dv6700 103c 30cf Pavilion dv9668eg Laptop 1043 1237 A6J-Q008 - 1043 1967 ASUS V6800V + 1043 1967 V6800V 10f7 8338 Panasonic CF-Y5 laptop 144d c018 X20 IV 17aa 201d ThinkPad X60/X60s @@ -13050,8 +13125,8 @@ 1025 0121 Aspire 5920G 1028 01d7 XPS M1210 1028 01f3 Inspiron 1420 - 1028 01f5 Dell Inspiron 1501 - 1028 024f Dell Latitude e6500 + 1028 01f5 Inspiron 1501 + 1028 024f Latitude e6500 103c 03b5 Presario V3242AU 103c 30b7 Presario V6133CL 103c 30cf Pavilion dv9500/9600/9700 series @@ -13191,6 +13266,7 @@ 0001 FireStream 155 0003 FireStream 50 119f Bull HN Information Systems + 1081 BXI Host Channel Adapter 11a0 Convex Computer Corporation 11a1 Hamamatsu Photonics K.K. 11a2 Sierra Research and Technology @@ -13727,6 +13803,7 @@ 7375 PM7375 [LASAR-155 ATM SAR] 7384 PM7384 [FREEDM - 84P672 Frm Engine & Datalink Mgr] 8000 PM8000 [SPC - SAS Protocol Controller] + 8009 PM8009 SPCve 8x6G 8032 ATTO Celerity FC8xEN 117c 003b Celerity FC-82EN Fibre Channel Adapter 117c 003c Celerity FC-84EN Fibre Channel Adapter @@ -13740,6 +13817,8 @@ 8071 PM8071 Tachyon SPCve 12G eight-port SAS/SATA controller 8072 PM8072 Tachyon SPCv 12G 16-port SAS/SATA controller 8073 PM8073 Tachyon SPCve 12G 16-port SAS/SATA controller + 8531 PM8531 PFX 24xG3 Fanout PCIe Switches + 8546 PM8546 B-FEIP PSX 96xG3 PCIe Storage Switch 11f9 I-Cube Inc 11fa Kasan Electronics Company, Ltd. 11fb Datel Inc @@ -15672,8 +15751,8 @@ 1409 0103 PAR4008A 1409 0104 PAR4018A 140a DSP Research Inc -# Formerly RAMiX, Inc. -140b GE Intelligent Platforms +# Formerly RAMiX, GE Fanuc, GE Intelligent Platforms +140b Abaco Systems, Inc. 140c Elmic Systems Inc 140d Matsushita Electric Works Ltd 140e Goepel Electronic GmbH @@ -15965,7 +16044,7 @@ 5081 T540-5081 Unified Wire Ethernet Controller 5082 T504-5082 Unified Wire Ethernet Controller 5083 T540-5083 Unified Wire Ethernet Controller - 5084 T580-5084 Unified Wire Ethernet Controller + 5084 T540-5084 Unified Wire Ethernet Controller 5085 T580-5085 Unified Wire Ethernet Controller 5086 T580-5086 Unified Wire Ethernet Controller 5087 T580-5087 Unified Wire Ethernet Controller @@ -15984,6 +16063,10 @@ 509a T520-509A Unified Wire Ethernet Controller 509b T540-509B Unified Wire Ethernet Controller 509c T520-509C Unified Wire Ethernet Controller + 509d T540-509D Unified Wire Ethernet Controller + 509e T520-509E Unified Wire Ethernet Controller + 509f T540-509F Unified Wire Ethernet Controller + 50a0 T540-50A0 Unified Wire Ethernet Controller 5401 T520-CR Unified Wire Ethernet Controller 5402 T522-CR Unified Wire Ethernet Controller 5403 T540-CR Unified Wire Ethernet Controller @@ -16012,7 +16095,7 @@ 5481 T540-5081 Unified Wire Ethernet Controller 5482 T504-5082 Unified Wire Ethernet Controller 5483 T540-5083 Unified Wire Ethernet Controller - 5484 T580-5084 Unified Wire Ethernet Controller + 5484 T540-5084 Unified Wire Ethernet Controller 5485 T580-5085 Unified Wire Ethernet Controller 5486 T580-5086 Unified Wire Ethernet Controller 5487 T580-5087 Unified Wire Ethernet Controller @@ -16031,6 +16114,10 @@ 549a T520-509A Unified Wire Ethernet Controller 549b T540-509B Unified Wire Ethernet Controller 549c T520-509C Unified Wire Ethernet Controller + 549d T540-509D Unified Wire Ethernet Controller + 549e T520-509E Unified Wire Ethernet Controller + 549f T540-509F Unified Wire Ethernet Controller + 54a0 T540-50A0 Unified Wire Ethernet Controller 5501 T520-CR Unified Wire Storage Controller 5502 T522-CR Unified Wire Storage Controller 5503 T540-CR Unified Wire Storage Controller @@ -16059,7 +16146,7 @@ 5581 T540-5081 Unified Wire Storage Controller 5582 T504-5082 Unified Wire Storage Controller 5583 T540-5083 Unified Wire Storage Controller - 5584 T580-5084 Unified Wire Storage Controller + 5584 T540-5084 Unified Wire Storage Controller 5585 T580-5085 Unified Wire Storage Controller 5586 T580-5086 Unified Wire Storage Controller 5587 T580-5087 Unified Wire Storage Controller @@ -16078,6 +16165,10 @@ 559a T520-509A Unified Wire Storage Controller 559b T540-509B Unified Wire Storage Controller 559c T520-509C Unified Wire Storage Controller + 559d T540-509D Unified Wire Storage Controller + 559e T520-509E Unified Wire Storage Controller + 559f T540-509F Unified Wire Storage Controller + 55a0 T540-50A0 Unified Wire Storage Controller 5601 T520-CR Unified Wire Storage Controller 5602 T522-CR Unified Wire Storage Controller 5603 T540-CR Unified Wire Storage Controller @@ -16106,7 +16197,7 @@ 5681 T540-5081 Unified Wire Storage Controller 5682 T504-5082 Unified Wire Storage Controller 5683 T540-5083 Unified Wire Storage Controller - 5684 T580-5084 Unified Wire Storage Controller + 5684 T540-5084 Unified Wire Storage Controller 5685 T580-5085 Unified Wire Storage Controller 5686 T580-5086 Unified Wire Storage Controller 5687 T580-5087 Unified Wire Storage Controller @@ -16125,6 +16216,10 @@ 569a T520-509A Unified Wire Storage Controller 569b T540-509B Unified Wire Storage Controller 569c T520-509C Unified Wire Storage Controller + 569d T540-509D Unified Wire Storage Controller + 569e T520-509E Unified Wire Storage Controller + 569f T540-509F Unified Wire Storage Controller + 56a0 T540-50A0 Unified Wire Storage Controller 5701 T520-CR Unified Wire Ethernet Controller 5702 T522-CR Unified Wire Ethernet Controller 5703 T540-CR Unified Wire Ethernet Controller @@ -16192,7 +16287,7 @@ 5881 T540-5081 Unified Wire Ethernet Controller [VF] 5882 T504-5082 Unified Wire Ethernet Controller [VF] 5883 T540-5083 Unified Wire Ethernet Controller [VF] - 5884 T580-5084 Unified Wire Ethernet Controller [VF] + 5884 T540-5084 Unified Wire Ethernet Controller [VF] 5885 T580-5085 Unified Wire Ethernet Controller [VF] 5886 T580-5086 Unified Wire Ethernet Controller [VF] 5887 T580-5087 Unified Wire Ethernet Controller [VF] @@ -16211,6 +16306,85 @@ 589a T520-509A Unified Wire Ethernet Controller [VF] 589b T540-509B Unified Wire Ethernet Controller [VF] 589c T520-509C Unified Wire Ethernet Controller [VF] + 589d T540-509D Unified Wire Ethernet Controller [VF] + 589e T520-509E Unified Wire Ethernet Controller [VF] + 589f T540-509F Unified Wire Ethernet Controller [VF] + 58a0 T540-50A0 Unified Wire Ethernet Controller [VF] + 6001 T6225-CR Unified Wire Ethernet Controller + 6002 T6225-SO-CR Unified Wire Ethernet Controller + 6003 T6425-CR Unified Wire Ethernet Controller + 6004 T6425-SO-CR Unified Wire Ethernet Controller + 6005 T6225-OCP-SO Unified Wire Ethernet Controller + 6006 T62100-OCP-SO Unified Wire Ethernet Controller + 6007 T62100-LP-CR Unified Wire Ethernet Controller + 6008 T62100-SO-CR Unified Wire Ethernet Controller + 6009 T6210-BT Unified Wire Ethernet Controller + 600d T62100-CR Unified Wire Ethernet Controller + 6011 T6225-LL-CR Unified Wire Ethernet Controller + 6014 T61100-OCP-SO Unified Wire Ethernet Controller + 6015 T6201-BT Unified Wire Ethernet Controller + 6080 T6225-6080 Unified Wire Ethernet Controller + 6081 T62100-6081 Unified Wire Ethernet Controller + 6401 T6225-CR Unified Wire Ethernet Controller + 6402 T6225-SO-CR Unified Wire Ethernet Controller + 6403 T6425-CR Unified Wire Ethernet Controller + 6404 T6425-SO-CR Unified Wire Ethernet Controller + 6405 T6225-OCP-SO Unified Wire Ethernet Controller + 6406 T62100-OCP-SO Unified Wire Ethernet Controller + 6407 T62100-LP-CR Unified Wire Ethernet Controller + 6408 T62100-SO-CR Unified Wire Ethernet Controller + 6409 T6210-BT Unified Wire Ethernet Controller + 640d T62100-CR Unified Wire Ethernet Controller + 6411 T6225-LL-CR Unified Wire Ethernet Controller + 6414 T61100-OCP-SO Unified Wire Ethernet Controller + 6415 T6201-BT Unified Wire Ethernet Controller + 6480 T6225-6080 Unified Wire Ethernet Controller + 6481 T62100-6081 Unified Wire Ethernet Controller + 6501 T6225-CR Unified Wire Storage Controller + 6502 T6225-SO-CR Unified Wire Storage Controller + 6503 T6425-CR Unified Wire Storage Controller + 6504 T6425-SO-CR Unified Wire Storage Controller + 6505 T6225-OCP-SO Unified Wire Storage Controller + 6506 T62100-OCP-SO Unified Wire Storage Controller + 6507 T62100-LP-CR Unified Wire Storage Controller + 6508 T62100-SO-CR Unified Wire Storage Controller + 6509 T6210-BT Unified Wire Storage Controller + 650d T62100-CR Unified Wire Storage Controller + 6511 T6225-LL-CR Unified Wire Storage Controller + 6514 T61100-OCP-SO Unified Wire Storage Controller + 6515 T6201-BT Unified Wire Storage Controller + 6580 T6225-6080 Unified Wire Storage Controller + 6581 T62100-6081 Unified Wire Storage Controller + 6601 T6225-CR Unified Wire Storage Controller + 6602 T6225-SO-CR Unified Wire Storage Controller + 6603 T6425-CR Unified Wire Storage Controller + 6604 T6425-SO-CR Unified Wire Storage Controller + 6605 T6225-OCP-SO Unified Wire Storage Controller + 6606 T62100-OCP-SO Unified Wire Storage Controller + 6607 T62100-LP-CR Unified Wire Storage Controller + 6608 T62100-SO-CR Unified Wire Storage Controller + 6609 T6210-BT Unified Wire Storage Controller + 660d T62100-CR Unified Wire Storage Controller + 6611 T6225-LL-CR Unified Wire Storage Controller + 6614 T61100-OCP-SO Unified Wire Storage Controller + 6615 T6201-BT Unified Wire Storage Controller + 6680 T6225-6080 Unified Wire Storage Controller + 6681 T62100-6081 Unified Wire Storage Controller + 6801 T6225-CR Unified Wire Ethernet Controller [VF] + 6802 T6225-SO-CR Unified Wire Ethernet Controller [VF] + 6803 T6425-CR Unified Wire Ethernet Controller [VF] + 6804 T6425-SO-CR Unified Wire Ethernet Controller [VF] + 6805 T6225-OCP-SO Unified Wire Ethernet Controller [VF] + 6806 T62100-OCP-SO Unified Wire Ethernet Controller [VF] + 6807 T62100-LP-CR Unified Wire Ethernet Controller [VF] + 6808 T62100-SO-CR Unified Wire Ethernet Controller [VF] + 6809 T6210-BT Unified Wire Ethernet Controller [VF] + 680d T62100-CR Unified Wire Ethernet Controller [VF] + 6811 T6225-LL-CR Unified Wire Ethernet Controller [VF] + 6814 T61100-OCP-SO Unified Wire Ethernet Controller [VF] + 6815 T6201-BT Unified Wire Ethernet Controller [VF] + 6880 T6225-6080 Unified Wire Ethernet Controller [VF] + 6881 T62100-6081 Unified Wire Ethernet Controller [VF] a000 PE10K Unified Wire Ethernet Controller 1426 Storage Technology Corp. 1427 Better On-Line Solutions @@ -16282,7 +16456,8 @@ 144d Samsung Electronics Co Ltd 1600 Apple PCIe SSD a800 XP941 PCIe SSD - a802 NVMe SSD Controller + a802 NVMe SSD Controller SM951/PM951 + a804 NVMe SSD Controller SM961/PM961 a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -16299,6 +16474,16 @@ 1028 1fc1 Express Flash NVMe PM1725 800GB SFF 1028 1fc2 Express Flash NVMe PM1725 1.6TB SFF 1028 1fc4 Express Flash NVMe PM1725 1.6TB AIC + a822 NVMe SSD Controller 172Xa + 1014 0621 PCIe3 1.6TB NVMe Flash Adapter II x8 + 1014 0622 PCIe3 3.2TB NVMe Flash Adapter II x8 + 1028 1fd9 Express Flash PM1725a 800GB SFF + 1028 1fda Express Flash PM1725a 1.6TB SFF + 1028 1fdb Express Flash PM1725a 3.2TB SFF + 1028 1fdc Express Flash PM1725a 6.4TB SFF + 1028 1fdd Express Flash PM1725a 1.6TB AIC + 1028 1fde Express Flash PM1725a 3.2TB AIC + 1028 1fdf Express Flash PM1725a 6.4TB AIC 144e OLITEC 144f Askey Computer Corp. 1450 Octave Communications Ind. @@ -16409,6 +16594,7 @@ 14a2 Millennium Engineering Inc 14a3 Maverick Networks 14a4 Lite-On Technology Corporation + 22f1 M8Pe Series NVMe SSD # Wrong vendor ID used 4318 Broadcom BCM4318 [AirForce One 54g] 802.11g WLAN Controller 14a5 XIONICS Document Technologies Inc @@ -16484,7 +16670,10 @@ 14ca PE Logic Corp. 14cb Billionton Systems Inc 14cc NAKAYO Telecommunications Inc -14cd Universal Scientific Ind. +14cd Universal Global Scientific Industrial Co.,Ltd + 0001 USI-1514-1GbaseT [OCP1] + 0002 USI-4227-SFP [OCP2] + 0003 USI-X557-10GbaseT [OCP3] 14ce Whistle Communications 14cf TEK Microsystems Inc. 14d0 Ericsson Axe R & D @@ -16588,6 +16777,7 @@ 1028 02f1 PowerEdge R510 BCM5716 Gigabit Ethernet 163c NetXtreme II BCM5716S Gigabit Ethernet 163d NetXtreme II BCM57811 10-Gigabit Ethernet + 1043 858a PEB-10G/57811-1S 163e NetXtreme II BCM57811 10 Gigabit Ethernet Multi Function 163f NetXtreme II BCM57811 10-Gigabit Ethernet Virtual Function 1641 NetXtreme BCM57787 Gigabit Ethernet PCIe @@ -16713,7 +16903,7 @@ 1734 1061 PRIMERGY RX/TX S2 series onboard LAN 165a NetXtreme BCM5722 Gigabit Ethernet PCI Express # Dual NIC server - 1014 0378 IBM System x3350 (Machine type 4192) + 1014 0378 System x3350 (Machine type 4192) 1028 020f PowerEdge R300 Broadcom NetXtreme 5722 1028 0210 PowerEdge T300 Broadcom NetXtreme 5722 1028 0225 PowerEdge T105 Broadcom NetXtreme 5722 @@ -16921,6 +17111,7 @@ 16bc BCM57765/57785 SDXC/MMC Card Reader 16be BCM57765/57785 MS Card Reader 16bf BCM57765/57785 xD-Picture Card Reader + 16c1 NetXtreme-E RDMA Virtual Function 16c6 NetXtreme BCM5702A3 Gigabit Ethernet 10b7 1100 3C1000B-T 10/100/1000 PCI 14e4 000c BCM5702 1000Base-T @@ -16936,18 +17127,20 @@ 16c8 BCM57301 NetXtreme-C 10Gb Ethernet Controller 16c9 BCM57302 NetXtreme-C 10Gb/25Gb Ethernet Controller 16ca BCM57304 NetXtreme-C 10Gb/25Gb/40Gb/50Gb Ethernet Controller - 16cb BCM57304 NetXtreme-C Ethernet Virtual Function + 16cb NetXtreme-C Ethernet Virtual Function 16cc BCM57417 NetXtreme-E Ethernet Partition 16ce BCM57311 NetXtreme-C 10Gb RDMA Ethernet Controller 16cf BCM57312 NetXtreme-C 10Gb/25Gb RDMA Ethernet Controller 16d0 BCM57402 NetXtreme-E 10Gb Ethernet Controller 16d1 BCM57404 NetXtreme-E 10Gb/25Gb Ethernet Controller 16d2 BCM57406 NetXtreme-E 10GBASE-T Ethernet Controller - 16d3 BCM57404 NetXtreme-E Ethernet Virtual Function + 16d3 NetXtreme-E Ethernet Virtual Function 16d4 BCM57402 NetXtreme-E Ethernet Partition 16d5 BCM57407 NetXtreme-E 10GBase-T Ethernet Controller 16d6 BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller 16d7 BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller + 14e4 1202 BCM957412M4122 OCP 1x25G Type1 wRoCE + 14e4 1404 BCM957414M4142 OCP 2x25G Type1 wRoCE 1590 020e Ethernet 25Gb 2-port 631SFP28 Adapter 1590 0211 Ethernet 25Gb 2-port 631FLR-SFP28 Adapter 16d8 BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller @@ -16955,19 +17148,22 @@ 1590 0212 Ethernet 10Gb 2-port 535FLR-T Adapter 16d9 BCM57417 NetXtreme-E 10GBASE-T RDMA Ethernet Controller 108e 4866 Dual Port 10GBase-T Ethernet Controller - 16dc BCM57414 NetXtreme-E Ethernet Virtual Function + 16dc NetXtreme-E Ethernet Virtual Function 16dd NetLink BCM5781 Gigabit Ethernet PCI Express 16de BCM57412 NetXtreme-E Ethernet Partition 16df BCM57314 NetXtreme-C 10Gb/25Gb/40Gb/50Gb RDMA Ethernet Controller - 16e1 BCM57314 NetXtreme-C Ethernet Virtual Function + 16e1 NetXtreme-C Ethernet Virtual Function 16e2 BCM57417 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller 108e 4866 Dual Port 10Gb/25Gb SFP28 Ethernet Controller 16e3 BCM57416 NetXtreme-E 10Gb RDMA Ethernet Controller + 16e5 NetXtreme-C RDMA Virtual Function 16e7 BCM57404 NetXtreme-E Ethernet Partition 16e8 BCM57406 NetXtreme-E Ethernet Partition 16e9 BCM57407 NetXtreme-E 25Gb Ethernet Controller 16ec BCM57414 NetXtreme-E Ethernet Partition + 16ed BCM57414 NetXtreme-E RDMA Partition 16ee BCM57416 NetXtreme-E Ethernet Partition + 16ef BCM57416 NetXtreme-E RDMA Partition 16f3 NetXtreme BCM5727 Gigabit Ethernet PCIe 16f7 NetXtreme BCM5753 Gigabit Ethernet PCI Express 16fd NetXtreme BCM5753M Gigabit Ethernet PCI Express @@ -17245,6 +17441,10 @@ b334 BCM56334 StrataXGS 24x1GE 4x10GE Switch Controller b800 BCM56800 StrataXGS 10GE Switch Controller b842 BCM56842 Trident 10GE Switch Controller +# Trident2 + b850 Broadcom BCM56850 Switch ASIC +# Tomahawk + b960 Broadcom BCM56960 Switch ASIC 14e5 Pixelfusion Ltd 14e6 SHINING Technology Inc 14e7 3CX @@ -17435,7 +17635,7 @@ 1002 00f8 ATI TV Wonder Pro 1002 00f9 ATI TV Wonder 1002 a101 HDTV Wonder - 1043 4823 ASUS PVR-416 + 1043 4823 PVR-416 107d 6611 Winfast TV 2000XP Expert 107d 6613 Leadtek Winfast 2000XP Expert 107d 6620 Leadtek Winfast DV2000 @@ -17481,7 +17681,7 @@ 0070 9002 Nova-T DVB-T Model 909 0070 9402 WinTV-HVR1100 DVB-T/Hybrid 0070 9600 WinTV 88x MPEG Encoder - 1043 4823 ASUS PVR-416 + 1043 4823 PVR-416 107d 663c Leadtek PVR 2000 107d 665f WinFast DTV1000-T 14f1 0187 Conexant DVB-T reference design @@ -17847,6 +18047,7 @@ 1599 Delta Electronics Inc 159a General Instrument 159b Faraday Technology Corp + 4321 StorLink SL3516 (Gemini) Host Bridge 159c Stratus Computer Systems 159d Ningbo Harrison Electronics Co Ltd 159e A-Max Technology Co Ltd @@ -17890,16 +18091,20 @@ 15b3 Mellanox Technologies 0191 MT25408 [ConnectX IB Flash Recovery] 01f6 MT27500 Family [ConnectX-3 Flash Recovery] + 01f8 MT27520 Family [ConnectX-3 Pro Flash Recovery] 01ff MT27600 Family [Connect-IB Flash Recovery] 0209 MT27700 Family [ConnectX-4 Flash Recovery] 020b MT27710 Family [ConnectX-4 Lx Flash Recovery] 020d MT28800 Family [ConnectX-5 Flash Recovery] + 020f MT28908A0 Family [ConnectX-6 Flash Recovery] + 0211 MT416842 Family [BlueField SoC Flash Recovery] # reserved for RM#105916 024e MT53100 [Spectrum-2, Flash recovery mode] # Actual value to be used 024f MT53100 [Spectrum-2, Flash recovery mode] 0262 MT27710 [ConnectX-4 Lx Programmable] EN 0263 MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN + 0281 NPS-600 Flash Recovery 1002 MT25400 Family [ConnectX-2 Virtual Function] 1003 MT27500 Family [ConnectX-3] 103c 1777 InfiniBand FDR/EN 10/40Gb Dual Port 544FLR-QSFP Adapter (Rev Cx) @@ -17907,10 +18112,23 @@ 103c 18ce InfiniBand QDR/EN 10Gb Dual Port 544M Adapter 103c 18cf InfiniBand FDR/EN 10/40Gb Dual Port 544M Adapter 103c 18d6 InfiniBand FDR/EN 10/40Gb Dual Port 544QSFP Adapter + 15b3 0025 ConnectX-3 IB QDR Dual Port Mezzanine Card + 15b3 0026 ConnectX-3 IB FDR Dual Port Mezzanine Card + 15b3 0059 ConnectX-3 VPI IB FDR/40 GbE Single Port QSFP+ Mezzanine Card + 15b3 0065 ConnectX-3 VPI IB FDR/40 GbE Dual Port QSFP+ Adapter + 15b3 0066 ConnectX-3 IB FDR10 Dual Port Mezzanine Card + 15b3 0067 ConnectX-3 VPI IB FDR/40 GbE Single Port QSFP+ Adapter + 15b3 0071 ConnectX-3 VPI IB FDR/40 GbE Dual Port QSFP+ Mezzanine Card +# SVID = 15B3 SSID = 0078 + 15b3 0078 ConnectX-3 10 GbE Dual Port KR Mezzanine Card + 15b3 0079 ConnectX-3 40 GbE Dual Port QSFP+ Adapter +# SVID = 15B3 SSID = 0080 + 15b3 0080 ConnectX-3 10 GbE Dual Port SFP+ Adapter 1004 MT27500/MT27520 Family [ConnectX-3/ConnectX-3 Pro Virtual Function] 1005 MT27510 Family 1006 MT27511 Family 1007 MT27520 Family [ConnectX-3 Pro] + 1014 04eb 2-Port 10GbE NIC and RoCE SR PCIe3 103c 22f3 InfiniBand FDR/Ethernet 10Gb/40Gb 2-port 544+QSFP Adapter 103c 22f4 InfiniBand FDR/Ethernet 10Gb/40Gb 2-port 544+FLR-QSFP Adapter 103c 801f Ethernet 10G 2-port 546SFP+ Adapter @@ -17918,6 +18136,9 @@ 117c 0091 FastFrame NQ42 117c 0092 FastFrame NQ11 117c 0093 FastFrame NQ12 + 15b3 0078 ConnectX-3 Pro 10 GbE Dual Port KR Mezzanine Card + 15b3 0079 ConnectX-3 Pro 40 GbE Dual Port QSFP+ Adapter + 15b3 0080 ConnectX-3 Pro 10 GbE Dual Port SFP+ Adapter 1009 MT27530 Family 100a MT27531 Family 100b MT27540 Family @@ -17929,15 +18150,23 @@ 1011 MT27600 [Connect-IB] 1012 MT27600 Family [Connect-IB Virtual Function] 1013 MT27700 Family [ConnectX-4] + 15b3 0006 MCX416A-BCAT, ConnectX-4 EN, 40/56GbE 2P, PCIe3.0 x16 + 15b3 0033 ConnectX-4 VPI IB EDR/100 GbE Single Port QSFP28 Adapter + 15b3 0034 ConnectX-4 VPI IB EDR/100 GbE Dual Port QSFP28 Adapter + 15b3 0050 ConnectX-4 100 GbE Dual Port QSFP28 Adapter 1014 MT27700 Family [ConnectX-4 Virtual Function] 1015 MT27710 Family [ConnectX-4 Lx] + 15b3 0016 ConnectX-4 Lx 25 GbE Dual Port SFP28 Adapter + 15b3 0020 MCX4411A-ACQN, ConnectX-4 Lx EN OCP, 1x25Gb + 15b3 0021 MCX4421A-ACQN ConnectX-4 Lx EN OCP,2x25G + 15b3 0025 ConnectX-4 Lx 25 GbE Dual Port SFP28 rNDC 1016 MT27710 Family [ConnectX-4 Lx Virtual Function] 1017 MT27800 Family [ConnectX-5] 1018 MT27800 Family [ConnectX-5 Virtual Function] 1019 MT28800 Family [ConnectX-5 Ex] 101a MT28800 Family [ConnectX-5 Ex Virtual Function] - 101b MT28831 - 101c MT28840 + 101b MT28908 Family [ConnectX-6] + 101c MT28908 Family [ConnectX-6 Virtual Function] 101d MT28841 101e MT28850 101f MT28851 @@ -17967,6 +18196,7 @@ 103c 1781 NC543i 1-port 4x QDR IB/Flex-10 10Gb Adapter 103c 3349 NC543i 2-port 4xQDR IB/10Gb Adapter 6750 MT26448 [ConnectX EN 10GigE, PCIe 2.0 5GT/s] + 1014 0461 2-Port 10 GbE RoCE SR LP PCIe2 (rev b0) 15b3 0018 HP 10 GbE PCI-e G2 Dual-Port NIC (rev C1) 675a MT25408 [ConnectX EN 10GigE 10GBaseT, PCIe Gen2 5GT/s] 6764 MT26468 [ConnectX EN 10GigE, PCIe 2.0 5GT/s Virtualization+] @@ -17979,8 +18209,9 @@ 7121 NPS-600 configuration and management interface 7122 NPS-600 network interface PF 7123 NPS-600 network interface VF - a2d0 MT416842 - a2d1 MT416842 + a2d0 MT416842 BlueField SoC Crypto enabled + a2d1 MT416842 BlueField SoC Crypto disabled + a2d2 MT416842 BlueField integrated ConnectX-5 network controller a2d3 MT416842 BlueField multicore SoC family VF # SwitchX-2, 40GbE switch c738 MT51136 @@ -18516,6 +18747,7 @@ 0033 AR958x 802.11abgn Wireless Network Adapter 168c a120 AR9582 802.11a/n WLAN Mini-PCIe Adapter 0034 AR9462 Wireless Network Adapter + 1028 020b Wireless 1601 802.11abgn Adapter 1028 0300 Wireless 1802 802.11abgn Adapter 1a56 2003 Killer Wireless-N 1202 Half-size Mini PCIe Card 0036 QCA9565 / AR9565 Wireless Network Adapter @@ -18651,10 +18883,16 @@ 7013 AP440-3: 32-Channel Isolated Digital Input Module 7014 AP445: 32-Channel Isolated Digital Output Module 7016 AP470 48-Channel TTL Level Digital Input/Output Module + 7017 AP323 16-bit, 20 or 40 Channel Analog Input Module 7018 AP408: 32-Channel Digital I/O Module 701a AP220-16 12-Bit, 16-Channel Analog Output Module 701b AP231-16 16-Bit, 16-Channel Analog Output Module + 7021 APA7-201 Reconfigurable Artix-7 FPGA module 48 TTL channels + 7022 APA7-202 Reconfigurable Artix-7 FPGA module 24 RS485 channels + 7023 APA7-203 Reconfigurable Artix-7 FPGA module 24 TTL & 12 RS485 channels + 7024 APA7-204 Reconfigurable Artix-7 FPGA module 24 LVDS channels 7042 AP482 Counter Timer Module with TTL Level Input/Output + 7043 AP483 Counter Timer Module with TTL Level and RS422 Input/Output 7044 AP484 Counter Timer Module with RS422 Input/Output 16da Advantech Co., Ltd. 0011 INES GPIB-PCI @@ -18751,10 +18989,18 @@ 9700 Octeon III CN73XX Network Processor 9702 CN23XX [LiquidIO II] Intelligent Adapter 177d 0003 CN2350 [LiquidIO II] 2-port 10GbE Intelligent adapter - 177d 0004 CN2350 [LiquidIO II] 2-port 25GbE Intelligent adapter +# This was changed during the production phase to 10GbE adapter. + 177d 0004 CN2350 [LiquidIO II] 2-port 10GbE Intelligent adapter + 177d 0005 CN2360 [LiquidIO II] 2-port 10GbE Intelligent adapter + 177d 0006 CN2360 [LiquidIO II] 2-port 25GbE Intelligent adapter + 177d 0007 CN2350 [LiquidIO II] 2-port 25GbE Intelligent adapter 9703 CN23XX [LiquidIO II] NVMe Controller 9712 CN23XX [LiquidIO II] SRIOV Virtual Function 177d 0003 CN2350 [LiquidIO II] 2-port 10GbE SRIOV Virtual Function + 177d 0004 CN2350 [LiquidIO II] 2-port 10GbE SRIOV Virtual Function + 177d 0005 CN2360 [LiquidIO II] 2-port 10GbE SRIOV Virtual Function + 177d 0006 CN2360 [LiquidIO II] 2-port 25GbE SRIOV Virtual Function + 177d 0007 CN2350 [LiquidIO II] 2-port 25GbE SRIOV Virtual Function 9713 CN23XX [LiquidIO II] NVMe SRIOV Virtual Function 9800 Octeon Fusion CNF75XX Processor a001 ThunderX MRML(Master RML Bridge to RSL devices) @@ -18906,6 +19152,7 @@ 1160 ARC-1160 16-Port PCI-X to SATA RAID Controller 1170 ARC-1170 24-Port PCI-X to SATA RAID Controller 1201 ARC-1200 2-Port PCI-Express to SATA II RAID Controller + 1203 ARC-1203 2/4/8 Port PCIe 2.0 to SATA 6Gb RAID Controller 1210 ARC-1210 4-Port PCI-Express to SATA RAID Controller 1214 ARC-12x4 PCIe 2.0 to SAS/SATA 6Gb RAID Controller 17d3 1214 ARC-1214 4-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller @@ -19224,7 +19471,7 @@ 18bc GeCube Technologies, Inc. 18c3 Micronas Semiconductor Holding AG 0720 nGene PCI-Express Multimedia Controller - 07ca 032e Hybrid M779 PCI-E + 1461 032e Hybrid M779 PCI-E # Nee Octigabay System 18c8 Cray Inc 18c9 ARVOO Engineering BV @@ -19323,6 +19570,8 @@ 0155 NT100E3-1-PTP Network Adapter 1x100Gb 0165 NT80E3-2-PTP Network Adapter 2x40Gb 0175 NT20E3-2-PTP Network Adapter 2x10Gb + 0185 NT40A01 Network Adapter + 01a5 NT200A01 Network Adapter 18f6 NextIO 1000 [Nexsis] Switch Virtual P2P PCIe Bridge 1001 [Texsis] Switch Virtual P2P PCIe Bridge @@ -19422,7 +19671,7 @@ 1924 5105 SFN4111T-R5 1924 5201 SFN4112F-R1 1924 5202 SFN4112F-R2 - 0803 SFC9020 [Solarstorm] + 0803 SFC9020 10G Ethernet Controller 1014 0478 2-port 10GbE Low-Latency (R7) 1014 0479 2-port 10GbE OpenOnload (R7) 1014 04a7 Solarflare 10Gb Low-latency Dual-port HBA (R7) @@ -19452,7 +19701,7 @@ 1924 7207 SFN5162F-R7 SFP+ Server Adapter 1924 7a06 SFN5152F-R6 SFP+ Server Adapter 1924 7a07 SFN5152F-R7 SFP+ Server Adapter - 0813 SFL9021 [Solarstorm] + 0813 SFL9021 10GBASE-T Ethernet Controller 1924 6100 SFN5121T-R0 10GBASE-T Server Adapter 1924 6102 SFN5121T-R2 10GBASE-T Server Adapter 1924 6103 SFN5121T-R3 10GBASE-T Server Adapter @@ -19461,7 +19710,7 @@ 1924 6904 SFN5111T-R4 10GBASE-T Server Adapter 1924 7104 SFN5161T-R4 10GBASE-T Server Adapter 1924 7904 SFN5151T-R4 10GBASE-T Server Adapter - 0903 SFC9120 + 0903 SFC9120 10G Ethernet Controller 1014 04cc SFN7122F-R2 2x10GbE SFP+ Flareon Ultra 1924 8002 SFN7122F-R1 SFP+ Server Adapter 1924 8003 SFN7x41Q-R1 Flareon Ultra 7000 Series 10/40G Adapter @@ -19473,23 +19722,25 @@ 1924 800d SFN7x02F-R3 Flareon 7000 Series 10G Adapter 1924 8010 SFA7942Q-R1 QSFP+ AOE Adapter 1924 8015 SFA7942Q-A5-0-R1 QSFP+ AOE Adapter - 0923 SFC9140 + 0923 SFC9140 10/40G Ethernet Controller 1924 800b SFN7x42Q-R1 Flareon Ultra 7000 Series 10/40G Adapter 1924 800e SFN7x42Q-R2 Flareon Ultra 7000 Series 10/40G Adapter 1924 800f SFN7xx4F-R1 Flareon Ultra 7000 Series 10G Adapter - 0a03 SFC9220 - 1924 8011 SFN 8022-R1 Solarflare Flareon 8000 Series 10G Adapter + 0a03 SFC9220 10/40G Ethernet Controller + 1924 8011 SFN8022-R1 Flareon 8000 Series 10G Adapter 1924 8012 SFN8522-R1 Flareon Ultra 8000 Series 10G Adapter - 1924 8013 SFN8042-R1 Solarflare Flareon 8000 Series 10/40G Adapter + 1924 8013 SFN8042-R1 Flareon 8000 Series 10/40G Adapter 1924 8014 SFN8542-R1 Flareon Ultra 8000 Series 10/40G Adapter 1924 8016 SFN8022-R2 Flareon 8000 Series 10G Adapter 1924 8017 SFN8522-R2 Flareon Ultra 8000 Series 10G Adapter 1924 8018 SFN8042-R2 Flareon 8000 Series 10/40G Adapter 1924 8019 SFN8542-R2 Flareon Ultra 8000 Series 10/40G Adapter - 1803 SFC9020 Virtual Function [Solarstorm] - 1813 SFL9021 Virtual Function [Solarstorm] - 1903 SFC9120 Virtual Function - 1923 SFC9140 Virtual Function + 1924 801a SFN8722-R1 Flareon Ultra 8000 Series OCP 10G Adapter + 1803 SFC9020 10G Ethernet Controller (Virtual Function) + 1813 SFL9021 10GBASE-T Ethernet Controller (Virtual Function) + 1903 SFC9120 10G Ethernet Controller (Virtual Function) + 1923 SFC9140 10/40G Ethernet Controller (Virtual Function) + 1a03 SFC9220 10/40G Ethernet Controller (Virtual Function) 6703 SFC4000 rev A iSCSI/Onload [Solarstorm] 10b8 0102 SMC10GPCIe-10BT (A2) [TigerCard] 10b8 0103 SMC10GPCIe-10BT (A3) [TigerCard] @@ -19756,6 +20007,7 @@ 0714 OneConnect 10Gb FCoE Initiator (be3) 103c 3315 NC553i 10Gb 2-port FlexFabric Converged Network Adapter 103c 337b NC554FLB 10Gb 2-port FlexFabric Converged Network Adapter + 0800 ServerView iRMC HTI 19a8 DAQDATA GmbH 19ac Kasten Chase Applied Research 0001 ACA2400 Crypto Accelerator @@ -19775,6 +20027,8 @@ 5801 DDRdrive X1 5808 DDRdrive X8 dd52 DDRdrive X1-30 +19e5 Huawei Technologies Co., Ltd. + 1711 Hi1710 [iBMC Intelligent Management system chip w/VGA support] 19e7 NET (Network Equipment Technologies) 1001 STIX DSP Card 1002 STIX - 1 Port T1/E1 Card @@ -19974,7 +20228,7 @@ 1b03 Magnum Semiconductor, Inc, 6100 DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder 7000 D7 Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder -1b08 MSC Vertriebs GmbH +1b08 MSC Technologies GmbH 1b0a Pegatron 1b13 Jaton Corp 1b1a K&F Computing Research Co. @@ -20086,6 +20340,7 @@ 1b79 Absolute Analysis 1b85 OCZ Technology Group, Inc. 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller) + 6018 RD400/400A SSD 8788 RevoDrive Hybrid 1b94 Signatec / Dynamic Signals Corp e400 PX14400 Dual Xilinx Virtex5 based Digitizer @@ -20114,7 +20369,9 @@ 1bb1 6523 Nytro XP6500-8A4096 0100 Nytro Flash Storage 1bb1 0101 Nytro XF1440 + 1bb1 0103 Nytro 5000 1bb1 0121 Nytro XM1440 + 1bb1 0123 Nytro 5000 1bb1 01a1 Nytro XP7102 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder @@ -20172,7 +20429,9 @@ 00a5 FBC2XLG Capture 2x40Gb 00a6 FBC1CG Capture 1x100Gb 00a9 FBC2XGHH Capture 2x10Gb + 00ad FBC2CGG3HL Capture 2x200Gb 00af Capture slave device + a001 FBC2CGG3 Capture 2x200Gb # Used on V120 VME Crate Controller 1c32 Highland Technology, Inc. 1c33 Daktronics, Inc @@ -20187,6 +20446,8 @@ 0003 Ultrastar SN100 Series NVMe SSD 1014 04f5 PCIe3 1.6TB NVMe Flash Adapter 1014 04f6 PCIe3 3.2TB NVMe Flash Adapter +1c5f Beijing Memblaze Technology Co. Ltd. + 0540 PBlaze4 NVMe SSD # http://www.nicevt.ru/ (in Russian) 1c63 Science and Research Centre of Computer Technology (JSC "NICEVT") # http://www.radiotec.ru/catalog.php?cat=jr8&art=14109 @@ -20210,6 +20471,8 @@ 0303 Simulyzer-RT CompactPCI Serial PSI5-SIM-1 card 0304 Simulyzer-RT CompactPCI Serial PWR-ANA-1 card 0305 Simulyzer-RT CompactPCI Serial CAN-1 card +1cd7 Nanjing Magewell Electronics Co., Ltd. + 0010 Pro Capture Endpoint 1cdd secunet Security Networks AG 1ce4 Exablaze 0001 ExaNIC X4 @@ -20217,6 +20480,7 @@ 0003 ExaNIC X10 0004 ExaNIC X10-GM 0005 ExaNIC X40 + 0006 ExaNIC X10-HPT 1cf7 Subspace Dynamics 1d00 Pure Storage 1d1d CNEX Labs @@ -20252,10 +20516,16 @@ 100b K35-2SFP 100c K35-4SFP 100d AR-ARKA-FX0 [Arkville 32B DPDK Data Mover] + 1d6c 2001 DPDK-Aware Virtual Function [Arkville VF] 100e AR-ARKA-FX1 [Arkville 64B DPDK Data Mover] + 1d6c 2001 DPDK-Aware Virtual Function [Arkville VF] 4200 A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument] 1d78 DERA +1d7c Aerotech, Inc. +1d87 Rockchip Inc. RK3399 PCI Express Root Port 1d8f Enyx +1d95 Graphcore Ltd +1da1 Teko Telecom S.r.l. 1de1 Tekram Technology Co.,Ltd. 0391 TRM-S1040 [DC-315 / DC-395 series] 2020 DC-390 @@ -20298,16 +20568,18 @@ 4022 TN9310 10GbE SFP+ Ethernet Adapter 1043 8709 XG-C100F 10GbE SFP+ Ethernet Adapter 1186 4d00 DXE-810S 10GbE SFP+ Ethernet Adapter - 1432 8103 EN-8102PF 10GbE SPF+ Ethernet Adapter + 1432 8103 10 Gigabit Ethernet SFP+ PCI Express Adapter 1fc9 3015 Ethernet Adapter 4024 TN9210 10GBase-T Ethernet Adapter 4025 TN9510 10GBase-T/NBASE-T Ethernet Adapter 105a 7203 SANLink3 NBase-T1 1186 2900 DXE-810T 10GBase-T Ethernet Adapter - 1432 8102 EN-8102P 10GbE Ethernet Adapter + 1432 8102 10 Gigabit Ethernet PCI Express Adapter 1fc9 3015 Ethernet Adapter 4026 TN9610 10GbE SFP+ Ethernet Adapter 4027 TN9710P 10GBase-T/NBASE-T Ethernet Adapter + 1432 8104 10 Gigabit Ethernet PCI Express Adapter + 1fc9 3015 Ethernet Adapter 4527 TN9710Q 5GBase-T/NBASE-T Ethernet Adapter 1fcc StreamLabs f416 MS416 @@ -20339,6 +20611,7 @@ 2bd8 ROPEX Industrie-Elektronik GmbH 3000 Hansol Electronics Inc. 3112 Satelco Ingenieria S.A. +3130 AUDIOTRAK 3142 Post Impression Systems. 31ab Zonet 1faa ZEW1602 802.11b/g Wireless Adapter @@ -20916,6 +21189,8 @@ 5654 VoiceTronix Pty Ltd 5678 Dawicontrol Computersysteme GmbH 5700 Netpower +# alternately Extreme Engineering Solutions, Inc. +5845 X-ES, Inc. 584d AuzenTech Co., Ltd. 5851 Exacq Technologies 8008 tDVR8008 8-port video capture card @@ -21237,6 +21512,27 @@ 0813 Moorestown SC DMA 0814 Moorestown LPE DMA 0815 Moorestown SSP0 + 0817 Medfield Serial IO I2C Controller #3 + 0818 Medfield Serial IO I2C Controller #4 + 0819 Medfield Serial IO I2C Controller #5 + 081a Medfield GPIO Controller [Core] + 081b Medfield Serial IO HSUART Controller #1 + 081c Medfield Serial IO HSUART Controller #2 + 081d Medfield Serial IO HSUART Controller #3 + 081e Medfield Serial IO HSUART DMA Controller + 081f Medfield GPIO Controller [AON] + 0820 Medfield SD Host Controller + 0821 Medfield SDIO Controller #1 + 0822 Medfield SDIO Controller #2 + 0823 Medfield eMMC Controller #0 + 0824 Medfield eMMC Controller #1 + 0827 Medfield Serial IO DMA Controller + 0828 Medfield Power Management Unit + 0829 Medfield USB Device Controller (OTG) + 082a Medfield SCU IPC + 082c Medfield Serial IO I2C Controller #0 + 082d Medfield Serial IO I2C Controller #1 + 082e Medfield Serial IO I2C Controller #2 0885 Centrino Wireless-N + WiMAX 6150 8086 1305 Centrino Wireless-N + WiMAX 6150 BGN 8086 1307 Centrino Wireless-N + WiMAX 6150 BG @@ -21587,6 +21883,7 @@ 0a26 Haswell-ULT Integrated Graphics Controller 0a2a Haswell-ULT Integrated Graphics Controller 0a2e Haswell-ULT Integrated Graphics Controller + 0a53 DC P3520 SSD 0be0 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 0be1 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 105b 0d7c D270S/D250S Motherboard @@ -21944,7 +22241,7 @@ 8086 1019 PRO/1000 CT Desktop Connection 8086 301f D865PERL mainboard 8086 3025 D875PBZ motherboard - 8086 302c Intel 82865G Mainboard (D865GBF) + 8086 302c D865GBF Mainboard 8086 3427 S875WP1-E mainboard 101a 82547EI Gigabit Ethernet Controller (Mobile) 8086 101a PRO/1000 CT Mobile Connection @@ -22142,7 +22439,7 @@ 1096 80003ES2LAN Gigabit Ethernet Controller (Copper) 15d9 1096 Motherboard 15d9 8680 X7DVL-E-O motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 1097 631xESB/632xESB DPT LAN Controller (Fiber) 1098 80003ES2LAN Gigabit Ethernet Controller (Serdes) 1099 82546GB Gigabit Ethernet Controller (Copper) @@ -22296,6 +22593,7 @@ 103c 17d2 Ethernet 10Gb 2-port 560M Adapter 103c 18d0 Ethernet 10Gb 2-port 560FLB Adapter 1059 0111 T4007 10GbE interface + 1059 0130 T4009 10GbE interface 8086 000c Ethernet X520 10GbE Dual Port KX4-KR Mezz 10f9 82599 10 Gigabit Dual Port Network Connection 10fb 82599ES 10-Gigabit SFI/SFP+ Network Connection @@ -22346,6 +22644,18 @@ 1161 82806AA PCI64 Hub Advanced Programmable Interrupt Controller 8086 1161 82806AA PCI64 Hub APIC 1162 Xscale 80200 Big Endian Companion Chip + 1190 Merrifield SD/SDIO/eMMC Controller + 1191 Merrifield Serial IO HSUART Controller + 1192 Merrifield Serial IO HSUART DMA Controller + 1194 Merrifield Serial IO SPI Controller + 1195 Merrifield Serial IO I2C Controller + 1196 Merrifield Serial IO I2C Controller + 1199 Merrifield GPIO Controller + 119e Merrifield USB Device Controller (OTG) + 11a0 Merrifield SCU IPC + 11a1 Merrifield Power Management Unit + 11a2 Merrifield Serial IO DMA Controller + 11a5 Merrifield Serial IO PWM Controller 1200 IXP1200 Network Processor 172a 0000 AEP SSL Accelerator 1209 8255xER/82551IT Fast Ethernet Controller @@ -22589,8 +22899,15 @@ 1520 I350 Ethernet Controller Virtual Function 1521 I350 Gigabit Network Connection 1028 0602 Gigabit 2P I350-t LOM + 1028 0693 Gigabit 2P I350-t LOM + 1028 06e2 Gigabit 2P I350-t LOM + 1028 0757 Gigabit I350-t LOM + 1028 075a Gigabit I350-t LOM 1028 1f60 Gigabit 4P I350-t rNDC 1028 1f62 Gigabit 4P X540/I350 rNDC + 1028 1fa8 Ethernet 10G 4P X550/I350 rNDC + 1028 1fa9 Ethernet 10G 4P X550 rNDC + 1028 1faa Gigabit 4P X550/I350 rNDC 1028 ff9a Gigabit 4P X710/I350 rNDC 103c 17d1 Ethernet 1Gb 4-port 366FLR Adapter 103c 2003 Ethernet 1Gb 2-port 367i Adapter @@ -22667,6 +22984,8 @@ 8086 5004 Ethernet 10G 2P X540-t Adapter 1529 82599 10 Gigabit Dual Port Network Connection with FCoE 152a 82599 10 Gigabit Dual Port Backplane Connection with FCoE + 152e 82599 Virtual Function + 1530 X540 Virtual Function 1533 I210 Gigabit Network Connection 103c 0003 Ethernet I210-T1 GbE NIC 1093 7706 Compact Vision System Ethernet Adapter @@ -22680,6 +22999,9 @@ 1059 0110 T4005 1GbE interface 1059 0111 T4007 1GbE interface 1059 0120 T4008 1GbE interface + 1059 0130 T4009 1GbE interface + 1059 0140 T2035 1GbE interface + 1059 0150 RD-01068 1GbE interface 1538 I210 Gigabit Network Connection 1539 I211 Gigabit Network Connection 153a Ethernet Connection I217-LM @@ -22722,6 +23044,7 @@ 8086 0001 Ethernet Converged Network Adapter X550-T2 8086 001a Ethernet Converged Network Adapter X550-T2 8086 0022 Ethernet Converged Network Adapter X550-T2 + 1564 X550 Virtual Function 1565 X550 Virtual Function 1566 DSL4410 Thunderbolt NHI [Redwood Ridge 2C 2013] 1567 DSL4410 Thunderbolt Bridge [Redwood Ridge 2C 2013] @@ -22739,12 +23062,14 @@ 1028 1f99 Ethernet 10G 4P X710/I350 rNDC 1028 1f9c Ethernet 10G 4P X710 SFP+ rNDC 103c 0000 Ethernet 10Gb 562SFP+ Adapter - 103c 22fc HP Ethernet 10Gb 2-port 562FLR-SFP+ Adapter - 103c 22fd HP Ethernet 10Gb 2-port 562SFP+ Adapter - 1137 0000 Ethernet Converged NIC X710-4 - 1137 013b Ethernet Converged NIC X710-4 - 1590 0000 Ethernet 10GbE 4P 563SFP+ Adapter + 103c 22fc Ethernet 10Gb 2-port 562FLR-SFP+ Adapter + 103c 22fd Ethernet 10Gb 2-port 562SFP+ Adapter + 1137 0000 Ethernet Converged NIC X710-DA + 1137 013b Ethernet Converged NIC X710-DA4 + 1137 020a Ethernet Converged NIC X710-DA2 + 1590 0000 Ethernet Controller X710 for 10GbE SFP+ 1590 0225 Ethernet 10GbE 4P 563SFP+ Adapter + 1590 022f Ethernet 10Gb 2-port 564i Communication Board 17aa 0000 ThinkServer X710 AnyFabric for 10GbE SFP+ 17aa 4001 ThinkServer X710-4 AnyFabric for 10GbE SFP+ 17aa 4002 ThinkServer X710-2 AnyFabric for 10GbE SFP+ @@ -22760,9 +23085,11 @@ 8086 000a Ethernet Controller X710 for 10GbE SFP+ 8086 000b Ethernet Server Adapter X710-DA2 for OCP 8086 000d Ethernet Controller X710 for 10GbE SFP+ + 8086 000e Ethernet Server Adapter OCP X710-2 8086 0010 Ethernet Converged Network Adapter X710 - 8086 4005 Ethernet Controller XL710 for 10 Gigabit SFP+ + 8086 4005 Ethernet Controller X710 for 10GbE SFP+ 8086 4006 Ethernet Controller X710 for 10GbE SFP+ + 8086 4007 Ethernet Controller X710 for 10GbE SFP+ 1575 DSL6340 Thunderbolt 3 NHI [Alpine Ridge 2C 2015] 1576 DSL6340 Thunderbolt 3 Bridge [Alpine Ridge 2C 2015] 1577 DSL6540 Thunderbolt 3 NHI [Alpine Ridge 4C 2015] @@ -22776,6 +23103,7 @@ 1028 0000 Ethernet 10G X710-k bNDC 1028 1f98 Ethernet 10G 4P X710-k bNDC 1028 1f9e Ethernet 10G 2P X710-k bNDC + 1059 0150 RD-01068 10GbE-KR interface 1590 0000 Ethernet 2-port 563i Adapter 1590 00f8 Ethernet 2-port 563i Adapter 8086 0000 Ethernet Converged Network Adapter XL710-Q2 @@ -22803,17 +23131,19 @@ 108e 0000 Ethernet Controller X710 for 10GBASE-T 108e 4857 Ethernet Controller X710 for 10GBASE-T 1587 Ethernet Controller XL710 for 20GbE backplane - 103c 0000 HPE Ethernet 10/20Gb 2-port 660FLB Adapter - 103c 22fe HPE Ethernet 10/20Gb 2-port 660FLB Adapter + 103c 0000 Ethernet 10/20Gb 2-port 660FLB Adapter + 103c 22fe Ethernet 10/20Gb 2-port 660FLB Adapter 1588 Ethernet Controller XL710 for 20GbE backplane - 103c 0000 HPE Ethernet 10/20Gb 2-port 660M Adapter - 103c 22ff HPE Ethernet 10/20Gb 2-port 660M Adapter + 103c 0000 Ethernet 10/20Gb 2-port 660M Adapter + 103c 22ff Ethernet 10/20Gb 2-port 660M Adapter 1589 Ethernet Controller X710/X557-AT 10GBASE-T 108e 0000 Quad Port 10GBase-T Adapter 108e 7b1c Quad Port 10GBase-T Adapter 8086 0000 Ethernet Converged Network Adapter X710-T 8086 0001 Ethernet Converged Network Adapter X710-T4 8086 0002 Ethernet Converged Network Adapter X710-T4 + 8086 0003 Ethernet Converged Network Adapter X710-T + 8086 00a0 Ethernet Converged Network Adapter X710-T4 8086 1003 Ethernet Converged Network Adapter X710-T 158a Ethernet Controller XXV710 for 25GbE backplane 158b Ethernet Controller XXV710 for 25GbE SFP28 @@ -22826,6 +23156,7 @@ 8086 0006 Ethernet Network Adapter OCP XXV710-2 8086 0007 Ethernet Network Adapter OCP XXV710-1 8086 0008 Ethernet Network Adapter OCP XXV710-1 + 8086 4001 Ethernet Network Adapter XXV710-2 15a0 Ethernet Connection (2) I218-LM 15a1 Ethernet Connection (2) I218-V 15a2 Ethernet Connection (3) I218-LM @@ -22833,19 +23164,28 @@ 15a4 Ethernet Switch FM10000 Host Interface 15a5 Ethernet Switch FM10000 Host Virtual Interface 15a8 Ethernet Connection X552 Virtual Function + 15a9 X552 Virtual Function 15aa Ethernet Connection X552 10 GbE Backplane 1059 0120 T4008 10GbE interface + 1059 0150 RD-01068 10GbE interface 15ab Ethernet Connection X552 10 GbE Backplane 15ac Ethernet Connection X552 10 GbE SFP+ 15ad Ethernet Connection X552/X557-AT 10GBASE-T 15ae Ethernet Connection X552 1000BASE-T + 15b0 Ethernet Connection X552 Backplane + 15b4 X553 Virtual Function 15b5 DSL6340 USB 3.1 Controller [Alpine Ridge] 15b6 DSL6540 USB 3.1 Controller [Alpine Ridge] 15b7 Ethernet Connection (2) I219-LM 15b8 Ethernet Connection (2) I219-V 15b9 Ethernet Connection (3) I219-LM + 15bb Ethernet Connection (7) I219-LM + 15bc Ethernet Connection (7) I219-V + 15bd Ethernet Connection (6) I219-LM + 15be Ethernet Connection (6) I219-V 15bf JHL6240 Thunderbolt 3 NHI (Low Power) [Alpine Ridge LP 2016] 15c0 JHL6240 Thunderbolt 3 Bridge (Low Power) [Alpine Ridge LP 2016] + 15c5 X553 Virtual Function 15d0 Ethernet SDI Adapter FM10420-100GbE-QDA2 15d1 Ethernet Controller 10G X550T 8086 0002 Ethernet Converged Network Adapter X550-T1 @@ -22960,7 +23300,30 @@ e4bf 3100 CX1-BAND 1962 80960RM (i960RM) Microprocessor 105a 0000 SuperTrak SX6000 I2O CPU + 19ac DNV SMBus Contoller - Host + 19b0 DNV SATA Controller 0 + 19b1 DNV SATA Controller 0 + 19b2 DNV SATA Controller 0 + 19b3 DNV SATA Controller 0 + 19b4 DNV SATA Controller 0 + 19b5 DNV SATA Controller 0 + 19b6 DNV SATA Controller 0 + 19b7 DNV SATA Controller 0 + 19be DNV SATA Controller 0 + 19bf DNV SATA Controller 0 + 19c0 DNV SATA Controller 1 + 19c1 DNV SATA Controller 1 + 19c2 DNV SATA Controller 1 + 19c3 DNV SATA Controller 1 + 19c4 DNV SATA Controller 1 + 19c5 DNV SATA Controller 1 + 19c6 DNV SATA Controller 1 + 19c7 DNV SATA Controller 1 + 19ce DNV SATA Controller 1 + 19cf DNV SATA Controller 1 + 19dc DNV LPC or eSPI 19df DNV SMBus controller + 19e0 DNV SPI Controller 1a21 82840 840 [Carmel] Chipset Host Bridge (Hub A) 1a23 82840 840 [Carmel] Chipset AGP Bridge 1a24 82840 840 [Carmel] Chipset PCI Bridge (Hub B) @@ -22971,7 +23334,7 @@ 1a31 82845 845 [Brookdale] Chipset AGP Bridge 1a38 5000 Series Chipset DMA Engine 15d9 8680 X7DVL-E-O motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 1a48 82597EX 10GbE Ethernet Controller 8086 a01f PRO/10GbE SR Server Adapter 8086 a11f PRO/10GbE SR Server Adapter @@ -23216,12 +23579,12 @@ 1e1e 7 Series/C210 Series Chipset Family PCI Express Root Port 8 1849 1e1e Motherboard 1e20 7 Series/C216 Chipset Family High Definition Audio Controller - 1028 054b Dell XPS One 2710 + 1028 054b XPS One 2710 1043 108d VivoBook X202EV 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1043 8415 P8H77-I Motherboard - 1043 8445 ASUS P8Z77-V LX Motherboard + 1043 8445 P8Z77-V LX Motherboard 144d c652 NP300E5C series laptop 1849 1898 Z77 Extreme4 motherboard 1e22 7 Series/C216 Chipset Family SMBus Controller @@ -24121,6 +24484,9 @@ 24f4 Wireless 8260 # Snow Field Peak AC 8086 0030 Dual Band Wireless-AC 8260 + 24fd Wireless 8265 / 8275 +# Windstorm Peak + 8086 0010 Dual Band Wireless-AC 8265 2500 82820 820 (Camino) Chipset Host Bridge (MCH) 1028 0095 Precision Workstation 220 Chipset 1043 801c P3C-2000 system chipset @@ -24214,7 +24580,7 @@ 258a E7221 Integrated Graphics Controller 2590 Mobile 915GM/PM/GMS/910GML Express Processor to DRAM Controller 1014 0575 ThinkPad X41 / Z60t - 1028 0182 Dell Latitude C610 + 1028 0182 Latitude C610 103c 0934 Compaq nw8240/nx8220 103c 099c NX6110/NC6120 104d 81b7 Vaio VGN-S3XP @@ -24503,7 +24869,7 @@ 1014 05b7 ThinkPad Z60t # based on the PTGD1-LA motherboard 103c 2a09 PufferM-UL8E - 1043 1173 Asus A6VC + 1043 1173 A6VC 1043 814e P5GD1-VW Mainboard 1462 7028 915P/G Neo2 1af4 1100 QEMU Virtual Machine @@ -24529,7 +24895,7 @@ 1028 0177 Dimension 8400 1028 0179 Optiplex GX280 1028 0182 Latitude D610 Laptop - 1028 0187 Dell Precision M70 Laptop + 1028 0187 Precision M70 Laptop 1028 0188 Inspiron 6000 laptop 103c 0934 Compaq nw8240/nx8220 103c 0944 Compaq NC6220 @@ -24553,13 +24919,13 @@ 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard 15d9 9680 X7DBN Motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 2680 631xESB/632xESB/3100 Chipset SATA IDE Controller 2681 631xESB/632xESB SATA AHCI Controller 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard 15d9 9680 X7DBN Motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 2682 631xESB/632xESB SATA RAID Controller 103c 31fe Adaptec Serial ATA HostRAID 2683 631xESB/632xESB SATA RAID Controller @@ -24569,31 +24935,31 @@ 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard 15d9 9680 X7DBN Motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 2689 631xESB/632xESB/3100 Chipset UHCI USB Controller #2 1028 01bb PowerEdge 1955 onboard USB 1028 01f0 PowerEdge R900 onboard USB 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard 15d9 9680 X7DBN Motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 268a 631xESB/632xESB/3100 Chipset UHCI USB Controller #3 1028 01f0 PowerEdge R900 onboard USB 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard 15d9 9680 X7DBN Motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 268b 631xESB/632xESB/3100 Chipset UHCI USB Controller #4 1028 01f0 PowerEdge R900 onboard USB 15d9 8680 X7DVL-E-O motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 268c 631xESB/632xESB/3100 Chipset EHCI USB2 Controller 1028 01bb PowerEdge 1955 onboard USB 1028 01f0 PowerEdge R900 onboard USB 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard 15d9 9680 X7DBN Motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 2690 631xESB/632xESB/3100 Chipset PCI Express Root Port 1 103c 31fe ProLiant DL140 G3 15d9 9680 X7DBN Motherboard @@ -24608,7 +24974,7 @@ 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard 15d9 9680 X7DBN Motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 8086 3476 S5000PSLSATA Server Board 269e 631xESB/632xESB IDE Controller 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard @@ -24625,7 +24991,7 @@ 103c 2a3b Pavilion A1512X 1462 7418 Wind PC MS-7418 8086 544e DeskTop Board D945GTP - 8086 d605 Intel Desktop Board D945GCCR + 8086 d605 Desktop Board D945GCCR 2774 82955X Memory Controller Hub 2775 82955X PCI Express Root Port 2776 82945G/GZ Integrated Graphics Controller @@ -24903,7 +25269,7 @@ 103c 30a3 Compaq nw8440 103c 30d5 530 Laptop 1043 1123 A6J-Q008 - 1043 13c4 Asus G2P + 1043 13c4 G2P 1043 817f P5LD2-VM Mainboard (Realtek ALC 882 codec) 1043 8290 P5KPL-VM Motherboard 1043 82ea P5KPL-CM Motherboard @@ -24921,7 +25287,7 @@ 152d 0753 Softmodem 1734 10ad Conexant softmodem SmartCP 17aa 2010 ThinkPad R60/T60/X60 series - 17aa 3802 Lenovo 3000 C200 audio [Realtek ALC861VD] + 17aa 3802 3000 C200 audio [Realtek ALC861VD] 8086 1112 DeskTop Board D945GTP 8086 27d8 DeskTop Board D945GTP 8086 d618 DeskTop Board D510MO @@ -25008,12 +25374,12 @@ 1028 01da OptiPlex 745 1462 7235 P965 Neo MS-7235 mainboard 2826 C600/X79 series chipset SATA RAID Controller - 1d49 0100 ThinkSystem RAID 331 - 1d49 0101 ThinkSystem RAID 331 - 1d49 0102 ThinkSystem RAID 331 - 1d49 0103 ThinkSystem RAID 331 - 1d49 0104 ThinkSystem RAID 331 - 1d49 0105 ThinkSystem RAID 331 + 1d49 0100 Intel RSTe SATA Software RAID + 1d49 0101 Intel RSTe SATA Software RAID + 1d49 0102 Intel RSTe SATA Software RAID + 1d49 0103 Intel RSTe SATA Software RAID + 1d49 0104 Intel RSTe SATA Software RAID + 1d49 0105 Intel RSTe SATA Software RAID 2827 C610/X99 series chipset sSATA Controller [RAID mode] 2828 82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [IDE mode] 1028 01f3 Inspiron 1420 @@ -25034,7 +25400,7 @@ 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 2830 82801H (ICH8 Family) USB UHCI Controller #1 - 1025 0121 Acer Aspire 5920G + 1025 0121 Aspire 5920G 1028 01da OptiPlex 745 1028 01f3 Inspiron 1420 103c 30c0 Compaq 6710b @@ -25094,7 +25460,7 @@ 17c0 4083 Medion WIM 2210 Notebook PC [MD96850] e4bf cc47 CCG-RUMBA 2835 82801H (ICH8 Family) USB UHCI Controller #5 - 1025 0121 Acer Aspire 5920G + 1025 0121 Aspire 5920G 1028 01da OptiPlex 745 1028 01f3 Inspiron 1420 103c 30c0 Compaq 6710b @@ -25122,7 +25488,7 @@ 17c0 4083 Medion WIM 2210 Notebook PC [MD96850] e4bf cc47 CCG-RUMBA 283a 82801H (ICH8 Family) USB2 EHCI Controller #2 - 1025 0121 Acer Aspire 5920G + 1025 0121 Aspire 5920G 1028 01da OptiPlex 745 1028 01f3 Inspiron 1420 103c 30c0 Compaq 6710b @@ -25177,14 +25543,14 @@ 1025 0145 Realtek ALC889 (Aspire 8920G w. Dolby Theather) 1028 01da OptiPlex 745 1028 01f3 Inspiron 1420 - 1028 01f9 Dell Latitude D630 - 1028 01ff Dell Precision M4300 + 1028 01f9 Latitude D630 + 1028 01ff Precision M4300 1028 0256 Studio 1735 103c 2802 Compaq dc7700p 103c 30c0 Compaq 6710b 103c 30c1 Compaq 6910p 103c 30cc Pavilion dv6700 - 1043 1339 Asus M51S series + 1043 1339 M51S series 1043 81ec P5B 104d 9005 Vaio VGN-FZ260E 104d 9008 Vaio VGN-SZ79SN_C @@ -25524,7 +25890,7 @@ 29f7 3200/3210 Chipset Serial KT Controller 29f9 3210 Chipset Host-Secondary PCI Express Bridge 2a00 Mobile PM965/GM965/GL960 Memory Controller Hub - 1025 0121 Acer Aspire 5920G + 1025 0121 Aspire 5920G 1028 01f3 Inspiron 1420 103c 30c0 Compaq 6710b 103c 30c1 Compaq 6910p @@ -25755,7 +26121,7 @@ 2e16 4 Series Chipset PT IDER Controller 2e17 4 Series Chipset Serial KT Controller 2e20 4 Series Chipset DRAM Controller - 1028 0283 Dell Vostro 220 + 1028 0283 Vostro 220 1043 82d3 P5Q Deluxe Motherboard 1458 5000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 2e21 4 Series Chipset PCI Express Root Port @@ -25831,6 +26197,9 @@ 2f09 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3 2f0a Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3 2f0b Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3 + 2f0d Haswell Xeon Non-Transparent Bridge (Back-to-back) + 2f0e Haswell Xeon Non-Transparent Bridge (Primary Side) + 2f0f Haswell Xeon Non-Transparent Bridge (Secondary Side) 2f10 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug 2f11 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug 2f12 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug @@ -25983,8 +26352,7 @@ 8086 4010 Dual Band Wireless AC 3165 # Stone Peak 1x1 8086 4210 Dual Band Wireless AC 3165 -# Stone Peak 1x1 - 3166 Intel Dual Band Wireless-AC 3165 Plus Bluetooth + 3166 Dual Band Wireless-AC 3165 Plus Bluetooth 3200 GD31244 PCI-X SATA HBA 1775 c200 C2K onboard SATA host bus adapter 3310 IOP348 I/O Processor @@ -26255,11 +26623,29 @@ 37cd X722 Virtual Function 37ce Ethernet Connection X722 for 10GbE backplane 1590 0215 Ethernet 10Gb 2-port 568i Adapter + 17aa 4023 Intel Ethernet Connection X722 for 10GbE backplane 37cf Ethernet Connection X722 for 10GbE QSFP+ 37d0 Ethernet Connection X722 for 10GbE SFP+ + 17aa 4020 Intel Ethernet Connection X722 for 10G SFP+ + 17aa 4021 Intel Ethernet Connection X722 for 10G SFP+ + 17aa 4022 Ethernet Connection X722 for 10GbE SFP+ 37d1 Ethernet Connection X722 for 1GbE + 1590 0216 Ethernet 1Gb 2-port 368i Adapter + 1590 0217 Ethernet 1Gb 2-port 368FLR-MMT Adapter + 1590 0247 Ethernet 1Gb 4-port 369i Adapter + 17aa 4020 Intel Ethernet Connection X722 for 1GbE + 17aa 4021 Intel Ethernet Connection X722 for 1GbE + 17aa 4022 Intel Ethernet Connection X722 for 1GbE 37d2 Ethernet Connection X722 for 10GBASE-T + 14cd 0030 Ethernet OCP 2x10G RJ45 Phy Card [USI-X557-10GbaseT] + 1590 0218 Ethernet 10Gb 2-port 568FLR-MMT Adapter + 17aa 4020 Ethernet Connection X722 for 10GBASE-T + 17aa 4021 Ethernet Connection X722 for 10GBASE-T + 17aa 4022 Ethernet Connection X722 for 10GBASE-T 37d3 Ethernet Connection X722 for 10GbE SFP+ + 1590 0219 Ethernet 10Gb 2-port 568FLR-MMSFP+ Adapter + 17aa 4020 Ethernet Connection X722 for 10GbE SFP+ + 17aa 4021 Ethernet Connection X722 for 10GbE SFP+ 37d4 Ethernet Connection X722 for 10GbE QSFP+ 37d9 X722 Hyper-V Virtual Function 3a00 82801JD/DO (ICH10 Family) 4-port SATA IDE Controller @@ -26530,7 +26916,7 @@ 1028 02da OptiPlex 980 1028 040a Latitude E6410 1028 040b Latitude E6510 - 1043 1373 ASUSTek G73-series gaming laptop + 1043 1373 G73-series gaming laptop 144d c06a R730 Laptop 15d9 060d C7SIM-Q Motherboard 17c0 10d2 Medion Akoya E7214 Notebook PC [MD98410] @@ -26674,7 +27060,7 @@ 1001 8086 mPCI 3B Europe ZZE 1002 8086 mPCI 3B Japan ZZJ 1003 8086 mPCI 3B High-Band ZZH - 1351 103c Compaq NC6220 + 103c 1351 Compaq nc6220 4224 PRO/Wireless 2915ABG [Calexico2] Network Connection 4227 PRO/Wireless 3945ABG [Golan] Network Connection 8086 1010 ThinkPad R60e @@ -26796,41 +27182,43 @@ 530d 80310 (IOP) IO Processor 5845 QEMU NVM Express Controller 1af4 1100 QEMU Virtual Machine - 5a84 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Integrated Graphics Controller - 5a88 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Imaging Unit - 5a98 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Audio Cluster - 5a9a Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Trusted Execution Engine - 5aa2 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Integrated Sensor Hub - 5aa8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series USB xHCI - 5aac Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #1 - 5aae Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #2 - 5ab0 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #3 - 5ab2 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #4 - 5ab4 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #5 - 5ab6 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #6 - 5ab8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #7 - 5aba Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series I2C Controller #8 - 5abc Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series HSUART Controller #1 - 5abe Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series HSUART Controller #2 - 5ac0 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series HSUART Controller #3 - 5ac2 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SPI Controller #1 - 5ac4 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SPI Controller #2 - 5ac6 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SPI Controller #3 - 5ac8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PWM Pin Controller - 5aca Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SDXC/MMC Host Controller - 5acc Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series eMMC Controller - 5ad0 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SDIO Controller - 5ad4 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SMBus Controller - 5ad6 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port B #1 - 5ad7 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port B #2 - 5ad8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port A #1 - 5ad9 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port A #2 - 5ada Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port A #3 - 5adb Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series PCI Express Port A #4 - 5ae3 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series SATA AHCI Controller - 5ae8 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Low Pin Count Interface - 5aee Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series HSUART Controller #4 - 5af0 Atom/Celeron/Pentium Processor N4200/N3350/E3900 Series Host Bridge + 5902 HD Graphics 610 + 5912 HD Graphics 630 + 5a84 Celeron N3350/Pentium N4200/Atom E3900 Series Integrated Graphics Controller + 5a88 Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit + 5a98 Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster + 5a9a Celeron N3350/Pentium N4200/Atom E3900 Series Trusted Execution Engine + 5aa2 Celeron N3350/Pentium N4200/Atom E3900 Series Integrated Sensor Hub + 5aa8 Celeron N3350/Pentium N4200/Atom E3900 Series USB xHCI + 5aac Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #1 + 5aae Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #2 + 5ab0 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #3 + 5ab2 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #4 + 5ab4 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #5 + 5ab6 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #6 + 5ab8 Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #7 + 5aba Celeron N3350/Pentium N4200/Atom E3900 Series I2C Controller #8 + 5abc Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #1 + 5abe Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #2 + 5ac0 Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #3 + 5ac2 Celeron N3350/Pentium N4200/Atom E3900 Series SPI Controller #1 + 5ac4 Celeron N3350/Pentium N4200/Atom E3900 Series SPI Controller #2 + 5ac6 Celeron N3350/Pentium N4200/Atom E3900 Series SPI Controller #3 + 5ac8 Celeron N3350/Pentium N4200/Atom E3900 Series PWM Pin Controller + 5aca Celeron N3350/Pentium N4200/Atom E3900 Series SDXC/MMC Host Controller + 5acc Celeron N3350/Pentium N4200/Atom E3900 Series eMMC Controller + 5ad0 Celeron N3350/Pentium N4200/Atom E3900 Series SDIO Controller + 5ad4 Celeron N3350/Pentium N4200/Atom E3900 Series SMBus Controller + 5ad6 Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port B #1 + 5ad7 Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port B #2 + 5ad8 Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port A #1 + 5ad9 Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port A #2 + 5ada Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port A #3 + 5adb Celeron N3350/Pentium N4200/Atom E3900 Series PCI Express Port A #4 + 5ae3 Celeron N3350/Pentium N4200/Atom E3900 Series SATA AHCI Controller + 5ae8 Celeron N3350/Pentium N4200/Atom E3900 Series Low Pin Count Interface + 5aee Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #4 + 5af0 Celeron N3350/Pentium N4200/Atom E3900 Series Host Bridge 65c0 5100 Chipset Memory Controller Hub 65e2 5100 Chipset PCI Express x4 Port 2 65e3 5100 Chipset PCI Express x4 Port 3 @@ -27616,6 +28004,7 @@ a16a Sunrise Point-H PCI Root Port #20 a170 Sunrise Point-H HD Audio a182 Lewisburg SATA Controller [AHCI mode] + a186 Lewisburg SATA Controller [RAID mode] a190 Lewisburg PCI Express Root Port #1 a191 Lewisburg PCI Express Root Port #2 a192 Lewisburg PCI Express Root Port #3 @@ -27651,6 +28040,7 @@ a1c6 Lewisburg LPC Controller a1c7 Lewisburg LPC Controller a1d2 Lewisburg SSATA Controller [AHCI mode] + a1d6 Lewisburg SSATA Controller [RAID mode] a1e7 Lewisburg PCI Express Root Port #17 a1e8 Lewisburg PCI Express Root Port #18 a1e9 Lewisburg PCI Express Root Port #19 @@ -27662,6 +28052,61 @@ a1fa Lewisburg IE: IDE-r a1fb Lewisburg IE: KT Controller a1fc Lewisburg IE: HECI #3 + a202 Lewisburg SATA Controller [AHCI mode] + a206 Lewisburg SATA Controller [RAID mode] + a223 Lewisburg SMBus + a224 Lewisburg SPI Controller + a242 Lewisburg LPC or eSPI Controller + a243 Lewisburg LPC or eSPI Controller + a252 Lewisburg SSATA Controller [AHCI mode] + a256 Lewisburg SSATA Controller [RAID mode] + a282 200 Series PCH SATA controller [AHCI mode] + a286 200 Series PCH SATA controller [RAID mode] + a290 200 Series PCH PCI Express Root Port #1 + a291 200 Series PCH PCI Express Root Port #2 + a292 200 Series PCH PCI Express Root Port #3 + a293 200 Series PCH PCI Express Root Port #4 + a294 200 Series PCH PCI Express Root Port #5 + a295 200 Series PCH PCI Express Root Port #6 + a296 200 Series PCH PCI Express Root Port #7 + a297 200 Series PCH PCI Express Root Port #8 + a298 200 Series PCH PCI Express Root Port #9 + a299 200 Series PCH PCI Express Root Port #10 + a29a 200 Series PCH PCI Express Root Port #11 + a29b 200 Series PCH PCI Express Root Port #12 + a29c 200 Series PCH PCI Express Root Port #13 + a29d 200 Series PCH PCI Express Root Port #14 + a29e 200 Series PCH PCI Express Root Port #15 + a29f 200 Series PCH PCI Express Root Port #16 + a2a1 200 Series PCH PMC + a2a3 200 Series PCH SMBus Controller + a2a7 200 Series PCH Serial IO UART Controller #0 + a2a8 200 Series PCH Serial IO UART Controller #1 + a2a9 200 Series PCH Serial IO SPI Controller #0 + a2aa 200 Series PCH Serial IO SPI Controller #1 + a2af 200 Series PCH USB 3.0 xHCI Controller + a2b1 200 Series PCH Thermal Subsystem + a2ba 200 Series PCH CSME HECI #1 + a2bb 200 Series PCH CSME HECI #2 + a2c4 200 Series PCH LPC Controller (H270) + a2c5 200 Series PCH LPC Controller (Z270) + a2c6 200 Series PCH LPC Controller (Q270) + a2c7 200 Series PCH LPC Controller (Q250) + a2c8 200 Series PCH LPC Controller (B250) + a2e0 200 Series PCH Serial IO I2C Controller #0 + a2e1 200 Series PCH Serial IO I2C Controller #1 + a2e2 200 Series PCH Serial IO I2C Controller #2 + a2e3 200 Series PCH Serial IO I2C Controller #3 + a2e6 200 Series PCH Serial IO UART Controller #2 + a2e7 200 Series PCH PCI Express Root Port #17 + a2e8 200 Series PCH PCI Express Root Port #18 + a2e9 200 Series PCH PCI Express Root Port #19 + a2ea 200 Series PCH PCI Express Root Port #20 + a2eb 200 Series PCH PCI Express Root Port #21 + a2ec 200 Series PCH PCI Express Root Port #22 + a2ed 200 Series PCH PCI Express Root Port #23 + a2ee 200 Series PCH PCI Express Root Port #24 + a2f0 200 Series PCH HD Audio a620 6400/6402 Advanced Memory Buffer (AMB) abc0 Omni-Path Fabric Switch Silicon 100 Series b152 21152 PCI-to-PCI Bridge @@ -28441,6 +28886,7 @@ f1d0 AJA Video cafe Kona SD cfee Xena LS/SD-22-DA/SD-DA daff KONA LHi + db09 Corvid 24 dcaf Kona HD dfee Xena HD-DA efac Xena SD-MM/SD-22-MM diff --git a/usr/src/data/hwdata/usb.ids b/usr/src/data/hwdata/usb.ids index c35afff77f..292affb22d 100644 --- a/usr/src/data/hwdata/usb.ids +++ b/usr/src/data/hwdata/usb.ids @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2016.10.13 -# Date: 2016-10-13 20:34:14 +# Version: 2017.02.12 +# Date: 2017-02-12 20:34:05 # # Vendors, devices and interfaces. Please keep sorted. @@ -36,6 +36,7 @@ 145f NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211] 0127 IBP 0002 HDM Interface + 0127 ibp 0145 Unknown 0112 Card Reader 017c MLK @@ -633,6 +634,7 @@ 8c11 Deskjet F4500 series 9002 PhotoSmart M437 9102 PhotoSmart M537 + 9207 HD-4110 Webcam 9302 PhotoSmart R930 series 9402 PhotoSmart R837 9502 PhotoSmart R840 series @@ -707,6 +709,7 @@ 03fc Elitegroup Computer Systems 03fd Xilinx, Inc. 0008 Platform Cable USB II + 0050 dfu downloader 03fe Farallon Comunications 0400 National Semiconductor Corp. 05dc Rigol Technologies DS1000USB Oscilloscope @@ -748,7 +751,7 @@ 6007 Serial Converter 6008 Serial Converter 6009 Serial Converter - 6010 FT2232C Dual USB-UART/FIFO IC + 6010 FT2232C/D/H Dual UART/FIFO IC 6011 FT4232H Quad HS USB-UART/FIFO IC 6014 FT232H Single HS USB-UART/FIFO IC 6015 Bridge(I2C/SPI/UART/FIFO) @@ -792,6 +795,7 @@ bfda OpenDCC (Throttle) bfdb OpenDCC (Gateway) bfdc OpenDCC (GBM) + c580 HID UNIKEY dongle [F-Response] c630 lcd2usb interface c631 i2c-tiny-usb interface c632 xu1541 c64 floppy drive interface @@ -1830,6 +1834,8 @@ ffff Compaq Bluetooth Multiport Module 044f ThrustMaster, Inc. 0400 HOTAS Cougar + 0402 HOTAS Warthog Joystick + 0404 HOTAS Warthog Throttle 044f GP XID a003 Rage 3D Game Pad a01b PK-GP301 Driving Wheel @@ -1853,6 +1859,7 @@ b651 Ferrari GT Rumble Force Wheel b653 RGT Force Feedback Clutch Racing Wheel b654 Ferrari GT Force Feedback Wheel + b687 TWCS Throttle b700 Tacticalboard 0450 DFI, Inc. 0451 Texas Instruments, Inc. @@ -2153,6 +2160,9 @@ 02d1 Xbox One Controller 02d5 Xbox One Digital TV Tuner 02dd Xbox One Controller (Covert Forces/Firmware 2015) + 02e3 Xbox One Elite Controller + 02e6 Wireless XBox Controller Dongle + 02ea Xbox One S Controller 0400 Windows Powered Pocket PC 2002 0401 Windows Powered Pocket PC 2002 0402 Windows Powered Pocket PC 2002 @@ -2303,12 +2313,14 @@ 0750 Wired Keyboard 600 0752 Wired Keyboard 400 075d LifeCam Cinema + 0761 LifeCam VX-2000 0766 LifeCam VX-800 0768 Sidewinder X4 076c Comfort Mouse 4500 076d LifeCam HD-5000 0772 LifeCam Studio 0779 LifeCam HD-3000 + 077f LifeChat LX-6000 Headset 0780 Comfort Curve Keyboard 3000 0797 Optical Mouse 200 07a5 Wireless Receiver 1461C @@ -2402,12 +2414,16 @@ 0027 CyMotion Master Solar Keyboard 002a Wireless Mouse & Keyboard 002d SmartTerminal XX44 + 003c Raptor Gaming Keyboard + 003d Raptor Gaming Keyboard Integrated Hub 003e SmartTerminal ST-2xxx 0041 G86 6240 Keyboard 0080 eHealth Terminal ST 1503 0081 eHealth Keyboard G87 1504 0106 R-300 Wireless Mouse Receiver 010d MX-Board 3.0 Keyboard + b090 Keyboard + b091 Mouse 046b American Megatrends, Inc. 0001 Keyboard 0101 PS/2 Keyboard, Mouse & Joystick Ports @@ -2555,7 +2571,9 @@ 0a37 USB Headset H540 0a38 Headset H340 0a44 Headset H390 + 0a45 960 Headset 0a4d G430 Surround Sound Gaming Headset + 0a5b G933 Wireless Headset Dongle 0b02 C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode) 8801 Video Camera b014 Bluetooth Mouse M336/M337/M535 @@ -2653,7 +2671,7 @@ c20c WingMan Precision c20d WingMan Attack 2 c20e WingMan Formula GP - c211 iTouch Cordless Reciever + c211 iTouch Cordless Receiver c212 WingMan Extreme Digital 3D c213 J-UH16 (Freedom 2.4 Cordless Joystick) c214 ATK3 (Attack III Joystick) @@ -3069,6 +3087,7 @@ a202 Canvio Basics HDD a208 Canvio Basics 2TB USB 3.0 Portable Hard Drive b001 Stor.E Partner + b207 Canvio Ready d000 External Disk 2TB Model DT01ABA200 d010 External Disk 3TB d011 Canvio Desk @@ -3140,6 +3159,7 @@ 048c Alps Electric Ireland, Ltd 048d Integrated Technology Express, Inc. 1165 IT1165 Flash Controller + 1172 Flash Drive 1336 SD/MMC Cardreader 1345 Multi Cardreader 9006 IT9135 BDA Afatech DVB-T HDTV Dongle @@ -3401,6 +3421,7 @@ 049b Strobe XP 100 04a0 7400 04ac Xerox Travel Scanner 100 + 04cd Xerox Travel Scanner 150 04a8 Multivideo Labs, Inc. 0101 Hub 0303 Peripheral Switch @@ -3473,9 +3494,11 @@ 10a8 iP6220D 10a9 iP6600D 10b6 PIXMA iP4300 Printer + 10b7 PIXMA iP5300 Printer 10c2 PIXMA iP1800 Printer 10c4 Pixma iP4500 Printer - 10c9 PIXIMA iP4600 Printer + 10c9 PIXMA iP4600 Printer + 10ca PIXMA iP3600 Printer 10e3 PIXMA iX6850 Printer 1404 W6400PG 1405 W8400PG @@ -3484,6 +3507,7 @@ 1512 BIJ1350D PCL 1601 DR-2080C Scanner 1607 DR-6080 Scanner + 1608 DR-2580C Scanner 1700 PIXMA MP110 Scanner 1701 PIXMA MP130 Scanner 1702 MP410 Composite @@ -3514,7 +3538,7 @@ 1725 MP610 ser 1726 MP970 ser 1727 MX300 ser - 1728 MX310 ser + 1728 PIXMA MX310 series 1729 MX700 ser 172b MP140 ser 1736 PIXMA MX320 series @@ -3874,7 +3898,9 @@ 3211 PowerShot SX130 IS 3212 Powershot S95 3214 SELPHY CP800 + 3215 EOS 60D 3218 EOS 600D / Rebel T3i (ptp) + 3219 EOS 1D X 3223 PowerShot A3300 IS 3224 PowerShot A3200 IS 3225 PowerShot ELPH 500 HS / IXUS 310 HS @@ -3891,7 +3917,9 @@ 3236 PowerShot S100 3237 PowerShot ELPH 310 HS / IXUS 230 HS 3238 PowerShot SX40 HS + 323a EOS 5D Mark III 323b EOS Rebel T4i + 323d EOS M 323e PowerShot A1300 323f PowerShot A810 3240 PowerShot ELPH 320 HS / IXUS 240 HS @@ -3900,10 +3928,14 @@ 3243 PowerShot A4000 IS 3244 PowerShot SX260 HS 3245 PowerShot SX240 HS + 3246 PowerShot ELPH 530 HS / IXUS 510 HS 3247 PowerShot ELPH 520 HS / IXUS 500 HS 3248 PowerShot A3400 IS 3249 PowerShot A2400 IS 324a PowerShot A2300 + 3250 EOS 6D + 3252 EOS 1D C + 3253 EOS 70D 3255 SELPHY CP900 3256 SELPHY CP810 3258 PowerShot G15 @@ -3921,10 +3953,16 @@ 3265 Powershot ELPH 130 IS / IXUS 140 3266 Powershot ELPH 120 IS / IXUS 135 3268 PowerShot ELPH 330 HS / IXUS 255 HS + 326f EOS 7D Mark II + 3270 EOS 100D 3271 PowerShot A2500 + 3272 EOS 700D + 3274 PowerShot G16 + 3275 PowerShot S120 3276 PowerShot SX170 IS 3277 PowerShot SX510 HS 3278 PowerShot S200 + 327a SELPHY CP910 327d Powershot ELPH 115 IS / IXUS 132 327f EOS Rebel T5 / EOS 1200D / EOS Kiss X70 3284 PowerShot D30 @@ -3943,9 +3981,14 @@ 329f PowerShot SX530 HS 32a6 PowerShot SX710 HS 32aa Powershot ELPH 160 / IXUS 160 + 32ab PowerShot ELPH 350HS / IXUS 275 HS 32ac PowerShot ELPH 170 IS / IXUS 170 32ad PowerShot SX410 IS + 32b1 SELPHY CP1200 + 32b2 PowerShot G9 X + 32bb EOS M5 32c1 PowerShot ELPH 180 / IXUS 175 + 32c2 PowerShot SX720 HS 04aa DaeWoo Telecom, Ltd 04ab Chromatic Research 04ac Micro Audiometrics Corp. @@ -4312,6 +4355,7 @@ 1304 iKey Token 1305 iKey Token 1306 iKey Token + 8000 SafeNet Sentinel Hardware Key 04ba Toucan Systems, Ltd 04bb I-O Data Device, Inc. 0101 USB2-IDE/ATAPI Bridge Adapter @@ -4607,6 +4651,7 @@ 1818 Keyboard [Diatec Filco Majestouch 2] 2011 Keyboard [Diatec Filco Majestouch 1] 2013 Keyboard [Das Keyboard] + 2206 Fujitsu Siemens Mouse Esprimo Q 2221 Keyboard 2323 Keyboard 2519 Shenzhen LogoTech 2.4GHz receiver @@ -4615,6 +4660,7 @@ a01c wireless multimedia keyboard with trackball [Trust ADURA 17911] a050 Chatman V1 a055 Keyboard + a11b Mouse [MX-3200] 04da Panasonic (Matsushita) 0901 LS-120 Camera 0912 SDR-S10 @@ -4625,6 +4671,7 @@ 0d0a CD-R Drive KXL-CB20AN 0d0d CDRCB03 0d0e DVD-ROM & CD-R/RW + 0f07 KX-MB2030 Multifunction Laser Printer 0f40 Printer 104d Elite Panaboard UB-T880 (HID) 104e Elite Panaboard Pen Adaptor (HID) @@ -4643,6 +4690,9 @@ 2374 Lumix Camera (PTP mode) 2451 HDC-SD9 245b HC-X920K (3MOS Full HD video camcorder) + 2477 SDR-H85 Camcorder (PC mode) + 2478 SDR-H85 Camcorder (recorder mode - SD card) + 2479 SDR-H85 Camcorder (recorder mode - HDD) 2497 HDC-TM700 250c Gobi Wireless Modem (QDL mode) 250d Gobi Wireless Modem @@ -4791,6 +4841,7 @@ 0082 Touchmonitor Interface 00ff Touchmonitor Interface 04e8 Samsung Electronics Co., Ltd + 0001 Printer Bootloader 0100 Kingston Flash Drive (128MB) 0110 Connect3D Flash Drive 0111 Connect3D Flash Drive @@ -4944,7 +4995,7 @@ 6125 D3 Station External Hard Drive 61b5 M3 Portable Hard Drive 2TB 61b6 M3 Portable Hard Drive 1TB - 61f3 MU-PT500B [T3 500GB USB SSD] + 61f3 Portable SSD T3 (MU-PT250B, MU-PT500B) 6601 Mobile Phone 6602 Galaxy 6603 Galaxy @@ -4988,8 +5039,8 @@ 6860 Galaxy (MTP) 6863 GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering) 6864 GT-I9070 (network tethering, USB debugging enabled) - 6865 GT-I9300 Phone [Galaxy S III] (PTP mode) - 6866 GT-I9300 Phone [Galaxy S III] (debugging mode) + 6865 Galaxy (PTP mode) + 6866 Galaxy (debugging mode) 6868 Escape Composite driver for Android Phones: Modem+Diagnostic+ADB 6875 GT-B3710 Standalone LTE device (Commercial) 6876 GT-B3710 LTE Modem @@ -5129,6 +5180,7 @@ 0214 Lynx M9 Optical Mouse 0230 3D Optical Mouse 0232 Mouse + 0234 Optical Mouse 02f4 2.4G Cordless Mouse 0381 Touchscreen 04a0 Dream Cheeky Stress/Panic Button @@ -5636,7 +5688,10 @@ 2027 QL-560 P-touch Label Printer 2028 QL-570 P-touch Label Printer 202b PT-7600 P-touch Label Printer + 2061 PT-P700 P-touch Label Printer + 2064 PT-P700 P-touch Label Printer RemovableDisk 2100 Card Reader Writer + 2102 Sewing machine 60a0 ADS-2000 60a1 ADS-2100 60a4 ADS-2500W @@ -6143,6 +6198,7 @@ 021b Net MD 021c Hi-MD WALKMAN 021d Net MD + 0226 UP-CR10L 0227 Printing Support 022c Net MD 022d Hi-MD AUDIO @@ -6204,7 +6260,13 @@ 05c4 DualShock 4 0689 Walkman NWZ-B173F 06bb WALKMAN NWZ-F805 + 06c3 RC-S380 + 07c4 ILCE-6000 (aka Alpha-6000) in Mass Storage mode 088c Portable Headphone Amplifier + 08b7 ILCE-6000 (aka Alpha-6000) in MTP mode + 094e ILCE-6000 (aka Alpha-6000) in PC Remote mode + 0994 ILCE-6000 (aka Alpha-6000) in charging mode + 0bb5 Headset MDR-1000X 1000 Wireless Buzz! Receiver 054d Try Corp. 054e Proside Corp. @@ -6492,6 +6554,12 @@ 0317 PTH-851 [Intuos pro (L)] 0318 CTH-301 [Bamboo] 032f DTU-1031X + 0347 Integrated Hub + 0348 Integrated Hub + 034a DTH-W1320 [MobileStudio Pro 13] touchscreen + 034b DTH-W1620 [MobileStudio Pro 16] touchscreen + 034d DTH-W1320 [MobileStudio Pro 13] tablet + 034e DTH-W1620 [MobileStudio Pro 16] tablet 0400 PenPartner 4x5 4001 TPC4001 4004 TPC4004 @@ -6541,6 +6609,7 @@ 1300 SoftK56 Data Fax Voice CARP 1301 Modem Enumerator 1328 TrendNet TFM-561 modem + 1804 HP Dock Audio 2000 SoftGate 802.11 Adapter 2002 SoftGate 802.11 Adapter 262a tm5600 Video & Audio Grabber Capture @@ -6982,6 +7051,7 @@ 001e Projector 001f Projector ffe5 IN34 Projector + ffeb Projector IN76 058d Micrel Semiconductor 058e Tripath Technology, Inc. 058f Alcor Micro Corp. @@ -7749,6 +7819,7 @@ b002 USB CF Reader b018 Multi-Card Reader b047 SDHC Reader [RW047-7000] + b051 microSD RDR UHS-I Card Reader [LRWM03U-7000] ba02 Workflow CFR1 ba0a Workflow DD512 c753 JumpDrive TwistTurn @@ -7786,6 +7857,7 @@ 0131 CF/SM Reader/Writer 0142 Multiple Slides Scanner-3600 0143 Multiple Frames Film Scanner-36series + 0145 Reflecta CrystalScan 7200 Photo-Scanner 0180 Plustek Scanner 0182 Wize Media 1000 0189 ScanJet 4600 series @@ -7835,6 +7907,7 @@ 0731 GL3310 SATA 3Gb/s Bridge Controller 0732 All-in-One Cardreader 0736 microSD Reader/Writer + 0738 Card reader 0741 microSD Card Reader 0743 SDXC and microSDXC CardReader 0745 Logilink CR0012 @@ -8744,6 +8817,11 @@ 0394 CP9000D/DW Port 03a1 CP9550D/DW Port 03a5 CP9550DW-S + 03a9 CP-9600DW + 03aa CP3020DA + 03ad CP-9800DW-S + 03ae CP-9800DW-S + 3b10 P95D 3b30 CP-D70DW / CP-D707DW 3b31 CP-K60DW-S 06d4 Cisco Systems @@ -8982,6 +9060,7 @@ 0622 TDK Trans-It 4GB 0624 TDK Trans-It 16GB 1120 RDX External dock (redbud) + 4006 8x Slim DVD Multi-Format Recorder External d000 Disc Stakka CD/DVD Manager 0719 Tremon Enterprises Co., Ltd 071b Domain Technologies, Inc. @@ -9317,10 +9396,12 @@ 5571 Cruzer Fit 5575 Cruzer Glide 5576 Cruzer Facet + 5577 Cruzer Pop (8GB) 557d Cruzer Force (64GB) 5580 SDCZ80 Flash Drive 5581 Ultra 5583 Ultra Fit + 5590 Ultra Dual 5591 Ultra Flair 5e10 Encrypted 6100 Ultra II SD Plus 2GB @@ -9967,6 +10048,7 @@ 0001 Dual PSX Adaptor 0002 Dual PCS Adaptor 0003 PlayStation Gamepad + e501 SNES Gamepad 0813 Mattel, Inc. 0001 Intel Play QX3 Microscope 0002 Dual Mode Camera Plus @@ -10316,14 +10398,21 @@ 01f4 USBSIMM1 08b9 RadioShack Corp. (Tandy) 08bb Texas Instruments - 2702 Speakers - 2704 Audio Codec - 2706 PCM2706 Audio Codec + 2702 PCM2702 16-bit stereo audio DAC + 2704 PCM2704 16-bit stereo audio DAC + 2705 PCM2705 stereo audio DAC + 2706 PCM2706 stereo audio DAC + 2707 PCM2707 stereo audio DAC + 27c4 PCM2704C stereo audio DAC + 27c5 PCM2705C stereo audio DAC + 27c6 PCM2706C stereo audio DAC + 27c7 PCM2707C stereo audio DAC 2900 PCM2900 Audio Codec 2901 PCM2901 Audio Codec 2902 PCM2902 Audio Codec 2904 PCM2904 Audio Codec 2910 PCM2912 Audio Codec + 2912 PCM2912A Audio Codec 29b0 PCM2900B Audio CODEC 29b2 PCM2902 Audio CODEC 29b3 PCM2903B Audio CODEC @@ -10695,6 +10784,7 @@ 253c GPSmap 62sc 255b Nuvi 2505LM 26a1 Nuvi 55 + 47fb nuviCam 0920 Echelon Co. 7500 Network Interface 0921 GoHubs, Inc. @@ -10713,6 +10803,7 @@ 23dd DocuPrint M760 (X760_USB) 3ce8 Phaser 3428 Printer 3cea Phaser 3125 + 3cec Phaser 3250 3d5b Phaser 6115MFP TWAIN Scanner 3d6d WorkCentre 6015N/NI 420f WorkCentre PE220 Series @@ -10835,7 +10926,12 @@ 0933 Quantum Corp. 0934 Spirent Communications 0936 NuTesla + 000a Moebius + 000b iMoebius 000c Rhythmedics 6 BioData Integrator + 000d Hypurius + 000e Millennius + 000f Purius 0030 Composite Device, Mass Storage Device (Flash Drive) amd HID 003c Rhythmedics HID Bootloader 0939 Lumberg, Inc. @@ -10938,6 +11034,7 @@ 168c DT Elite 3.0 0954 RPM Systems Corp. 0955 NVidia Corp. + 7018 APX 7030 Tegra 3 (recovery mode) 7100 Tegra Device 7210 SHIELD Controller @@ -11108,6 +11205,8 @@ 000b Bluetooth Adapter class 1 [BlueLight] 09d7 NovAtel Inc. 0100 NovAtel FlexPack GPS receiver +09d8 ELATEC + 0406 TWN4 MIFARE NFC 09d9 KRF Tech, Ltd 09da A4Tech Co., Ltd. 0006 Optical Mouse WOP-35 / Trust 450L Optical Mouse @@ -11770,9 +11869,15 @@ 4daf Transformer Pad Infinity TF700 (Fastboot) 5410 MeMO Pad HD 7 (MTP mode) 5412 MeMO Pad HD 7 (PTP mode) - 550f ASUS fonepad 7 + 550f Fonepad 7 6101 Cable Modem 620a Remote NDIS Device + 7772 ASUS Zenfone GO (ZB500KL) (MTP mode) + 7773 ASUS Zenfone GO (ZB500KL) (Debug, MTP mode) + 7774 ASUS Zenfone GO (ZB500KL) (RNDIS mode) + 7775 ASUS Zenfone GO (ZB500KL) (Debug, RNDIS mode) + 7776 ASUS Zenfone GO (ZB500KL) (PTP mode) + 7777 ASUS Zenfone GO (ZB500KL) (Debug, PTP mode) b700 Broadcom Bluetooth 2.1 0b0b Datamax-O'Neil 106e Datamax E-4304 @@ -12220,6 +12325,7 @@ 231a Expansion Portable 2320 USB 3.0 bridge [Portable Expansion Drive] 2321 Expansion Portable + 2322 SRD0NF1 Expansion Portable (STEA) 2340 FreeAgent External Hard Drive 3000 FreeAgent Desktop 3008 FreeAgent Desk 1TB @@ -12238,6 +12344,7 @@ 50a5 FreeAgent GoFlex Desk USB 3.0 5121 FreeAgent GoFlex 5161 FreeAgent GoFlex dock + 61b7 Maxtor M3 Portable a003 Backup Plus a0a1 Backup Plus Desktop a0a4 Backup Plus Desktop Drive @@ -12247,6 +12354,7 @@ ab24 Backup Plus Portable Drive ab31 Backup Plus Desktop Drive (5TB) ab34 Backup Plus + ab38 Backup Plus Hub 0bc3 IPWireless, Inc. 0001 UMTS-TDD (TD-CDMA) modem 0bc4 Microcube Corp. @@ -12316,6 +12424,7 @@ 5401 RTL 8153 USB 3.0 hub with gigabit ethernet 570c Asus laptop camera 5730 HP 2.0MP High Definition Webcam + 5751 Integrated Webcam 5775 HP "Truevision HD" laptop camera 57b3 Acer 640 × 480 laptop camera 57da Built-In Video Camera @@ -12390,6 +12499,8 @@ 0004 USBcan II 000b Leaf Light HS 000e Leaf SemiPro HS +0c00 FireFly Mouse Mat + 1607 Apex M500 0c04 MOTO Development Group, Inc. 0c05 Appian Graphics 0c06 Hasbro Games, Inc. @@ -12623,6 +12734,7 @@ 6480 Sonix 1.3 MP Laptop Integrated Webcam 648b Integrated Webcam 64bd Sony Visual Communication Camera + 64d0 Integrated Webcam 64d2 Integrated Webcam 651b HP Webcam 6705 Integrated HD Webcam @@ -12798,7 +12910,9 @@ 3050 EZ710 Smart Card Reader 0ca7 Information Systems Laboratories 0cad Motorola CGISS - 1030 APX Series Radio + 1007 APX Series Consolette + 1030 APX Series Radio (Portable) + 1031 APX Series Radio (Mobile) 1602 IMPRES Battery Data Reader 9001 PowerPad Pocket PC Device 0cae Ascom Business Systems, Ltd @@ -12882,6 +12996,10 @@ 0cd5 LabJack Corporation 0003 U3 0009 UE9 +0cd6 Scheidt & Bachmann + 000c S&B TPU + 000e S&B BKV + 0011 Money Coin Unit 0cd7 NewChip S.r.l. 0cd8 JS Digitech, Inc. 2007 Smart Card Reader/JSTU-9700 @@ -12994,6 +13112,7 @@ 0001 PhotoShuttle 0002 Photo Printer 730 series 0004 Photo Printer 63xPL/PS + 000e P910L 0100 Photo Printer 63xPL/PS 0102 Photo Printer 64xPS 0103 Photo Printer 730 series @@ -13231,7 +13350,7 @@ 0300 Avaya Wireless Card 1007 Discovery Kids Digital Camera 0d99 Trazer Technologies, Inc. -0d9a RTX Telecom AS +0d9a RTX AS 0001 Bluetooth Device 0d9b Tat Shing Electrical Co. 0d9c Chee Chen Hi-Technology Co., Ltd @@ -13462,6 +13581,7 @@ 0dfa Toyo Communication Equipment Co., Ltd 0dfc GeneralTouch Technology Co., Ltd 0001 Touchscreen + 0101 5-point Touch Screen 0e03 Nippon Systemware Co., Ltd 0e08 Winbest Technology Co., Ltd 0e0b Amigo Technology Inc. @@ -13899,6 +14019,7 @@ 8010 Blackberry Playbook (Connect to Windows mode) 8011 Blackberry Playbook (Connect to Mac mode) 8020 Blackberry Playbook (CD-Rom mode) + 8037 Blackberry PRIV 0fce Sony Ericsson Mobile Communications AB 0076 W910i (Multimedia mode) 00af V640i Phone [PTP Camera] @@ -14091,6 +14212,7 @@ 631d Optimus Android Phone (Camera/PTP Mode) 631e G2/Optimus Android Phone [Camera/PTP mode] 631f Optimus Android Phone (Charge Mode) + 633a Ultimate 2 Android Phone L41C 633e G2/G3 Android Phone [MTP/PTP/Download mode] 6344 G2 Android Phone [tethering mode] 6356 Optimus Android Phone [Virtual CD mode] @@ -14304,6 +14426,7 @@ 1140 My Book Essential (WDBACW) 1230 My Book (WDBFJK) 1235 My Book (WDBFJK0040HBK) + 2599 My Passport Ultra (WD40NMZW) 259d My Passport Ultra (WDBBKD) 259f My Passport Ultra (WD10JMVW) 1059 Giesecke & Devrient GmbH @@ -16978,9 +17101,23 @@ 0890 Flash Padlock 0a00 SP2500 Speakers 0a60 Vengeance K60 Keyboard + 0c04 Link Cooling Node 1a01 Flash Voyager GT + 1a03 Voyager 3.0 + 1a09 Voyager GT 3.0 1a0a Survivor Stealth Flash Drive + 1a0b Flash Voyager LS + 1a15 Voyager Slider Flash Drive 1a90 Flash Voyager GT + 1ab1 Voyager + 1b04 Raptor K50 Keyboard + 1b07 Vengeance K65 Gaming Keyboard + 1b08 Vengeance K95 Keyboard + 1b09 Vengeance K70R keyboard + 1b11 K95 RGB Mechanical Gaming Keyboard + 1b13 Vengeance K70RGB keyboard + 1c00 Controller for Corsair Link + 1c0c RM850i Power Supply 1b1f eQ-3 Entwicklung GmbH c00f HM-CFG-USB/HM-CFG-USB-2 [HomeMatic Configuration adapter] 1b20 MStar Semiconductor, Inc. @@ -17535,6 +17672,9 @@ 0200 Qemu Audio Device 1d90 Citizen 201e PPU-700 +1d9d Sigma Sport + 1010 Docking Station Topline 2009 + 1011 Docking Station Topline 2012 1de1 Actions Microelectronics Co. 1101 Generic Display Device (Mass storage mode) c101 Generic Display Device @@ -18145,6 +18285,13 @@ 1042 MPIO FY670 1043 HCT HMD-180A 1044 HCT HMD-180A +273f Hughski Limited + 1000 ColorHug bootloader + 1001 ColorHug + 1002 ColorHug+ + 1003 ColorHug+ Bootloader + 1004 ColorHug2 + 1005 ColorHug2 bootloader 2770 NHJ, Ltd 0a01 ScanJet 4600 series 905c Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35 @@ -18227,6 +18374,8 @@ 14ea GW-US11H WLAN 2c1a Dolphin Peripherals 0000 Wireless Optical Mouse +2dcf Dialog Semiconductor + c952 Audio Class 2.0 Devices 2fb2 Fujitsu, Ltd 3125 Eagletron 0001 TrackerPod Camera Stand -- cgit v1.2.3 From 719db50f9baba455978a31987e3e235ebd8a1592 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Mon, 1 May 2017 22:34:08 +0300 Subject: 8142 bootadm: get_boot_cap() should test for both 32-bit and 64-bit kernel Reviewed by: Hans Rosenfeld Reviewed by: Peter Tribble Approved by: Robert Mustacchi --- usr/src/cmd/boot/bootadm/bootadm_upgrade.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/usr/src/cmd/boot/bootadm/bootadm_upgrade.c b/usr/src/cmd/boot/bootadm/bootadm_upgrade.c index 0a6b95f7ed..86a184e623 100644 --- a/usr/src/cmd/boot/bootadm/bootadm_upgrade.c +++ b/usr/src/cmd/boot/bootadm/bootadm_upgrade.c @@ -21,7 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright 2016 Toomas Soome + * Copyright 2017 Toomas Soome */ #include @@ -109,6 +109,7 @@ get_boot_cap(const char *osroot) char fname[PATH_MAX]; char *image; uchar_t *ident; + uchar_t class; int fd; int m; multiboot_header_t *mbh; @@ -123,9 +124,25 @@ get_boot_cap(const char *osroot) return (BAM_SUCCESS); } + /* + * The install media can support both 64 and 32 bit boot + * by using boot archive as ramdisk image. However, to save + * the memory, the ramdisk may only have either 32 or 64 + * bit kernel files. To avoid error message about missing unix, + * we should try both variants here and only complain if neither + * is found. Since the 64-bit systems are more common, we start + * from amd64. + */ + class = ELFCLASS64; (void) snprintf(fname, PATH_MAX, "%s/%s", osroot, - "platform/i86pc/kernel/unix"); + "platform/i86pc/kernel/amd64/unix"); fd = open(fname, O_RDONLY); + if (fd < 0) { + class = ELFCLASS32; + (void) snprintf(fname, PATH_MAX, "%s/%s", osroot, + "platform/i86pc/kernel/unix"); + fd = open(fname, O_RDONLY); + } error = errno; INJECT_ERROR1("GET_CAP_UNIX_OPEN", fd = -1); if (fd < 0) { @@ -161,7 +178,7 @@ get_boot_cap(const char *osroot) bam_error(_("%s is not an ELF file.\n"), fname); return (BAM_ERROR); } - if (ident[EI_CLASS] != ELFCLASS32) { + if (ident[EI_CLASS] != class) { bam_error(_("%s is wrong ELF class 0x%x\n"), fname, ident[EI_CLASS]); return (BAM_ERROR); -- cgit v1.2.3 From bccbd30bb6d0c20635d3f23e8d63f3f8170d3c46 Mon Sep 17 00:00:00 2001 From: Peter Tribble Date: Mon, 1 May 2017 13:44:17 +0100 Subject: 8138 Improve manpage spelling Reviewed by: Toomas Soome Reviewed by: Cody Mello Reviewed by: Patrick Mooney Approved by: Robert Mustacchi --- usr/src/man/man1/audioctl.1 | 5 +-- usr/src/man/man1/digest.1 | 8 +--- usr/src/man/man1/unifdef.1 | 7 +-- usr/src/man/man1b/lpr.1b | 2 +- usr/src/man/man1m/beadm.1m | 2 +- usr/src/man/man1m/cfgadm_pci.1m | 2 +- usr/src/man/man1m/chat.1m | 2 +- usr/src/man/man1m/in.telnetd.1m | 13 ++---- usr/src/man/man1m/pkgadm.1m | 2 +- usr/src/man/man1m/pmconfig.1m | 59 ++++++++++--------------- usr/src/man/man1m/poold.1m | 6 +-- usr/src/man/man1m/print-service.1m | 8 +--- usr/src/man/man1m/projdel.1m | 11 +---- usr/src/man/man1m/rmt.1m | 8 +--- usr/src/man/man1m/rsh.1m | 12 ++--- usr/src/man/man1m/smbstat.1m | 2 +- usr/src/man/man1m/stmfadm.1m | 2 +- usr/src/man/man1m/svadm.1m | 7 +-- usr/src/man/man1m/syncinit.1m | 9 +--- usr/src/man/man1m/tpmadm.1m | 2 +- usr/src/man/man1m/zfs.1m | 2 +- usr/src/man/man3/Intro.3 | 6 +-- usr/src/man/man3avl/avl_insert.3avl | 2 +- usr/src/man/man3c/atomic_or.3c | 8 +--- usr/src/man/man3c/freopen.3c | 14 ++---- usr/src/man/man3c/getopt.3c | 9 +--- usr/src/man/man3c/mbstowcs.3c | 2 +- usr/src/man/man3c/mtx.3c | 2 +- usr/src/man/man3c/tss.3c | 2 +- usr/src/man/man3c/wcstombs.3c | 2 +- usr/src/man/man3gss/gss_accept_sec_context.3gss | 7 +-- usr/src/man/man3ldap/ldap_ufn.3ldap | 10 ++--- usr/src/man/man3proc/Lfree.3proc | 6 +-- usr/src/man/man3proc/Pcreate.3proc | 2 +- usr/src/man/man3proc/Pwrite.3proc | 2 +- usr/src/man/man4/NISLDAPmapping.4 | 2 +- usr/src/man/man4/fdi.4 | 6 +-- usr/src/man/man4/mpapi.conf.4 | 5 +-- usr/src/man/man4/rcmscript.4 | 2 +- usr/src/man/man4/slpd.reg.4 | 5 +-- usr/src/man/man5/attributes.5 | 13 +----- usr/src/man/man5/largefile.5 | 2 +- usr/src/man/man5/pam_authtok_get.5 | 2 +- usr/src/man/man5/pam_ldap.5 | 11 +---- usr/src/man/man5/regex.5 | 22 +-------- usr/src/man/man5/standards.5 | 2 +- usr/src/man/man5/threads.5 | 2 +- usr/src/man/man7d/usbsksp.7d | 10 +---- usr/src/man/man9e/usba_hcdi.9e | 4 +- usr/src/man/man9f/ddi_cb_register.9f | 10 +---- usr/src/man/man9f/mac_prop_info.9f | 2 +- usr/src/man/man9f/mod_install.9f | 8 +--- usr/src/tools/onbld/Checks/SpellCheck.py | 3 +- 53 files changed, 96 insertions(+), 260 deletions(-) diff --git a/usr/src/man/man1/audioctl.1 b/usr/src/man/man1/audioctl.1 index 78f7df7327..6c65764e86 100644 --- a/usr/src/man/man1/audioctl.1 +++ b/usr/src/man/man1/audioctl.1 @@ -126,21 +126,18 @@ specified). .RE .SH ENVIRONMENT VARIABLES -.sp -.sp .ne 2 .na \fB\fBAUDIODEV\fR\fR .ad .RS 12n -The full path name of the default audio device to use if on +The full path name of the default audio device to use if one is not specified on the command line. If this variable is not set, \fB/dev/audio\fR is used. .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp diff --git a/usr/src/man/man1/digest.1 b/usr/src/man/man1/digest.1 index cacf5e296a..b615f0f2fc 100644 --- a/usr/src/man/man1/digest.1 +++ b/usr/src/man/man1/digest.1 @@ -13,13 +13,11 @@ digest \- calculate a message digest .fi .SH DESCRIPTION -.sp .LP The \fBdigest\fR utility calculates the message digest of the given files or \fBstdin\fR using the algorithm specified. If more than one file is given, each line of output is the digest of a single file. .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -53,7 +51,6 @@ Verbose output. Includes the algorithm name and filename in the output. .SH USAGE .SS "Algorithms" -.sp .LP These algorithms are provided by the Cryptographic Framework. Each algorithm supported by the command is an alias of the PKCS #11 mechanism for easier @@ -128,7 +125,7 @@ sha1 (/usr/lib/inet/ntpd) = 5b4aff102372cea801e7d08acde9655fec81f07c \fBExample 4 \fRDisplaying a List of Available Algorithms .sp .LP -The following example displays a list of available algortithms to digest: +The following example displays a list of available algorithms to digest: .sp .in +2 @@ -144,7 +141,6 @@ sha512 .sp .SH EXIT STATUS -.sp .LP The following exit values are returned: .sp @@ -166,7 +162,6 @@ An error occurred. .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -182,7 +177,6 @@ Interface Stability Committed .TE .SH SEE ALSO -.sp .LP \fBcksum\fR(1), \fBencrypt\fR(1), \fBmac\fR(1), \fBbart\fR(1M), \fBcryptoadm\fR(1M), \fBlibpkcs11\fR(3LIB), \fBattributes\fR(5), diff --git a/usr/src/man/man1/unifdef.1 b/usr/src/man/man1/unifdef.1 index 4ccb5906fe..9bb36bf6d0 100644 --- a/usr/src/man/man1/unifdef.1 +++ b/usr/src/man/man1/unifdef.1 @@ -14,7 +14,6 @@ unifdef \- resolve and remove ifdef'ed lines from C program source .fi .SH DESCRIPTION -.sp .LP \fBunifdef\fR removes \fBifdef\fRed lines from a file while otherwise leaving the file alone. It is smart enough to deal with the nested \fBifdef\fRs, @@ -28,7 +27,7 @@ removed, as appropriate. Any \fBifdef\fR, \fBifndef\fR, \fBelse\fR, and .sp .LP \fBifdef\fRs involving symbols you do not specify are untouched and copied out -along with their associated \fBifdef\fR, \fBelse\fR, and \fBendiff1\fR lines. +along with their associated \fBifdef\fR, \fBelse\fR, and \fBendif\fR lines. .sp .LP If an \fBifdef\fR\fIX\fR occurs nested inside another \fBifdef\fR\fIX\fR, then @@ -40,7 +39,6 @@ significant. \fBunifdef\fR copies its output to the standard output and will take its input from the standard input if no \fIfilename\fR argument is given. .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -113,7 +111,6 @@ Ignore, but print out, lines associated with the undefined symbol \fIname\fR. .RE .SH EXIT STATUS -.sp .LP The following exit values are returned: .sp @@ -135,11 +132,9 @@ Operation failed. .RE .SH SEE ALSO -.sp .LP \fBdiff\fR(1), \fBattributes\fR(5) .SH DIAGNOSTICS -.sp .ne 2 .na \fB\fBPremature\fR \fBEOF\fR\fR diff --git a/usr/src/man/man1b/lpr.1b b/usr/src/man/man1b/lpr.1b index fc6a054a84..3f1e84796b 100644 --- a/usr/src/man/man1b/lpr.1b +++ b/usr/src/man/man1b/lpr.1b @@ -358,7 +358,7 @@ c | c l | l . ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface Stabilitly Standard +Interface Stability Standard _ CSI Enabled. See NOTES .TE diff --git a/usr/src/man/man1m/beadm.1m b/usr/src/man/man1m/beadm.1m index 8e92d8767b..b62e31331c 100644 --- a/usr/src/man/man1m/beadm.1m +++ b/usr/src/man/man1m/beadm.1m @@ -346,7 +346,7 @@ and snapshot operations for boot environments from non-active global parent BE aren't supported, destroy is allowed if these boot environments aren't active on boot. .sp -Each line in the machine parasable output has the boot environment name as the +Each line in the machine parsable output has the boot environment name as the first field. The 'Space' field is displayed in bytes and the 'Created' field is displayed in UTC format. The \fB-H\fR option used with no other options gives diff --git a/usr/src/man/man1m/cfgadm_pci.1m b/usr/src/man/man1m/cfgadm_pci.1m index 7015a06f33..ebed12b823 100644 --- a/usr/src/man/man1m/cfgadm_pci.1m +++ b/usr/src/man/man1m/cfgadm_pci.1m @@ -666,7 +666,7 @@ example# \fBcfgadm -c configure cpci_slot4\fR .sp .LP -The change can be verifed by entering the following command: +The change can be verified by entering the following command: .sp .in +2 diff --git a/usr/src/man/man1m/chat.1m b/usr/src/man/man1m/chat.1m index db5b98ebd5..7b233ae62f 100644 --- a/usr/src/man/man1m/chat.1m +++ b/usr/src/man/man1m/chat.1m @@ -640,7 +640,7 @@ in expect.) .LP Environment variables are available within \fBchat\fR scripts if the \fB-E\fR option is specified on the command line. The metacharacter \fB$\fR introduces -the name of the environment variable to substitute. If the substition fails +the name of the environment variable to substitute. If the substitution fails because the requested environment variable is not set, nothing is replaced for the variable. .SH EXIT STATUS diff --git a/usr/src/man/man1m/in.telnetd.1m b/usr/src/man/man1m/in.telnetd.1m index 9cd0b4874b..ba6d80c2dc 100644 --- a/usr/src/man/man1m/in.telnetd.1m +++ b/usr/src/man/man1m/in.telnetd.1m @@ -15,7 +15,6 @@ in.telnetd, telnetd \- DARPA TELNET protocol server .fi .SH DESCRIPTION -.sp .LP \fBin.telnetd\fR is a server that supports the \fBDARPA\fR standard \fBTELNET\fR virtual terminal protocol. \fBin.telnetd\fR is normally invoked in @@ -94,7 +93,6 @@ BANNER="" .in -2 .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -218,11 +216,9 @@ Disables Kerberos V5 authentication support negotiation. .RE .SH USAGE -.sp .LP \fBtelnetd\fR and \fBin.telnetd\fR are IPv6-enabled. See \fBip6\fR(7P). .SH SECURITY -.sp .LP \fBin.telnetd\fR can authenticate using Kerberos V5 authentication, \fBpam\fR(3PAM), or both. By default, the telnet server will accept valid @@ -263,8 +259,8 @@ session management, and password management modules. .in +2 .nf telnet auth requisite pam_authtok_get.so.1 -telent auth required pam_dhkeys.so.1 -telent auth required pam_unix_auth.so.1 +telnet auth required pam_dhkeys.so.1 +telnet auth required pam_unix_auth.so.1 telnet account requisite pam_roles.so.1 telnet account required pam_projects.so.1 @@ -273,7 +269,7 @@ telnet account required pam_unix_account.so.1 telnet session required pam_unix_session.so.1 telnet password required pam_dhkeys.so.1 -telent password requisite pam_authtok_get.so.1 +telnet password requisite pam_authtok_get.so.1 telnet password requisite pam_authtok_check.so.1 telnet password required pam_authtok_store.so.1 .fi @@ -289,7 +285,6 @@ then the user may be prompted for multiple passwords. For a Kerberized telnet service, the correct \fBPAM\fR service name is \fBktelnet\fR. .SH FILES -.sp .ne 2 .na \fB\fB/etc/default/telnetd\fR\fR @@ -299,7 +294,6 @@ For a Kerberized telnet service, the correct \fBPAM\fR service name is .RE .SH SEE ALSO -.sp .LP \fBlogin\fR(1), \fBsvcs\fR(1), \fBtelnet\fR(1), \fBinetadm\fR(1M), \fBinetd\fR(1M), \fBkadmin\fR(1M), \fBsvcadm\fR(1M), @@ -361,7 +355,6 @@ Ts'o, T., \fITelnet Data Encryption Option, RFC 2946\fR. September 2000. Ts'o, T., \fITelnet Encryption: DES 64 bit Cipher Feedback, RFC 2952\fR. September 2000. .SH NOTES -.sp .LP Some \fBTELNET\fR commands are only partially implemented. .sp diff --git a/usr/src/man/man1m/pkgadm.1m b/usr/src/man/man1m/pkgadm.1m index 2a5180eb5e..b204fe0f4f 100644 --- a/usr/src/man/man1m/pkgadm.1m +++ b/usr/src/man/man1m/pkgadm.1m @@ -49,7 +49,7 @@ Writes the contents file and rolls the contents log file. With use of the The Solaris operating system relies upon enhanced System V revision 4 (SVr4) packages as the basis for its software installation and revision management. The package maintenance software stores information about installed packages in -an internal database. The \fBpkgadm\fR subcomand \fBdbstatus\fR is used to +an internal database. The \fBpkgadm\fR subcommand \fBdbstatus\fR is used to determine how the package internal database is implemented. The \fBdbstatus\fR command returns a string that indicates the type of internal database in use. In the current implementation, the \fBdbstatus\fR command always returns the diff --git a/usr/src/man/man1m/pmconfig.1m b/usr/src/man/man1m/pmconfig.1m index 2bf343db50..05e34b317a 100644 --- a/usr/src/man/man1m/pmconfig.1m +++ b/usr/src/man/man1m/pmconfig.1m @@ -1,9 +1,10 @@ '\" te +.\" Copyright (c) 2017 Peter Tribble .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH PMCONFIG 1M "Aug 12, 2004" +.TH PMCONFIG 1M "May 1, 2017" .SH NAME pmconfig \- Configure the Power Management system .SH SYNOPSIS @@ -13,33 +14,27 @@ pmconfig \- Configure the Power Management system .fi .SH DESCRIPTION -.sp .LP -The \fBpmconfig\fR utility sets the Power Management and suspend-resume +The \fBpmconfig\fR utility sets the Power Management and suspend-resume configuration. User has permission to change Power Management configuration using \fBpmconfig\fR only if he is allowed to do so according to -\fBPMCHANGEPERM \fRkeyword of \fB/etc/default/power\fR. User has permission to -change the suspend-resume configuration using \fBpmconfig\fR only if he is -allowed to do so according to the \fBCPRCHANGEPERM \fRkeyword of +\fBPMCHANGEPERM\fR keyword of \fB/etc/default/power\fR. User has permission to +change the suspend-resume configuration using \fBpmconfig\fR only if he is +allowed to do so according to the \fBCPRCHANGEPERM\fR keyword of \fB/etc/default/power\fR. See FILES section below for a description of the -\fBPMCHANGEPERM \fRand \fBCPRCHANGEPERM \fR keywords of +\fBPMCHANGEPERM\fR and \fBCPRCHANGEPERM\fR keywords of \fB/etc/default/power\fR. .sp .LP -Based on user permissions, \fBpmconfig\fR first resets the Power Management -and/or suspend-resume state back to its default and then reads the new -Power Management and/or suspend-resume configuration from -\fB/etc/power.conf\fR and issues the commands to activiate the new +Based on user permissions, \fBpmconfig\fR first resets the Power Management +and/or suspend-resume state back to its default and then reads the new +Power Management and/or suspend-resume configuration from +\fB/etc/power.conf\fR and issues the commands to activate the new configuration. The \fBpmconfig\fR utility is run at system boot. This utility can also be run from the command line after manual changes have been made to -the \fB/etc/power.conf\fR file. For editing changes made to the +the \fB/etc/power.conf\fR file. For changes made to the \fB/etc/power.conf\fR file to take effect, users must run \fBpmconfig\fR. -.sp -.LP -The preferred interface for changing Power Management and suspend-resume -configuration is \fBdtpower\fR(1M). .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -48,13 +43,12 @@ The following options are supported: \fB\fB-r\fR\fR .ad .RS 6n - Reset Power Management and suspend-resume state to default and exit. User -must have both Power Management and suspend-resume configuration permission +Reset Power Management and suspend-resume state to default and exit. User +must have both Power Management and suspend-resume configuration permission for this option. .RE .SH EXIT STATUS -.sp .LP The following exit values are returned: .sp @@ -76,13 +70,12 @@ An error occurred .RE .SH FILES -.sp .ne 2 .na \fB\fB/etc/power.conf\fR\fR .ad .RS 22n -System Power Management configuration file +System Power Management configuration file. .RE .sp @@ -91,10 +84,10 @@ System Power Management configuration file \fB\fB/etc/default/power\fR\fR .ad .RS 22n -File that controls permissions for system's Power Management and -suspend-resume features. The \fBPMCHANGEPERM\fR keyboard controls the Power -Management configuration permissions, while the \fBCPRCHANGEPERM \fRkeyword -controls the suspend-resume configuration permissions. +File that controls permissions for system's Power Management and +suspend-resume features. The \fBPMCHANGEPERM\fR keyboard controls the Power +Management configuration permissions, while the \fBCPRCHANGEPERM\fR keyword +controls the suspend-resume configuration permissions. .RE .sp @@ -124,7 +117,7 @@ No one except super-user can change the configuration. \fB\fB\fR\fR .ad .RS 22n -A user in this user list or a super-user can change the configuration. The +A user in this user list or a super-user can change the configuration. The user list is a space and/or comma (,) separated list. You must enclose the list in < and > characters. .RE @@ -135,7 +128,7 @@ in < and > characters. \fB\fBconsole-owner\fR\fR .ad .RS 22n -A user who owns the system console device node or a super-user can change the +A user who owns the system console device node or a super-user can change the configuration. .RE @@ -144,7 +137,6 @@ configuration. The default values are \fBPMCHANGEPERM=console-owner\fR and \fBCPRCHANGEPERM=console-owner\fR. .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -156,11 +148,10 @@ c | c l | l . ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface stability Unstable +Interface Stability Unstable .TE .SH SEE ALSO -.sp .LP \fBsvcs\fR(1), \fBpowerd\fR(1M), \fBpower.conf\fR(4), \fBsvcadm\fR(1M), \fBattributes\fR(5), \fBsmf\fR(5), \fBcpr\fR(7), \fBpm\fR(7D) @@ -168,7 +159,6 @@ Interface stability Unstable .LP \fIUsing Power Management\fR .SH NOTES -.sp .LP The \fBpmconfig\fR service is managed by the service management facility, \fBsmf\fR(5), under the service identifier: @@ -186,14 +176,13 @@ Administrative actions on this service, such as enabling, disabling, or requesting restart, can be performed using \fBsvcadm\fR(1M). The service's status can be queried using the \fBsvcs\fR(1) command. .SH DIAGNOSTICS -.sp .LP If the program cannot open the configuration file, it prints an error message to standard error. If the program encounters a syntax error in the configuration file, it prints an error message and the line number of the error -in the configuration file. It then skips the rest of the information on that +in the configuration file. It then skips the rest of the information on that line and processes the next line. Any configuration information already processed on the line containing the error is used. If user does not have -permission to change Power Management and/or suspend-resume configuration, and +permission to change Power Management and/or suspend-resume configuration, and configuration file has entries for which user doesn't have permission, it process the entries for which user has permissions and prints error on rest. diff --git a/usr/src/man/man1m/poold.1m b/usr/src/man/man1m/poold.1m index 0fdee07ddd..84039a1b34 100644 --- a/usr/src/man/man1m/poold.1m +++ b/usr/src/man/man1m/poold.1m @@ -13,7 +13,6 @@ poold \- automated resource pools partitioning daemon .fi .SH DESCRIPTION -.sp .LP \fBpoold\fR provides automated resource partitioning facilities. \fBpoold\fR can be enabled or disabled using the Solaris Service Management Facility, @@ -62,7 +61,6 @@ system administrator must determine which resource pools are most deserving of scarce resource and indicate this through the importance of resource pools and objectives. .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -71,7 +69,7 @@ The following options are supported: \fB\fB-l\fR \fIlevel\fR\fR .ad .RS 12n -Specify the vebosity level for logging information. +Specify the verbosity level for logging information. .sp Specify \fIlevel\fR as \fBALERT\fR, \fBCRIT\fR, \fBERR\fR, \fBWARNING\fR, \fBNOTICE\fR, \fBINFO\fR, and \fBDEBUG\fR. If \fIlevel\fR is not supplied, then @@ -178,7 +176,6 @@ The following command enables dynamic resource pools: .sp .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -197,7 +194,6 @@ Interface Stability See below. .LP The invocation is Evolving. The output is Unstable. .SH SEE ALSO -.sp .LP \fBpooladm\fR(1M), \fBpoolbind\fR(1M), \fBpoolcfg\fR(1M), \fBpoolstat\fR(1M), \fBsvcadm\fR(1M), \fBpool_set_status\fR(3POOL), \fBlibpool\fR(3LIB), diff --git a/usr/src/man/man1m/print-service.1m b/usr/src/man/man1m/print-service.1m index 681a611101..2d8a31ed48 100644 --- a/usr/src/man/man1m/print-service.1m +++ b/usr/src/man/man1m/print-service.1m @@ -14,7 +14,6 @@ system .fi .SH DESCRIPTION -.sp .LP The \fBprint-service\fR utility manages print service selection, as well as export and import of basic print queue configuration. @@ -23,7 +22,6 @@ export and import of basic print queue configuration. Only a user root privileges or with the Printer Management profile can change the active print service or import print queue configuration. .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -138,7 +136,6 @@ service. .sp .SH EXIT STATUS -.sp .ne 2 .na \fB\fB0\fR\fR @@ -159,7 +156,6 @@ An error occurred. .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -175,11 +171,9 @@ Interface Stability Obsolete .TE .SH SEE ALSO -.sp .LP -\fBintro\fR(1), \fBattributes\fR(5) +\fBIntro\fR(1), \fBattributes\fR(5) .SH NOTES -.sp .LP The print queue configuration saved and restored during export, import, and migration is limited to queue name and device name. It is likely that further diff --git a/usr/src/man/man1m/projdel.1m b/usr/src/man/man1m/projdel.1m index ba7674ea9b..e680658b0a 100644 --- a/usr/src/man/man1m/projdel.1m +++ b/usr/src/man/man1m/projdel.1m @@ -14,12 +14,10 @@ projdel \- delete a project from the system .fi .SH DESCRIPTION -.sp .LP The \fBprojdel\fR utility deletes a project from the system and makes the appropriate changes to the system file. .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -33,7 +31,6 @@ system project file, \fB/etc/project\fR, is modified. .RE .SH OPERANDS -.sp .LP The following operands are supported: .sp @@ -46,7 +43,6 @@ The name of the project to be deleted. .RE .SH EXIT STATUS -.sp .LP The following exit values are returned: .sp @@ -122,7 +118,6 @@ Cannot update the \fB/etc/project\fR file. .RE .SH FILES -.sp .ne 2 .na \fB\fB/etc/project\fR\fR @@ -141,7 +136,6 @@ System project file .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -153,26 +147,23 @@ c | c l | l . ATTRIBUTE TYPE ATTRIBUTE VALUE _ -Interface stabilty See below. +Interface Stability See below. .TE .sp .LP Invocation is evolving. Human readable output is unstable. .SH SEE ALSO -.sp .LP \fBprojects\fR(1), \fBgroupadd\fR(1M), \fBgroupdel\fR(1M), \fBgroupmod\fR(1M), \fBgrpck\fR(1M), \fBlogins\fR(1M), \fBprojadd\fR(1M), \fBprojmod\fR(1M), \fBuseradd\fR(1M), \fBuserdel\fR(1M), \fBusermod\fR(1M), \fBproject\fR(4), \fBattributes\fR(5) .SH DIAGNOSTICS -.sp .LP In case of an error, \fBprojdel\fR prints an error message and exits with a non-zero status. .SH NOTES -.sp .LP \fBprojdel\fR deletes a project definition only on the local system. If a network name service such as \fBNIS\fR or \fBLDAP\fR is being used to diff --git a/usr/src/man/man1m/rmt.1m b/usr/src/man/man1m/rmt.1m index 82f8614b77..1aa7557997 100644 --- a/usr/src/man/man1m/rmt.1m +++ b/usr/src/man/man1m/rmt.1m @@ -14,7 +14,6 @@ rmt \- remote magtape protocol module .fi .SH DESCRIPTION -.sp .LP \fBrmt\fR is a program used by the remote dump and restore programs in manipulating a magnetic tape drive through an interprocess communication @@ -54,7 +53,7 @@ Unsuccessful commands are responded to with: .sp .6 .RS 4n where \fIerror-number\fR is one of the possible error numbers described in -\fBintro\fR(3), and \fIerror-message\fR is the corresponding error string as +\fBIntro\fR(3), and \fIerror-message\fR is the corresponding error string as printed from a call to \fBperror\fR(3C). .RE @@ -143,17 +142,14 @@ value is returned from the \fBwrite\fR(9E) call. .LP Any other command causes \fBrmt\fR to exit. .SH SEE ALSO -.sp .LP -\fBufsdump\fR(1M), \fBufsrestore\fR(1M), \fBintro\fR(3), \fBioctl\fR(2), +\fBufsdump\fR(1M), \fBufsrestore\fR(1M), \fBIntro\fR(3), \fBioctl\fR(2), \fBlseek\fR(2), \fBperror \fR(3C), \fBrcmd\fR(3SOCKET), \fBrexec\fR(3SOCKET), \fBattributes\fR(5), \fBmtio\fR(7I), \fBopen\fR(9E), \fBread\fR(9E), \fBwrite\fR(9E) .SH DIAGNOSTICS -.sp .LP All responses are of the form described above. .SH BUGS -.sp .LP Do not use this for a remote file access protocol. diff --git a/usr/src/man/man1m/rsh.1m b/usr/src/man/man1m/rsh.1m index 025f371aec..85696ba0f4 100644 --- a/usr/src/man/man1m/rsh.1m +++ b/usr/src/man/man1m/rsh.1m @@ -13,7 +13,6 @@ rsh, restricted_shell \- restricted shell command interpreter .fi .SH DESCRIPTION -.sp .LP \fBrsh\fR is a limiting version of the standard command interpreter \fBsh\fR, used to restrict logins to execution environments whose capabilities are more @@ -44,7 +43,7 @@ setting the value of $\fBPATH\fR, .TP .ie t \(bu .el o -pecifying path or command names containing \fB/\fR, +specifying path or command names containing \fB/\fR, .RE .RS +4 .TP @@ -79,7 +78,7 @@ the shell is invoked and \fBrsh\fR is the file name part of argument 0; .RS +4 .TP 4. -the shell is invoke with the \fB-r\fR option. +the shell is invoked with the \fB-r\fR option. .RE .sp .LP @@ -100,19 +99,16 @@ The system administrator often sets up a directory of commands (that is, \fB/usr/rbin\fR) that can be safely invoked by a restricted shell. Some systems also provide a restricted editor, \fBred\fR. .SH EXIT STATUS -.sp .LP Errors detected by the shell, such as syntax errors, cause the shell to return a non-zero exit status. If the shell is being used non-interactively execution of the shell file is abandoned. Otherwise, the shell returns the exit status of the last command executed. .SH SEE ALSO -.sp .LP -\fBintro\fR(1), \fBcd\fR(1), \fBlogin\fR(1), \fBrsh\fR(1), \fBsh\fR(1), \fB -exec\fR(2), \fBpasswd\fR(4), \fBprofile\fR(4), \fBattributes\fR(5) +\fBIntro\fR(1), \fBcd\fR(1), \fBlogin\fR(1), \fBrsh\fR(1), \fBsh\fR(1), +\fBexec\fR(2), \fBpasswd\fR(4), \fBprofile\fR(4), \fBattributes\fR(5) .SH NOTES -.sp .LP The restricted shell, \fB/usr/lib/rsh\fR, should not be confused with the remote shell, \fB/usr/bin/rsh\fR, which is documented in \fBrsh\fR(1). diff --git a/usr/src/man/man1m/smbstat.1m b/usr/src/man/man1m/smbstat.1m index c45736767f..04723e3d7e 100644 --- a/usr/src/man/man1m/smbstat.1m +++ b/usr/src/man/man1m/smbstat.1m @@ -168,7 +168,7 @@ specified, and subsequent outputs represent the activity in the interval that just finished. .El .Sh INTERFACE STABILITY -.Sy Uncommited . +.Sy Uncommitted . Output format is .Sy Not-an-Interface. .Sh SEE ALSO diff --git a/usr/src/man/man1m/stmfadm.1m b/usr/src/man/man1m/stmfadm.1m index 4bc6ea1429..8493c20d04 100644 --- a/usr/src/man/man1m/stmfadm.1m +++ b/usr/src/man/man1m/stmfadm.1m @@ -633,7 +633,7 @@ View Entry: 0 .Ed .El .Sh INTERFACE STABILITY -.Sy Commited +.Sy Committed .Sh SEE ALSO .Xr sbdadm 1M , .Xr attributes 5 diff --git a/usr/src/man/man1m/svadm.1m b/usr/src/man/man1m/svadm.1m index 1f923fc99d..82ba35ba94 100644 --- a/usr/src/man/man1m/svadm.1m +++ b/usr/src/man/man1m/svadm.1m @@ -44,13 +44,11 @@ operations .fi .SH DESCRIPTION -.sp .LP The \fBsvadm\fR command controls the Storage Volume (SV) driver by providing facilities to enable and disable the SV driver for specified volumes, and to dynamically reconfigure the system. .SH OPTIONS -.sp .LP If you specify no arguments to an \fBsvadm\fR command, the utility displays the list of volumes currently under SV control. \fBsvadm\fR supports the following @@ -153,10 +151,9 @@ Displays the SV version number. .RE .SH USAGE -.sp .LP When an SV volume is enabled, normal system call access to the device (see -\fBintro\fR(2)) is redirected into the StoreEdge architecture software. This +\fBIntro\fR(2)) is redirected into the StoreEdge architecture software. This allows standard applications to use StorageTek features such as Sun StorageTek Point-in-Time Copy and Remote Mirror Software. .sp @@ -165,7 +162,6 @@ The \fBsvadm\fR command generates an entry in the Availability Suite log file, \fB/var/adm/ds.log\fR (see \fBds.log\fR(4)), when performing enable (\fB-e\fR) and disable (\fB-d\fR) operations. .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -181,6 +177,5 @@ Interface Stability Evolving .TE .SH SEE ALSO -.sp .LP \fBdscfg\fR(1M), \fBds.log\fR(4), \fBattributes\fR(5), \fBsv\fR(7D) diff --git a/usr/src/man/man1m/syncinit.1m b/usr/src/man/man1m/syncinit.1m index b9275fde3a..2eda0dd927 100644 --- a/usr/src/man/man1m/syncinit.1m +++ b/usr/src/man/man1m/syncinit.1m @@ -14,7 +14,6 @@ syncinit \- set serial line interface operating parameters .fi .SH DESCRIPTION -.sp .LP The \fBsyncinit\fR utility allows the user to modify some of the hardware operating modes common to synchronous serial lines. This can be useful in @@ -26,7 +25,6 @@ If run without options, \fBsyncinit\fR reports the options as presently set on the port. If options are specified, the new settings are reported after they have been made. .SH OPTIONS -.sp .LP Options to \fBsyncinit\fR normally take the form of a keyword, followed by an equal sign and a value. The exception is that a baud rate may be specified as a @@ -139,12 +137,10 @@ speed=0, loopback=no, echo=no, nrzi=no, txc=txc, rxc=rxc .sp .SH SEE ALSO -.sp .LP -\fBsyncloop\fR(1M), \fBsyncstat\fR(1M), \fBintro\fR(2), \fBioctl\fR(2), +\fBsyncloop\fR(1M), \fBsyncstat\fR(1M), \fBIntro\fR(2), \fBioctl\fR(2), \fBattributes\fR(5), \fB zsh\fR(7D) .SH DIAGNOSTICS -.sp .ne 2 .na \fB\fIdevice\fR\fB missing minor device number\fR\fR @@ -184,11 +180,10 @@ The string \fIarg\fR did not make sense as an option. .sp .6 .RS 4n An \fBioctl\fR(2) system called failed. The meaning of the value of -\fIerrno\fR may be found in \fBintro\fR(2). +\fIerrno\fR may be found in \fBIntro\fR(2). .RE .SH WARNINGS -.sp .LP Do not use \fBsyncinit\fR on an active serial link, unless needed to resolve an error condition. Do not use this command casually or without being aware of diff --git a/usr/src/man/man1m/tpmadm.1m b/usr/src/man/man1m/tpmadm.1m index c60b356165..f1c99db6ff 100644 --- a/usr/src/man/man1m/tpmadm.1m +++ b/usr/src/man/man1m/tpmadm.1m @@ -74,7 +74,7 @@ The following subcommands are used in the form: .sp .in +2 .nf -# tpamadm \fI\fR \fI[operand]\fR +# tpmadm \fI\fR \fI[operand]\fR .fi .in -2 .sp diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m index 22f5b7c0aa..90ebe1263b 100644 --- a/usr/src/man/man1m/zfs.1m +++ b/usr/src/man/man1m/zfs.1m @@ -949,7 +949,7 @@ settings for this property, .Sy on does not select a fixed compression type. As new compression algorithms are added to ZFS and enabled on a pool, the default compression algorithm may -change. The current default compression algorthm is either +change. The current default compression algorithm is either .Sy lzjb or, if the .Sy lz4_compress diff --git a/usr/src/man/man3/Intro.3 b/usr/src/man/man3/Intro.3 index 62c952187e..330dec1b76 100644 --- a/usr/src/man/man3/Intro.3 +++ b/usr/src/man/man3/Intro.3 @@ -410,7 +410,7 @@ command line to link with this library. See \fBlibpanel\fR(3LIB). .ad .sp .6 .RS 4n -These functions constitute the grapnics library, \fBlibplot\fR. This library is +These functions constitute the graphics library, \fBlibplot\fR. This library is implemented as a shared object, \fBlibplot.so\fR, but is not automatically linked by the C compilation system. Specify \fB-lplot\fR on the \fBcc\fR command line to link with this library. See \fBlibplot\fR(3LIB). @@ -770,7 +770,7 @@ automatically linked by the C compilation system. Specify \fB-lnvpair\fR on the .ad .sp .6 .RS 4n -These functions constitute the pluggable uuthentication module library, +These functions constitute the pluggable authentication module library, \fBlibpam\fR. This library is implemented as a shared object, \fBlibpam.so\fR, but is not automatically linked by the C compilation system. Specify \fB-lpam\fR on the \fBcc\fR command line to link with this library. See @@ -840,7 +840,7 @@ See \fBlibpool\fR(3LIB). .ad .sp .6 .RS 4n -These functions consittue the process mainpulation library, +These functions constitute the process manipulation library, \fBlibproc\fR. This library is implemented as a shared object, \fBlibproc.so\fR, but it is not automatically linked by the C compilation system. Specify \fB-lproc\fR on the \fBcc\fR command line to link with this diff --git a/usr/src/man/man3avl/avl_insert.3avl b/usr/src/man/man3avl/avl_insert.3avl index f00cf533ad..4a942918fb 100644 --- a/usr/src/man/man3avl/avl_insert.3avl +++ b/usr/src/man/man3avl/avl_insert.3avl @@ -51,7 +51,7 @@ function uses the value, obtained from a call to .Xr avl_find 3AVL , to determine where to insert the new entry into the tree. The tree must -not have been modified inbetween the call to +not have been modified in between the call to .Xr avl_find 3AVL and the call to .Fn avl_insert . diff --git a/usr/src/man/man3c/atomic_or.3c b/usr/src/man/man3c/atomic_or.3c index 63a57c66dd..847587ef6d 100644 --- a/usr/src/man/man3c/atomic_or.3c +++ b/usr/src/man/man3c/atomic_or.3c @@ -93,21 +93,17 @@ atomic_or_uint_nv, atomic_or_ulong_nv, atomic_or_64_nv \- atomic OR operations .fi .SH DESCRIPTION -.sp .LP -These functions enable the the bitwise OR of \fIbits\fR to the value stored in +These functions enable the bitwise OR of \fIbits\fR to the value stored in \fItarget\fR to occur in an atomic manner. .SH RETURN VALUES -.sp .LP The *\fB_nv()\fR variants of these functions return the new value of \fItarget\fR. .SH ERRORS -.sp .LP No errors are defined. .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -125,14 +121,12 @@ MT-Level MT-Safe .TE .SH SEE ALSO -.sp .LP \fBatomic_add\fR(3C), \fBatomic_and\fR(3C), \fBatomic_bits\fR(3C), \fBatomic_cas\fR(3C), \fBatomic_dec\fR(3C), \fBatomic_inc\fR(3C), \fBatomic_swap\fR(3C), \fBmembar_ops\fR(3C), \fBattributes\fR(5), \fBatomic_ops\fR(9F) .SH NOTES -.sp .LP The *\fB_nv()\fR variants are substantially more expensive on some platforms than the versions that do not return values. Do not use them unless you need to diff --git a/usr/src/man/man3c/freopen.3c b/usr/src/man/man3c/freopen.3c index 9944f3e153..e4492dc181 100644 --- a/usr/src/man/man3c/freopen.3c +++ b/usr/src/man/man3c/freopen.3c @@ -19,7 +19,6 @@ freopen \- open a stream .fi .SH DESCRIPTION -.sp .LP The \fBfreopen()\fR function first attempts to flush the stream and close any file descriptor associated with \fIstream\fR. Failure to flush or close the @@ -33,7 +32,7 @@ pointed to by \fIfilename\fR and associates the stream pointed to by \fBfopen\fR(3C). .sp .LP -If \fIfilename\fR is a null pointer and the application comforms to SUSv3 (see +If \fIfilename\fR is a null pointer and the application conforms to SUSv3 (see \fBstandards\fR(5)), the \fBfreopen()\fR function attempts to change the mode of the stream to that specified by \fImode\fR, as though the name of the file currently associated with the \fIstream\fR had been used. The following @@ -61,7 +60,7 @@ When \fBa\fR or \fBw\fR is specified, the file descriptor mode must be .RE .sp .LP -If the filename is a null pointer and the application does not comform to +If the filename is a null pointer and the application does not conform to SUSv3, \fBfreopen()\fR returns a null pointer. .sp .LP @@ -78,13 +77,11 @@ The largest value that can be represented correctly in an object of type \fBoff_t\fR will be established as the offset maximum in the open file description. .SH RETURN VALUES -.sp .LP Upon successful completion, \fBfreopen()\fR returns the value of \fIstream\fR. Otherwise, a null pointer is returned and \fBerrno\fR is set to indicate the error. .SH ERRORS -.sp .LP The \fBfreopen()\fR function will fail if: .sp @@ -105,7 +102,7 @@ to be created. \fB\fBEBADF\fR\fR .ad .RS 16n -The application comforms to SUSv3, the \fIfilename\fR argument is a null +The application conforms to SUSv3, the \fIfilename\fR argument is a null pointer, and either the underlying file descriptor is not valid or the mode specified when the underlying file descriptor was opened does not support the file access modes requested by the \fImode\fR argument. @@ -117,7 +114,7 @@ file access modes requested by the \fImode\fR argument. \fB\fBEFAULT\fR\fR .ad .RS 16n -The application does not comform to SUSv3 and the \fIfilename\fR argument is a +The application does not conform to SUSv3 and the \fIfilename\fR argument is a null pointer. .RE @@ -288,7 +285,6 @@ The file is a pure procedure (shared text) file that is being executed and .RE .SH USAGE -.sp .LP The \fBfreopen()\fR function is typically used to attach the preopened \fIstreams\fR associated with \fBstdin\fR, \fBstdout\fR and \fBstderr\fR to @@ -299,7 +295,6 @@ other files. By default \fBstderr\fR is unbuffered, but the use of The \fBfreopen()\fR function has a transitional interface for 64-bit file offsets. See \fBlf64\fR(5). .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -317,7 +312,6 @@ MT-Level MT-Safe .TE .SH SEE ALSO -.sp .LP \fBfclose\fR(3C), \fBfdopen\fR(3C), \fBfopen\fR(3C), \fBstdio\fR(3C), \fBattributes\fR(5), \fBlf64\fR(5), \fBstandards\fR(5) diff --git a/usr/src/man/man3c/getopt.3c b/usr/src/man/man3c/getopt.3c index d8b80b8da4..a5f6e50979 100644 --- a/usr/src/man/man3c/getopt.3c +++ b/usr/src/man/man3c/getopt.3c @@ -50,12 +50,11 @@ getopt \- command option parsing .fi .SH DESCRIPTION -.sp .LP The \fBgetopt()\fR function is a command line parser that can be used by applications that follow Basic Utility Syntax Guidelines 3, 4, 5, 6, 7, 9, and 10 which parallel those defined by application portability standards (see -intro(1)). It can also be used by applications which additionally follow the +Intro(1)). It can also be used by applications which additionally follow the Command Line Interface Paradigm (CLIP) syntax extension guidelines 15, 16, and 17. It partially enforces guideline 18 by requiring that every option has a short-name, but it allows multiple long-names to be associated with an option. @@ -143,7 +142,6 @@ through \fIargv\fR[\fIoptind\fR-1]. If the application has not set the variable \fIopterr\fR to 0 and the first character of \fIoptstring\fR is not a colon (:), \fBgetopt()\fR also prints a diagnostic message to \fBstderr\fR. .SH RETURN VALUES -.sp .LP The \fBgetopt()\fR function returns the short-option character associated with the option recognized. @@ -160,7 +158,6 @@ character of \fIoptstring\fR was not a colon (:). .LP Otherwise, \fBgetopt()\fR returns -1 when all command line options are parsed. .SH ERRORS -.sp .LP No errors are defined. .SH EXAMPLES @@ -358,7 +355,6 @@ can also be assigned as shown in the following example: .in -2 .SH ENVIRONMENT VARIABLES -.sp .LP See \fBenviron\fR(5) for descriptions of the following environment variables that affect the execution of \fBgetopt()\fR: \fBLANG\fR, \fBLC_ALL\fR, and @@ -374,7 +370,6 @@ in \fIoptstring\fR. .RE .SH USAGE -.sp .LP The \fBgetopt()\fR function does not fully check for mandatory arguments because there is no unambiguous algorithm to do so. Given an option string @@ -401,7 +396,6 @@ cmd \(miab \(mio filename .sp .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -424,7 +418,6 @@ Standard See below. .LP For the Basic Utility Command syntax is Standard, see \fBstandards\fR(5). .SH SEE ALSO -.sp .LP \fBIntro\fR(1), \fBgetopt\fR(1), \fBgetopts\fR(1), \fBgetsubopt\fR(3C), \fBgettext\fR(3C), \fBsetlocale\fR(3C), \fBattributes\fR(5), \fBenviron\fR(5), diff --git a/usr/src/man/man3c/mbstowcs.3c b/usr/src/man/man3c/mbstowcs.3c index ce2e017050..e8dcbaa861 100644 --- a/usr/src/man/man3c/mbstowcs.3c +++ b/usr/src/man/man3c/mbstowcs.3c @@ -100,7 +100,7 @@ function is The .Fn mbstowcs_l function is -.Sy Uncommited . +.Sy Uncommitted . .Sh MT-LEVEL .Sy MT-Safe .Sh SEE ALSO diff --git a/usr/src/man/man3c/mtx.3c b/usr/src/man/man3c/mtx.3c index 7a2a89b11e..8283161d61 100644 --- a/usr/src/man/man3c/mtx.3c +++ b/usr/src/man/man3c/mtx.3c @@ -179,7 +179,7 @@ If they were unable to successfully complete the operation, they instead return .Sy thrd_error . .Pp -Upon sucessful completion, the +Upon successful completion, the .Fn mtx_timedlock function returns .Sy thrd_success . diff --git a/usr/src/man/man3c/tss.3c b/usr/src/man/man3c/tss.3c index 37ae52bd97..6e4b696339 100644 --- a/usr/src/man/man3c/tss.3c +++ b/usr/src/man/man3c/tss.3c @@ -52,7 +52,7 @@ The .Fn tss_create function creates a new thread-specific data key. The key space is opaque and global to all threads in the process. Each thread has its own -value-space which can be mainpulated with the +value-space which can be manipulated with the .Fn tss_get and .Fn tss_set diff --git a/usr/src/man/man3c/wcstombs.3c b/usr/src/man/man3c/wcstombs.3c index b068bc0c8e..e1447ab239 100644 --- a/usr/src/man/man3c/wcstombs.3c +++ b/usr/src/man/man3c/wcstombs.3c @@ -101,7 +101,7 @@ function is The .Fn wcstombs_l function is -.Sy Uncommited . +.Sy Uncommitted . .Sh MT-LEVEL .Sy MT-Safe .Sh SEE ALSO diff --git a/usr/src/man/man3gss/gss_accept_sec_context.3gss b/usr/src/man/man3gss/gss_accept_sec_context.3gss index ce700001ab..9febb67151 100644 --- a/usr/src/man/man3gss/gss_accept_sec_context.3gss +++ b/usr/src/man/man3gss/gss_accept_sec_context.3gss @@ -24,7 +24,6 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lgss\fR [ \fIlibrary\fR\&.\|. .fi .SH PARAMETERS -.sp .LP The parameter descriptions for \fBgss_accept_sec_context()\fR follow: .sp @@ -263,7 +262,6 @@ that is, if the \fIret_flag\fR argument resolves to \fBGSS_C_DELEG_FLAG\fR. .RE .SH DESCRIPTION -.sp .LP The \fBgss_accept_sec_context()\fR function allows a remotely initiated security context between the application and a remote peer to be established. @@ -325,7 +323,7 @@ All other bits within the \fIret_flags\fR argument are set to zero. .sp .LP While \fBgss_accept_sec_context()\fR returns \fBGSS_S_CONTINUE_NEEDED\fR, the -values returned by means of the the \fIret_flags\fR argument indicate the +values returned by means of the \fIret_flags\fR argument indicate the services available from the established context. If the initial call of \fBgss_accept_sec_context()\fR fails, no context object is created, and the value of the \fIcontext_handle\fR parameter is set to \fBGSS_C_NO_CONTEXT\fR. @@ -339,7 +337,6 @@ requirement did not exist in version 1 of the \fBGSS-API\fR specification, so applications that wish to run over version 1 implementations must special-case these codes. .SH ERRORS -.sp .LP \fBgss_accept_sec_context()\fR may return the following status codes: .sp @@ -522,7 +519,6 @@ do { .in -2 .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -538,7 +534,6 @@ MT-Level Safe .TE .SH SEE ALSO -.sp .LP \fBgss_delete_sec_context\fR(3GSS), \fBgss_export_sec_context\fR(3GSS), \fBgss_get_mic\fR(3GSS), \fBgss_init_sec_context\fR(3GSS), diff --git a/usr/src/man/man3ldap/ldap_ufn.3ldap b/usr/src/man/man3ldap/ldap_ufn.3ldap index 911e04382f..81ec34b3c2 100644 --- a/usr/src/man/man3ldap/ldap_ufn.3ldap +++ b/usr/src/man/man3ldap/ldap_ufn.3ldap @@ -51,11 +51,10 @@ cc[ \fIflag\fR... ] \fIfile\fR... -lldap[ \fIlibrary\fR... ] .fi .SH DESCRIPTION -.sp .LP These functions are used to perform LDAP user friendly search operations. \fBldap_ufn_search_s()\fR is the simplest form. It does the search -synchronously. It takes \fIld\fR to identify the the LDAP connection. The +synchronously. It takes \fIld\fR to identify the LDAP connection. The \fIufn\fR parameter is the user friendly name for which to search. The \fIattrs\fR, \fIattrsonly\fR and \fIres\fR parameters are the same as for \fBldap_search\fR(3LDAP). @@ -63,8 +62,8 @@ synchronously. It takes \fIld\fR to identify the the LDAP connection. The .LP The \fBldap_ufn_search_c()\fR function functions the same as \fBldap_ufn_search_s()\fR, except that it takes \fIcancelproc\fR, a function to -call periodicly during the search. It should be a function taking a single -void * argument, given by \fIcalcelparm\fR. If \fIcancelproc\fR returns a +call periodically during the search. It should be a function taking a single +void * argument, given by \fIcancelparm\fR. If \fIcancelproc\fR returns a non-zero result, the search will be abandoned and no results returned. The purpose of this function is to provide a way for the search to be cancelled, for example, by a user or because some other condition occurs. @@ -98,7 +97,6 @@ with \fBldap_ufn_search_s()\fR searches. The \fItimeout\fR parameter should actually be a pointer to a struct timeval. This is so \fBldap_ufn_timeout()\fR can be used as a cancelproc in the above functions. .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for a description of the following attributes: .sp @@ -113,13 +111,11 @@ Interface Stability Evolving .TE .SH SEE ALSO -.sp .LP \fBgettimeofday\fR(3C), \fBldap\fR(3LDAP), \fBldap_search\fR(3LDAP), \fBldap_getfilter\fR(3LDAP), \fBldapfilter.conf\fR(4), \fBldap_error\fR(3LDAP), \fBattributes\fR(5) .SH NOTES -.sp .LP These functions may allocates memory. Return values are contained in <\fBldap.h\fR>. diff --git a/usr/src/man/man3proc/Lfree.3proc b/usr/src/man/man3proc/Lfree.3proc index fcbb4cf0c0..07e0f3f6c5 100644 --- a/usr/src/man/man3proc/Lfree.3proc +++ b/usr/src/man/man3proc/Lfree.3proc @@ -27,11 +27,11 @@ .Sh DESCRIPTION The .Fn Lfree -function releases all control resources associated with the the handle +function releases all control resources associated with the handle .Fa L . After -.Fn Lfree -, calls to other +.Fn Lfree , +calls to other .Sy libproc routines which leverage information from the handle .Fa L diff --git a/usr/src/man/man3proc/Pcreate.3proc b/usr/src/man/man3proc/Pcreate.3proc index d3ac9467f9..23eb6f9e6a 100644 --- a/usr/src/man/man3proc/Pcreate.3proc +++ b/usr/src/man/man3proc/Pcreate.3proc @@ -125,7 +125,7 @@ may exist on the .Fa PATH . To determine the full path of the executable pass a non-NULL .Fa path -pointer. Upon succesful completion of +pointer. Upon successful completion of .Fn Pcreate or .Fn Pxcreate diff --git a/usr/src/man/man3proc/Pwrite.3proc b/usr/src/man/man3proc/Pwrite.3proc index 32ac66b57c..575cea4a88 100644 --- a/usr/src/man/man3proc/Pwrite.3proc +++ b/usr/src/man/man3proc/Pwrite.3proc @@ -32,7 +32,7 @@ The .Fn Pwrite function writes data from .Fa buf -to the the process handle +to the process handle .Fa P starting at the address .Fa address . diff --git a/usr/src/man/man4/NISLDAPmapping.4 b/usr/src/man/man4/NISLDAPmapping.4 index 9debc079b8..0094fb0ad8 100644 --- a/usr/src/man/man4/NISLDAPmapping.4 +++ b/usr/src/man/man4/NISLDAPmapping.4 @@ -163,7 +163,7 @@ domainname .in -2 If there are multiple domains, use multiple \fBnisLDAPyppasswddDomain\fR -entries withone domainname per entry. +entries with one domainname per entry. .RE .sp diff --git a/usr/src/man/man4/fdi.4 b/usr/src/man/man4/fdi.4 index 60cc582ebd..39b5db99a4 100644 --- a/usr/src/man/man4/fdi.4 +++ b/usr/src/man/man4/fdi.4 @@ -354,7 +354,7 @@ Device information for specific devices. \fB\fBpolicy\fR\fR .ad .RS 15n -Device information files to merge policy propertys +Device information files to merge policy properties. .sp .ne 2 .na @@ -362,7 +362,7 @@ Device information files to merge policy propertys .ad .RS 16n Device information files included with the hal tarball and supplied by the -operating system vendor for policy rules +operating system vendor for policy rules. .RE .sp @@ -372,7 +372,7 @@ operating system vendor for policy rules .ad .RS 16n Policy rules from the device manufacturer and installed from media accompanying -the hardware +the hardware. .RE .sp diff --git a/usr/src/man/man4/mpapi.conf.4 b/usr/src/man/man4/mpapi.conf.4 index 7a4ef27e48..79379f95b4 100644 --- a/usr/src/man/man4/mpapi.conf.4 +++ b/usr/src/man/man4/mpapi.conf.4 @@ -14,7 +14,6 @@ mpapi.conf \- configuration file for libMPAPI .fi .SH DESCRIPTION -.sp .LP The \fB/etc/mpapi.conf\fR file is used to specify the vendor-provided plugin library that is installed on the system. This file is used by the @@ -45,7 +44,7 @@ where .RS 21n The identification of library. It is the resersed domain name of the vendor followed by \fB\&.\fR followed by the vendor specific name of the plugin that -uniquiely identifies the plugin library. +uniquely identifies the plugin library. .RE .sp @@ -77,7 +76,6 @@ com.sun.mpapi64 /lib/64/libmpscsi_vhci.so .in -2 .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -95,7 +93,6 @@ T} .TE .SH SEE ALSO -.sp .LP \fBlibMPAPI\fR(3LIB), \fBMP_DeregisterPlugin\fR(3MPAPI), \fBMP_RegisterPlugin\fR(3MPAPI), \fBattributes\fR(5) diff --git a/usr/src/man/man4/rcmscript.4 b/usr/src/man/man4/rcmscript.4 index bf88dc894d..c8142136fb 100644 --- a/usr/src/man/man4/rcmscript.4 +++ b/usr/src/man/man4/rcmscript.4 @@ -980,5 +980,5 @@ RCM script. An ill-behaved RCM script can cause unexpected DR failures. .sp .LP RCM commands are invoked only for the resources whose subsystems participate -within the RCM framework. Currently, not all susbsystems participate within the +within the RCM framework. Currently, not all subsystems participate within the RCM framework. diff --git a/usr/src/man/man4/slpd.reg.4 b/usr/src/man/man4/slpd.reg.4 index 09cca59798..7701544b0d 100644 --- a/usr/src/man/man4/slpd.reg.4 +++ b/usr/src/man/man4/slpd.reg.4 @@ -14,7 +14,6 @@ daemon (slpd) .fi .SH DESCRIPTION -.sp .LP The serialized registration file contains a group of registrations that \fBslpd\fR(1M) registers when it starts. These registrations are primarily for @@ -81,7 +80,7 @@ registration is taken to be permanent, and it is continually refreshed by the Scopes can be included in a registration by including an attribute definition with tag \fBscopes\fR followed by a comma-separated list of scope names immediately after the \fBurl-props\fR production. If the optional -\fBscope-list\fR is present, the registations are made in the indicated scopes; +\fBscope-list\fR is present, the registrations are made in the indicated scopes; otherwise, they are registered in the scopes with which the \fBDA\fR or \fBSA\fR server was configured through the \fBnet.slp.useScopes\fR property. If any conflicts occur between the scope list and the \fBnet.slp.useScopes\fR @@ -115,7 +114,6 @@ location=headquarters .in -2 .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -133,7 +131,6 @@ Interface Stability Standard .TE .SH SEE ALSO -.sp .LP \fBslpd\fR(1M), \fBslp_api\fR(3SLP), \fBsyslog\fR(3C), \fBslp.conf\fR(4), \fBattributes\fR(5) diff --git a/usr/src/man/man5/attributes.5 b/usr/src/man/man5/attributes.5 index fcfe09fd1b..f9c0290fda 100644 --- a/usr/src/man/man5/attributes.5 +++ b/usr/src/man/man5/attributes.5 @@ -8,7 +8,6 @@ attributes, architecture, availability, CSI, stability, MT-Level, standard \- attributes of interfaces .SH DESCRIPTION -.sp .LP The \fBATTRIBUTES\fR section of a manual page contains a table defining attribute types and their corresponding values. The following is an example of @@ -35,13 +34,11 @@ Standard See \fBstandards\fR(5). .TE .SS "Architecture" -.sp .LP Architecture defines processor or specific hardware. See \fB-p\fR option of \fBuname\fR(1). In some cases, it may indicate required adapters or peripherals. .SS "Code Set Independence (CSI)" -.sp .LP \fBOS\fR utilities and libraries free of dependencies on the properties of any code sets are said to have Code Set Independence (CSI). They have the attribute @@ -182,7 +179,6 @@ applied. Statically bound programs will only get support for C and POSIX locales. .RE .SS "Interface Stability" -.sp .LP Sun often provides developers with early access to new technologies, which allows developers to evaluate with them as soon as possible. Unfortunately, new @@ -213,7 +209,6 @@ structures and some symbols in system header files) may be implementation artifacts. Such internal interfaces are not only subject to incompatible change or removal, but we are unlikely to mention such a change in release notes. .SS "Release Levels" -.sp .LP Products are given release levels, as well as names, to aid compatibility discussions. Each release level may also include changes suitable for lower @@ -244,7 +239,6 @@ T} In the context of interface stability, update releases (occasionally referred to as patch releases) should be considered equivalent to Micro Releases. .SS "Classifications" -.sp .LP The following table summarizes how stability level classifications relate to release level. The first column lists the Stability Level. The second column @@ -327,7 +321,7 @@ general expectation should be that Uncommitted interfaces are not likely to change incompatibly and if such changes occur they will be small in impact and may often have a mitigation plan. .sp -Uncommitted interfaces generally fall into one of the following subcategorizes: +Uncommitted interfaces generally fall into one of the following subcategories: .RS +4 .TP 1. @@ -450,7 +444,6 @@ support. Use of an Obsolete interface may produce warning messages. .RE .SS "Exceptions" -.sp .LP There are rare instances when it is in the best interest of both Sun and the customer to break the interface stability commitment. The following list @@ -493,7 +486,6 @@ major" release vehicle possible. However, often the consequences of the vulnerabilities or contractual branding requirements will force delivery in a patch. .SS "Compatibility with Earlier Interface Classification Schemes" -.sp .LP In releases up to and including Solaris 10, a different interface classification scheme was used. The following table summarizes the mapping @@ -530,7 +522,6 @@ interpretation. As part of the migration to the new classification scheme, many formerly Evolving interfaces were upgraded to Committed. However, upon encountering the term Evolving, Uncommitted should be inferred. .SS "MT-Level" -.sp .LP Libraries are classified into categories that define their ability to support multiple threads. Manual pages containing functions that are of multiple or @@ -706,7 +697,6 @@ also, by definition, Deferred-Cancel-Safe. .RE .SS "Standard" -.sp .LP Many interfaces are defined and controlled as industry standards. When this is the case, the controlling body and/or public, versioned document is noted in @@ -728,6 +718,5 @@ very formal organization, as in ISO or ANSII, a less formal, but generally accepted organization such as IETF, or as informal as the sole contributor in the case of FOSS (Free or Open Source Software). .SH SEE ALSO -.sp .LP \fBuname\fR(1), \fBpkgadd\fR(1M), \fBIntro\fR(3), \fBstandards\fR(5) diff --git a/usr/src/man/man5/largefile.5 b/usr/src/man/man5/largefile.5 index 3da728fe79..619dac08ec 100644 --- a/usr/src/man/man5/largefile.5 +++ b/usr/src/man/man5/largefile.5 @@ -48,7 +48,7 @@ l l l l l . \fBrm\fR \fBrmdir\fR \fBrsh\fR \fBsed\fR \fBsh\fR \fBsort\fR \fBsplit\fR \fBsum\fR \fBtail\fR \fBtar\fR \fBtee\fR \fBtest\fR \fBtouch\fR \fBtr\fR \fBuncompress\fR -\fBuudcode\fR \fBuuencode\fR \fBvacation\fR \fBwc\fR \fBzcat\fR +\fBuudecode\fR \fBuuencode\fR \fBvacation\fR \fBwc\fR \fBzcat\fR .TE .LP diff --git a/usr/src/man/man5/pam_authtok_get.5 b/usr/src/man/man5/pam_authtok_get.5 index 580186b52d..b4e4d650a4 100644 --- a/usr/src/man/man5/pam_authtok_get.5 +++ b/usr/src/man/man5/pam_authtok_get.5 @@ -35,7 +35,7 @@ Due to the nature of the PAM Password Management stack traversal mechanism, the .LP In the first (\fBPRELIM\fR) invocation, the implementation of \fBpam_sm_chauthtok\fR(3PAM) moves the contents of the \fBPAM_AUTHTOK\fR -(current authentication token) to \fBPAM_OLDAUTHTOK\fR, and subsequentially +(current authentication token) to \fBPAM_OLDAUTHTOK\fR, and subsequently prompts the user for a new password. This new password is stored in \fBPAM_AUTHTOK\fR. .sp diff --git a/usr/src/man/man5/pam_ldap.5 b/usr/src/man/man5/pam_ldap.5 index fec71f0322..26d2786af8 100644 --- a/usr/src/man/man5/pam_ldap.5 +++ b/usr/src/man/man5/pam_ldap.5 @@ -13,7 +13,6 @@ pam_ldap \- authentication and account management PAM module for LDAP .fi .SH DESCRIPTION -.sp .LP The \fBpam_ldap\fR module implements \fBpam_sm_authenticate\fR(3PAM) and \fBpam_sm_acct_mgmt\fR(3PAM), the functions that provide functionality for the @@ -44,7 +43,6 @@ is, LDAP users. For the stacks to work, \fBpam_unix_auth\fR, \fBbinding\fR control flag and the \fBserver_policy\fR option. This configuration allows local account override of a network account. .SS "LDAP Authentication Module" -.sp .LP The LDAP authentication module verifies the identity of a user. The \fBpam_sm_authenticate\fR(3PAM) function uses the password entered by the user @@ -86,7 +84,6 @@ Turn off warning messages. .LP These options are case sensitive and must be used exactly as presented here. .SS "LDAP Account Management Module" -.sp .LP The LDAP account management module validates the user's account. The \fBpam_sm_acct_mgmt\fR(3PAM) function authenticates to the LDAP server to @@ -120,14 +117,12 @@ Turn off warning messages. These options are case sensitive, and the options must be used exactly as presented here. .SS "LDAP Password Management Module" -.sp .LP LDAP password management is no longer supported by \fBpam_ldap\fR. Use \fBpam_authtok_store\fR(5) instead of \fBpam_ldap\fR for password change. \fBpam_authtok_store\fR(5) handles both the local and LDAP accounts and updates the passwords in all the repositories configured by \fBnsswitch.conf\fR(4). .SH ERRORS -.sp .LP The authentication service returns the following error codes: .sp @@ -136,7 +131,7 @@ The authentication service returns the following error codes: \fB\fBPAM_SUCCESS\fR\fR .ad .RS 20n -The uthentication was successful. +The authentication was successful. .RE .sp @@ -344,7 +339,6 @@ other password required pam_authtok_store.so.1 server_policy .in -2 .SH FILES -.sp .ne 2 .na \fB\fB/var/ldap/ldap_client_file\fR\fR @@ -369,7 +363,6 @@ PAM configuration file. .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -387,7 +380,6 @@ MT-Level MT-Safe with exceptions .TE .SH SEE ALSO -.sp .LP \fBldap\fR(1), \fBidsconfig\fR(1M), \fBldap_cachemgr\fR(1M), \fBldapclient\fR(1M), \fBlibpam\fR(3LIB), \fBpam\fR(3PAM), @@ -398,7 +390,6 @@ MT-Level MT-Safe with exceptions \fBpam_authtok_get\fR(5), \fBpam_authtok_store\fR(5), \fBpam_passwd_auth\fR(5), \fBpam_unix_account\fR(5), \fBpam_unix_auth\fR(5) .SH NOTES -.sp .LP The interfaces in \fBlibpam\fR(3LIB) are MT-Safe only if each thread within the multi-threaded application uses its own \fBPAM\fR handle. diff --git a/usr/src/man/man5/regex.5 b/usr/src/man/man5/regex.5 index ae69ddd34f..68ae1656a7 100644 --- a/usr/src/man/man5/regex.5 +++ b/usr/src/man/man5/regex.5 @@ -12,7 +12,6 @@ .SH NAME regex \- internationalized basic and extended regular expression matching .SH DESCRIPTION -.sp .LP Regular Expressions (REs) provide a mechanism to select specific strings from a set of character strings. The Internationalized Regular Expressions described @@ -43,14 +42,12 @@ EREs are supported by the Regular Expression Matching interfaces \fBregcomp\fR(3C) and \fBregexec\fR(3C). .SH BASIC REGULAR EXPRESSIONS .SS "BREs Matching a Single Character" -.sp .LP A BRE ordinary character, a special character preceded by a backslash, or a period matches a single character. A bracket expression matches a single character or a single collating element. See \fBRE Bracket Expression\fR, below. .SS "BRE Ordinary Characters" -.sp .LP An ordinary character is a BRE that matches itself: any character in the supported character set, except for the BRE special characters listed in \fBBRE @@ -76,7 +73,6 @@ below) a character inside a bracket expression. .RE .SS "BRE Special Characters" -.sp .LP A BRE \fIspecial\fR \fIcharacter\fR has special properties in certain contexts. Outside those contexts, or when preceded by a backslash, such a character will @@ -154,12 +150,10 @@ The dollar sign is special when used as an anchor. .RE .SS "Periods in BREs" -.sp .LP A period (\fB\&.\fR), when used outside a bracket expression, is a BRE that matches any character in the supported character set except NUL. .SS "RE Bracket Expression" -.sp .LP A bracket expression (an expression enclosed in square brackets, [\|]) is an RE that matches a single collating element contained in the non-empty set of @@ -349,7 +343,6 @@ first (after the ^, if any) and the \(mi last within the bracket expression. Note: Latin-1 characters such as \(ga or ^ are not printable in some locales, for example, the \fBja\fR locale. .SS "BREs Matching Multiple Characters" -.sp .LP The following rules can be used to construct BREs matching multiple characters from BREs matching a single character: @@ -425,7 +418,6 @@ the BRE c\e{1,3\e}d is matched by characters ten to thirteen. The behavior of multiple adjacent duplication symbols \fB(\fR \fB*\fR \fB\fR and intervals) produces undefined results. .SS "BRE Precedence" -.sp .LP The order of precedence is as shown in the following table: .sp @@ -454,7 +446,6 @@ anchoring ^ $ .TE .SS "BRE Expression Anchoring" -.sp .LP A BRE can be limited to matching strings that begin or end a line; this is called \fIanchoring\fR. The circumflex and dollar sign special characters will @@ -497,9 +488,8 @@ For example, the BRE \fB^abcdef$\fR matches strings consisting only of Note: The Solaris implementation does not support anchoring in BRE subexpressions. .SH EXTENDED REGULAR EXPRESSIONS -.sp .LP -The rules specififed for BREs apply to Extended Regular Expressions (EREs) with +The rules specified for BREs apply to Extended Regular Expressions (EREs) with the following exceptions: .RS +4 .TP @@ -529,7 +519,6 @@ The back reference operator is not supported. Anchoring (\fB^$\fR) is supported in subexpressions. .RE .SS "EREs Matching a Single Character" -.sp .LP An ERE ordinary character, a special character preceded by a backslash, or a period matches a single character. A bracket expression matches a single @@ -537,7 +526,6 @@ character or a single collating element. An \fIERE\fR \fImatching\fR \fIa\fR \fIsingle\fR \fIcharacter\fR enclosed in parentheses matches the same as the ERE without parentheses would have matched. .SS "ERE Ordinary Characters" -.sp .LP An \fIordinary character\fR is an ERE that matches itself. An ordinary character is any character in the supported character set, except for the ERE @@ -545,7 +533,6 @@ special characters listed in \fBERE\fR \fBSpecial\fR \fBCharacters\fR below. The interpretation of an ordinary character preceded by a backslash (\fB\e\fR) is undefined. .SS "ERE Special Characters" -.sp .LP An \fIERE\fR \fIspecial\fR \fIcharacter\fR has special properties in certain contexts. Outside those contexts, or when preceded by a backslash, such a @@ -642,17 +629,14 @@ The dollar sign is special when used as an anchor. .RE .SS "Periods in EREs" -.sp .LP A period (\fB\&.\fR), when used outside a bracket expression, is an ERE that matches any character in the supported character set except NUL. .SS "ERE Bracket Expression" -.sp .LP The rules for ERE Bracket Expressions are the same as for Basic Regular Expressions; see \fBRE Bracket Expression\fR, above). .SS "EREs Matching Multiple Characters" -.sp .LP The following rules will be used to construct EREs matching multiple characters from EREs matching a single character: @@ -719,7 +703,6 @@ six. The behavior of multiple adjacent duplication symbols \fB(\fR+\fB,\fR \fB*\fR, \fB?\fR and intervals) produces undefined results. .SS "ERE Alternation" -.sp .LP Two EREs separated by the special character vertical-line (|) match a string that is matched by either. For example, the ERE a((bc)|d) matches the string @@ -727,7 +710,6 @@ abc and the string ad. Single characters, or expressions matching single characters, separated by the vertical bar and enclosed in parentheses, will be treated as an ERE matching a single character. .SS "ERE Precedence" -.sp .LP The order of precedence will be as shown in the following table: .sp @@ -754,7 +736,6 @@ For example, the ERE \fBabba\||\|cde\fR matches either the string \fBabba\fR or the string \fBcde\fR (rather than the string \fBabbade\fR or \fBabbcde\fR, because concatenation has a higher order of precedence than alternation). .SS "ERE Expression Anchoring" -.sp .LP An ERE can be limited to matching strings that begin or end a line; this is called \fIanchoring\fR. The circumflex and dollar sign special characters are @@ -783,7 +764,6 @@ valid, but can never match because the \fBf\fR prevents the expression e$ from matching ending at the last character. .RE .SH SEE ALSO -.sp .LP \fBlocaledef\fR(1), \fBregcomp\fR(3C), \fBattributes\fR(5), \fBenviron\fR(5), \fBlocale\fR(5), \fBregexp\fR(5) diff --git a/usr/src/man/man5/standards.5 b/usr/src/man/man5/standards.5 index 766890ea52..43e22bb85e 100644 --- a/usr/src/man/man5/standards.5 +++ b/usr/src/man/man5/standards.5 @@ -137,7 +137,7 @@ conflicts with POSIX.2, POSIX.2a, SUS, or SUSv2, a new version that is SUSv3 standard-conforming has been provided in \fB/usr/xpg6/bin\fR. .sp .LP -An application that wants to use standard-conforming utilitues must set the +An application that wants to use standard-conforming utilities must set the \fBPATH\fR (\fBsh\fR(1) or \fBksh\fR(1)) or \fBpath\fR (\fBcsh\fR(1)) environment variable to specify the directories listed below in the order specified to get the appropriate utilities: diff --git a/usr/src/man/man5/threads.5 b/usr/src/man/man5/threads.5 index 5d882e7d45..02b308de9b 100644 --- a/usr/src/man/man5/threads.5 +++ b/usr/src/man/man5/threads.5 @@ -74,7 +74,7 @@ which may be accessed concurrently from multiple threads of execution. To avoid such problems, programs may use atomic operations (see \fBatomic_ops\fR(3C)) and locking primitives, such as mutexes, readers/writer locks, condition variables, and semaphores. Note, that depending on the hardware platform, memory -synchronization may be necesary, for more information, see \fBmembar_ops\fR(3C). +synchronization may be necessary, for more information, see \fBmembar_ops\fR(3C). .LP POSIX, C11, and illumos threads each have their own implementation within \fBlibc\fR(3LIB). All implementations are interoperable, their functionality diff --git a/usr/src/man/man7d/usbsksp.7d b/usr/src/man/man7d/usbsksp.7d index 253446bbb4..c6c59ef923 100644 --- a/usr/src/man/man7d/usbsksp.7d +++ b/usr/src/man/man7d/usbsksp.7d @@ -23,7 +23,6 @@ usbskpsp@unit .fi .SH DESCRIPTION -.sp .LP The \fBusbsksp\fR driver is a loadable \fBSTREAMS\fR and \fBUSBA\fR (Solaris USB architecture) compliant client driver that provides basic asynchronous @@ -31,7 +30,7 @@ communication support for Keyspan USB-to-serial converters. The \fBusbsksp\fR driver supports the Keyspan USA19HS, USA49WG and USA49WLC models. By default, the USA19HS and USA49WG models are compatible with the \fBusbsksp\fR driver and no configuration or installation steps are required. (The USA49WG model is a -USB 2.0 device comforming to \fIUniversal Serial Bus Specification 2.0\fR and +USB 2.0 device conforming to \fIUniversal Serial Bus Specification 2.0\fR and the USB 2.0 host controller is required to support the USA49WG model. Note that the USA49WG is not compatible with USB 1.1 host controllers). If you use the Keyspan USA49WLC model, you must download and install a firmware package to @@ -67,7 +66,6 @@ commonly known as 'dial-out' lines. Unlike onboard serial ports, the \fBusbsksp\fR ports cannot serve as a local serial console. .SH APPLICATION PROGRAMMING INTERFACE -.sp .LP A dial-in line can be opened only if the corresponding dial-out line is closed. A blocking \fB/dev/term\fR open waits until the \fB/dev/cua\fR line is closed @@ -86,7 +84,6 @@ enabling the line for login in \fB/etc/inittab\fR) or dial-out (by Device hot-removal is functionally equivalent to a modem disconnect event, as defined in \fBtermio\fR(7I). .SH IOCTLS -.sp .LP The \fBusbsksp\fR driver supports the standard set of \fBtermio\fR(7I) ioctl calls. @@ -98,7 +95,6 @@ Input and output line speeds can be set to the following baud rates: 0, 50, independently. For example, when the output speed is set, the input speed is automatically set to the same speed. .SH ERRORS -.sp .LP An \fBopen()\fR fails under the following conditions: .sp @@ -141,7 +137,6 @@ USB device I/O error. .RE .SH FILES -.sp .ne 2 .na \fB\fB/kernel/drv/usbsksp\fR\fR @@ -192,7 +187,6 @@ dial-in tty lines. .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -208,13 +202,11 @@ Architecture SPARC, x86, PCI-based systems .TE .SH SEE ALSO -.sp .LP \fBstrconf\fR(1), \fBtip\fR(1), \fBuucp\fR(1C), \fBautopush\fR(1M), \fBioctl\fR(2), \fBopen\fR(2), \fBtermios\fR(3C), \fBattributes\fR(5), \fBusba\fR(7D), \fBtermio\fR(7I), \fBldterm\fR(7M), \fBttcompat\fR(7M) .SH DIAGNOSTICS -.sp .LP In addition to being logged, the following messages may appear on the system console. All messages are formatted in the following manner: diff --git a/usr/src/man/man9e/usba_hcdi.9e b/usr/src/man/man9e/usba_hcdi.9e index b14747861d..a60f56db58 100644 --- a/usr/src/man/man9e/usba_hcdi.9e +++ b/usr/src/man/man9e/usba_hcdi.9e @@ -276,7 +276,7 @@ from the USBA. To unbind the root hub, the instance of the driver should call .Xr usba_hubdi_unbind_root_hub 9F . If for some reason that function does not return -.Sy USB_SUCESS , +.Sy USB_SUCCESS , then the device driver should fail the call to .Xr detach 9E and return @@ -288,7 +288,7 @@ call .Xr usba_hcdi_unregister 9F . As this call always succeeds, at this point, it is safe for the driver to tear down all the rest of its resources and successfully detach. -.Ss State Tracking and Minors Numbers +.Ss State Tracking and Minor Numbers Because a host controller driver is also a root hub, there are a few constraints around how the device must store its per-instance state and how its minor numbers are used. diff --git a/usr/src/man/man9f/ddi_cb_register.9f b/usr/src/man/man9f/ddi_cb_register.9f index 512efdd6ba..bb12019907 100644 --- a/usr/src/man/man9f/ddi_cb_register.9f +++ b/usr/src/man/man9f/ddi_cb_register.9f @@ -23,11 +23,9 @@ callback handler .fi .SH INTERFACE LEVEL -.sp .LP Solaris DDI specific (Solaris DDI). .SH PARAMETERS -.sp .LP \fBddi_cb_register()\fR .sp @@ -97,7 +95,6 @@ Handle to the registered callback handler that is to be unregistered. .RE .SH DESCRIPTION -.sp .LP The \fBddi_cb_register()\fR function installs a callback handler which processes various actions that require the driver's attention while it is @@ -195,7 +192,6 @@ functions to respond accordingly. A driver is not required to allocate all interrupts that are available to it, but it is required to manage its allocations so that it never uses more interrupts than are currently available. .SH RETURN VALUES -.sp .LP The \fBddi_cb_register()\fR and \fBddi_cb_unregister()\fR functions return: .sp @@ -258,7 +254,6 @@ Implementation specific failure .RE .SH CONTEXT -.sp .LP These functions can be called from kernel, non-interrupt context. .SH EXAMPLES @@ -364,7 +359,7 @@ These functions can be called from kernel, non-interrupt context. break; } - return (DDI_SUCESS); + return (DDI_SUCCESS); } /* @@ -510,7 +505,6 @@ These functions can be called from kernel, non-interrupt context. .in -2 .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -528,12 +522,10 @@ MT-Level Unsafe .TE .SH SEE ALSO -.sp .LP \fBattributes\fR(5), \fBddi_intr_alloc\fR(9F), \fBddi_intr_free\fR(9F), \fBddi_intr_set_nreq\fR(9F) .SH NOTES -.sp .LP Users of these interfaces that register for \fBDDI_CB_FLAG_INTR\fR become participants in interrupt resource management. With that participation comes a diff --git a/usr/src/man/man9f/mac_prop_info.9f b/usr/src/man/man9f/mac_prop_info.9f index 4e3ea44477..8b134ddd03 100644 --- a/usr/src/man/man9f/mac_prop_info.9f +++ b/usr/src/man/man9f/mac_prop_info.9f @@ -98,7 +98,7 @@ This flag indicates that a property is This flag indicates that a property is both .Sy readable and -.Sy writeable . +.Sy writable . This is equivalent to specifying both .Sy MAC_PROP_PERM_READ and diff --git a/usr/src/man/man9f/mod_install.9f b/usr/src/man/man9f/mod_install.9f index ea4f06916d..2165166ed4 100644 --- a/usr/src/man/man9f/mod_install.9f +++ b/usr/src/man/man9f/mod_install.9f @@ -34,11 +34,9 @@ loadable module .fi .SH INTERFACE LEVEL -.sp .LP Solaris DDI specific (Solaris DDI). .SH PARAMETERS -.sp .ne 2 .na \fB\fImodlinkage\fR\fR @@ -58,7 +56,6 @@ Pointer to the \fBmodinfo\fR structure passed to \fB_info\fR(9E). .RE .SH DESCRIPTION -.sp .LP \fBmod_install()\fR must be called from a module's \fB_init\fR(9E) routine. .sp @@ -83,7 +80,7 @@ means that all \fB_init\fR(9E) initialization must occur prior to When \fB_fini\fR(9E) is executing, another thread may call \fBattach\fR(9E) prior to \fB_fini\fR(9E) calling \fBmod_remove()\fR. If this occurs, the \fBmod_remove()\fR fails (non-zero return). From a programming standpoint, this -means that \fB_init\fR(9E) initilizations should only be undone after a +means that \fB_init\fR(9E) initializations should only be undone after a successful return from \fBmod_remove()\fR. .sp .LP @@ -92,7 +89,6 @@ driver, the module name is the same as the driver name. This function can be used to avoid compiled-in knowledge of the module name, and is of particular use when \fB_init\fR(9E) needs to call a function like \fBkstat_create\fR(9F). .SH RETURN VALUES -.sp .LP \fBmod_install()\fR and \fBmod_remove()\fR return \fB0\fR upon success and non-zero on failure. @@ -104,11 +100,9 @@ non-zero on failure. \fBmod_modname()\fR returns the name of the module. The returned name remains valid as long as the module remains loaded. .SH EXAMPLES -.sp .LP See \fB_init\fR(9E) for an example that uses these functions. .SH SEE ALSO -.sp .LP \fB_fini\fR(9E), \fB_info\fR(9E), \fB_init\fR(9E), \fBkstat_create\fR(9F), \fBmodldrv\fR(9S), \fBmodlinkage\fR(9S), \fBmodlstrmod\fR(9S) diff --git a/usr/src/tools/onbld/Checks/SpellCheck.py b/usr/src/tools/onbld/Checks/SpellCheck.py index 8923b41818..01b24d25cb 100644 --- a/usr/src/tools/onbld/Checks/SpellCheck.py +++ b/usr/src/tools/onbld/Checks/SpellCheck.py @@ -26,7 +26,7 @@ import re, sys spellMsg = '%s: Line %d contains "%s", a common misspelling of "%s"\n' -altMsg = '%s: Lined %d contains "%s"; please use "%s" instead for consistency with other documentation\n' +altMsg = '%s: Line %d contains "%s"; please use "%s" instead for consistency with other documentation\n' misspellings = { 'absense': 'absence', @@ -230,6 +230,7 @@ misspellings = { 'transfered': 'transferred', 'truely': 'truly', 'trustworthyness': 'trustworthiness', + 'uncommited': 'uncommitted', 'unforseen': 'unforeseen', 'unfortunatly': 'unfortunately', 'unsuccessfull': 'unsuccessful', -- cgit v1.2.3 From 22cc57556161a28b2141976ff578db2558def3e1 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Sun, 23 Apr 2017 22:04:04 +0200 Subject: 8098 Some xdr_simple(3nsl) and xdr_complex(3nsl) functions can succeed for undefined xdrs->x_op values Reviewed by: Yuri Pankov Reviewed by: Jason King Reviewed by: Vitaliy Gusev Approved by: Robert Mustacchi --- usr/src/lib/libnsl/rpc/xdr.c | 31 ++++++++++++------------------- usr/src/lib/libnsl/rpc/xdr_array.c | 12 ++++++++---- usr/src/lib/libnsl/rpc/xdr_refer.c | 8 ++++++-- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/usr/src/lib/libnsl/rpc/xdr.c b/usr/src/lib/libnsl/rpc/xdr.c index 6d5095ff11..dd1314046c 100644 --- a/usr/src/lib/libnsl/rpc/xdr.c +++ b/usr/src/lib/libnsl/rpc/xdr.c @@ -33,8 +33,6 @@ * California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Generic XDR routines implementation. * @@ -382,12 +380,6 @@ xdr_opaque(XDR *xdrs, caddr_t cp, const uint_t cnt) uint_t rndup; char crud[BYTES_PER_XDR_UNIT]; - /* - * if no data we are done - */ - if (cnt == 0) - return (TRUE); - /* * round byte count to full xdr units */ @@ -488,7 +480,7 @@ xdr_netobj(XDR *xdrs, struct netobj *np) */ bool_t xdr_union(XDR *xdrs, enum_t *dscmp, char *unp, - const struct xdr_discrim *choices, const xdrproc_t dfault) + const struct xdr_discrim *choices, const xdrproc_t dfault) { enum_t dscm; @@ -617,38 +609,39 @@ xdr_string(XDR *xdrs, char **cpp, const uint_t maxsize) bool_t xdr_hyper(XDR *xdrs, longlong_t *hp) { - if (xdrs->x_op == XDR_ENCODE) { + switch (xdrs->x_op) { + case XDR_ENCODE: #if defined(_LONG_LONG_HTOL) if (XDR_PUTINT32(xdrs, (int *)hp) == TRUE) /* LINTED pointer cast */ return (XDR_PUTINT32(xdrs, (int *)((char *)hp + - BYTES_PER_XDR_UNIT))); + BYTES_PER_XDR_UNIT))); #else /* LINTED pointer cast */ if (XDR_PUTINT32(xdrs, (int *)((char *)hp + - BYTES_PER_XDR_UNIT)) == TRUE) + BYTES_PER_XDR_UNIT)) == TRUE) return (XDR_PUTINT32(xdrs, (int32_t *)hp)); #endif return (FALSE); - } - - if (xdrs->x_op == XDR_DECODE) { + case XDR_DECODE: #if defined(_LONG_LONG_HTOL) if (XDR_GETINT32(xdrs, (int *)hp) == FALSE || /* LINTED pointer cast */ (XDR_GETINT32(xdrs, (int *)((char *)hp + - BYTES_PER_XDR_UNIT)) == FALSE)) + BYTES_PER_XDR_UNIT)) == FALSE)) return (FALSE); #else /* LINTED pointer cast */ if ((XDR_GETINT32(xdrs, (int *)((char *)hp + - BYTES_PER_XDR_UNIT)) == FALSE) || - (XDR_GETINT32(xdrs, (int *)hp) == FALSE)) + BYTES_PER_XDR_UNIT)) == FALSE) || + (XDR_GETINT32(xdrs, (int *)hp) == FALSE)) return (FALSE); #endif return (TRUE); + case XDR_FREE: + return (TRUE); } - return (TRUE); + return (FALSE); } bool_t diff --git a/usr/src/lib/libnsl/rpc/xdr_array.c b/usr/src/lib/libnsl/rpc/xdr_array.c index c3b4508e31..80e49cff4d 100644 --- a/usr/src/lib/libnsl/rpc/xdr_array.c +++ b/usr/src/lib/libnsl/rpc/xdr_array.c @@ -33,8 +33,6 @@ * California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Generic XDR routines impelmentation. * @@ -65,7 +63,7 @@ char mem_err_msg_arr[] = "xdr_array: out of memory"; */ bool_t xdr_array(XDR *xdrs, caddr_t *addrp, uint_t *sizep, const uint_t maxsize, - const uint_t elsize, const xdrproc_t elproc) + const uint_t elsize, const xdrproc_t elproc) { uint_t i; caddr_t target = *addrp; @@ -133,11 +131,17 @@ xdr_array(XDR *xdrs, caddr_t *addrp, uint_t *sizep, const uint_t maxsize, */ bool_t xdr_vector(XDR *xdrs, char *basep, const uint_t nelem, - const uint_t elemsize, const xdrproc_t xdr_elem) + const uint_t elemsize, const xdrproc_t xdr_elem) { uint_t i; char *elptr; + /* Make sure x_op contains a valid value */ + if (xdrs->x_op != XDR_ENCODE && + xdrs->x_op != XDR_DECODE && + xdrs->x_op != XDR_FREE) + return (FALSE); + elptr = basep; for (i = 0; i < nelem; i++) { if (!(*xdr_elem)(xdrs, elptr, LASTUNSIGNED)) diff --git a/usr/src/lib/libnsl/rpc/xdr_refer.c b/usr/src/lib/libnsl/rpc/xdr_refer.c index e3be8f2529..c20ee180af 100644 --- a/usr/src/lib/libnsl/rpc/xdr_refer.c +++ b/usr/src/lib/libnsl/rpc/xdr_refer.c @@ -33,8 +33,6 @@ * California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Generic XDR routines impelmentation. * @@ -68,6 +66,12 @@ xdr_reference(XDR *xdrs, caddr_t *pp, uint_t size, const xdrproc_t proc) caddr_t loc = *pp; bool_t stat; + /* Make sure x_op contains a valid value */ + if (xdrs->x_op != XDR_ENCODE && + xdrs->x_op != XDR_DECODE && + xdrs->x_op != XDR_FREE) + return (FALSE); + if (loc == NULL) switch (xdrs->x_op) { case XDR_FREE: -- cgit v1.2.3