hwdb: update for v245-rc2

network: Move config_parse_ip_service_type to networkd-dhcp4.c and
rename
2020-03-03 11:54:18 +09:00 · 2020-03-03 11:53:49 +09:00 · 2020-03-02 21:31:24 +01:00 · 2020-03-02 15:56:30 +01:00 · 2020-03-02 15:56:30 +01:00 · 2020-03-02 15:56:30 +01:00
34 changed files with 3382 additions and 1343 deletions
--- a/hwdb.d/20-OUI.hwdb
+++ b/hwdb.d/20-OUI.hwdb
--- a/hwdb.d/20-acpi-vendor.hwdb
+++ b/hwdb.d/20-acpi-vendor.hwdb
@ -216,6 +216,9 @@ acpi:OVTI*:
 acpi:PEGA*:
 ID_VENDOR_FROM_DATABASE=Pegatron Corporation
 acpi:PHYT*:
 ID_VENDOR_FROM_DATABASE=Phytium Technology Co. Ltd.
 acpi:QCOM*:
 ID_VENDOR_FROM_DATABASE=Qualcomm Inc
--- a/hwdb.d/20-acpi-vendor.hwdb.patch
+++ b/hwdb.d/20-acpi-vendor.hwdb.patch
@ -1,5 +1,5 @@
--- 20-acpi-vendor.hwdb.base	2020-02-04 18:26:50.552863816 +0100
+--- 20-acpi-vendor.hwdb.base	2020-03-02 21:43:42.220221582 +0100
-+++ 20-acpi-vendor.hwdb	2020-02-04 18:26:50.569863967 +0100
+++ 20-acpi-vendor.hwdb	2020-03-02 21:43:42.226221638 +0100
@@ -3,6 +3,8 @@
 # Data imported from:
 #     https://uefi.org/uefi-pnp-export
@ -19,7 +19,7 @@
 acpi:AMDI*:
  ID_VENDOR_FROM_DATABASE=AMD
-@@ -283,6 +282,9 @@
+@@ -286,6 +285,9 @@
 acpi:AAA*:
  ID_VENDOR_FROM_DATABASE=Avolites Ltd
@ -29,7 +29,7 @@
 acpi:AAE*:
  ID_VENDOR_FROM_DATABASE=Anatek Electronics Inc.
-@@ -310,6 +312,9 @@
+@@ -313,6 +315,9 @@
 acpi:ABO*:
  ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
@ -39,7 +39,7 @@
 acpi:ABS*:
  ID_VENDOR_FROM_DATABASE=Abaco Systems, Inc.
-@@ -355,7 +360,7 @@
+@@ -358,7 +363,7 @@
 acpi:ACO*:
  ID_VENDOR_FROM_DATABASE=Allion Computer Inc.
@ -48,7 +48,7 @@
  ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
 acpi:ACR*:
-@@ -628,6 +633,9 @@
+@@ -631,6 +636,9 @@
 acpi:AMT*:
  ID_VENDOR_FROM_DATABASE=AMT International Industry
@ -58,7 +58,7 @@
 acpi:AMX*:
  ID_VENDOR_FROM_DATABASE=AMX LLC
-@@ -676,6 +684,9 @@
+@@ -679,6 +687,9 @@
 acpi:AOA*:
  ID_VENDOR_FROM_DATABASE=AOpen Inc.
@ -68,7 +68,7 @@
 acpi:AOE*:
  ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
-@@ -685,6 +696,9 @@
+@@ -688,6 +699,9 @@
 acpi:AOT*:
  ID_VENDOR_FROM_DATABASE=Alcatel
@ -78,7 +78,7 @@
 acpi:APC*:
  ID_VENDOR_FROM_DATABASE=American Power Conversion
-@@ -860,7 +874,7 @@
+@@ -863,7 +877,7 @@
  ID_VENDOR_FROM_DATABASE=Alps Electric Inc
 acpi:AUO*:
@ -87,7 +87,7 @@
 acpi:AUR*:
  ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -940,6 +954,9 @@
+@@ -943,6 +957,9 @@
 acpi:AXE*:
  ID_VENDOR_FROM_DATABASE=Axell Corporation
@ -97,7 +97,7 @@
 acpi:AXI*:
  ID_VENDOR_FROM_DATABASE=American Magnetics
-@@ -1090,6 +1107,9 @@
+@@ -1093,6 +1110,9 @@
 acpi:BML*:
  ID_VENDOR_FROM_DATABASE=BIOMED Lab
@ -107,7 +107,7 @@
 acpi:BMS*:
  ID_VENDOR_FROM_DATABASE=BIOMEDISYS
-@@ -1102,6 +1122,9 @@
+@@ -1105,6 +1125,9 @@
 acpi:BNO*:
  ID_VENDOR_FROM_DATABASE=Bang & Olufsen
@ -117,7 +117,7 @@
 acpi:BNS*:
  ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
-@@ -1342,6 +1365,9 @@
+@@ -1345,6 +1368,9 @@
 acpi:CHA*:
  ID_VENDOR_FROM_DATABASE=Chase Research PLC
@ -127,7 +127,7 @@
 acpi:CHD*:
  ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
-@@ -1495,6 +1521,9 @@
+@@ -1498,6 +1524,9 @@
 acpi:COD*:
  ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
@ -137,7 +137,7 @@
 acpi:COI*:
  ID_VENDOR_FROM_DATABASE=Codec Inc.
-@@ -1901,7 +1930,7 @@
+@@ -1904,7 +1933,7 @@
  ID_VENDOR_FROM_DATABASE=Dragon Information Technology
 acpi:DJE*:
@ -146,7 +146,7 @@
 acpi:DJP*:
  ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2233,6 +2262,9 @@
+@@ -2236,6 +2265,9 @@
 acpi:EIN*:
  ID_VENDOR_FROM_DATABASE=Elegant Invention
@ -156,7 +156,7 @@
 acpi:EKA*:
  ID_VENDOR_FROM_DATABASE=MagTek Inc.
-@@ -2494,6 +2526,9 @@
+@@ -2497,6 +2529,9 @@
 acpi:FCG*:
  ID_VENDOR_FROM_DATABASE=First International Computer Ltd
@ -166,7 +166,7 @@
 acpi:FCS*:
  ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
-@@ -2867,7 +2902,7 @@
+@@ -2870,7 +2905,7 @@
  ID_VENDOR_FROM_DATABASE=General Standards Corporation
 acpi:GSM*:
@ -175,7 +175,7 @@
 acpi:GSN*:
  ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -2968,6 +3003,9 @@
+@@ -2971,6 +3006,9 @@
 acpi:HEC*:
  ID_VENDOR_FROM_DATABASE=Hisense Electric Co., Ltd.
@ -185,7 +185,7 @@
 acpi:HEL*:
  ID_VENDOR_FROM_DATABASE=Hitachi Micro Systems Europe Ltd
-@@ -3097,6 +3135,9 @@
+@@ -3100,6 +3138,9 @@
 acpi:HSD*:
  ID_VENDOR_FROM_DATABASE=HannStar Display Corp
@ -195,7 +195,7 @@
 acpi:HSM*:
  ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
-@@ -3220,6 +3261,9 @@
+@@ -3223,6 +3264,9 @@
 acpi:ICI*:
  ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
@ -205,7 +205,7 @@
 acpi:ICM*:
  ID_VENDOR_FROM_DATABASE=Intracom SA
-@@ -3316,6 +3360,9 @@
+@@ -3319,6 +3363,9 @@
 acpi:IKE*:
  ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
@ -215,7 +215,7 @@
 acpi:IKS*:
  ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
-@@ -3361,6 +3408,9 @@
+@@ -3364,6 +3411,9 @@
 acpi:IMT*:
  ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
@ -225,7 +225,7 @@
 acpi:INA*:
  ID_VENDOR_FROM_DATABASE=Inventec Corporation
-@@ -3868,6 +3918,9 @@
+@@ -3871,6 +3921,9 @@
 acpi:LAN*:
  ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
@ -235,7 +235,7 @@
 acpi:LAS*:
  ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
-@@ -3913,6 +3966,9 @@
+@@ -3916,6 +3969,9 @@
 acpi:LED*:
  ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
@ -245,7 +245,7 @@
 acpi:LEG*:
  ID_VENDOR_FROM_DATABASE=Legerity, Inc
-@@ -3928,6 +3984,9 @@
+@@ -3931,6 +3987,9 @@
 acpi:LGC*:
  ID_VENDOR_FROM_DATABASE=Logic Ltd
@ -255,7 +255,7 @@
 acpi:LGI*:
  ID_VENDOR_FROM_DATABASE=Logitech Inc
-@@ -3982,6 +4041,9 @@
+@@ -3985,6 +4044,9 @@
 acpi:LND*:
  ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
@ -265,7 +265,7 @@
 acpi:LNK*:
  ID_VENDOR_FROM_DATABASE=Link Tech Inc
-@@ -4016,7 +4078,7 @@
+@@ -4019,7 +4081,7 @@
  ID_VENDOR_FROM_DATABASE=Design Technology
 acpi:LPL*:
@ -274,7 +274,7 @@
 acpi:LSC*:
  ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4192,6 +4254,9 @@
+@@ -4195,6 +4257,9 @@
 acpi:MCX*:
  ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
@ -284,7 +284,7 @@
 acpi:MDA*:
  ID_VENDOR_FROM_DATABASE=Media4 Inc
-@@ -4429,6 +4494,9 @@
+@@ -4432,6 +4497,9 @@
 acpi:MOM*:
  ID_VENDOR_FROM_DATABASE=Momentum Data Systems
@ -294,7 +294,7 @@
 acpi:MOS*:
  ID_VENDOR_FROM_DATABASE=Moses Corporation
-@@ -4654,6 +4722,9 @@
+@@ -4657,6 +4725,9 @@
 acpi:NAL*:
  ID_VENDOR_FROM_DATABASE=Network Alchemy
@ -304,7 +304,7 @@
 acpi:NAT*:
  ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
-@@ -5158,6 +5229,9 @@
+@@ -5161,6 +5232,9 @@
 acpi:PCX*:
  ID_VENDOR_FROM_DATABASE=PC Xperten
@ -314,7 +314,7 @@
 acpi:PDM*:
  ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
-@@ -5221,9 +5295,6 @@
+@@ -5224,9 +5298,6 @@
 acpi:PHE*:
  ID_VENDOR_FROM_DATABASE=Philips Medical Systems Boeblingen GmbH
@ -324,7 +324,7 @@
 acpi:PHL*:
  ID_VENDOR_FROM_DATABASE=Philips Consumer Electronics Company
-@@ -5311,9 +5382,6 @@
+@@ -5314,9 +5385,6 @@
 acpi:PNL*:
  ID_VENDOR_FROM_DATABASE=Panelview, Inc.
@ -334,7 +334,7 @@
 acpi:PNR*:
  ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
-@@ -5449,15 +5517,9 @@
+@@ -5452,15 +5520,9 @@
 acpi:PTS*:
  ID_VENDOR_FROM_DATABASE=Plain Tree Systems Inc
@ -350,7 +350,7 @@
 acpi:PVG*:
  ID_VENDOR_FROM_DATABASE=Proview Global Co., Ltd
-@@ -5773,9 +5835,6 @@
+@@ -5776,9 +5838,6 @@
 acpi:RTI*:
  ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
@ -360,7 +360,7 @@
 acpi:RTL*:
  ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
-@@ -5941,9 +6000,6 @@
+@@ -5944,9 +6003,6 @@
 acpi:SEE*:
  ID_VENDOR_FROM_DATABASE=SeeColor Corporation
@ -370,7 +370,7 @@
 acpi:SEI*:
  ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
-@@ -6400,6 +6456,9 @@
+@@ -6403,6 +6459,9 @@
 acpi:SVD*:
  ID_VENDOR_FROM_DATABASE=SVD Computer
@ -380,7 +380,7 @@
 acpi:SVI*:
  ID_VENDOR_FROM_DATABASE=Sun Microsystems
-@@ -6484,6 +6543,9 @@
+@@ -6487,6 +6546,9 @@
 acpi:SZM*:
  ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
@ -390,7 +390,7 @@
 acpi:TAA*:
  ID_VENDOR_FROM_DATABASE=Tandberg
-@@ -6574,6 +6636,9 @@
+@@ -6577,6 +6639,9 @@
 acpi:TDG*:
  ID_VENDOR_FROM_DATABASE=Six15 Technologies
@ -400,7 +400,7 @@
 acpi:TDM*:
  ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
-@@ -6616,6 +6681,9 @@
+@@ -6619,6 +6684,9 @@
 acpi:TEV*:
  ID_VENDOR_FROM_DATABASE=Televés, S.A.
@ -410,7 +410,7 @@
 acpi:TEZ*:
  ID_VENDOR_FROM_DATABASE=Tech Source Inc.
-@@ -6730,9 +6798,6 @@
+@@ -6733,9 +6801,6 @@
 acpi:TNC*:
  ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
@ -420,7 +420,7 @@
 acpi:TNM*:
  ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
-@@ -7039,14 +7104,14 @@
+@@ -7042,14 +7107,14 @@
 acpi:UNC*:
  ID_VENDOR_FROM_DATABASE=Unisys Corporation
@ -441,7 +441,7 @@
 acpi:UNI*:
  ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7081,6 +7146,9 @@
+@@ -7084,6 +7149,9 @@
 acpi:USA*:
  ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
@ -451,7 +451,7 @@
 acpi:USD*:
  ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
-@@ -7324,9 +7392,6 @@
+@@ -7327,9 +7395,6 @@
 acpi:WAL*:
  ID_VENDOR_FROM_DATABASE=Wave Access
@ -461,7 +461,7 @@
 acpi:WAV*:
  ID_VENDOR_FROM_DATABASE=Wavephore
-@@ -7451,7 +7516,7 @@
+@@ -7454,7 +7519,7 @@
  ID_VENDOR_FROM_DATABASE=WyreStorm Technologies LLC
 acpi:WYS*:
@ -470,7 +470,7 @@
 acpi:WYT*:
  ID_VENDOR_FROM_DATABASE=Wooyoung Image & Information Co.,Ltd.
-@@ -7465,9 +7530,6 @@
+@@ -7468,9 +7533,6 @@
 acpi:XDM*:
  ID_VENDOR_FROM_DATABASE=XDM Ltd.
@ -480,7 +480,7 @@
 acpi:XES*:
  ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
-@@ -7498,9 +7560,6 @@
+@@ -7501,9 +7563,6 @@
 acpi:XNT*:
  ID_VENDOR_FROM_DATABASE=XN Technologies, Inc.
@ -490,7 +490,7 @@
 acpi:XQU*:
  ID_VENDOR_FROM_DATABASE=SHANGHAI SVA-DAV ELECTRONICS CO., LTD
-@@ -7567,6 +7626,9 @@
+@@ -7570,6 +7629,9 @@
 acpi:ZBX*:
  ID_VENDOR_FROM_DATABASE=Zebax Technologies
--- a/hwdb.d/20-pci-vendor-model.hwdb
+++ b/hwdb.d/20-pci-vendor-model.hwdb
@ -116,6 +116,9 @@ pci:v0000018A*
 pci:v0000018Ad00000106*
 ID_MODEL_FROM_DATABASE=FPC-0106TX misprogrammed [RTL81xx]
 pci:v000001DE*
 ID_VENDOR_FROM_DATABASE=Oxide Computer Company
 pci:v0000021B*
 ID_VENDOR_FROM_DATABASE=Compaq Computer Corporation
@ -1214,6 +1217,12 @@ pci:v00001000d0000005Dsv000017AAsd00001052*
 pci:v00001000d0000005Dsv000017AAsd00001053*
 ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (ThinkServer RAID 720ix)
 pci:v00001000d0000005Dsv00001BD4sd00000014*
 ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (6G SAS3108 2G)
 pci:v00001000d0000005Dsv00001BD4sd00000015*
 ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (6G SAS3108 4G)
 pci:v00001000d0000005Dsv00001D49sd00000600*
 ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter)
@ -1427,6 +1436,21 @@ pci:v00001000d00000072sv00001028sd00001F20*
 pci:v00001000d00000072sv00001028sd00001F22*
 ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (PERC H200 Internal Tape Adapter)
 pci:v00001000d00000072sv00001734sd00001177*
 ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (HBA Ctrl SAS 6G 0/1 [D2607])
 pci:v00001000d00000072sv00001BD4sd0000000D*
 ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (6G SAS2008IT)
 pci:v00001000d00000072sv00001BD4sd0000000E*
 ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (6G SAS2008IR)
 pci:v00001000d00000072sv00001BD4sd0000000F*
 ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (6G SAS2008IT SA5248)
 pci:v00001000d00000072sv00001BD4sd00000010*
 ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (6G SAS2008IR SA5248)
 pci:v00001000d00000072sv00008086sd0000350F*
 ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (RMS2LL040 RAID Controller)
@ -1751,6 +1775,12 @@ pci:v00001000d00000087sv00001590sd00000042*
 pci:v00001000d00000087sv00001590sd00000044*
 ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (H220i)
 pci:v00001000d00000087sv00001BD4sd00000009*
 ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (6G SAS2308IR)
 pci:v00001000d00000087sv00001BD4sd0000000A*
 ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (6G SAS2308IT)
 pci:v00001000d00000087sv00008086sd00003000*
 ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (RS25GB008 RAID Controller)
@ -1841,6 +1871,18 @@ pci:v00001000d00000097sv00001BD4sd0000000C*
 pci:v00001000d00000097sv00001BD4sd00000011*
 ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (Inspur 12Gb 8i-3008 IT SAS HBA)
 pci:v00001000d00000097sv00001BD4sd00000012*
 ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (12Gb SAS3008IR UDM)
 pci:v00001000d00000097sv00001BD4sd00000026*
 ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (12G SAS3008IT RACK)
 pci:v00001000d00000097sv00001BD4sd00000027*
 ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (12G SAS3008IMR RACK)
 pci:v00001000d00000097sv00001BD4sd00000028*
 ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (12G SAS3008IR RACK)
 pci:v00001000d000000AB*
 ID_MODEL_FROM_DATABASE=SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
@ -2480,9 +2522,15 @@ pci:v00001002d00001307*
 pci:v00001002d00001308*
 ID_MODEL_FROM_DATABASE=Kaveri HDMI/DP Audio Controller
 pci:v00001002d00001308sv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=Kaveri HDMI/DP Audio Controller (Z50-75)
 pci:v00001002d00001309*
 ID_MODEL_FROM_DATABASE=Kaveri [Radeon R6/R7 Graphics]
 pci:v00001002d00001309sv000017AAsd00003830*
 ID_MODEL_FROM_DATABASE=Kaveri [Radeon R6/R7 Graphics] (Z50-75)
 pci:v00001002d0000130A*
 ID_MODEL_FROM_DATABASE=Kaveri [Radeon R6 Graphics]
@ -3114,7 +3162,7 @@ pci:v00001002d00004383sv00001019sd00002120*
 ID_MODEL_FROM_DATABASE=SBx00 Azalia (Intel HDA) (A785GM-M)
 pci:v00001002d00004383sv0000103Csd00001611*
- ID_MODEL_FROM_DATABASE=SBx00 Azalia (Intel HDA) (Pavilion DM1Z-3000)
+ ID_MODEL_FROM_DATABASE=SBx00 Azalia (Intel HDA) (Pavilion dm1z-3000)
 pci:v00001002d00004383sv0000103Csd0000280A*
 ID_MODEL_FROM_DATABASE=SBx00 Azalia (Intel HDA) (DC5750 Microtower)
@ -5417,6 +5465,9 @@ pci:v00001002d00006611*
 pci:v00001002d00006611sv00001028sd0000210B*
 ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8570 / R7 240/340 OEM] (Radeon R5 240 OEM)
 pci:v00001002d00006611sv00001642sd00001869*
 ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8570 / R7 240/340 OEM] (AMD Radeon 520)
 pci:v00001002d00006611sv0000174Bsd00004248*
 ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8570 / R7 240/340 OEM] (Radeon R7 240 OEM)
@ -5604,7 +5655,7 @@ pci:v00001002d00006665*
 ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile]
 pci:v00001002d00006665sv000017AAsd00001309*
- ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile] (Radeon R7 M260DX)
+ ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile] (Z50-75 Radeon R7 M260DX)
 pci:v00001002d00006665sv000017AAsd0000368F*
 ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile] (Radeon R5 A230)
@ -7485,7 +7536,7 @@ pci:v00001002d000067DFsv00001462sd00008A92*
 ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Radeon RX 580)
 pci:v00001002d000067DFsv0000148Csd00002372*
- ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Radeon RX 480)
+ ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Radeon RX 480 [Red Dragon])
 pci:v00001002d000067DFsv0000148Csd00002373*
 ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Radeon RX 470)
@ -14435,6 +14486,9 @@ pci:v00001022d00007801sv0000103Csd0000168B*
 pci:v00001022d00007801sv0000103Csd0000194E*
 ID_MODEL_FROM_DATABASE=FCH SATA Controller [AHCI mode] (ProBook 455 G1 Notebook)
 pci:v00001022d00007801sv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=FCH SATA Controller [AHCI mode] (Z50-75)
 pci:v00001022d00007801sv00001849sd00007801*
 ID_MODEL_FROM_DATABASE=FCH SATA Controller [AHCI mode] (QC5000-ITX/PH)
@ -14465,6 +14519,9 @@ pci:v00001022d00007807sv0000103Csd0000194E*
 pci:v00001022d00007807sv0000103Csd00001985*
 ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller (Pavilion 17-e163sg Notebook PC)
 pci:v00001022d00007807sv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller (Z50-75)
 pci:v00001022d00007807sv00001849sd00007807*
 ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller (QC5000-ITX/PH)
@ -14477,6 +14534,9 @@ pci:v00001022d00007808sv0000103Csd0000194E*
 pci:v00001022d00007808sv0000103Csd00001985*
 ID_MODEL_FROM_DATABASE=FCH USB EHCI Controller (Pavilion 17-e163sg Notebook PC)
 pci:v00001022d00007808sv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=FCH USB EHCI Controller (Z50-75)
 pci:v00001022d00007808sv00001849sd00007808*
 ID_MODEL_FROM_DATABASE=FCH USB EHCI Controller (QC5000-ITX/PH)
@ -14486,6 +14546,9 @@ pci:v00001022d00007809*
 pci:v00001022d00007809sv0000103Csd0000194E*
 ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller (ProBook 455 G1 Notebook)
 pci:v00001022d00007809sv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller (Z50-75)
 pci:v00001022d0000780A*
 ID_MODEL_FROM_DATABASE=Kabini/Mullins SATA Raid/AHCI Mode (DotHill driver)
@ -14498,6 +14561,9 @@ pci:v00001022d0000780Bsv0000103Csd0000194E*
 pci:v00001022d0000780Bsv0000103Csd00001985*
 ID_MODEL_FROM_DATABASE=FCH SMBus Controller (Pavilion 17-e163sg Notebook PC)
 pci:v00001022d0000780Bsv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=FCH SMBus Controller (Z50-75)
 pci:v00001022d0000780Bsv00001849sd0000780B*
 ID_MODEL_FROM_DATABASE=FCH SMBus Controller (QC5000-ITX/PH)
@ -14516,6 +14582,9 @@ pci:v00001022d0000780Dsv0000103Csd00001985*
 pci:v00001022d0000780Dsv00001043sd00008444*
 ID_MODEL_FROM_DATABASE=FCH Azalia Controller (F2A85-M Series)
 pci:v00001022d0000780Dsv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=FCH Azalia Controller (Z50-75)
 pci:v00001022d0000780Dsv00001849sd00008892*
 ID_MODEL_FROM_DATABASE=FCH Azalia Controller (QC5000-ITX/PH)
@ -14528,6 +14597,9 @@ pci:v00001022d0000780Esv0000103Csd0000194E*
 pci:v00001022d0000780Esv0000103Csd00001985*
 ID_MODEL_FROM_DATABASE=FCH LPC Bridge (Pavilion 17-e163sg Notebook PC)
 pci:v00001022d0000780Esv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=FCH LPC Bridge (Z50-75)
 pci:v00001022d0000780Esv00001849sd0000780E*
 ID_MODEL_FROM_DATABASE=FCH LPC Bridge (QC5000-ITX/PH)
@ -14549,6 +14621,9 @@ pci:v00001022d00007814sv0000103Csd0000194E*
 pci:v00001022d00007814sv0000103Csd00001985*
 ID_MODEL_FROM_DATABASE=FCH USB XHCI Controller (Pavilion 17-e163sg Notebook PC)
 pci:v00001022d00007814sv000017AAsd00003988*
 ID_MODEL_FROM_DATABASE=FCH USB XHCI Controller (Z50-75)
 pci:v00001022d00007814sv00001849sd00007814*
 ID_MODEL_FROM_DATABASE=FCH USB XHCI Controller (QC5000-ITX/PH)
@ -19226,6 +19301,9 @@ pci:v00001057d00004803*
 pci:v00001057d00004806*
 ID_MODEL_FROM_DATABASE=CPX8216
 pci:v00001057d0000480B*
 ID_MODEL_FROM_DATABASE=MPC7410
 pci:v00001057d00004D68*
 ID_MODEL_FROM_DATABASE=20268
@ -20513,6 +20591,12 @@ pci:v00001077d00002281sv00001077sd000002EE*
 pci:v00001077d00002281sv00001077sd000002F0*
 ID_MODEL_FROM_DATABASE=ISP2812-based 64/32G Fibre Channel to PCIe Controller (QLE2770 Single Port 32GFC PCIe Gen4 x8 Adapter)
 pci:v00001077d00002281sv00001077sd000002F2*
 ID_MODEL_FROM_DATABASE=ISP2812-based 64/32G Fibre Channel to PCIe Controller (QLogic 1x32Gb QLE2770 FC HBA)
 pci:v00001077d00002281sv00001077sd000002F3*
 ID_MODEL_FROM_DATABASE=ISP2812-based 64/32G Fibre Channel to PCIe Controller (QLogic 2x32Gb QLE2772 FC HBA)
 pci:v00001077d00002281sv00001590sd000002D3*
 ID_MODEL_FROM_DATABASE=ISP2812-based 64/32G Fibre Channel to PCIe Controller (SN1610Q - 1P Enhanced 32GFC Single Port Fibre Channel Host Bus Adapter)
@ -20747,6 +20831,12 @@ pci:v00001077d00008070sv00001077sd00000056*
 pci:v00001077d00008070sv00001077sd00000057*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (2x25GE QL41232HxCU NIC)
 pci:v00001077d00008070sv00001077sd00000065*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (QLogic 4x10GE QL41154HQRJ CNA)
 pci:v00001077d00008070sv00001077sd00000066*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (QLogic 4x10GE QL41154HQCU CNA)
 pci:v00001077d00008070sv00001077sd00000068*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (10GbE 2p SFP+ QL41132HLCU-HC Adapter)
@ -20876,6 +20966,12 @@ pci:v00001077d00008084sv00001077sd0000000E*
 pci:v00001077d00008084sv00001077sd0000000F*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (iSCSI) (2x25GE QL41262HMKR CNA)
 pci:v00001077d00008084sv00001077sd00000065*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (iSCSI) (QLogic 4x10GE QL41154HQRJ CNA)
 pci:v00001077d00008084sv00001077sd00000066*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (iSCSI) (QLogic 4x10GE QL41154HQCU CNA)
 pci:v00001077d00008084sv00001590sd0000021A*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series 10/25/40/50GbE Controller (iSCSI) (10GbE 2P QL41162HLRJ-HP Adapter)
@ -20948,6 +21044,12 @@ pci:v00001077d00008090sv00001077sd00000056*
 pci:v00001077d00008090sv00001077sd00000057*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series Gigabit Ethernet Controller (SR-IOV VF) (2x25GE QL41232HxCU NIC)
 pci:v00001077d00008090sv00001077sd00000065*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series Gigabit Ethernet Controller (SR-IOV VF) (QLogic 4x10GE QL41154HQRJ CNA)
 pci:v00001077d00008090sv00001077sd00000066*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series Gigabit Ethernet Controller (SR-IOV VF) (QLogic 4x10GE QL41154HQCU CNA)
 pci:v00001077d00008090sv00001590sd0000021A*
 ID_MODEL_FROM_DATABASE=FastLinQ QL41000 Series Gigabit Ethernet Controller (SR-IOV VF) (10GbE 2P QL41162HLRJ-HP Adapter)
@ -34727,6 +34829,9 @@ pci:v000010DEd00001407*
 pci:v000010DEd00001427*
 ID_MODEL_FROM_DATABASE=GM206M [GeForce GTX 965M]
 pci:v000010DEd00001427sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=GM206M [GeForce GTX 965M] (OMEN-17-w001nv)
 pci:v000010DEd00001430*
 ID_MODEL_FROM_DATABASE=GM206GL [Quadro M2000]
@ -35135,6 +35240,12 @@ pci:v000010DEd00001CCC*
 pci:v000010DEd00001CCD*
 ID_MODEL_FROM_DATABASE=GP107BM [GeForce GTX 1050 Mobile]
 pci:v000010DEd00001CFA*
 ID_MODEL_FROM_DATABASE=GP107GL [Quadro P2000]
 pci:v000010DEd00001CFB*
 ID_MODEL_FROM_DATABASE=GP107GL [Quadro P1000]
 pci:v000010DEd00001D01*
 ID_MODEL_FROM_DATABASE=GP108 [GeForce GT 1030]
@ -35204,6 +35315,12 @@ pci:v000010DEd00001DBA*
 pci:v000010DEd00001DBAsv000010DEsd000012EB*
 ID_MODEL_FROM_DATABASE=GV100GL [Quadro GV100] (TITAN V CEO Edition)
 pci:v000010DEd00001DF0*
 ID_MODEL_FROM_DATABASE=GV100GL [Tesla PG500-216]
 pci:v000010DEd00001DF2*
 ID_MODEL_FROM_DATABASE=GV100GL [Tesla PG503-216]
 pci:v000010DEd00001DF5*
 ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 SXM2 16GB]
@ -35237,6 +35354,18 @@ pci:v000010DEd00001E30sv000010DEsd0000129E*
 pci:v000010DEd00001E30sv000010DEsd000012BA*
 ID_MODEL_FROM_DATABASE=TU102GL [Quadro RTX 6000/8000] (Quadro RTX 6000)
 pci:v000010DEd00001E37*
 ID_MODEL_FROM_DATABASE=TU102GL [GRID RTX T10-4/T10-8/T10-16]
 pci:v000010DEd00001E37sv000010DEsd00001347*
 ID_MODEL_FROM_DATABASE=TU102GL [GRID RTX T10-4/T10-8/T10-16] (GRID RTX T10-8)
 pci:v000010DEd00001E37sv000010DEsd00001348*
 ID_MODEL_FROM_DATABASE=TU102GL [GRID RTX T10-4/T10-8/T10-16] (GRID RTX T10-4)
 pci:v000010DEd00001E37sv000010DEsd00001370*
 ID_MODEL_FROM_DATABASE=TU102GL [GRID RTX T10-4/T10-8/T10-16] (GRID RTX T10-16)
 pci:v000010DEd00001E38*
 ID_MODEL_FROM_DATABASE=TU102GL
@ -36041,6 +36170,9 @@ pci:v000010ECd0000522A*
 pci:v000010ECd0000522Asv0000103Csd00008079*
 ID_MODEL_FROM_DATABASE=RTS522A PCI Express Card Reader (EliteBook 840 G3)
 pci:v000010ECd0000522Asv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=RTS522A PCI Express Card Reader (OMEN-17-w001nv)
 pci:v000010ECd00005249*
 ID_MODEL_FROM_DATABASE=RTS5249 PCI Express Card Reader
@ -36344,6 +36476,9 @@ pci:v000010ECd00008168sv0000103Csd00001950*
 pci:v000010ECd00008168sv0000103Csd00002A6F*
 ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (Asus IPIBL-LB Motherboard)
 pci:v000010ECd00008168sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (OMEN-17-w001nv)
 pci:v000010ECd00008168sv0000103Csd00008615*
 ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (Pavilion Laptop 15-cw1xxx)
@ -36401,6 +36536,9 @@ pci:v000010ECd00008168sv00001462sd00007C37*
 pci:v000010ECd00008168sv00001775sd000011CC*
 ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (CC11/CL11)
 pci:v000010ECd00008168sv000017AAsd00003814*
 ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (Z50-75)
 pci:v000010ECd00008168sv00001849sd00008168*
 ID_MODEL_FROM_DATABASE=RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (Motherboard (one of many))
@ -36551,6 +36689,9 @@ pci:v000010ECd0000B723*
 pci:v000010ECd0000B723sv000010ECsd00008739*
 ID_MODEL_FROM_DATABASE=RTL8723BE PCIe Wireless Network Adapter (Dell Wireless 1801)
 pci:v000010ECd0000B723sv000017AAsd0000B736*
 ID_MODEL_FROM_DATABASE=RTL8723BE PCIe Wireless Network Adapter (Z50-75)
 pci:v000010ECd0000B822*
 ID_MODEL_FROM_DATABASE=RTL8822BE 802.11a/b/g/n/ac WiFi adapter
@ -53561,6 +53702,9 @@ pci:v0000144Dd0000A822sv00001028sd00001FF9*
 pci:v0000144Dd0000A822sv00001028sd00001FFA*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller 172Xa/172Xb (Express Flash PM1725b 12.8TB AIC)
 pci:v0000144Dd0000A824*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller PM173X
 pci:v0000144E*
 ID_VENDOR_FROM_DATABASE=OLITEC
@ -58907,6 +59051,9 @@ pci:v000015B3d00004117*
 pci:v000015B3d00004117sv00001BD4sd00000039*
 ID_MODEL_FROM_DATABASE=MT27712A0-FDCF-AE (SN10XMP2P25)
 pci:v000015B3d00004117sv00001BD4sd0000003A*
 ID_MODEL_FROM_DATABASE=MT27712A0-FDCF-AE (10G SFP28 SP EO251FM9 Adapter)
 pci:v000015B3d00004117sv00001BD4sd0000004D*
 ID_MODEL_FROM_DATABASE=MT27712A0-FDCF-AE (SN10XMP2P25,YZPC-01191-101)
@ -64826,6 +64973,9 @@ pci:v000019E5d00000211sv000019E5sd0000D12F*
 pci:v000019E5d00000211sv000019E5sd0000D137*
 ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 SP581 (4*25GE))
 pci:v000019E5d00000211sv000019E5sd0000D142*
 ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 SP583 (4*25GE))
 pci:v000019E5d00000212*
 ID_MODEL_FROM_DATABASE=Hi1822 Family (2*8G FC)
@ -64850,6 +65000,9 @@ pci:v000019E5d00001822sv000019E5sd0000D129*
 pci:v000019E5d00001822sv000019E5sd0000D136*
 ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 SP580 (4*25GE))
 pci:v000019E5d00001822sv000019E5sd0000D141*
 ID_MODEL_FROM_DATABASE=Hi1822 Family (4*25GE) (Hi1822 SP583 (4*25GE))
 pci:v000019E5d0000371E*
 ID_MODEL_FROM_DATABASE=Hi1822 Family Virtual Bridge
@ -65318,6 +65471,12 @@ pci:v00001AB8d00004006*
 pci:v00001AB9*
 ID_VENDOR_FROM_DATABASE=Espia Srl
 pci:v00001AC1*
 ID_VENDOR_FROM_DATABASE=Global Unichip Corp.
 pci:v00001AC1d0000089A*
 ID_MODEL_FROM_DATABASE=Coral Edge TPU
 pci:v00001AC8*
 ID_VENDOR_FROM_DATABASE=Aeroflex Gaisler
@ -67145,6 +67304,9 @@ pci:v00001DBFd00000401*
 pci:v00001DC5*
 ID_VENDOR_FROM_DATABASE=FADU Inc.
 pci:v00001DCD*
 ID_VENDOR_FROM_DATABASE=Liqid Inc.
 pci:v00001DD8*
 ID_VENDOR_FROM_DATABASE=Pensando Systems Inc
@ -67415,6 +67577,9 @@ pci:v00001E89d00000002*
 pci:v00001E89d00000003*
 ID_MODEL_FROM_DATABASE=Quantis-PCIe-240M
 pci:v00001E94*
 ID_VENDOR_FROM_DATABASE=Calian SED
 pci:v00001FC0*
 ID_VENDOR_FROM_DATABASE=Ascom (Finland) Oy
@ -76019,6 +76184,9 @@ pci:v00008086d00001903sv00001028sd000006DC*
 pci:v00008086d00001903sv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem (XPS 15 9550)
 pci:v00008086d00001903sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem (OMEN-17-w001nv)
 pci:v00008086d00001903sv000017AAsd0000225D*
 ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem (ThinkPad T480)
@ -76064,6 +76232,9 @@ pci:v00008086d00001910*
 pci:v00008086d00001910sv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers (XPS 15 9550)
 pci:v00008086d00001910sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers (OMEN-17-w001nv)
 pci:v00008086d00001911*
 ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th/8th Gen Core Processor Gaussian Mixture Model
@ -76103,6 +76274,9 @@ pci:v00008086d0000191B*
 pci:v00008086d0000191Bsv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=HD Graphics 530 (XPS 15 9550)
 pci:v00008086d0000191Bsv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=HD Graphics 530 (OMEN-17-w001nv)
 pci:v00008086d0000191D*
 ID_MODEL_FROM_DATABASE=HD Graphics P530
@ -87827,6 +88001,9 @@ pci:v00008086d00003B42sv00001028sd0000040A*
 pci:v00008086d00003B42sv00001028sd0000040B*
 ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (Latitude E6510)
 pci:v00008086d00003B42sv0000103Csd00001521*
 ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (EliteBook 8540p)
 pci:v00008086d00003B42sv0000144Dsd0000C06A*
 ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (R730 Laptop)
@ -91502,6 +91679,9 @@ pci:v00008086d0000A103*
 pci:v00008086d0000A103sv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=HM170/QM170 Chipset SATA Controller [AHCI Mode] (XPS 15 9550)
 pci:v00008086d0000A103sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=HM170/QM170 Chipset SATA Controller [AHCI Mode] (OMEN-17-w001nv)
 pci:v00008086d0000A105*
 ID_MODEL_FROM_DATABASE=Sunrise Point-H SATA Controller [RAID mode]
@ -91571,6 +91751,9 @@ pci:v00008086d0000A121*
 pci:v00008086d0000A121sv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family Power Management Controller (XPS 15 9550)
 pci:v00008086d0000A121sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family Power Management Controller (OMEN-17-w001nv)
 pci:v00008086d0000A122*
 ID_MODEL_FROM_DATABASE=Sunrise Point-H cAVS
@ -91580,6 +91763,9 @@ pci:v00008086d0000A123*
 pci:v00008086d0000A123sv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family SMBus (XPS 15 9550)
 pci:v00008086d0000A123sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family SMBus (OMEN-17-w001nv)
 pci:v00008086d0000A124*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family SPI Controller
@ -91607,6 +91793,9 @@ pci:v00008086d0000A12F*
 pci:v00008086d0000A12Fsv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family USB 3.0 xHCI Controller (XPS 15 9550)
 pci:v00008086d0000A12Fsv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family USB 3.0 xHCI Controller (OMEN-17-w001nv)
 pci:v00008086d0000A130*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family USB Device Controller (OTG)
@ -91616,6 +91805,9 @@ pci:v00008086d0000A131*
 pci:v00008086d0000A131sv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family Thermal Subsystem (XPS 15 9550)
 pci:v00008086d0000A131sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family Thermal Subsystem (OMEN-17-w001nv)
 pci:v00008086d0000A133*
 ID_MODEL_FROM_DATABASE=Sunrise Point-H Northpeak ACPI Function
@ -91628,6 +91820,9 @@ pci:v00008086d0000A13A*
 pci:v00008086d0000A13Asv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family MEI Controller #1 (XPS 15 9550)
 pci:v00008086d0000A13Asv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family MEI Controller #1 (OMEN-17-w001nv)
 pci:v00008086d0000A13B*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family MEI Controller #2
@ -91688,6 +91883,9 @@ pci:v00008086d0000A14E*
 pci:v00008086d0000A14Esv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=HM170 Chipset LPC/eSPI Controller (XPS 15 9550)
 pci:v00008086d0000A14Esv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=HM170 Chipset LPC/eSPI Controller (OMEN-17-w001nv)
 pci:v00008086d0000A14F*
 ID_MODEL_FROM_DATABASE=Sunrise Point-H LPC Controller
@ -91745,6 +91943,9 @@ pci:v00008086d0000A160*
 pci:v00008086d0000A160sv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family Serial IO I2C Controller #0 (XPS 15 9550)
 pci:v00008086d0000A160sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family Serial IO I2C Controller #0 (OMEN-17-w001nv)
 pci:v00008086d0000A161*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family Serial IO I2C Controller #1
@ -91778,6 +91979,9 @@ pci:v00008086d0000A170*
 pci:v00008086d0000A170sv00001028sd000006E4*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family HD Audio Controller (XPS 15 9550)
 pci:v00008086d0000A170sv0000103Csd0000825B*
 ID_MODEL_FROM_DATABASE=100 Series/C230 Series Chipset Family HD Audio Controller (OMEN-17-w001nv)
 pci:v00008086d0000A171*
 ID_MODEL_FROM_DATABASE=CM238 HD Audio Controller
--- a/hwdb.d/20-usb-vendor-model.hwdb
+++ b/hwdb.d/20-usb-vendor-model.hwdb
@ -68,6 +68,9 @@ usb:v0085*
 usb:v0085p0600*
 ID_MODEL_FROM_DATABASE=eBook Reader
 usb:v0102*
 ID_VENDOR_FROM_DATABASE=miniSTREAK
 usb:v0105*
 ID_VENDOR_FROM_DATABASE=Trust International B.V.
@ -458,6 +461,9 @@ usb:v03EBp7800*
 usb:v03EBp800C*
 ID_MODEL_FROM_DATABASE=Airspy HF+
 usb:v03EBpFF01*
 ID_MODEL_FROM_DATABASE=WootingOne
 usb:v03EBpFF02*
 ID_MODEL_FROM_DATABASE=WootingTwo
@ -2048,6 +2054,9 @@ usb:v03F0pC111*
 usb:v03F0pC202*
 ID_MODEL_FROM_DATABASE=PhotoSmart 8200 series
 usb:v03F0pC211*
 ID_MODEL_FROM_DATABASE=Deskjet 2540 series
 usb:v03F0pC302*
 ID_MODEL_FROM_DATABASE=DeskJet D2300
@ -2336,6 +2345,9 @@ usb:v0403p8371*
 usb:v0403p8372*
 ID_MODEL_FROM_DATABASE=FT8U100AX Serial Port
 usb:v0403p8508*
 ID_MODEL_FROM_DATABASE=Selectronic SP PRO
 usb:v0403p87D0*
 ID_MODEL_FROM_DATABASE=Cressi Dive Computer Interface
@ -2378,6 +2390,9 @@ usb:v0403p9136*
 usb:v0403p9E90*
 ID_MODEL_FROM_DATABASE=Marvell OpenRD Base/Client
 usb:v0403p9F08*
 ID_MODEL_FROM_DATABASE=CIB-1894 Conclusion SmartLink Box:
 usb:v0403p9F80*
 ID_MODEL_FROM_DATABASE=Ewert Energy Systems CANdapter
@ -3437,6 +3452,9 @@ usb:v040B*
 usb:v040Bp0A68*
 ID_MODEL_FROM_DATABASE=Func MS-3 gaming mouse [WT6573F MCU]
 usb:v040Bp2000*
 ID_MODEL_FROM_DATABASE=wired Keyboard [Dynex DX-WRK1401]
 usb:v040Bp2367*
 ID_MODEL_FROM_DATABASE=Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad]
@ -5882,6 +5900,9 @@ usb:v0450*
 usb:v0451*
 ID_VENDOR_FROM_DATABASE=Texas Instruments, Inc.
 usb:v0451p0422*
 ID_MODEL_FROM_DATABASE=TUSB422 Port Controller with Power Delivery
 usb:v0451p1234*
 ID_MODEL_FROM_DATABASE=Bluetooth Device
@ -5891,9 +5912,18 @@ usb:v0451p1428*
 usb:v0451p1446*
 ID_MODEL_FROM_DATABASE=TUSB2040/2070 Hub
 usb:v0451p16A2*
 ID_MODEL_FROM_DATABASE=CC Debugger
 usb:v0451p16A6*
 ID_MODEL_FROM_DATABASE=BM-USBD1 BlueRobin RF heart rate sensor receiver
 usb:v0451p16A8*
 ID_MODEL_FROM_DATABASE=CC2531 ZigBee
 usb:v0451p16AE*
 ID_MODEL_FROM_DATABASE=CC2531 Dongle
 usb:v0451p2036*
 ID_MODEL_FROM_DATABASE=TUSB2036 Hub
@ -5996,6 +6026,9 @@ usb:v0451pE013*
 usb:v0451pE01C*
 ID_MODEL_FROM_DATABASE=Data Collection Sled [Nspire Lab Cradle, Nspire Datatracker Cradle]
 usb:v0451pE01E*
 ID_MODEL_FROM_DATABASE=Nspire CX Navigator Access Point
 usb:v0451pE01F*
 ID_MODEL_FROM_DATABASE=Python Adapter (firmware install mode)
@ -6092,6 +6125,9 @@ usb:v0458p0003*
 usb:v0458p0006*
 ID_MODEL_FROM_DATABASE=Easy Mouse+
 usb:v0458p0007*
 ID_MODEL_FROM_DATABASE=Trackbar Emotion
 usb:v0458p000B*
 ID_MODEL_FROM_DATABASE=NetMouse Wheel(P+U)
@ -6710,6 +6746,9 @@ usb:v045Ep00CE*
 usb:v045Ep00D1*
 ID_MODEL_FROM_DATABASE=Optical Mouse with Tilt Wheel
 usb:v045Ep00D2*
 ID_MODEL_FROM_DATABASE=Notebook Optical Mouse with Tilt Wheel
 usb:v045Ep00DA*
 ID_MODEL_FROM_DATABASE=eHome Infrared Receiver
@ -7364,6 +7403,9 @@ usb:v045Ep07F8*
 usb:v045Ep07FD*
 ID_MODEL_FROM_DATABASE=Nano Transceiver 1.1
 usb:v045Ep0810*
 ID_MODEL_FROM_DATABASE=LifeCam HD-3000
 usb:v045Ep0900*
 ID_MODEL_FROM_DATABASE=Surface Dock Hub
@ -7595,6 +7637,9 @@ usb:v0461p4D75*
 usb:v0461p4D81*
 ID_MODEL_FROM_DATABASE=Dell N889 Optical Mouse
 usb:v0461p4D8A*
 ID_MODEL_FROM_DATABASE=HP Multimedia Keyboard
 usb:v0461p4D91*
 ID_MODEL_FROM_DATABASE=Laser mouse M-D16DL
@ -7613,6 +7658,9 @@ usb:v0461p4DE7*
 usb:v0461p4E04*
 ID_MODEL_FROM_DATABASE=Lenovo Keyboard KB1021
 usb:v0461p4E6F*
 ID_MODEL_FROM_DATABASE=Acer Wired Keyboard Model KBAY211
 usb:v0463*
 ID_VENDOR_FROM_DATABASE=MGE UPS Systems
@ -7697,6 +7745,9 @@ usb:v046Ap0106*
 usb:v046Ap010D*
 ID_MODEL_FROM_DATABASE=MX-Board 3.0 Keyboard
 usb:v046Ap0180*
 ID_MODEL_FROM_DATABASE=Strait 3.0
 usb:v046ApB090*
 ID_MODEL_FROM_DATABASE=Keyboard
@ -8168,6 +8219,9 @@ usb:v046Dp0A4D*
 usb:v046Dp0A5B*
 ID_MODEL_FROM_DATABASE=G933 Wireless Headset Dongle
 usb:v046Dp0A5D*
 ID_MODEL_FROM_DATABASE=G933 Headset Battery Charger
 usb:v046Dp0A66*
 ID_MODEL_FROM_DATABASE=[G533 Wireless Headset Dongle]
@ -8555,6 +8609,9 @@ usb:v046DpC245*
 usb:v046DpC246*
 ID_MODEL_FROM_DATABASE=Gaming Mouse G300
 usb:v046DpC247*
 ID_MODEL_FROM_DATABASE=G100S Optical Gaming Mouse
 usb:v046DpC248*
 ID_MODEL_FROM_DATABASE=G105 Gaming Keyboard
@ -8699,6 +8756,9 @@ usb:v046DpC326*
 usb:v046DpC328*
 ID_MODEL_FROM_DATABASE=Corded Keyboard K280e
 usb:v046DpC32B*
 ID_MODEL_FROM_DATABASE=G910 Orion Spark Mechanical Keyboard
 usb:v046DpC332*
 ID_MODEL_FROM_DATABASE=G502 Proteus Spectrum Optical Mouse
@ -8822,6 +8882,12 @@ usb:v046DpC532*
 usb:v046DpC534*
 ID_MODEL_FROM_DATABASE=Unifying Receiver
 usb:v046DpC537*
 ID_MODEL_FROM_DATABASE=Cordless Mouse Receiver
 usb:v046DpC53A*
 ID_MODEL_FROM_DATABASE=PowerPlay Wireless Charging System
 usb:v046DpC603*
 ID_MODEL_FROM_DATABASE=3Dconnexion Spacemouse Plus XT
@ -9683,6 +9749,9 @@ usb:v047F*
 usb:v047Fp0101*
 ID_MODEL_FROM_DATABASE=Bulk Driver
 usb:v047Fp02EE*
 ID_MODEL_FROM_DATABASE=BT600
 usb:v047Fp0301*
 ID_MODEL_FROM_DATABASE=Bulk Driver
@ -9710,6 +9779,9 @@ usb:v047FpC008*
 usb:v047FpC00E*
 ID_MODEL_FROM_DATABASE=Blackwire C310 headset
 usb:v047FpC03B*
 ID_MODEL_FROM_DATABASE=HD1
 usb:v0480*
 ID_VENDOR_FROM_DATABASE=Toshiba America Inc
@ -9737,6 +9809,9 @@ usb:v0480p0820*
 usb:v0480p0821*
 ID_MODEL_FROM_DATABASE=Canvio Advance 2TB model DTC920
 usb:v0480p0900*
 ID_MODEL_FROM_DATABASE=MQ04UBF100
 usb:v0480pA006*
 ID_MODEL_FROM_DATABASE=External Disk 1.5TB
@ -9944,6 +10019,9 @@ usb:v0483p91D1*
 usb:v0483pA171*
 ID_MODEL_FROM_DATABASE=ThermaData WiFi
 usb:v0483pA2E0*
 ID_MODEL_FROM_DATABASE=BMeasure instrument
 usb:v0483pDF11*
 ID_MODEL_FROM_DATABASE=STM Device in DFU Mode
@ -10031,6 +10109,9 @@ usb:v048Dp1165*
 usb:v048Dp1172*
 ID_MODEL_FROM_DATABASE=Flash Drive
 usb:v048Dp1234*
 ID_MODEL_FROM_DATABASE=Mass storage
 usb:v048Dp1336*
 ID_MODEL_FROM_DATABASE=SD/MMC Cardreader
@ -11066,6 +11147,9 @@ usb:v04A9p10CA*
 usb:v04A9p10E3*
 ID_MODEL_FROM_DATABASE=PIXMA iX6850 Printer
 usb:v04A9p12FE*
 ID_MODEL_FROM_DATABASE=Printer in service mode
 usb:v04A9p1404*
 ID_MODEL_FROM_DATABASE=W6400PG
@ -11411,6 +11495,9 @@ usb:v04A9p178D*
 usb:v04A9p180B*
 ID_MODEL_FROM_DATABASE=PIXMA MG3000 series
 usb:v04A9p1856*
 ID_MODEL_FROM_DATABASE=PIXMA TS6250
 usb:v04A9p1900*
 ID_MODEL_FROM_DATABASE=CanoScan LiDE 90
@ -11615,6 +11702,9 @@ usb:v04A9p2634*
 usb:v04A9p2635*
 ID_MODEL_FROM_DATABASE=MPC190
 usb:v04A9p2636*
 ID_MODEL_FROM_DATABASE=LBP3200
 usb:v04A9p2637*
 ID_MODEL_FROM_DATABASE=iR C6800
@ -11657,12 +11747,18 @@ usb:v04A9p2650*
 usb:v04A9p2651*
 ID_MODEL_FROM_DATABASE=iR 3100C EUR
 usb:v04A9p2654*
 ID_MODEL_FROM_DATABASE=LBP3600
 usb:v04A9p2655*
 ID_MODEL_FROM_DATABASE=FP-L170/MF350/L380/L398
 usb:v04A9p2656*
 ID_MODEL_FROM_DATABASE=iR1510-1670 CAPT Printer
 usb:v04A9p2657*
 ID_MODEL_FROM_DATABASE=LBP3210
 usb:v04A9p2659*
 ID_MODEL_FROM_DATABASE=MF8100
@ -11703,7 +11799,7 @@ usb:v04A9p2669*
 ID_MODEL_FROM_DATABASE=iR105PLUS
 usb:v04A9p266A*
- ID_MODEL_FROM_DATABASE=CAPT Device
+ ID_MODEL_FROM_DATABASE=LBP3000
 usb:v04A9p266B*
 ID_MODEL_FROM_DATABASE=iR8070
@ -11748,7 +11844,7 @@ usb:v04A9p2678*
 ID_MODEL_FROM_DATABASE=iR 2570C EUR
 usb:v04A9p2679*
- ID_MODEL_FROM_DATABASE=CAPT Device
+ ID_MODEL_FROM_DATABASE=LBP5000
 usb:v04A9p267A*
 ID_MODEL_FROM_DATABASE=iR2016
@ -11759,6 +11855,9 @@ usb:v04A9p267B*
 usb:v04A9p267D*
 ID_MODEL_FROM_DATABASE=MF7100 series
 usb:v04A9p267E*
 ID_MODEL_FROM_DATABASE=LBP3300
 usb:v04A9p2684*
 ID_MODEL_FROM_DATABASE=MF3200 series
@ -11777,6 +11876,9 @@ usb:v04A9p2689*
 usb:v04A9p268A*
 ID_MODEL_FROM_DATABASE=LC310/L390/L408S
 usb:v04A9p268B*
 ID_MODEL_FROM_DATABASE=LBP3500
 usb:v04A9p268C*
 ID_MODEL_FROM_DATABASE=iR C6870
@ -11792,9 +11894,15 @@ usb:v04A9p268F*
 usb:v04A9p2691*
 ID_MODEL_FROM_DATABASE=iR7105
 usb:v04A9p26A1*
 ID_MODEL_FROM_DATABASE=LBP5300
 usb:v04A9p26A3*
 ID_MODEL_FROM_DATABASE=MF4100 series
 usb:v04A9p26A4*
 ID_MODEL_FROM_DATABASE=LBP5100
 usb:v04A9p26B0*
 ID_MODEL_FROM_DATABASE=MF4600 series
@ -11807,21 +11915,54 @@ usb:v04A9p26B5*
 usb:v04A9p26B6*
 ID_MODEL_FROM_DATABASE=FAX-L140/L130
 usb:v04A9p26B9*
 ID_MODEL_FROM_DATABASE=LBP3310
 usb:v04A9p26BA*
 ID_MODEL_FROM_DATABASE=LBP5050
 usb:v04A9p26DA*
- ID_MODEL_FROM_DATABASE=LBP3010B printer
+ ID_MODEL_FROM_DATABASE=LBP3010/LBP3018/LBP3050
 usb:v04A9p26DB*
 ID_MODEL_FROM_DATABASE=LBP3100/LBP3108/LBP3150
 usb:v04A9p26E6*
 ID_MODEL_FROM_DATABASE=iR1024
 usb:v04A9p26EA*
 ID_MODEL_FROM_DATABASE=LBP9100C
 usb:v04A9p26EE*
 ID_MODEL_FROM_DATABASE=MF4320-4350
 usb:v04A9p26F1*
 ID_MODEL_FROM_DATABASE=LBP7200C
 usb:v04A9p26FF*
 ID_MODEL_FROM_DATABASE=LBP6300
 usb:v04A9p271A*
 ID_MODEL_FROM_DATABASE=LBP6000
 usb:v04A9p271B*
 ID_MODEL_FROM_DATABASE=LBP6200
 usb:v04A9p271C*
 ID_MODEL_FROM_DATABASE=LBP7010C/7018C
 usb:v04A9p2736*
 ID_MODEL_FROM_DATABASE=I-SENSYS MF4550d
 usb:v04A9p2737*
 ID_MODEL_FROM_DATABASE=MF4410
 usb:v04A9p2771*
 ID_MODEL_FROM_DATABASE=LBP6020
 usb:v04A9p2796*
 ID_MODEL_FROM_DATABASE=LBP6230/6240
 usb:v04A9p3041*
 ID_MODEL_FROM_DATABASE=PowerShot S10
@ -13028,6 +13169,9 @@ usb:v04B0p042A*
 usb:v04B0p0430*
 ID_MODEL_FROM_DATABASE=D7100
 usb:v04B0p0436*
 ID_MODEL_FROM_DATABASE=D810
 usb:v04B0p043F*
 ID_MODEL_FROM_DATABASE=D5600
@ -13211,6 +13355,9 @@ usb:v04B4p4616*
 usb:v04B4p4624*
 ID_MODEL_FROM_DATABASE=DS-Xtreme Flash Card
 usb:v04B4p4717*
 ID_MODEL_FROM_DATABASE=West Bridge
 usb:v04B4p5201*
 ID_MODEL_FROM_DATABASE=Combi Keyboard-Hub (Hub)
@ -35001,7 +35148,7 @@ usb:v09C2*
 ID_VENDOR_FROM_DATABASE=Nisca Corp.
 usb:v09C3*
- ID_VENDOR_FROM_DATABASE=ActivCard, Inc.
+ ID_VENDOR_FROM_DATABASE=HID Global
 usb:v09C3p0007*
 ID_MODEL_FROM_DATABASE=Reader V2
@ -35012,6 +35159,24 @@ usb:v09C3p0008*
 usb:v09C3p0014*
 ID_MODEL_FROM_DATABASE=ActivIdentity ActivKey SIM USB Token
 usb:v09C3p0028*
 ID_MODEL_FROM_DATABASE=Crescendo Key
 usb:v09C3p0029*
 ID_MODEL_FROM_DATABASE=Crescendo Key
 usb:v09C3p002A*
 ID_MODEL_FROM_DATABASE=Crescendo Key
 usb:v09C3p002B*
 ID_MODEL_FROM_DATABASE=Crescendo Key
 usb:v09C3p002C*
 ID_MODEL_FROM_DATABASE=Crescendo Key
 usb:v09C3p002E*
 ID_MODEL_FROM_DATABASE=Crescendo Key
 usb:v09C4*
 ID_VENDOR_FROM_DATABASE=ACTiSYS Corp.
@ -57887,6 +58052,12 @@ usb:v2548p1001*
 usb:v2548p1002*
 ID_MODEL_FROM_DATABASE=CEC Adapter
 usb:v25B5*
 ID_VENDOR_FROM_DATABASE=FlatFrog
 usb:v25B5p0002*
 ID_MODEL_FROM_DATABASE=Multitouch 3200
 usb:v2632*
 ID_VENDOR_FROM_DATABASE=TwinMOS
--- a/hwdb.d/acpi_id_registry.html
+++ b/hwdb.d/acpi_id_registry.html
@ -96,6 +96,7 @@
 <tr class="even"><td>Amazon Corporation</td><td>AMZN</td><td>02/06/2019</td> </tr>
 <tr class="odd"><td>ASEM S.p.A.</td><td>ASEM</td><td>04/29/2019</td> </tr>
 <tr class="even"><td>Fujitsu Limited</td><td>FUJI</td><td>06/18/2019</td> </tr>
 <tr class="odd"><td>Phytium Technology Co. Ltd.</td><td>PHYT</td><td>02/14/2020</td> </tr>
      </tbody>
    </table>
  </body>
--- a/hwdb.d/ma-large.txt
+++ b/hwdb.d/ma-large.txt
--- a/hwdb.d/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
@ -1133,12 +1133,6 @@ A4-DA-22   (hex)		DURATECH Enterprise,LLC
 				Seoul    08501
 				KR
 A4-DA-22   (hex)		Abetechs GmbH
 A00000-AFFFFF     (base 16)		Abetechs GmbH
 				Niermannsweg 11
 				Erkrath   North Rhine-Westphalia  40699
 				DE
 A4-DA-22   (hex)		LORIOT AG
 400000-4FFFFF     (base 16)		LORIOT AG
 				Zuercherstrasse 68
@ -1241,12 +1235,6 @@ B00000-BFFFFF     (base 16)		ThirdReality, Inc
 				SHEN ZHEN  GUANGDONG  518000
 				CN
 9C-43-1E   (hex)		Midas Technology DBA Phoenix Audio Technologies
 E00000-EFFFFF     (base 16)		Midas Technology DBA Phoenix Audio Technologies
 				16 Goodyear #120
 				Irvine  CA  92618
 				US
 F8-B5-68   (hex)		Dongwoo Engineering Co.,Ltd
 300000-3FFFFF     (base 16)		Dongwoo Engineering Co.,Ltd
 				#311, dREC Techno 9-ro, Yuseong-gu
@ -3560,6 +3548,12 @@ E00000-EFFFFF     (base 16)		Nanjing Yining Intelligent Technology Co., Ltd.
 				Nanjing  Jiangsu  210019
 				CN
 B0-B3-53   (hex)		Blake UK
 000000-0FFFFF     (base 16)		Blake UK
 				177-187, Rutland Road
 				Sheffield  --select--  S3 9PT
 				GB
 B0-B3-53   (hex)		Beijing Geekplus Technology Co.,Ltd.
 C00000-CFFFFF     (base 16)		Beijing Geekplus Technology Co.,Ltd.
 				1st Floor, Building 1, Chaolai High-Tech industrial Part, Chaoyang District
@ -3572,12 +3566,6 @@ D00000-DFFFFF     (base 16)		IPvideo Corporation
 				Bay Shore  NY  11706
 				US
 B0-B3-53   (hex)		Blake UK
 000000-0FFFFF     (base 16)		Blake UK
 				177-187, Rutland Road
 				Sheffield  --select--  S3 9PT
 				GB
 B0-B3-53   (hex)		Zoox
 B00000-BFFFFF     (base 16)		Zoox
 				1149 Chess Drive
@ -3596,30 +3584,30 @@ B00000-BFFFFF     (base 16)		Zoox
 				New Taipei City  Xizhi Dist  221
 				TW
 14-AE-85   (hex)		MTA Systems
 A00000-AFFFFF     (base 16)		MTA Systems
 				Pemstraße 2
 				Mauthausen    4310
 				AT
 64-62-66   (hex)		MiiVii Dynamics Technology CO.,LTD
 000000-0FFFFF     (base 16)		MiiVii Dynamics Technology CO.,LTD
 				1408-1415 Tower A BUGG Building,No.18 N. Taipingzhuang Rd,haidian District
 				Beijing  Beijing  100000
 				CN
 64-62-66   (hex)		Annapurna labs
 100000-1FFFFF     (base 16)		Annapurna labs
 				Matam Scientific Industries Center,   Building 8.2
 				Mail box 15123  Haifa  3508409
 				IL
 14-AE-85   (hex)		MTA Systems
 A00000-AFFFFF     (base 16)		MTA Systems
 				Pemstraße 2
 				Mauthausen    4310
 				AT
 64-62-66   (hex)		Bühler AG
 500000-5FFFFF     (base 16)		Bühler AG
 				Gupfenstrasse 5
 				Uzwil    9240
 				CH
 64-62-66   (hex)		MiiVii Dynamics Technology CO.,LTD
 000000-0FFFFF     (base 16)		MiiVii Dynamics Technology CO.,LTD
 				1408-1415 Tower A BUGG Building,No.18 N. Taipingzhuang Rd,haidian District
 				Beijing  Beijing  100000
 				CN
 64-62-66   (hex)		Shenzhen Jie Shi Lian Industrial Co., LTD
 E00000-EFFFFF     (base 16)		Shenzhen Jie Shi Lian Industrial Co., LTD
 				6F,C Building,Jinao Industrial Park,Juling Rd,Guanlan Town,Longhua
@ -3632,30 +3620,24 @@ E00000-EFFFFF     (base 16)		Shenzhen Jie Shi Lian Industrial Co., LTD
 				Hong Kong  Hong Kong  00000
 				HK
 94-CC-04   (hex)		Sam Nazarko Trading Ltd
 600000-6FFFFF     (base 16)		Sam Nazarko Trading Ltd
 				18 Watermill Way
 				London  Surrey  SW19 2RD
 				GB
 94-CC-04   (hex)		Hanzhuo Information Technology(Shanghai) Ltd.
 D00000-DFFFFF     (base 16)		Hanzhuo Information Technology(Shanghai) Ltd.
 				Room 2085, building 2, 622 Yingyuan middle Road, Jiading Strict
 				Shanghai    201200
 				CN
 94-CC-04   (hex)		Sam Nazarko Trading Ltd
 600000-6FFFFF     (base 16)		Sam Nazarko Trading Ltd
 				18 Watermill Way
 				London  Surrey  SW19 2RD
 				GB
 94-CC-04   (hex)		hyBee Inc.
 A00000-AFFFFF     (base 16)		hyBee Inc.
 				#1003, Innovalley B, 253, Pangyo-ro, Bundang-gu
 				Seongnam-si  Gyeonggi-do  13486
 				KR
 94-05-BB   (hex)		iungo
 800000-8FFFFF     (base 16)		iungo
 				Vrouwenlaan 62
 				Zwolle  Overijssel  8017 HS
 				NL
 94-CC-04   (hex)		Nanjing Yacer Communication Technology Co. Ltd.
 200000-2FFFFF     (base 16)		Nanjing Yacer Communication Technology Co. Ltd.
 				333 Taiping South Road Jinling Yujingyuan 19nd  floor Unit K Qin Huai District
@ -3668,17 +3650,11 @@ A00000-AFFFFF     (base 16)		hyBee Inc.
 				Dubai    90072
 				AE
-94-05-BB   (hex)		Dongguan CXWE Technology Co.,Ltd.
+94-05-BB   (hex)		iungo
-200000-2FFFFF     (base 16)		Dongguan CXWE Technology Co.,Ltd.
+800000-8FFFFF     (base 16)		iungo
-				Room 805, building 1, No. 16, Keji 4th Road, Songshanhu
+				Vrouwenlaan 62
-				Dongguan  Guangdong  523000
+				Zwolle  Overijssel  8017 HS
-				CN
+				NL
 94-05-BB   (hex)		Zimmer GmbH
 900000-9FFFFF     (base 16)		Zimmer GmbH
 				Im Salmenkopf 5
 				Rheinau  Baden-Württemberg  77866
 				DE
 94-05-BB   (hex)		Qingdao Maotran Electronics co., ltd
 000000-0FFFFF     (base 16)		Qingdao Maotran Electronics co., ltd
@ -3686,17 +3662,11 @@ A00000-AFFFFF     (base 16)		hyBee Inc.
 				Qingdao  Shandong  266000
 				CN
-94-05-BB   (hex)		LTE-X, Inc
+94-05-BB   (hex)		Dongguan CXWE Technology Co.,Ltd.
-700000-7FFFFF     (base 16)		LTE-X, Inc
+200000-2FFFFF     (base 16)		Dongguan CXWE Technology Co.,Ltd.
-				2-2-20 Higashi-Shinagawa
+				Room 805, building 1, No. 16, Keji 4th Road, Songshanhu
-				Shinagawa  Tokyo  1400002
+				Dongguan  Guangdong  523000
-				JP
+				CN
 94-05-BB   (hex)		BAE Systems
 E00000-EFFFFF     (base 16)		BAE Systems
 				21 continental boulevard
 				Merrimack  NH  03054
 				US
 F4-90-CB   (hex)		Cheetah Medical
 C00000-CFFFFF     (base 16)		Cheetah Medical
@ -3704,18 +3674,66 @@ C00000-CFFFFF     (base 16)		Cheetah Medical
 				Tel Aviv    6706055
 				IL
 94-05-BB   (hex)		Zimmer GmbH
 900000-9FFFFF     (base 16)		Zimmer GmbH
 				Im Salmenkopf 5
 				Rheinau  Baden-Württemberg  77866
 				DE
 94-05-BB   (hex)		BAE Systems
 E00000-EFFFFF     (base 16)		BAE Systems
 				21 continental boulevard
 				Merrimack  NH  03054
 				US
 F4-90-CB   (hex)		A-dec Inc.
 B00000-BFFFFF     (base 16)		A-dec Inc.
 				2601 Crestview Drive
 				Newberg  OR  97132
 				US
 94-05-BB   (hex)		LTE-X, Inc
 700000-7FFFFF     (base 16)		LTE-X, Inc
 				4F Ginza Showa Dori Building 8-14-14 Ginza
 				Chuo-ku  Tokyo  104-0062
 				JP
 C0-9B-F4   (hex)		LTD Delovoy Office
 600000-6FFFFF     (base 16)		LTD Delovoy Office
 				Block “B”, floor 6, build 4/1, Stroiteley blvd
 				Krasnogorsk    143401
 				RU
 F4-90-CB   (hex)		TEQ SA
 700000-7FFFFF     (base 16)		TEQ SA
 				Via al Municipio 16
 				Barbengo  Ticino  6917
 				CH
 A4-DA-22   (hex)		Grundig
 A00000-AFFFFF     (base 16)		Grundig
 				Steinhof 39
 				Erkrath   North Rhine-Westphalia  40699
 				DE
 E8-B4-70   (hex)		YAWATA ELECTRIC INDUSTRIAL CO.,LTD.
 400000-4FFFFF     (base 16)		YAWATA ELECTRIC INDUSTRIAL CO.,LTD.
 				1-17-1 Ohmorihigashi
 				Ohta-ku  Tokyo  143-0012
 				JP
 9C-43-1E   (hex)		Midas Technology, Inc. dba Stem Audio / Phoenix Au
 E00000-EFFFFF     (base 16)		Midas Technology, Inc. dba Stem Audio / Phoenix Au
 				2552 White Road, Suite A
 				Irvine  CA  92614
 				US
 E8-B4-70   (hex)		Tibit Communications
 700000-7FFFFF     (base 16)		Tibit Communications
 				1 Willowbrook Court, Suite 150
 				Petaluma  CA  94954
 				US
 4C-4B-F9   (hex)		Shenzhen dingsheng technology co., LTD
 400000-4FFFFF     (base 16)		Shenzhen dingsheng technology co., LTD
 				Floor 3, building 5, kaijeda industrial zone, no.97, huaxing road, langkou community, dalang street, longhua district
@ -7145,18 +7163,18 @@ B00000-BFFFFF     (base 16)		Shenzhen Dingsheng Intelligent Technology Co., Ltd
 				Chengdu  Sichuan  611731
 				CN
 D0-C8-57   (hex)		IFLYTEK CO.,LTD.
 D00000-DFFFFF     (base 16)		IFLYTEK CO.,LTD.
 				National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,
 				Hefei  An hui  230088
 				CN
 94-CC-04   (hex)		Shanxi Baixin Information Technology Co., Ltd.
 C00000-CFFFFF     (base 16)		Shanxi Baixin Information Technology Co., Ltd.
 				Room 210-213, Room 215-217, Room 219-220, No.2, Yari Street, Taiyuan University Park, Shanxi Comprehensive Reform Demonstration Zone
 				Taiyuan  Shanxi  030032
 				CN
 D0-C8-57   (hex)		IFLYTEK CO.,LTD.
 D00000-DFFFFF     (base 16)		IFLYTEK CO.,LTD.
 				National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,
 				Hefei  An hui  230088
 				CN
 94-05-BB   (hex)		ZIGPOS GmbH
 600000-6FFFFF     (base 16)		ZIGPOS GmbH
 				Räcknitzhöhe 35a
@ -7175,6 +7193,54 @@ F4-90-CB   (hex)		Airbeam Wireless Technologies Inc.
 				Richmond  British Columbia  V6W 1J8
 				CA
 C0-9B-F4   (hex)		Annapurna labs
 000000-0FFFFF     (base 16)		Annapurna labs
 				Matam Scientific Industries Center,   Building 8.2
 				Mail box 15123  Haifa  3508409
 				IL
 C0-9B-F4   (hex)		Alcatraz AI Inc.
 900000-9FFFFF     (base 16)		Alcatraz AI Inc.
 				1808 El Camino Real
 				Redwood City  CA  94063
 				US
 F4-90-CB   (hex)		RSAE Labs Inc
 E00000-EFFFFF     (base 16)		RSAE Labs Inc
 				400 E 16th St
 				Panama City  FL  32405
 				US
 C0-9B-F4   (hex)		Big Dutchman International GmbH
 700000-7FFFFF     (base 16)		Big Dutchman International GmbH
 				Auf der Lage, 2
 				Vechta  Niedersachsen  49377
 				DE
 C0-9B-F4   (hex)		Continental Automotive Component Malaysia Sdn.Bhd.
 E00000-EFFFFF     (base 16)		Continental Automotive Component Malaysia Sdn.Bhd.
 				2455, MK.1, Tingkat Perusahaan 2A,
 				Prai Industrial Estate, Prai,  Penang  13600
 				MY
 E8-B4-70   (hex)		Anduril Industries
 C00000-CFFFFF     (base 16)		Anduril Industries
 				2272 Michelson Dr
 				Irvine  CA  92612
 				US
 E8-B4-70   (hex)		Webfleet Solutions B.V.
 300000-3FFFFF     (base 16)		Webfleet Solutions B.V.
 				De Ruijterkade 154
 				Amsterdam    1011 AC
 				NL
 E8-B4-70   (hex)		Medica Corporation
 D00000-DFFFFF     (base 16)		Medica Corporation
 				 5 Oak Park Drive
 				Bedford  MA  01730
 				US
 20-85-93   (hex)		UNILUMIN GROUP CO.,LTD
 300000-3FFFFF     (base 16)		UNILUMIN GROUP CO.,LTD
 				No.112 Yongfu Rd.,BaoanDistrict,
@ -10682,6 +10748,84 @@ F4-90-CB   (hex)		OmniNet
 				Charlotte  NC  28277
 				US
 F4-90-CB   (hex)		Epitel, Inc.
 000000-0FFFFF     (base 16)		Epitel, Inc.
 				630 S. Stringfellow Ct., Unit #B
 				Salt Lake City  UT  84111
 				US
 F4-90-CB   (hex)		Fractyl Labs
 900000-9FFFFF     (base 16)		Fractyl Labs
 				17 HARTWELL AVE
 				LEXINGTON  MA  02421
 				US
 C0-9B-F4   (hex)		JSC NPK ATRONIK
 400000-4FFFFF     (base 16)		JSC NPK ATRONIK
 				VARSHAVSKOE SH, 118-1-P XLII K4 10
 				Moscow  Moscow  117587
 				RU
 C0-9B-F4   (hex)		Pinpark Inc.
 C00000-CFFFFF     (base 16)		Pinpark Inc.
 				9F., No. 101, Sec. 2, Nanjing E. Rd.,, Zhongshan Dist.,
 				Taipei  Taiwan  104
 				TW
 C0-9B-F4   (hex)		NUCTECH COMPANY LIMITED
 B00000-BFFFFF     (base 16)		NUCTECH COMPANY LIMITED
 				 2/F Block A,Tongfang Building,Shuangqinglu,Haidian District
 				Beijing  Beijing  100084
 				CN
 C0-9B-F4   (hex)		Osprey Video, Inc
 300000-3FFFFF     (base 16)		Osprey Video, Inc
 				1628 Valwood Parkway Suite 200
 				Carrollton  TX  75006
 				US
 E8-B4-70   (hex)		internet domain name system beijing engineering research center ltd
 200000-2FFFFF     (base 16)		internet domain name system beijing engineering research center ltd
 				4,4TH SOUTH STREET ZHONG GUAN CUN
 				hai dian qu ,beijing  BEIJING  100190
 				CN
 E8-B4-70   (hex)		DongGuan Ramaxel Memory Technology
 000000-0FFFFF     (base 16)		DongGuan Ramaxel Memory Technology
 				No.32, Industrial East Road,Innovation Park, High-tech Industrial Development Zone, Songshan Lake, Dongguan City, Guangdong Province,China
 				DongGuan  Guangdong  523808
 				CN
 C0-9B-F4   (hex)		Infiot Inc.
 500000-5FFFFF     (base 16)		Infiot Inc.
 				75 E. Santa Clara St., Suite 600
 				San Jose  CA  95113
 				US
 E8-B4-70   (hex)		plc2 Design GmbH
 A00000-AFFFFF     (base 16)		plc2 Design GmbH
 				Hugstmattweg 30
 				Freiburg i. Br.    79112
 				DE
 E8-B4-70   (hex)		Miltek Industries Pte Ltd
 900000-9FFFFF     (base 16)		Miltek Industries Pte Ltd
 				62 Ubi Road 1 #10-03, Oxley Bizhub 2. Singapore 408734
 				Singapore    408734
 				SG
 E8-B4-70   (hex)		DEHN SE + Co KG
 800000-8FFFFF     (base 16)		DEHN SE + Co KG
 				Hans-Dehn-Straße 1
 				Neumarkt  Bavaria  92318
 				DE
 E8-B4-70   (hex)		Alperia Fiber srl 
 500000-5FFFFF     (base 16)		Alperia Fiber srl 
 				Via Dodiciville 8
 				Bolzano   bz  39100
 				IT
 4C-4B-F9   (hex)		Shandong Linkotech Electronic Co., Ltd.
 600000-6FFFFF     (base 16)		Shandong Linkotech Electronic Co., Ltd.
 				22nd Floor, Building 2, Aosheng Building, No.1166 Xinyi Street, High-tech Zone
@ -14138,18 +14282,18 @@ B0-B3-53   (hex)		Zenlayer
 				DIAMOND BAR  CA  91765
 				US
 90-E2-FC   (hex)		Beijing Lanxum Computer Technology CO.,LTD.
 D00000-DFFFFF     (base 16)		Beijing Lanxum Computer Technology CO.,LTD.
 				3A Floor,BlockB,Technology Fortune Center,No 8 Xueqing Road,Haidian District,
 				Beijing  Beijing  100192
 				CN
 90-E2-FC   (hex)		ShenZhen Temwey Innovation Technology Co.,Ltd.
 200000-2FFFFF     (base 16)		ShenZhen Temwey Innovation Technology Co.,Ltd.
 				Room 1008, 10/F, Bld.B, Bantian International Centre, No. 5 South Huancheng Road, Bantian Street of Shenzhen Longgang District
 				SHENZHEN  GUANGDONG  518129
 				CN
 90-E2-FC   (hex)		Beijing Lanxum Computer Technology CO.,LTD.
 D00000-DFFFFF     (base 16)		Beijing Lanxum Computer Technology CO.,LTD.
 				3A Floor,BlockB,Technology Fortune Center,No 8 Xueqing Road,Haidian District,
 				Beijing  Beijing  100192
 				CN
 90-E2-FC   (hex)		Dongguan Kangyong electronics technology Co. Ltd
 400000-4FFFFF     (base 16)		Dongguan Kangyong electronics technology Co. Ltd
 				No 9,Yincheng 1st Road, Xiabian Village, Chang’an Town
@ -14180,6 +14324,12 @@ D00000-DFFFFF     (base 16)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
 				Wolverhampton  West Midlands  WV6 0JZ
 				GB
 64-62-66   (hex)		Pass & Seymour, Inc d/b/a Legrand
 600000-6FFFFF     (base 16)		Pass & Seymour, Inc d/b/a Legrand
 				50 Boyd Ave
 				Syracuse  NY  13209
 				US
 64-62-66   (hex)		FaceHeart Inc.
 300000-3FFFFF     (base 16)		FaceHeart Inc.
 				Rm. 8, 19F., No.118, Ciyun Rd., East Dist.
@ -14192,12 +14342,6 @@ A00000-AFFFFF     (base 16)		Sensoro Co., Ltd.
 				Beijing  Beijing  100102
 				CN
 64-62-66   (hex)		Pass & Seymour, Inc d/b/a Legrand
 600000-6FFFFF     (base 16)		Pass & Seymour, Inc d/b/a Legrand
 				50 Boyd Ave
 				Syracuse  NY  13209
 				US
 94-CC-04   (hex)		Shandong free optical technology co., ltd.
 B00000-BFFFFF     (base 16)		Shandong free optical technology co., ltd.
 				195 East First Street, Industrial First Street, Economic Development Zone, Weifang, Weicheng District,
@ -14228,6 +14372,33 @@ F4-90-CB   (hex)		Ricker Lyman Robotic
 				Beacon  NY  12508
 				US
 F4-90-CB   (hex)		Beijing Penslink Co., Ltd.
 800000-8FFFFF     (base 16)		Beijing Penslink Co., Ltd.
 				502,12rd floor,no.2,Fangheng International Center Beijing, Chaoyang district 100102
 				Beijing  Beijing  100102
 				CN
 F4-90-CB   (hex)		Private
 A00000-AFFFFF     (base 16)		Private
 C0-9B-F4   (hex)		The Professional Monitor Company Ltd
 D00000-DFFFFF     (base 16)		The Professional Monitor Company Ltd
 				Holme Court A1
 				Biggleswade  Bedfordshire  SG189ST
 				GB
 C0-9B-F4   (hex)		Connected Space Management
 100000-1FFFFF     (base 16)		Connected Space Management
 				62 boulevard Diderot
 				Paris    75012
 				FR
 C0-9B-F4   (hex)		Inveo
 A00000-AFFFFF     (base 16)		Inveo
 				Rzemieslnicza 21
 				Kozy    43-340
 				PL
 20-85-93   (hex)		Great Lite International
 700000-7FFFFF     (base 16)		Great Lite International
 				11F., No.207-2, Sec. 3, Beixin Rd., Xindian Dist.,
@ -17621,11 +17792,11 @@ B0-B3-53   (hex)		Sprocomm Technologies CO.,LTD.
 				shenzhen  guangdong  518000
 				CN
-B0-B3-53   (hex)		VOXISCOM
+3C-FA-D3   (hex)		Mirico
-800000-8FFFFF     (base 16)		VOXISCOM
+E00000-EFFFFF     (base 16)		Mirico
-				Rue Jules Ferry
+				30 DongSan Rd 9th floor Mirico
-				PORNIC    44210
+				Ansan  Gyunggi  15434
-				FR
+				KR
 B0-B3-53   (hex)		Innotas Elektronik GmbH
 400000-4FFFFF     (base 16)		Innotas Elektronik GmbH
@ -17633,11 +17804,11 @@ B0-B3-53   (hex)		Innotas Elektronik GmbH
 				Zittau    D-02763
 				DE
-3C-FA-D3   (hex)		Mirico
+B0-B3-53   (hex)		VOXISCOM
-E00000-EFFFFF     (base 16)		Mirico
+800000-8FFFFF     (base 16)		VOXISCOM
-				30 DongSan Rd 9th floor Mirico
+				Rue Jules Ferry
-				Ansan  Gyunggi  15434
+				PORNIC    44210
-				KR
+				FR
 90-E2-FC   (hex)		Power Engineering & Manufacturing, Inc.
 A00000-AFFFFF     (base 16)		Power Engineering & Manufacturing, Inc.
@ -17681,6 +17852,12 @@ C00000-CFFFFF     (base 16)		IO Industries Inc.
 				London  Ontario  N5V 0A4
 				CA
 90-E2-FC   (hex)		Fair Winds Digital srl
 700000-7FFFFF     (base 16)		Fair Winds Digital srl
 				Via Italo Svevo 85
 				Rome  Italy  00137
 				IT
 14-AE-85   (hex)		AZ-TECHNOLOGY SDN BHD
 500000-5FFFFF     (base 16)		AZ-TECHNOLOGY SDN BHD
 				A108 & A109 BLOCK A KELANA BUSINESS CENTRE NO: 97 JALAN SS7/2 KELANA JAYA
@ -17693,35 +17870,23 @@ C00000-CFFFFF     (base 16)		IO Industries Inc.
 				PADOVA  PADOVA  35129
 				IT
 90-E2-FC   (hex)		Fair Winds Digital srl
 700000-7FFFFF     (base 16)		Fair Winds Digital srl
 				Via Italo Svevo 85
 				Rome  Italy  00137
 				IT
 14-AE-85   (hex)		TMG TE GmbH
 600000-6FFFFF     (base 16)		TMG TE GmbH
 				Zur Gießerei 10
 				Karlsruhe    776227
 				DE
 14-AE-85   (hex)		NTC SOFT
 B00000-BFFFFF     (base 16)		NTC SOFT
 				B-805, Gwangmyeong SK Techno park, 60, Haan-ro,
 				Gwangmyeong-si  Gyeonggi-do  14322
 				KR
 14-AE-85   (hex)		Sercomm Corporation.
 E00000-EFFFFF     (base 16)		Sercomm Corporation.
 				3F,No.81,Yu-Yih Rd.,Chu-Nan Chen
 				Miao-Lih Hsuan    115
 				TW
-64-62-66   (hex)		Jiangsu Aisida Electronic Co.,Ltd
+14-AE-85   (hex)		NTC SOFT
-C00000-CFFFFF     (base 16)		Jiangsu Aisida Electronic Co.,Ltd
+B00000-BFFFFF     (base 16)		NTC SOFT
-				Aisida Industrial Park,Lanling Road,Danyang Development Zone
+				B-805, Gwangmyeong SK Techno park, 60, Haan-ro,
-				DanYang  JiangSu  212300
+				Gwangmyeong-si  Gyeonggi-do  14322
-				CN
+				KR
 94-CC-04   (hex)		Hangzhou Yongkong Technology Co., Ltd.
 000000-0FFFFF     (base 16)		Hangzhou Yongkong Technology Co., Ltd.
@ -17729,6 +17894,12 @@ C00000-CFFFFF     (base 16)		Jiangsu Aisida Electronic Co.,Ltd
 				Hangzhou  Zhejiang  310000
 				CN
 64-62-66   (hex)		Jiangsu Aisida Electronic Co.,Ltd
 C00000-CFFFFF     (base 16)		Jiangsu Aisida Electronic Co.,Ltd
 				Aisida Industrial Park,Lanling Road,Danyang Development Zone
 				DanYang  JiangSu  212300
 				CN
 94-CC-04   (hex)		Gowing Business And Contracting Wenzhou Co., LTD
 700000-7FFFFF     (base 16)		Gowing Business And Contracting Wenzhou Co., LTD
 				Room 101, No.4 Liming Industrial District, Lucheng, Wenzhou, China
@ -17759,12 +17930,6 @@ C00000-CFFFFF     (base 16)		Jiangsu Aisida Electronic Co.,Ltd
 				North Andover  MA  01845
 				US
 94-05-BB   (hex)		Neurik AG
 300000-3FFFFF     (base 16)		Neurik AG
 				Im alten Riet 143
 				Schaan  SCHAAN  9494
 				LI
 94-05-BB   (hex)		Dongguan Kingtron Electronics Tech Co., Ltd
 100000-1FFFFF     (base 16)		Dongguan Kingtron Electronics Tech Co., Ltd
 				No.3 Fumin North Rd,Shu'an Industrial Park, Humen Town
@ -17777,8 +17942,44 @@ D00000-DFFFFF     (base 16)		Sunthink S&T Development Co.,Ltd
 				Shenzhen    518100
 				CN
 94-05-BB   (hex)		Neurik AG
 300000-3FFFFF     (base 16)		Neurik AG
 				Im alten Riet 143
 				Schaan  SCHAAN  9494
 				LI
 DC-44-27   (hex)		Tesla,Inc.
 100000-1FFFFF     (base 16)		Tesla,Inc.
 				3500 Deer Creek Road
 				Palo Alto  CA  94304
 				US
 F4-90-CB   (hex)		ICE Gateway GmbH
 200000-2FFFFF     (base 16)		ICE Gateway GmbH
 				Am Studio 2
 				Berlin  Berlin  12489
 				DE
 C0-9B-F4   (hex)		SHENZHEN WINS ELECTRONIC TECHNOLOGY CO., LTD
 800000-8FFFFF     (base 16)		SHENZHEN WINS ELECTRONIC TECHNOLOGY CO., LTD
 				Baoan Xixiang Xinbaoji Industry Park,Building A1-2
 				Shenzhen  Guangdong  518026
 				CN
 F4-90-CB   (hex)		DELEM BV
 100000-1FFFFF     (base 16)		DELEM BV
 				LUCHTHAVEN WEG 42
 				5657 EB EINDHOVEN    
 				NL
 C0-9B-F4   (hex)		Hitachi High-Tech Materials Corporation
 200000-2FFFFF     (base 16)		Hitachi High-Tech Materials Corporation
 				Toranomon Hills Business Tower, 1-17-1 Toranomon, Minato-ku
 				Tokyo    105-6413
 				JP
 E8-B4-70   (hex)		Autocom Diagnostic Partner AB
 100000-1FFFFF     (base 16)		Autocom Diagnostic Partner AB
 				Grafitvägen 23B
 				TROLLHÄTTAN    46138
 				SE
--- a/hwdb.d/ma-small.txt
+++ b/hwdb.d/ma-small.txt
@ -4301,6 +4301,72 @@ B96000-B96FFF     (base 16)		Oculii
 				MAUREPAS    78310
 				FR
 70-B3-D5   (hex)		NEUROPHET, Inc.
 E31000-E31FFF     (base 16)		NEUROPHET, Inc.
 				3rd Floor, 175, Yeoksam-ro, Gangnam-gu, seoul
 				Seoul  Province  06247
 				KR
 70-B3-D5   (hex)		Remote Diagnostic Technologies Ltd
 C99000-C99FFF     (base 16)		Remote Diagnostic Technologies Ltd
 				Pavilion C2 Ashwood Park, Ashwood Way
 				Basingstoke  Hampshire  RG23 8BG
 				GB
 70-B3-D5   (hex)		Gogo Business Aviation
 3E0000-3E0FFF     (base 16)		Gogo Business Aviation
 				105 Edgeview Dr., Suite 300
 				Broomfield  CO  80021
 				US
 70-B3-D5   (hex)		Chromateq
 944000-944FFF     (base 16)		Chromateq
 				191, allée de Lauzard, Bat. B, RDC 1 (Chromateq)
 				Saint Gély du Fesc    34980
 				FR
 70-B3-D5   (hex)		Elk Solutions, LLC
 1A7000-1A7FFF     (base 16)		Elk Solutions, LLC
 				12708 Misty Grove St
 				Moorpark  CA  93021
 				US
 70-B3-D5   (hex)		KAYA Instruments
 F3D000-F3DFFF     (base 16)		KAYA Instruments
 				20 HaMesila St.
 				Nesher     3688520
 				IL
 70-B3-D5   (hex)		Asiga Pty Ltd
 53E000-53EFFF     (base 16)		Asiga Pty Ltd
 				Unit 2, 19-21 Bourke Road
 				Alexandria  New South Wales  2015
 				AU
 70-B3-D5   (hex)		Salupo Sas
 898000-898FFF     (base 16)		Salupo Sas
 				Via Laganeto n. 129
 				Rocca di Capri Leone  Italia / ME / Sicilia  98070
 				IT
 70-B3-D5   (hex)		Nippon Safety co,ltd
 872000-872FFF     (base 16)		Nippon Safety co,ltd
 				1, suimeicho
 				Amagasaki  Hyogo  660-0082
 				JP
 70-B3-D5   (hex)		ENABLER LTD.
 15A000-15AFFF     (base 16)		ENABLER LTD.
 				29F Shiroyama Trust Tower 4-3-1 Toranomon 
 				Minato-ku  Tokyo  105-6029
 				JP
 70-B3-D5   (hex)		LINEAGE POWER PVT LTD.,
 62E000-62EFFF     (base 16)		LINEAGE POWER PVT LTD.,
 				30-A1, KIADB, 1ST PHASE INDUSTRIAL ESTATE,KUMBALGODU, BANGALORE-MYSORE ROAD
 				BANGALORE  KARNATAKA  560074
 				IN
 70-B3-D5   (hex)		EVCO SPA
 A80000-A80FFF     (base 16)		EVCO SPA
 				VIA FELTRE N. 81
@ -8675,12 +8741,60 @@ EA5000-EA5FFF     (base 16)		LOTES TM OOO
 				Moscow    121309
 				RU
 70-B3-D5   (hex)		Ariston Thermo s.p.a.
 3D6000-3D6FFF     (base 16)		Ariston Thermo s.p.a.
 				Via Aristide Merloni 45
 				Fabriano  Ancona  60044
 				IT
 70-B3-D5   (hex)		Yi An Electronics Co., Ltd
 F28000-F28FFF     (base 16)		Yi An Electronics Co., Ltd
 				5F.-2, No. 81, Sec. 1, Xintai 5th Rd., Xizhi Dist
 				 New Taipei City    22101
 				TW
 70-B3-D5   (hex)		DORLET SAU
 639000-639FFF     (base 16)		DORLET SAU
 				Albert Eistein 34
 				Alava  SPAIN  01510
 				ES
 70-B3-D5   (hex)		OOO ORION-R
 047000-047FFF     (base 16)		OOO ORION-R
 				Novoselov str., 40A, room N200
 				Ryazan    390048
 				RU
 70-B3-D5   (hex)		MG s.r.l.
 130000-130FFF     (base 16)		MG s.r.l.
 				via Monte Bianco, 1
 				Solbiate Olona  VA  21058
 				IT
 70-B3-D5   (hex)		Postmark Incorporated 
 CBB000-CBBFFF     (base 16)		Postmark Incorporated 
 				3197 Duncan Lane
 				San Luis Obispo  CA  93401
 				US
 70-B3-D5   (hex)		Glory Technology Service Inc.
 801000-801FFF     (base 16)		Glory Technology Service Inc.
 				3F., No.43-1, Ln. 11, Sec. 6, Minquan E. Rd
 				Taipei City   Neihu Dist  114
 				TW
 70-B3-D5   (hex)		Toolplanet Co., Ltd.
 4B5000-4B5FFF     (base 16)		Toolplanet Co., Ltd.
 				43-2 Himigaike-cho
 				Gifu-shi  Gifu  500-8122
 				JP
 70-B3-D5   (hex)		Abbott Diagnostics Technologies AS
 53F000-53FFFF     (base 16)		Abbott Diagnostics Technologies AS
 				P. O.  Box 6863 Rodeløkka
 				Oslo  Oslo  0504
 				NO
 70-B3-D5   (hex)		System West dba ICS Electronics
 E06000-E06FFF     (base 16)		System West dba ICS Electronics
 				7034 Commerce Circle Suite A
@ -9002,12 +9116,6 @@ D36000-D36FFF     (base 16)		Insitu Inc.
 				Bingen  WA  98605
 				US
 70-B3-D5   (hex)		Pano0ramic Power
 669000-669FFF     (base 16)		Pano0ramic Power
 				15 Atir Yeda
 				Kfar Saba    4464312
 				IL
 00-1B-C5   (hex)		Private
 0B8000-0B8FFF     (base 16)		Private
@ -13022,18 +13130,6 @@ C98000-C98FFF     (base 16)		Trust Automation
 				San Luis Obispo  CA  93401
 				US
 70-B3-D5   (hex)		ARCLAN'SYSTEM
 25C000-25CFFF     (base 16)		ARCLAN'SYSTEM
 				1140 rue Ampère - Actimart II - Lot 9
 				AIX EN PROVENCE    13290
 				FR
 70-B3-D5   (hex)		Taejin InfoTech
 A75000-A75FFF     (base 16)		Taejin InfoTech
 				40, Imi-ro, A-411
 				Uiwang-si  Gyeonggi-do  16006
 				KR
 70-B3-D5   (hex)		Coheros Oy
 D2E000-D2EFFF     (base 16)		Coheros Oy
 				Tammukkakatu 6
@ -13058,6 +13154,78 @@ F6A000-F6AFFF     (base 16)		Guan Show Technologe Co., Ltd.
 				 Kaohsiung City     802
 				TW
 70-B3-D5   (hex)		Taejin InfoTech
 A75000-A75FFF     (base 16)		Taejin InfoTech
 				40, Imi-ro, A-411
 				Uiwang-si  Gyeonggi-do  16006
 				KR
 70-B3-D5   (hex)		ARCLAN'SYSTEM
 25C000-25CFFF     (base 16)		ARCLAN'SYSTEM
 				1140 rue Ampère - Actimart II - Lot 9
 				AIX EN PROVENCE    13290
 				FR
 70-B3-D5   (hex)		LLC Sarov Innovative Technologies (WIZOLUTION)
 50F000-50FFFF     (base 16)		LLC Sarov Innovative Technologies (WIZOLUTION)
 				RUSSIAN FEDERATION, Nizhny Novgorod region, Varlamovskaya road, 7, build 2
 				Sarov  Nizhny Novgorod  607188
 				RU
 70-B3-D5   (hex)		SPX Radiodetection
 A77000-A77FFF     (base 16)		SPX Radiodetection
 				Western Drive
 				Bristol  Avon  BS14 0AF
 				GB
 70-B3-D5   (hex)		INVISSYS
 AD4000-AD4FFF     (base 16)		INVISSYS
 				25 rue marcel issartier
 				merignac    33700
 				FR
 70-B3-D5   (hex)		LM-Instruments Oy
 5AC000-5ACFFF     (base 16)		LM-Instruments Oy
 				Norrbyn rantatie 8
 				Parainen    21600
 				FI
 70-B3-D5   (hex)		Fuhr GmbH Filtertechnik
 DBB000-DBBFFF     (base 16)		Fuhr GmbH Filtertechnik
 				Am Weinkastell 14
 				Klein-Winternheim  Rheinland-Pfalz  55270
 				DE
 70-B3-D5   (hex)		Panoramic Power
 669000-669FFF     (base 16)		Panoramic Power
 				15 Atir Yeda
 				Kfar Saba    4464312
 				IL
 70-B3-D5   (hex)		Sanmina Israel
 C18000-C18FFF     (base 16)		Sanmina Israel
 				Koren Industrial Zone , POBox 102
 				Maalot  Israel  2101002
 				IL
 70-B3-D5   (hex)		Avlinkpro
 2C1000-2C1FFF     (base 16)		Avlinkpro
 				380 US Highway 46
 				Totowa  NJ  07512
 				US
 70-B3-D5   (hex)		Panoramic Power
 06D000-06DFFF     (base 16)		Panoramic Power
 				Atir Yeda 15
 				Kfar Saba    4464312
 				IL
 70-B3-D5   (hex)		DECYBEN
 683000-683FFF     (base 16)		DECYBEN
 				170 Rue Raymond Losserand
 				Paris    75014
 				FR
 70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
 BBB000-BBBFFF     (base 16)		YUYAMA MFG Co.,Ltd
 				3-3-1
@ -17465,6 +17633,24 @@ D77000-D77FFF     (base 16)		Portrait Displays, Inc.
 				Irvine  CA  92614
 				US
 70-B3-D5   (hex)		Sprintshield d.o.o.
 B03000-B03FFF     (base 16)		Sprintshield d.o.o.
 				Marina Getaldi?a 3
 				Velika Gorica    10410
 				HR
 70-B3-D5   (hex)		KeyProd
 473000-473FFF     (base 16)		KeyProd
 				66 avenue des Champs Elysées
 				Paris    77008
 				FR
 70-B3-D5   (hex)		Mictrotrac Retsch GmbH
 F09000-F09FFF     (base 16)		Mictrotrac Retsch GmbH
 				Retsch-Allee 1-5
 				Haan  NRW  42781
 				DE
 70-B3-D5   (hex)		DISMUNTEL SAL
 92C000-92CFFF     (base 16)		DISMUNTEL SAL
 				Pol ind cotes
@ -18971,12 +19157,6 @@ E18000-E18FFF     (base 16)		Plasmapp Co.,Ltd.
 				Eckental  Bavaria  90542
 				DE
 70-B3-D5   (hex)		Pano0ramic Power
 53A000-53AFFF     (base 16)		Pano0ramic Power
 				15 Atir Yeda
 				Kfar Saba    4464312
 				IL
 70-B3-D5   (hex)		ND METER
 68C000-68CFFF     (base 16)		ND METER
 				228 BOLTON ROAD
@ -21863,8 +22043,32 @@ DE1000-DE1FFF     (base 16)		Duplomatic MS spa
 				NanJing    211100
 				CN
 70-B3-D5   (hex)		PHYZHON Health Inc
 744000-744FFF     (base 16)		PHYZHON Health Inc
 				180 Blue Ravine Road, suite A
 				Folsom  CA  95630
 				US
 70-B3-D5   (hex)		thingdust AG
 3C1000-3C1FFF     (base 16)		thingdust AG
 				Moosstrasse 7
 				Lucerne  Lucerne  6003
 				CH
 70-B3-D5   (hex)		Panoramic Power
 53A000-53AFFF     (base 16)		Panoramic Power
 				15 Atir Yeda
 				Kfar Saba    4464312
 				IL
 70-B3-D5   (hex)		ALVAT s.r.o.
 369000-369FFF     (base 16)		ALVAT s.r.o.
 				Chodovska 228/3
 				Praha 4    14100
 				CZ
 70-B3-D5   (hex)		PCB Piezotronics
 4CA000-4CAFFF     (base 16)		PCB Piezotronics
 				3425 Walden Avenue
 				Depew  NY  14043
 				US
--- a/hwdb.d/pci.ids
+++ b/hwdb.d/pci.ids
@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2020.01.25
+#	Version: 2020.02.22
-#	Date:    2020-01-25 03:15:02
+#	Date:    2020-02-22 03:15:04
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@ -67,6 +67,7 @@
 # 018a is not LevelOne but there is a board misprogrammed
 018a  LevelOne
 	0106  FPC-0106TX misprogrammed [RTL81xx]
 01de  Oxide Computer Company
 # 021b is not Compaq but there is a board misprogrammed
 021b  Compaq Computer Corporation
 	8139  HNE-300 (RealTek RTL8139c) [iPaq Networking]
@ -436,6 +437,8 @@
 		1028 1fd1  PERC H730P MX
 		17aa 1052  ThinkServer RAID 720i
 		17aa 1053  ThinkServer RAID 720ix
 		1bd4 0014  6G SAS3108 2G
 		1bd4 0015  6G SAS3108 4G
 		1d49 0600  ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter
 		1d49 0608  ThinkSystem RAID 730-8i 2GB Flash PCIe 12Gb Adapter
 		1d49 0609  ThinkSystem RAID 730-8i 4GB Flash PCIe 12Gb Adapter
@ -507,6 +510,12 @@
 		1028 1f1f  PERC H200 Modular
 		1028 1f20  PERC H200 Embedded
 		1028 1f22  PERC H200 Internal Tape Adapter
 # Fujitsu D2607 SAS2008 HBA controller
 		1734 1177  HBA Ctrl SAS 6G 0/1 [D2607]
 		1bd4 000d  6G SAS2008IT
 		1bd4 000e  6G SAS2008IR
 		1bd4 000f  6G SAS2008IT SA5248
 		1bd4 0010  6G SAS2008IR SA5248
 		8086 350f  RMS2LL040 RAID Controller
 		8086 3700  SSD 910 Series
 	0073  MegaRAID SAS 2008 [Falcon]
@ -615,6 +624,8 @@
 		1590 0041  H220i
 		1590 0042  H221 / 9207-8e
 		1590 0044  H220i
 		1bd4 0009  6G SAS2308IR
 		1bd4 000a  6G SAS2308IT
 		8086 3000  RS25GB008 RAID Controller
 		8086 3060  RS25FB044 RAID Controller
 		8086 3516  RMS25JB080 RAID Controller
@ -646,6 +657,10 @@
 		1bd4 000b  12G SAS3008IR
 		1bd4 000c  12G SAS3008IT
 		1bd4 0011  Inspur 12Gb 8i-3008 IT SAS HBA
 		1bd4 0012  12Gb SAS3008IR UDM
 		1bd4 0026  12G SAS3008IT RACK
 		1bd4 0027  12G SAS3008IMR RACK
 		1bd4 0028  12G SAS3008IR RACK
 	00ab  SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
 # 8 Internal and 8 External port channel 9400 HBA
 		1000 3040  HBA 9400-8i8e
@ -881,7 +896,9 @@
 	1306  Kaveri
 	1307  Kaveri
 	1308  Kaveri HDMI/DP Audio Controller
 		17aa 3988  Z50-75
 	1309  Kaveri [Radeon R6/R7 Graphics]
 		17aa 3830  Z50-75
 	130a  Kaveri [Radeon R6 Graphics]
 	130b  Kaveri [Radeon R4 Graphics]
 	130c  Kaveri [Radeon R7 Graphics]
@ -1092,7 +1109,7 @@
 	4382  SB600 AC97 Audio
 	4383  SBx00 Azalia (Intel HDA)
 		1019 2120  A785GM-M
-		103c 1611  Pavilion DM1Z-3000
+		103c 1611  Pavilion dm1z-3000
 		103c 280a  DC5750 Microtower
 		1043 8230  M3A78-EH Motherboard
 		1043 836c  M4A785TD Motherboard
@ -1862,6 +1879,7 @@
 		1642 3f09  Radeon R7 350
 	6611  Oland [Radeon HD 8570 / R7 240/340 OEM]
 		1028 210b  Radeon R5 240 OEM
 		1642 1869  AMD Radeon 520
 		174b 4248  Radeon R7 240 OEM
 		174b a240  Radeon R7 240 OEM
 		174b d340  Radeon R7 340 OEM
@ -1927,7 +1945,7 @@
 		17aa 3805  Radeon HD 8570M
 	6664  Jet XT [Radeon R5 M240]
 	6665  Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile]
-		17aa 1309  Radeon R7 M260DX
+		17aa 1309  Z50-75 Radeon R7 M260DX
 		17aa 368f  Radeon R5 A230
 	6667  Jet ULT [Radeon R5 M230]
 	666f  Sun LE [Radeon HD 8550M / R5 M230]
@ -2558,7 +2576,7 @@
 		1462 3418  Radeon RX 580 Armor 4G OC
 		1462 341e  Radeon RX 570 Armor 4G OC
 		1462 8a92  Radeon RX 580
-		148c 2372  Radeon RX 480
+		148c 2372  Radeon RX 480 [Red Dragon]
 		148c 2373  Radeon RX 470
 		1682 9470  Radeon RX 470
 		1682 9480  Radeon RX 480
@ -4890,6 +4908,7 @@
 	7801  FCH SATA Controller [AHCI mode]
 		103c 168b  ProBook 4535s Notebook
 		103c 194e  ProBook 455 G1 Notebook
 		17aa 3988  Z50-75
 		1849 7801  QC5000-ITX/PH
 	7802  FCH SATA Controller [RAID mode]
 	7803  FCH SATA Controller [RAID mode]
@ -4900,27 +4919,33 @@
 	7807  FCH USB OHCI Controller
 		103c 194e  ProBook 455 G1 Notebook
 		103c 1985  Pavilion 17-e163sg Notebook PC
 		17aa 3988  Z50-75
 		1849 7807  QC5000-ITX/PH
 	7808  FCH USB EHCI Controller
 		103c 194e  ProBook 455 G1 Notebook
 		103c 1985  Pavilion 17-e163sg Notebook PC
 		17aa 3988  Z50-75
 		1849 7808  QC5000-ITX/PH
 	7809  FCH USB OHCI Controller
 		103c 194e  ProBook 455 G1 Notebook
 		17aa 3988  Z50-75
 	780a  Kabini/Mullins SATA Raid/AHCI Mode (DotHill driver)
 	780b  FCH SMBus Controller
 		103c 194e  ProBook 455 G1 Notebook
 		103c 1985  Pavilion 17-e163sg Notebook PC
 		17aa 3988  Z50-75
 		1849 780b  QC5000-ITX/PH
 	780c  FCH IDE Controller
 	780d  FCH Azalia Controller
 		103c 194e  ProBook 455 G1 Notebook
 		103c 1985  Pavilion 17-e163sg Notebook PC
 		1043 8444  F2A85-M Series
 		17aa 3988  Z50-75
 		1849 8892  QC5000-ITX/PH
 	780e  FCH LPC Bridge
 		103c 194e  ProBook 455 G1 Notebook
 		103c 1985  Pavilion 17-e163sg Notebook PC
 		17aa 3988  Z50-75
 		1849 780e  QC5000-ITX/PH
 	780f  FCH PCI Bridge
 	7812  FCH USB XHCI Controller
@ -4928,6 +4953,7 @@
 	7814  FCH USB XHCI Controller
 		103c 194e  ProBook 455 G1 Notebook
 		103c 1985  Pavilion 17-e163sg Notebook PC
 		17aa 3988  Z50-75
 		1849 7814  QC5000-ITX/PH
 	7900  FCH SATA Controller [IDE mode]
 	7901  FCH SATA Controller [AHCI mode]
@ -6502,6 +6528,8 @@
 	4802  Falcon
 	4803  Hawk
 	4806  CPX8216
 # MPC7410 PowerPC microprocessor and PCI host bridge
 	480b  MPC7410
 	4d68  20268
 	5600  SM56 PCI Modem
 		1057 0300  SM56 PCI Speakerphone Modem
@ -6932,6 +6960,8 @@
 		1077 02e4  QLE2772 Dual Port 32GFC PCIe Gen4 x8 Adapter
 		1077 02ee  QLE2870 Single Port 64GFC PCIe Gen4 x8 Adapter
 		1077 02f0  QLE2770 Single Port 32GFC PCIe Gen4 x8 Adapter
 		1077 02f2  QLogic 1x32Gb QLE2770 FC HBA
 		1077 02f3  QLogic 2x32Gb QLE2772 FC HBA
 		1590 02d3  SN1610Q - 1P Enhanced 32GFC Single Port Fibre Channel Host Bus Adapter
 		1590 02d4  SN1610Q – 2P Enhanced 32GFC Dual Port Fibre Channel Host Bus Adapter
 	2300  QLA2300 64-bit Fibre Channel Adapter
@ -7010,6 +7040,8 @@
 		1077 0055  QLogic 2x10GE QL41132HQCU NIC
 		1077 0056  2x10GE QL41132HxRJ NIC
 		1077 0057  2x25GE QL41232HxCU NIC
 		1077 0065  QLogic 4x10GE QL41154HQRJ CNA
 		1077 0066  QLogic 4x10GE QL41154HQCU CNA
 		1077 0068  10GbE 2p SFP+ QL41132HLCU-HC Adapter
 		1077 0069  10GbE 2p BASE-T QL41132HQRJ-HC OCP3 Adapter
 		1077 0070  10GbE 2p BASE-T QL41132HLRJ-HC Adapter
@ -7053,6 +7085,8 @@
 		1077 000d  FastLinQ QL41262H 25GbE iSCSI Adapter
 		1077 000e  FastLinQ QL41162H 10GbE iSCSI Adapter
 		1077 000f  2x25GE QL41262HMKR CNA
 		1077 0065  QLogic 4x10GE QL41154HQRJ CNA
 		1077 0066  QLogic 4x10GE QL41154HQCU CNA
 		1590 021a  10GbE 2P QL41162HLRJ-HP Adapter
 		1590 021b  10GbE 2P QL41162HLRJ-HP Adapter
 	8090  FastLinQ QL41000 Series Gigabit Ethernet Controller (SR-IOV VF)
@ -7077,6 +7111,8 @@
 		1077 0055  QLogic 2x10GE QL41132HQCU NIC
 		1077 0056  2x10GE QL41132HxRJ NIC
 		1077 0057  2x25GE QL41232HxCU NIC
 		1077 0065  QLogic 4x10GE QL41154HQRJ CNA
 		1077 0066  QLogic 4x10GE QL41154HQCU CNA
 		1590 021a  10GbE 2P QL41162HLRJ-HP Adapter
 		1590 021b  10GbE 2P QL41162HLRJ-HP Adapter
 		1590 021e  10/25GbE 2P QL41162HMRJ-HP Adapter
@ -11714,6 +11750,7 @@
 	1406  GM206 [GeForce GTX 960 OEM]
 	1407  GM206 [GeForce GTX 750 v2]
 	1427  GM206M [GeForce GTX 965M]
 		103c 825b  OMEN-17-w001nv
 	1430  GM206GL [Quadro M2000]
 	1431  GM206GL [Tesla M4]
 	1436  GM206GLM [Quadro M2200 Mobile]
@ -11850,6 +11887,8 @@
 	1cbd  GP107GLM [Quadro P620]
 	1ccc  GP107BM [GeForce GTX 1050 Ti Mobile]
 	1ccd  GP107BM [GeForce GTX 1050 Mobile]
 	1cfa  GP107GL [Quadro P2000]
 	1cfb  GP107GL [Quadro P1000]
 	1d01  GP108 [GeForce GT 1030]
 	1d10  GP108M [GeForce MX150]
 		17aa 225e  ThinkPad T480
@ -11873,6 +11912,8 @@
 		10de 131d  Tesla V100-SXM3-32GB-H
 	1dba  GV100GL [Quadro GV100]
 		10de 12eb  TITAN V CEO Edition
 	1df0  GV100GL [Tesla PG500-216]
 	1df2  GV100GL [Tesla PG503-216]
 	1df5  GV100GL [Tesla V100 SXM2 16GB]
 	1df6  GV100GL [Tesla V100S PCIe 32GB]
 	1e02  TU102 [TITAN RTX]
@ -11884,6 +11925,10 @@
 	1e30  TU102GL [Quadro RTX 6000/8000]
 		10de 129e  Quadro RTX 8000
 		10de 12ba  Quadro RTX 6000
 	1e37  TU102GL [GRID RTX T10-4/T10-8/T10-16]
 		10de 1347  GRID RTX T10-8
 		10de 1348  GRID RTX T10-4
 		10de 1370  GRID RTX T10-16
 	1e38  TU102GL
 	1e3c  TU102GL
 	1e3d  TU102GL
@ -12154,6 +12199,7 @@
 		17aa 3832  Yoga 520
 	522a  RTS522A PCI Express Card Reader
 		103c 8079  EliteBook 840 G3
 		103c 825b  OMEN-17-w001nv
 	5249  RTS5249 PCI Express Card Reader
 		103c 1909  ZBook 15
 	524a  RTS524A PCI Express Card Reader
@ -12255,6 +12301,7 @@
 		103c 1611  Pavilion DM1Z-3000
 		103c 1950  ProBook 450/455
 		103c 2a6f  Asus IPIBL-LB Motherboard
 		103c 825b  OMEN-17-w001nv
 		103c 8615  Pavilion Laptop 15-cw1xxx
 		1043 11f5  Notebook motherboard (one of many models)
 		1043 16d5  U6V/U31J laptop
@ -12274,6 +12321,7 @@
 		1462 7522  X58 Pro-E
 		1462 7c37  X570-A PRO motherboard
 		1775 11cc  CC11/CL11
 		17aa 3814  Z50-75
 		1849 8168  Motherboard (one of many)
 		7470 3468  TG-3468 Gigabit PCI Express Network Adapter
 		8086 2055  NUC Kit DN2820FYKH
@ -12324,6 +12372,7 @@
 	8821  RTL8821AE 802.11ac PCIe Wireless Network Adapter
 	b723  RTL8723BE PCIe Wireless Network Adapter
 		10ec 8739  Dell Wireless 1801
 		17aa b736  Z50-75
 	b822  RTL8822BE 802.11a/b/g/n/ac WiFi adapter
 		103c 831b  Realtek RTL8822BE 802.11ac 2 × 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported)
 	c821  RTL8821CE 802.11ac PCIe Wireless Network Adapter
@ -18067,6 +18116,7 @@
 		1028 1ff8  Express Flash PM1725b 3.2TB AIC
 		1028 1ff9  Express Flash PM1725b 6.4TB AIC
 		1028 1ffa  Express Flash PM1725b 12.8TB AIC
 	a824  NVMe SSD Controller PM173X
 144e  OLITEC
 144f  Askey Computer Corp.
 1450  Octave Communications Ind.
@ -19873,6 +19923,7 @@
 	1978  MT42822 Family [BlueField-2 SoC PCIe Bridge]
 	4117  MT27712A0-FDCF-AE
 		1bd4 0039  SN10XMP2P25
 		1bd4 003a  10G SFP28 SP EO251FM9 Adapter
 		1bd4 004d  SN10XMP2P25,YZPC-01191-101
 	5274  MT21108 InfiniBridge
 	5a44  MT23108 InfiniHost
@ -21907,6 +21958,7 @@
 	0211  Hi1822 Family (4*25GE)
 		19e5 d12f  Hi1822 SP571 (4*25GE)
 		19e5 d137  Hi1822 SP581 (4*25GE)
 		19e5 d142  Hi1822 SP583 (4*25GE)
 	0212  Hi1822 Family (2*8G FC)
 		19e5 d303  Hi1822 SP522 (2*8G FC)
 		19e5 d306  Hi1822 SP523 (2*8G FC)
@ -21915,6 +21967,7 @@
 	1822  Hi1822 Family (4*25GE)
 		19e5 d129  Hi1822 SP570 (4*25GE)
 		19e5 d136  Hi1822 SP580 (4*25GE)
 		19e5 d141  Hi1822 SP583 (4*25GE)
 	371e  Hi1822 Family Virtual Bridge
 	375e  Hi1822 Family Virtual Function
 	379e  Hi1822 Family Virtual Function
@ -22074,6 +22127,8 @@
 	4005  Accelerated Virtual Video Adapter
 	4006  Memory Ballooning Controller
 1ab9  Espia Srl
 1ac1  Global Unichip Corp.
 	089a  Coral Edge TPU
 1ac8  Aeroflex Gaisler
 1acc  Point of View BV
 1ad7  Spectracom Corporation
@ -22725,6 +22780,7 @@
 1dbf  Guizhou Huaxintong Semiconductor Technology Co., Ltd
 	0401  StarDragon4800 PCI Express Root Port
 1dc5  FADU Inc.
 1dcd  Liqid Inc.
 1dd8  Pensando Systems Inc
 	1000  DSC Capri Upstream Port
 		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
@ -22820,6 +22876,8 @@
 1e89  ID Quantique SA
 	0002  Quantis-PCIe-40M
 	0003  Quantis-PCIe-240M
 # aka SED Systems
 1e94  Calian SED
 # nee Tumsan Oy
 1fc0  Ascom (Finland) Oy
 	0300  E2200 Dual E1/Rawpipe Card
@ -25847,6 +25905,7 @@
 	1903  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem
 		1028 06dc  Latitude E7470
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 		17aa 225d  ThinkPad T480
 	1904  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 		1028 06dc  Latitude E7470
@ -25862,6 +25921,7 @@
 	190f  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 	1910  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	1911  Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th/8th Gen Core Processor Gaussian Mixture Model
 		17aa 2247  ThinkPad T570
 		17aa 224f  ThinkPad X1 Carbon 5th Gen
@ -25875,6 +25935,7 @@
 	1919  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Imaging Unit
 	191b  HD Graphics 530
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	191d  HD Graphics P530
 	191e  HD Graphics 515
 	191f  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
@ -29792,6 +29853,7 @@
 		1028 02da  OptiPlex 980
 		1028 040a  Latitude E6410
 		1028 040b  Latitude E6510
 		103c 1521  EliteBook 8540p
 		144d c06a  R730 Laptop
 		15d9 060d  C7SIM-Q Motherboard
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
@ -31017,6 +31079,7 @@
 	a102  Q170/Q150/B150/H170/H110/Z170/CM236 Chipset SATA Controller [AHCI Mode]
 	a103  HM170/QM170 Chipset SATA Controller [AHCI Mode]
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a105  Sunrise Point-H SATA Controller [RAID mode]
 	a106  Q170/H170/Z170/CM236 Chipset SATA Controller [RAID Mode]
 	a107  HM170/QM170 Chipset SATA Controller [RAID Mode]
@ -31040,9 +31103,11 @@
 	a120  100 Series/C230 Series Chipset Family P2SB
 	a121  100 Series/C230 Series Chipset Family Power Management Controller
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a122  Sunrise Point-H cAVS
 	a123  100 Series/C230 Series Chipset Family SMBus
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a124  100 Series/C230 Series Chipset Family SPI Controller
 	a125  100 Series/C230 Series Chipset Family Gigabit Ethernet Controller
 	a126  100 Series/C230 Series Chipset Family Trace Hub
@ -31052,13 +31117,16 @@
 	a12a  100 Series/C230 Series Chipset Family Serial IO GSPI #1
 	a12f  100 Series/C230 Series Chipset Family USB 3.0 xHCI Controller
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a130  100 Series/C230 Series Chipset Family USB Device Controller (OTG)
 	a131  100 Series/C230 Series Chipset Family Thermal Subsystem
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a133  Sunrise Point-H Northpeak ACPI Function
 	a135  100 Series/C230 Series Chipset Family Integrated Sensor Hub
 	a13a  100 Series/C230 Series Chipset Family MEI Controller #1
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a13b  100 Series/C230 Series Chipset Family MEI Controller #2
 	a13c  100 Series/C230 Series Chipset Family IDE Redirection
 	a13d  100 Series/C230 Series Chipset Family KT Redirection
@ -31079,6 +31147,7 @@
 	a14d  QM170 Chipset LPC/eSPI Controller
 	a14e  HM170 Chipset LPC/eSPI Controller
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a14f  Sunrise Point-H LPC Controller
 	a150  CM236 Chipset LPC/eSPI Controller
 	a151  Sunrise Point-H LPC Controller
@ -31098,6 +31167,7 @@
 	a15f  Sunrise Point-H LPC Controller
 	a160  100 Series/C230 Series Chipset Family Serial IO I2C Controller #0
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a161  100 Series/C230 Series Chipset Family Serial IO I2C Controller #1
 		1028 06e4  XPS 15 9550
 	a162  100 Series/C230 Series Chipset Family Serial IO I2C Controller #2
@ -31109,6 +31179,7 @@
 	a16a  100 Series/C230 Series Chipset Family PCI Express Root Port #20
 	a170  100 Series/C230 Series Chipset Family HD Audio Controller
 		1028 06e4  XPS 15 9550
 		103c 825b  OMEN-17-w001nv
 	a171  CM238 HD Audio Controller
 	a182  C620 Series Chipset Family SATA Controller [AHCI mode]
 	a186  C620 Series Chipset Family SATA Controller [RAID mode]
--- a/hwdb.d/usb.ids
+++ b/hwdb.d/usb.ids
@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2020.01.09
+# Version: 2020.02.28
-# Date:    2020-01-09 20:34:06
+# Date:    2020-02-28 20:34:06
 #
 # Vendors, devices and interfaces. Please keep sorted.
@ -42,6 +42,7 @@
 	a001  Digitus DA-71114 SATA
 0085  Boeye Technology Co., Ltd.
 	0600  eBook Reader
 0102  miniSTREAK
 0105  Trust International B.V.
 	145f  NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
 0127  IBP
@ -172,6 +173,7 @@
 	7617  AT76C505AS Wireless Adapter
 	7800  Mini Album
 	800c  Airspy HF+
 	ff01  WootingOne
 	ff02  WootingTwo
 	ff07  Tux Droid fish dongle
 03ec  Iwatsu America, Inc.
@ -702,6 +704,7 @@
 	c102  PhotoSmart 8000 series
 	c111  Deskjet 1510
 	c202  PhotoSmart 8200 series
 	c211  Deskjet 2540 series
 	c302  DeskJet D2300
 	c402  PhotoSmart D5100 series
 	c502  PhotoSmart D6100 series
@ -798,6 +801,7 @@
 	8370  7 Port Hub
 	8371  PS/2 Keyboard And Mouse
 	8372  FT8U100AX Serial Port
 	8508  Selectronic SP PRO
 	87d0  Cressi Dive Computer Interface
 	8a28  Rainforest Automation ZigBee Controller
 	8a98  TIAO Multi-Protocol Adapter
@ -812,6 +816,7 @@
 	9135  Rotary Pub alarm
 	9136  Pulsecounter
 	9e90  Marvell OpenRD Base/Client
 	9f08  CIB-1894 Conclusion SmartLink Box:
 	9f80  Ewert Energy Systems CANdapter
 	a6d0  Texas Instruments XDS100v2 JTAG / BeagleBone A3
 	a951  HCP HIT GSM/GPRS modem [Cinterion MC55i]
@ -1165,6 +1170,7 @@
 	602a  i900
 040b  Weltrend Semiconductor
 	0a68  Func MS-3 gaming mouse [WT6573F MCU]
 	2000  wired Keyboard [Dynex DX-WRK1401]
 	2367  Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad]
 	6510  Weltrend Bar Code Reader
 	6520  Xploder Xbox Memory Unit (8MB)
@ -1980,10 +1986,14 @@
 	b700  Tacticalboard
 0450  DFI, Inc.
 0451  Texas Instruments, Inc.
 	0422  TUSB422 Port Controller with Power Delivery
 	1234  Bluetooth Device
 	1428  Hub
 	1446  TUSB2040/2070 Hub
 	16a2  CC Debugger
 	16a6  BM-USBD1 BlueRobin RF heart rate sensor receiver
 	16a8  CC2531 ZigBee
 	16ae  CC2531 Dongle
 	2036  TUSB2036 Hub
 	2046  TUSB2046 Hub
 	2077  TUSB2077 Hub
@ -2018,6 +2028,7 @@
 	e012  TI-Nspire Calculator
 	e013  Network Bridge
 	e01c  Data Collection Sled [Nspire Lab Cradle, Nspire Datatracker Cradle]
 	e01e  Nspire CX Navigator Access Point
 	e01f  Python Adapter (firmware install mode)
 	e020  Python Adapter
 	e022  Nspire CX II
@ -2050,6 +2061,7 @@
 	0002  Genius NetMouse Pro
 	0003  Genius NetScroll+
 	0006  Easy Mouse+
 	0007  Trackbar Emotion
 	000b  NetMouse Wheel(P+U)
 	000c  TACOMA Fingerprint V1.06.01
 	000e  Genius NetScroll Optical
@ -2256,6 +2268,7 @@
 	00cb  Basic Optical Mouse v2.0
 	00ce  Generic PPC Flash device
 	00d1  Optical Mouse with Tilt Wheel
 	00d2  Notebook Optical Mouse with Tilt Wheel
 	00da  eHome Infrared Receiver
 	00db  Natural Ergonomic Keyboard 4000 V1.0
 	00dd  Comfort Curve Keyboard 2000 V1.0
@ -2474,6 +2487,7 @@
 	07cd  Surface Keyboard
 	07f8  Wired Keyboard 600 (model 1576)
 	07fd  Nano Transceiver 1.1
 	0810  LifeCam HD-3000
 	0900  Surface Dock Hub
 	0901  Surface Dock Hub
 	0902  Surface Dock Hub
@ -2551,12 +2565,14 @@
 	4d62  HP Laser Mobile Mini Mouse
 	4d75  Rocketfish RF-FLBTAD Bluetooth Adapter
 	4d81  Dell N889 Optical Mouse
 	4d8a  HP Multimedia Keyboard
 	4d91  Laser mouse M-D16DL
 	4d92  Optical mouse M-D17DR
 	4db1  Dell Laptop Integrated Webcam 2Mpix
 	4de3  HP 5-Button Optical Comfort Mouse
 	4de7  webcam
 	4e04  Lenovo Keyboard KB1021
 	4e6f  Acer Wired Keyboard Model KBAY211
 0463  MGE UPS Systems
 	0001  UPS
 	ffff  UPS
@ -2585,6 +2601,7 @@
 	00a1  SmartCard Reader Keyboard KC 1000 SC
 	0106  R-300 Wireless Mouse Receiver
 	010d  MX-Board 3.0 Keyboard
 	0180  Strait 3.0
 	b090  Keyboard
 	b091  Mouse
 046b  American Megatrends, Inc.
@ -2742,6 +2759,7 @@
 	0a45  960 Headset
 	0a4d  G430 Surround Sound Gaming Headset
 	0a5b  G933 Wireless Headset Dongle
 	0a5d  G933 Headset Battery Charger
 	0a66  [G533 Wireless Headset Dongle]
 	0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
 	8801  Video Camera
@ -2871,6 +2889,7 @@
 	c231  G13 Virtual Mouse
 	c245  G400 Optical Mouse
 	c246  Gaming Mouse G300
 	c247  G100S Optical Gaming Mouse
 	c248  G105 Gaming Keyboard
 	c24a  G600 Gaming Mouse
 	c24c  G400s Optical Mouse
@ -2919,6 +2938,7 @@
 	c31f  Comfort Keyboard K290
 	c326  Washable Keyboard K310
 	c328  Corded Keyboard K280e
 	c32b  G910 Orion Spark Mechanical Keyboard
 	c332  G502 Proteus Spectrum Optical Mouse
 	c335  G910 Orion Spectrum Mechanical Keyboard
 	c33a  G413 Gaming Keyboard
@ -2960,6 +2980,8 @@
 	c531  C-U0007 [Unifying Receiver]
 	c532  Unifying Receiver
 	c534  Unifying Receiver
 	c537  Cordless Mouse Receiver
 	c53a  PowerPlay Wireless Charging System
 	c603  3Dconnexion Spacemouse Plus XT
 	c605  3Dconnexion CADman
 	c606  3Dconnexion Spacemouse Classic
@ -3247,6 +3269,7 @@
 	f101  Atlas Modem
 047f  Plantronics, Inc.
 	0101  Bulk Driver
 	02ee  BT600
 	0301  Bulk Driver
 	0411  Savi Office Base Station
 	0ca1  USB DSP v4 Audio Interface
@ -3256,6 +3279,7 @@
 	af01  DA80
 	c008  Audio 655 DSP
 	c00e  Blackwire C310 headset
 	c03b  HD1
 0480  Toshiba America Inc
 	0001  InTouch Module
 	0004  InTouch Module
@ -3265,6 +3289,7 @@
 	0200  External Disk
 	0820  Canvio Advance Disk
 	0821  Canvio Advance 2TB model DTC920
 	0900  MQ04UBF100
 	a006  External Disk 1.5TB
 	a007  External Disk USB 3.0
 	a009  Stor.E Basics
@ -3334,6 +3359,7 @@
 	8259  Probe
 	91d1  Sensor Hub
 	a171  ThermaData WiFi
 	a2e0  BMeasure instrument
 	df11  STM Device in DFU Mode
 	ff10  Swann ST56 Modem
 0484  Specialix
@ -3363,6 +3389,7 @@
 048d  Integrated Technology Express, Inc.
 	1165  IT1165 Flash Controller
 	1172  Flash Drive
 	1234  Mass storage
 	1336  SD/MMC Cardreader
 	1345  Multi Cardreader
 	9006  IT9135 BDA Afatech DVB-T HDTV Dongle
@ -3708,6 +3735,7 @@
 	10c9  PIXMA iP4600 Printer
 	10ca  PIXMA iP3600 Printer
 	10e3  PIXMA iX6850 Printer
 	12fe  Printer in service mode
 	1404  W6400PG
 	1405  W8400PG
 	150f  BIJ2350 PCL
@ -3823,6 +3851,7 @@
 	178a  PIXMA MG3600 Series
 	178d  PIXMA MG6853
 	180b  PIXMA MG3000 series
 	1856  PIXMA TS6250
 	1900  CanoScan LiDE 90
 	1901  CanoScan 8800F
 	1904  CanoScan LiDE 100
@ -3891,6 +3920,7 @@
 	2633  LASERCLASS 500
 	2634  PC-D300/FAX-L400/ICD300
 	2635  MPC190
 	2636  LBP3200
 	2637  iR C6800
 	2638  iR C3100
 	263c  PIXMA MP360
@ -3905,8 +3935,10 @@
 	264f  MF5650 (FAX)
 	2650  iR 6800C EUR
 	2651  iR 3100C EUR
 	2654  LBP3600
 	2655  FP-L170/MF350/L380/L398
 	2656  iR1510-1670 CAPT Printer
 	2657  LBP3210
 	2659  MF8100
 	265b  CAPT Printer
 	265c  iR C3220
@ -3920,7 +3952,7 @@
 	2666  iR C5800
 	2667  iR85PLUS
 	2669  iR105PLUS
-	266a  CAPT Device
+	266a  LBP3000
 	266b  iR8070
 	266c  iR9070
 	266d  iR 5800C EUR
@ -3935,31 +3967,46 @@
 	2676  LBP2900
 	2677  iR C2570
 	2678  iR 2570C EUR
-	2679  CAPT Device
+	2679  LBP5000
 	267a  iR2016
 	267b  iR2020
 	267d  MF7100 series
 	267e  LBP3300
 	2684  MF3200 series
 	2686  MF6500 series
 	2687  iR4530
 	2688  LBP3460
 	2689  FAX-L180/L380S/L398S
 	268a  LC310/L390/L408S
 	268b  LBP3500
 	268c  iR C6870
 	268d  iR 6870C EUR
 	268e  iR C5870
 	268f  iR 5870C EUR
 	2691  iR7105
 	26a1  LBP5300
 	26a3  MF4100 series
 	26a4  LBP5100
 	26b0  MF4600 series
 	26b4  MF4010 series
 	26b5  MF4200 series
 	26b6  FAX-L140/L130
-	26da  LBP3010B printer
+	26b9  LBP3310
 	26ba  LBP5050
 	26da  LBP3010/LBP3018/LBP3050
 	26db  LBP3100/LBP3108/LBP3150
 	26e6  iR1024
 	26ea  LBP9100C
 	26ee  MF4320-4350
 	26f1  LBP7200C
 	26ff  LBP6300
 	271a  LBP6000
 	271b  LBP6200
 	271c  LBP7010C/7018C
 	2736  I-SENSYS MF4550d
 	2737  MF4410
 	2771  LBP6020
 	2796  LBP6230/6240
 	3041  PowerShot S10
 	3042  CanoScan FS4000US Film Scanner
 	3043  PowerShot S20
@ -4362,6 +4409,7 @@
 	0429  D5100
 	042a  D800 (ptp)
 	0430  D7100
 	0436  D810
 	043f  D5600
 	0f03  PD-10 Wireless Printer Adapter
 	4000  Coolscan LS 40 ED
@ -4423,6 +4471,7 @@
 	4611  Storage Adapter FX2 (CY)
 	4616  Flash Disk (TPP)
 	4624  DS-Xtreme Flash Card
 	4717  West Bridge
 	5201  Combi Keyboard-Hub (Hub)
 	5202  Combi Keyboard-Hub (Keyboard)
 	5500  HID->COM RS232 Adapter
@ -11687,10 +11736,16 @@
 09c1  Arris Interactive LLC
 	1337  TOUCHSTONE DEVICE
 09c2  Nisca Corp.
-09c3  ActivCard, Inc.
+09c3  HID Global
 	0007  Reader V2
 	0008  ZFG-9800-AC SmartCard Reader
 	0014  ActivIdentity ActivKey SIM USB Token
 	0028  Crescendo Key
 	0029  Crescendo Key
 	002a  Crescendo Key
 	002b  Crescendo Key
 	002c  Crescendo Key
 	002e  Crescendo Key
 09c4  ACTiSYS Corp.
 	0011  ACT-IR2000U IrDA Dongle
 09c5  Memory Corp.
@ -19316,6 +19371,8 @@
 2548  Pulse-Eight
 	1001  CEC Adapter
 	1002  CEC Adapter
 25b5  FlatFrog
 	0002  Multitouch 3200
 2632  TwinMOS
 	3209  7-in-1 Card Reader
 2639  Xsens
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@ -865,9 +865,10 @@ int bus_init_system(Manager *m) {
 int bus_init_private(Manager *m) {
        _cleanup_close_ int fd = -1;
-        union sockaddr_union sa = {};
+        union sockaddr_union sa;
        socklen_t sa_len;
        sd_event_source *s;
-        int r, salen;
+        int r;
        assert(m);
@ -880,7 +881,7 @@ int bus_init_private(Manager *m) {
                if (getpid_cached() != 1)
                        return 0;
-                salen = sockaddr_un_set_path(&sa.un, "/run/systemd/private");
+                r = sockaddr_un_set_path(&sa.un, "/run/systemd/private");
        } else {
                const char *e, *joined;
@ -890,10 +891,11 @@ int bus_init_private(Manager *m) {
                                               "XDG_RUNTIME_DIR is not set, refusing.");
                joined = strjoina(e, "/systemd/private");
-                salen = sockaddr_un_set_path(&sa.un, joined);
+                r = sockaddr_un_set_path(&sa.un, joined);
        }
-        if (salen < 0)
+        if (r < 0)
-                return log_error_errno(salen, "Can't set path for AF_UNIX socket to bind to: %m");
+                return log_error_errno(r, "Can't set path for AF_UNIX socket to bind to: %m");
        sa_len = r;
        (void) mkdir_parents_label(sa.un.sun_path, 0755);
        (void) sockaddr_un_unlink(&sa.un);
@ -902,7 +904,7 @@ int bus_init_private(Manager *m) {
        if (fd < 0)
                return log_error_errno(errno, "Failed to allocate private socket: %m");
-        r = bind(fd, &sa.sa, salen);
+        r = bind(fd, &sa.sa, sa_len);
        if (r < 0)
                return log_error_errno(errno, "Failed to bind private socket: %m");
--- a/src/core/execute.c
+++ b/src/core/execute.c
@ -271,9 +271,8 @@ static int connect_journal_socket(
                uid_t uid,
                gid_t gid) {
-        union sockaddr_union sa = {
+        union sockaddr_union sa;
-                .un.sun_family = AF_UNIX,
+        socklen_t sa_len;
        };
        uid_t olduid = UID_INVALID;
        gid_t oldgid = GID_INVALID;
        const char *j;
@ -285,6 +284,7 @@ static int connect_journal_socket(
        r = sockaddr_un_set_path(&sa.un, j);
        if (r < 0)
                return r;
        sa_len = r;
        if (gid_is_valid(gid)) {
                oldgid = getgid();
@ -302,7 +302,7 @@ static int connect_journal_socket(
                }
        }
-        r = connect(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0 ? -errno : 0;
+        r = connect(fd, &sa.sa, sa_len) < 0 ? -errno : 0;
        /* If we fail to restore the uid or gid, things will likely
           fail later on. This should only happen if an LSM interferes. */
@ -383,9 +383,10 @@ static int open_terminal_as(const char *path, int flags, int nfd) {
 }
 static int acquire_path(const char *path, int flags, mode_t mode) {
-        union sockaddr_union sa = {};
+        union sockaddr_union sa;
        socklen_t sa_len;
        _cleanup_close_ int fd = -1;
-        int r, salen;
+        int r;
        assert(path);
@ -398,20 +399,19 @@ static int acquire_path(const char *path, int flags, mode_t mode) {
        if (errno != ENXIO) /* ENXIO is returned when we try to open() an AF_UNIX file system socket on Linux */
                return -errno;
        if (strlen(path) >= sizeof(sa.un.sun_path)) /* Too long, can't be a UNIX socket */
                return -ENXIO;
        /* So, it appears the specified path could be an AF_UNIX socket. Let's see if we can connect to it. */
        r = sockaddr_un_set_path(&sa.un, path);
        if (r < 0)
                return r == -EINVAL ? -ENXIO : r;
        sa_len = r;
        fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (fd < 0)
                return -errno;
-        salen = sockaddr_un_set_path(&sa.un, path);
+        if (connect(fd, &sa.sa, sa_len) < 0)
        if (salen < 0)
                return salen;
        if (connect(fd, &sa.sa, salen) < 0)
                return errno == EINVAL ? -ENXIO : -errno; /* Propagate initial error if we get EINVAL, i.e. we have
                                                           * indication that his wasn't an AF_UNIX socket after all */
@ -420,7 +420,7 @@ static int acquire_path(const char *path, int flags, mode_t mode) {
        else if ((flags & O_ACCMODE) == O_WRONLY)
                r = shutdown(fd, SHUT_RD);
        else
-                return TAKE_FD(fd);
+                r = 0;
        if (r < 0)
                return -errno;
--- a/src/core/manager.c
+++ b/src/core/manager.c
@ -924,8 +924,8 @@ static int manager_setup_notify(Manager *m) {
        if (m->notify_fd < 0) {
                _cleanup_close_ int fd = -1;
-                union sockaddr_union sa = {};
+                union sockaddr_union sa;
-                int salen;
+                socklen_t sa_len;
                /* First free all secondary fields */
                m->notify_socket = mfree(m->notify_socket);
@ -941,14 +941,16 @@ static int manager_setup_notify(Manager *m) {
                if (!m->notify_socket)
                        return log_oom();
-                salen = sockaddr_un_set_path(&sa.un, m->notify_socket);
+                r = sockaddr_un_set_path(&sa.un, m->notify_socket);
-                if (salen < 0)
+                if (r < 0)
-                        return log_error_errno(salen, "Notify socket '%s' not valid for AF_UNIX socket address, refusing.", m->notify_socket);
+                        return log_error_errno(r, "Notify socket '%s' not valid for AF_UNIX socket address, refusing.",
                                               m->notify_socket);
                sa_len = r;
                (void) mkdir_parents_label(m->notify_socket, 0755);
                (void) sockaddr_un_unlink(&sa.un);
-                r = bind(fd, &sa.sa, salen);
+                r = bind(fd, &sa.sa, sa_len);
                if (r < 0)
                        return log_error_errno(errno, "bind(%s) failed: %m", m->notify_socket);
--- a/src/home/homed-manager.c
+++ b/src/home/homed-manager.c
@ -1056,7 +1056,10 @@ static int on_notify_socket(sd_event_source *s, int fd, uint32_t revents, void *
 static int manager_listen_notify(Manager *m) {
        _cleanup_close_ int fd = -1;
-        union sockaddr_union sa;
+        union sockaddr_union sa = {
                .un.sun_family = AF_UNIX,
                .un.sun_path = "/run/systemd/home/notify",
        };
        int r;
        assert(m);
@ -1066,10 +1069,6 @@ static int manager_listen_notify(Manager *m) {
        if (fd < 0)
                return log_error_errno(errno, "Failed to create listening socket: %m");
        r = sockaddr_un_set_path(&sa.un, "/run/systemd/home/notify");
        if (r < 0)
                return log_error_errno(r, "Failed to set AF_UNIX socket path: %m");
        (void) mkdir_parents(sa.un.sun_path, 0755);
        (void) sockaddr_un_unlink(&sa.un);
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@ -457,13 +457,13 @@ int server_open_native_socket(Server *s, const char *native_socket) {
        assert(native_socket);
        if (s->native_fd < 0) {
-                union sockaddr_union sa = {
+                union sockaddr_union sa;
-                        .un.sun_family = AF_UNIX,
+                size_t sa_len;
                };
                r = sockaddr_un_set_path(&sa.un, native_socket);
                if (r < 0)
                        return log_error_errno(r, "Unable to use namespace path %s for AF_UNIX socket: %m", native_socket);
                sa_len = r;
                s->native_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
                if (s->native_fd < 0)
@ -471,7 +471,7 @@ int server_open_native_socket(Server *s, const char *native_socket) {
                (void) sockaddr_un_unlink(&sa.un);
-                r = bind(s->native_fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
+                r = bind(s->native_fd, &sa.sa, sa_len);
                if (r < 0)
                        return log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path);
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@ -1840,9 +1840,10 @@ static int dispatch_watchdog(sd_event_source *es, uint64_t usec, void *userdata)
 }
 static int server_connect_notify(Server *s) {
-        union sockaddr_union sa = {};
+        union sockaddr_union sa;
        socklen_t sa_len;
        const char *e;
-        int r, salen;
+        int r;
        assert(s);
        assert(s->notify_fd < 0);
@ -1865,9 +1866,10 @@ static int server_connect_notify(Server *s) {
        if (!e)
                return 0;
-        salen = sockaddr_un_set_path(&sa.un, e);
+        r = sockaddr_un_set_path(&sa.un, e);
-        if (salen < 0)
+        if (r < 0)
-                return log_error_errno(salen, "NOTIFY_SOCKET set to invalid value '%s': %m", e);
+                return log_error_errno(r, "NOTIFY_SOCKET set to invalid value '%s': %m", e);
        sa_len = r;
        s->notify_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
        if (s->notify_fd < 0)
@ -1875,7 +1877,7 @@ static int server_connect_notify(Server *s) {
        (void) fd_inc_sndbuf(s->notify_fd, NOTIFY_SNDBUF_SIZE);
-        r = connect(s->notify_fd, &sa.sa, salen);
+        r = connect(s->notify_fd, &sa.sa, sa_len);
        if (r < 0)
                return log_error_errno(errno, "Failed to connect to notify socket: %m");
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@ -849,13 +849,13 @@ int server_open_stdout_socket(Server *s, const char *stdout_socket) {
        assert(stdout_socket);
        if (s->stdout_fd < 0) {
-                union sockaddr_union sa = {
+                union sockaddr_union sa;
-                        .un.sun_family = AF_UNIX,
+                socklen_t sa_len;
                };
                r = sockaddr_un_set_path(&sa.un, stdout_socket);
                if (r < 0)
                        return log_error_errno(r, "Unable to use namespace path %s for AF_UNIX socket: %m", stdout_socket);
                sa_len = r;
                s->stdout_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
                if (s->stdout_fd < 0)
@ -863,7 +863,7 @@ int server_open_stdout_socket(Server *s, const char *stdout_socket) {
                (void) sockaddr_un_unlink(&sa.un);
-                r = bind(s->stdout_fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
+                r = bind(s->stdout_fd, &sa.sa, sa_len);
                if (r < 0)
                        return log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path);
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@ -32,14 +32,11 @@ static void forward_syslog_iovec(
                const struct ucred *ucred,
                const struct timeval *tv) {
-        union sockaddr_union sa = {
+        union sockaddr_union sa;
-                .un.sun_family = AF_UNIX,
+
        };
        struct msghdr msghdr = {
                .msg_iov = (struct iovec *) iovec,
                .msg_iovlen = n_iovec,
                .msg_name = (struct sockaddr*) &sa.sa,
                .msg_namelen = SOCKADDR_UN_LEN(sa.un),
        };
        struct cmsghdr *cmsg;
        union {
@ -60,6 +57,9 @@ static void forward_syslog_iovec(
                return;
        }
        msghdr.msg_name = &sa.sa;
        msghdr.msg_namelen = r;
        if (ucred) {
                zero(control);
                msghdr.msg_control = &control;
@ -461,13 +461,13 @@ int server_open_syslog_socket(Server *s, const char *syslog_socket) {
        assert(syslog_socket);
        if (s->syslog_fd < 0) {
-                union sockaddr_union sa = {
+                union sockaddr_union sa;
-                        .un.sun_family = AF_UNIX,
+                socklen_t sa_len;
                };
                r = sockaddr_un_set_path(&sa.un, syslog_socket);
                if (r < 0)
                        return log_error_errno(r, "Unable to use namespace path %s for AF_UNIX socket: %m", syslog_socket);
                sa_len = r;
                s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
                if (s->syslog_fd < 0)
@ -475,7 +475,7 @@ int server_open_syslog_socket(Server *s, const char *syslog_socket) {
                (void) sockaddr_un_unlink(&sa.un);
-                r = bind(s->syslog_fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
+                r = bind(s->syslog_fd, &sa.sa, sa_len);
                if (r < 0)
                        return log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path);
--- a/src/libsystemd/sd-bus/test-bus-watch-bind.c
+++ b/src/libsystemd/sd-bus/test-bus-watch-bind.c
@ -41,9 +41,9 @@ static const sd_bus_vtable vtable[] = {
 static void* thread_server(void *p) {
        _cleanup_free_ char *suffixed = NULL, *suffixed2 = NULL, *d = NULL;
        _cleanup_close_ int fd = -1;
-        union sockaddr_union u = {};
+        union sockaddr_union u;
        const char *path = p;
-        int salen;
+        int r;
        log_debug("Initializing server");
@ -66,13 +66,15 @@ static void* thread_server(void *p) {
        assert_se(symlink(basename(suffixed), suffixed2) >= 0);
        (void) usleep(100 * USEC_PER_MSEC);
-        salen = sockaddr_un_set_path(&u.un, path);
+        socklen_t sa_len;
-        assert_se(salen >= 0);
+        r = sockaddr_un_set_path(&u.un, path);
        assert_se(r >= 0);
        sa_len = r;
        fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
        assert_se(fd >= 0);
-        assert_se(bind(fd, &u.sa, salen) >= 0);
+        assert_se(bind(fd, &u.sa, sa_len) >= 0);
        usleep(100 * USEC_PER_MSEC);
        assert_se(listen(fd, SOMAXCONN) >= 0);
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@ -443,7 +443,7 @@ _public_ int sd_pid_notify_with_fds(
                const int *fds,
                unsigned n_fds) {
-        union sockaddr_union sockaddr = {};
+        union sockaddr_union sockaddr;
        struct iovec iovec;
        struct msghdr msghdr = {
                .msg_iov = &iovec,
@ -454,7 +454,7 @@ _public_ int sd_pid_notify_with_fds(
        struct cmsghdr *cmsg = NULL;
        const char *e;
        bool send_ucred;
-        int r, salen;
+        int r;
        if (!state) {
                r = -EINVAL;
@ -470,11 +470,10 @@ _public_ int sd_pid_notify_with_fds(
        if (!e)
                return 0;
-        salen = sockaddr_un_set_path(&sockaddr.un, e);
+        r = sockaddr_un_set_path(&sockaddr.un, e);
-        if (salen < 0) {
+        if (r < 0)
                r = salen;
                goto finish;
-        }
+        msghdr.msg_namelen = r;
        fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
        if (fd < 0) {
@ -485,7 +484,6 @@ _public_ int sd_pid_notify_with_fds(
        (void) fd_inc_sndbuf(fd, SNDBUF_SIZE);
        iovec = IOVEC_MAKE_STRING(state);
        msghdr.msg_namelen = salen;
        send_ucred =
                (pid != 0 && pid != getpid_cached()) ||
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@ -219,11 +219,12 @@ static int socket_from_display(const char *display, char **path) {
 }
 static int get_seat_from_display(const char *display, const char **seat, uint32_t *vtnr) {
-        union sockaddr_union sa = {};
+        union sockaddr_union sa;
        socklen_t sa_len;
        _cleanup_free_ char *p = NULL, *sys_path = NULL, *tty = NULL;
        _cleanup_close_ int fd = -1;
        struct ucred ucred;
-        int v, r, salen;
+        int v, r;
        dev_t display_ctty;
        assert(display);
@ -238,15 +239,16 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_
        r = socket_from_display(display, &p);
        if (r < 0)
                return r;
-        salen = sockaddr_un_set_path(&sa.un, p);
+        r = sockaddr_un_set_path(&sa.un, p);
-        if (salen < 0)
+        if (r < 0)
-                return salen;
+                return r;
        sa_len = r;
        fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
        if (fd < 0)
                return -errno;
-        if (connect(fd, &sa.sa, salen) < 0)
+        if (connect(fd, &sa.sa, sa_len) < 0)
                return -errno;
        r = getpeercred(fd, &ucred);
--- a/src/network/networkd-conf.c
+++ b/src/network/networkd-conf.c
@ -182,30 +182,3 @@ int config_parse_duid_rawdata(
        ret->raw_data_len = count;
        return 0;
 }
 int config_parse_ip_service_type(
                const char *unit,
                const char *filename,
                unsigned line,
                const char *section,
                unsigned section_line,
                const char *lvalue,
                int ltype,
                const char *rvalue,
                void *data,
                void *userdata) {
        assert(filename);
        assert(lvalue);
        assert(rvalue);
        if (streq(rvalue, "CS4"))
                *((int *)data) = IPTOS_CLASS_CS4;
        else if (streq(rvalue, "CS6"))
                *((int *)data) = IPTOS_CLASS_CS6;
        else
                log_syntax(unit, LOG_WARNING, filename, line, 0,
                           "Failed to parse IPServiceType type '%s', ignoring.", rvalue);
        return 0;
 }
--- a/src/network/networkd-conf.h
+++ b/src/network/networkd-conf.h
@ -15,4 +15,3 @@ const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TY
 CONFIG_PARSER_PROTOTYPE(config_parse_duid_type);
 CONFIG_PARSER_PROTOTYPE(config_parse_duid_rawdata);
 CONFIG_PARSER_PROTOTYPE(config_parse_ip_service_type);
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <linux/if.h>
 #include <linux/if_arp.h>
@ -1703,6 +1704,33 @@ int config_parse_dhcp_request_options(
        return 0;
 }
 int config_parse_dhcp_ip_service_type(
                const char *unit,
                const char *filename,
                unsigned line,
                const char *section,
                unsigned section_line,
                const char *lvalue,
                int ltype,
                const char *rvalue,
                void *data,
                void *userdata) {
        assert(filename);
        assert(lvalue);
        assert(rvalue);
        if (streq(rvalue, "CS4"))
                *((int *)data) = IPTOS_CLASS_CS4;
        else if (streq(rvalue, "CS6"))
                *((int *)data) = IPTOS_CLASS_CS6;
        else
                log_syntax(unit, LOG_WARNING, filename, line, 0,
                           "Failed to parse IPServiceType type '%s', ignoring.", rvalue);
        return 0;
 }
 static const char* const dhcp_client_identifier_table[_DHCP_CLIENT_ID_MAX] = {
        [DHCP_CLIENT_ID_MAC] = "mac",
        [DHCP_CLIENT_ID_DUID] = "duid",
--- a/src/network/networkd-dhcp4.h
+++ b/src/network/networkd-dhcp4.h
@ -27,3 +27,4 @@ CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_black_listed_ip_address);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_max_attempts);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_user_class);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_request_options);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_ip_service_type);
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@ -180,7 +180,7 @@ DHCPv4.ListenPort,                           config_parse_uint16,
 DHCPv4.SendRelease,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_release)
 DHCPv4.SendDecline,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_decline)
 DHCPv4.BlackList,                            config_parse_dhcp_black_listed_ip_address,                0,                             0
-DHCPv4.IPServiceType,                        config_parse_ip_service_type,                             0,                             offsetof(Network, ip_service_type)
+DHCPv4.IPServiceType,                        config_parse_dhcp_ip_service_type,                        0,                             offsetof(Network, ip_service_type)
 DHCPv4.SendOption,                           config_parse_dhcp_send_option,                            0,                             offsetof(Network, dhcp_client_send_options)
 DHCPv4.RouteMTUBytes,                        config_parse_mtu,                                         AF_INET,                       offsetof(Network, dhcp_route_mtu)
 DHCPv6.UseDNS,                               config_parse_bool,                                        0,                             offsetof(Network, dhcp6_use_dns)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@ -696,9 +696,10 @@ finish:
 static int create_socket(char **ret) {
        _cleanup_free_ char *path = NULL;
-        union sockaddr_union sa = {};
+        union sockaddr_union sa;
        socklen_t sa_len;
        _cleanup_close_ int fd = -1;
-        int salen, r;
+        int r;
        assert(ret);
@ -709,14 +710,14 @@ static int create_socket(char **ret) {
        if (asprintf(&path, "/run/systemd/ask-password/sck.%" PRIx64, random_u64()) < 0)
                return -ENOMEM;
-        salen = sockaddr_un_set_path(&sa.un, path);
+        r = sockaddr_un_set_path(&sa.un, path);
-        if (salen < 0)
+        if (r < 0)
-                return salen;
+                return r;
        sa_len = r;
-        RUN_WITH_UMASK(0177) {
+        RUN_WITH_UMASK(0177)
-                if (bind(fd, &sa.sa, salen) < 0)
+                if (bind(fd, &sa.sa, sa_len) < 0)
                        return -errno;
        }
        r = setsockopt_int(fd, SOL_SOCKET, SO_PASSCRED, true);
        if (r < 0)
--- a/src/shared/varlink.c
+++ b/src/shared/varlink.c
@ -271,6 +271,7 @@ static int varlink_new(Varlink **ret) {
 int varlink_connect_address(Varlink **ret, const char *address) {
        _cleanup_(varlink_unrefp) Varlink *v = NULL;
        union sockaddr_union sockaddr;
        socklen_t sockaddr_len;
        int r;
        assert_return(ret, -EINVAL);
@ -279,6 +280,7 @@ int varlink_connect_address(Varlink **ret, const char *address) {
        r = sockaddr_un_set_path(&sockaddr.un, address);
        if (r < 0)
                return r;
        sockaddr_len = r;
        r = varlink_new(&v);
        if (r < 0)
@ -290,7 +292,7 @@ int varlink_connect_address(Varlink **ret, const char *address) {
        v->fd = fd_move_above_stdio(v->fd);
-        if (connect(v->fd, &sockaddr.sa, SOCKADDR_UN_LEN(sockaddr.un)) < 0) {
+        if (connect(v->fd, &sockaddr.sa, sockaddr_len) < 0) {
                if (!IN_SET(errno, EAGAIN, EINPROGRESS))
                        return -errno;
@ -2224,6 +2226,7 @@ int varlink_server_listen_fd(VarlinkServer *s, int fd) {
 int varlink_server_listen_address(VarlinkServer *s, const char *address, mode_t m) {
        union sockaddr_union sockaddr;
        socklen_t sockaddr_len;
        _cleanup_close_ int fd = -1;
        int r;
@ -2234,6 +2237,7 @@ int varlink_server_listen_address(VarlinkServer *s, const char *address, mode_t
        r = sockaddr_un_set_path(&sockaddr.un, address);
        if (r < 0)
                return r;
        sockaddr_len = r;
        fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
        if (fd < 0)
@ -2244,7 +2248,7 @@ int varlink_server_listen_address(VarlinkServer *s, const char *address, mode_t
        (void) sockaddr_un_unlink(&sockaddr.un);
        RUN_WITH_UMASK(~m & 0777)
-                if (bind(fd, &sockaddr.sa, SOCKADDR_UN_LEN(sockaddr.un)) < 0)
+                if (bind(fd, &sockaddr.sa, sockaddr_len) < 0)
                        return -errno;
        if (listen(fd, SOMAXCONN) < 0)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@ -373,20 +373,21 @@ static int resolve_remote(Connection *c) {
                .ai_flags = AI_ADDRCONFIG
        };
        union sockaddr_union sa = {};
        const char *node, *service;
        int r;
        if (IN_SET(arg_remote_host[0], '/', '@')) {
-                int salen;
+                union sockaddr_union sa;
                int sa_len;
-                salen = sockaddr_un_set_path(&sa.un, arg_remote_host);
+                r = sockaddr_un_set_path(&sa.un, arg_remote_host);
-                if (salen < 0) {
+                if (r < 0) {
-                        log_error_errno(salen, "Specified address doesn't fit in an AF_UNIX address, refusing: %m");
+                        log_error_errno(r, "Specified address doesn't fit in an AF_UNIX address, refusing: %m");
                        goto fail;
                }
                sa_len = r;
-                return connection_start(c, &sa.sa, salen);
+                return connection_start(c, &sa.sa, sa_len);
        }
        service = strrchr(arg_remote_host, ':');
--- a/src/test/test-sizeof.c
+++ b/src/test/test-sizeof.c
@ -3,6 +3,8 @@
 #include <sched.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #define __STDC_WANT_IEC_60559_TYPES_EXT__
 #include <float.h>
@ -65,6 +67,7 @@ int main(void) {
        info(pid_t);
        info(uid_t);
        info(gid_t);
        info(socklen_t);
        info(__cpu_mask);
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@ -57,17 +57,19 @@ static const char *arg_device = NULL;
 static int send_passwords(const char *socket_name, char **passwords) {
        _cleanup_(erase_and_freep) char *packet = NULL;
        _cleanup_close_ int socket_fd = -1;
-        union sockaddr_union sa = {};
+        union sockaddr_union sa;
        socklen_t sa_len;
        size_t packet_length = 1;
        char **p, *d;
        ssize_t n;
-        int salen;
+        int r;
        assert(socket_name);
-        salen = sockaddr_un_set_path(&sa.un, socket_name);
+        r = sockaddr_un_set_path(&sa.un, socket_name);
-        if (salen < 0)
+        if (r < 0)
-                return salen;
+                return r;
        sa_len = r;
        STRV_FOREACH(p, passwords)
                packet_length += strlen(*p) + 1;
@ -86,7 +88,7 @@ static int send_passwords(const char *socket_name, char **passwords) {
        if (socket_fd < 0)
                return log_debug_errno(errno, "socket(): %m");
-        n = sendto(socket_fd, packet, packet_length, MSG_NOSIGNAL, &sa.sa, salen);
+        n = sendto(socket_fd, packet, packet_length, MSG_NOSIGNAL, &sa.sa, sa_len);
        if (n < 0)
                return log_debug_errno(errno, "sendto(): %m");
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@ -494,6 +494,7 @@ static int display_services(int argc, char *argv[], void *userdata) {
        FOREACH_DIRENT(de, d, return -errno) {
                _cleanup_free_ char *j = NULL, *no = NULL;
                union sockaddr_union sockaddr;
                socklen_t sockaddr_len;
                _cleanup_close_ int fd = -1;
                j = path_join("/run/systemd/userdb/", de->d_name);
@ -503,12 +504,13 @@ static int display_services(int argc, char *argv[], void *userdata) {
                r = sockaddr_un_set_path(&sockaddr.un, j);
                if (r < 0)
                        return log_error_errno(r, "Path %s does not fit in AF_UNIX socket address: %m", j);
                sockaddr_len = r;
                fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
                if (fd < 0)
                        return log_error_errno(r, "Failed to allocate AF_UNIX/SOCK_STREAM socket: %m");
-                if (connect(fd, &sockaddr.un, SOCKADDR_UN_LEN(sockaddr.un)) < 0) {
+                if (connect(fd, &sockaddr.un, sockaddr_len) < 0) {
                        no = strjoin("No (", errno_to_name(errno), ")");
                        if (!no)
                                return log_oom();
--- a/src/userdb/userdbd-manager.c
+++ b/src/userdb/userdbd-manager.c
@ -265,11 +265,10 @@ int manager_startup(Manager *m) {
        if (n == 1)
                m->listen_fd = SD_LISTEN_FDS_START;
        else {
-                union sockaddr_union sockaddr;
+                union sockaddr_union sockaddr = {
-
+                        .un.sun_family = AF_UNIX,
-                r = sockaddr_un_set_path(&sockaddr.un, "/run/systemd/userdb/io.systemd.NameServiceSwitch");
+                        .un.sun_path = "/run/systemd/userdb/io.systemd.NameServiceSwitch",
-                if (r < 0)
+                };
                        return log_error_errno(r, "Cannot assign socket path to socket address: %m");
                r = mkdir_p("/run/systemd/userdb", 0755);
                if (r < 0)
Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	8193040362	hwdb: update for v245-rc2	2020-03-03 11:54:18 +09:00
Susant Sahani	a75b211750	network: Move config_parse_ip_service_type to networkd-dhcp4.c and rename	2020-03-03 11:53:49 +09:00
Zbigniew Jędrzejewski-Szmek	52c222db11	Merge pull request #14992 from keszybz/syslog-address-length-fix Syslog address length fix	2020-03-02 21:31:24 +01:00
Zbigniew Jędrzejewski-Szmek	2b43402c84	ask-password-api: drop unneeded parentheses	2020-03-02 15:56:30 +01:00
Zbigniew Jędrzejewski-Szmek	86fca584c3	core/execute: use return value from sockaddr_un_set_path(), remove duplicate check	2020-03-02 15:56:30 +01:00
Zbigniew Jędrzejewski-Szmek	425d925f24	homed,userdb: don't use sockaddr_un_set_path() on fixed addresses Let's use structured initialization and let the compiler do its job.	2020-03-02 15:56:30 +01:00
Zbigniew Jędrzejewski-Szmek	f36a9d5909	tree-wide: use the return value from sockaddr_un_set_path() It fully initializes the address structure, so no need for pre-initialization, and also returns the length of the address, so no need to recalculate using SOCKADDR_UN_LEN(). socklen_t is unsigned, so let's not use an int for it. (It doesn't matter, but seems cleaner and more portable to not assume anything about the type.)	2020-03-02 15:55:44 +01:00
Zbigniew Jędrzejewski-Szmek	0f18868723	test-sizeof: print size socklen_t It returns 32 bits, unsigned on amd64, so it's probably similar everywhere with glibc. But let's make the code generic, without assuming specific size or signedness.	2020-03-02 15:54:57 +01:00
Zbigniew Jędrzejewski-Szmek	64177e9e4e	journald: fix forwarding to syslog .msg_namelen was set to a bogus value before we actually stored the path in the the structure. sockaddr_un_set_path() returns the length, so just use that. Fixes #14799.	2020-03-02 15:47:41 +01:00