Update data

iab.txt

@@ -320,12 +320,6 @@ EE6000-EE6FFF                 (base 16)                     Narinet, Inc.
                                                             Bievres    91570                             
                                                             FR                                           
 
-40-D8-55                      (hex)                         QUANTAFLOW                                   
-0C9000-0C9FFF                 (base 16)                     QUANTAFLOW                                   
-                                                            AVENUE DUPONT GRAVE                          
-                                                            HONFLEUR    14600                            
-                                                            FR                                           
-
 40-D8-55                      (hex)                         STV Electronic GmbH                          
 0E1000-0E1FFF                 (base 16)                     STV Electronic GmbH                          
                                                             Hellweg 203-205                              
@@ -1934,12 +1928,6 @@ A1F000-A1FFFF                 (base 16)                     Flight Data Systems
                                                             Hilden  NRW  40721                           
                                                             DE                                           
 
-00-50-C2                      (hex)                         TempSys                                      
-9B2000-9B2FFF                 (base 16)                     TempSys                                      
-                                                            160 Arlingtoin Ave                           
-                                                            Kensington  CA  94707                        
-                                                            US                                           
-
 00-50-C2                      (hex)                         Kahler Automation                            
 9B3000-9B3FFF                 (base 16)                     Kahler Automation                            
                                                             808 Timberlake Rd                            
@@ -4349,30 +4337,6 @@ FA5000-FA5FFF                 (base 16)                     Intuitive Surgical,
                                                             Rockville  MD  20850                         
                                                             US                                           
 
-40-D8-55                      (hex)                         Sicon srl                                    
-11A000-11AFFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-00-50-C2                      (hex)                         Sicon srl                                    
-330000-330FFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-00-50-C2                      (hex)                         Sicon srl                                    
-C3A000-C3AFFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-00-50-C2                      (hex)                         Sicon srl                                    
-A92000-A92FFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
 00-50-C2                      (hex)                         Miromico AG                                  
 99A000-99AFFF                 (base 16)                     Miromico AG                                  
                                                             Gallusstrasse 4                              
@@ -4487,12 +4451,6 @@ F2D000-F2DFFF                 (base 16)                     Robert Bosch Healthc
                                                             Palo Alto  CA  94303                         
                                                             US                                           
 
-00-50-C2                      (hex)                         Vtron Pty Ltd                                
-F3E000-F3EFFF                 (base 16)                     Vtron Pty Ltd                                
-                                                            6/59 Township Drive                          
-                                                            West Burleigh  QLD  4219                     
-                                                            AU                                           
-
 00-50-C2                      (hex)                         DAVE SRL                                     
 1EA000-1EAFFF                 (base 16)                     DAVE SRL                                     
                                                             via Talponedo 29/A                           
@@ -4583,9 +4541,6 @@ AC4000-AC4FFF                 (base 16)                     Orion Technologies,L
                                                             Orlando  FL  32826                           
                                                             US                                           
 
-00-50-C2                      (hex)                         Private                                      
-0BF000-0BFFFF                 (base 16)                     Private                                      
-
 00-50-C2                      (hex)                         MedAvant Healthcare                          
 4F0000-4F0FFF                 (base 16)                     MedAvant Healthcare                          
                                                             2533 Centennial Blvd                         
@@ -4628,6 +4583,51 @@ FC6000-FC6FFF                 (base 16)                     Critical Link LLC
                                                             Taipei Hsien                                 
                                                             TW                                           
 
+00-50-C2                      (hex)                         Sicon srl                                    
+A92000-A92FFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+C3A000-C3AFFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+330000-330FFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+40-D8-55                      (hex)                         Sicon srl                                    
+11A000-11AFFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+00-50-C2                      (hex)                         Vtron Pty Ltd                                
+F3E000-F3EFFF                 (base 16)                     Vtron Pty Ltd                                
+                                                            Unit 2, 62 Township Drive West               
+                                                            West Burleigh  Queensland  4219              
+                                                            AU                                           
+
+40-D8-55                      (hex)                         QUANTAFLOW                                   
+0C9000-0C9FFF                 (base 16)                     QUANTAFLOW                                   
+                                                            AVENUE DUPONT GRAVE                          
+                                                            HONFLEUR    14600                            
+                                                            FR                                           
+
+00-50-C2                      (hex)                         Mesa Labs, Inc.                              
+9B2000-9B2FFF                 (base 16)                     Mesa Labs, Inc.                              
+                                                            12100 West 6th Ave                           
+                                                            Lakewood  CO  80228                          
+                                                            US                                           
+
+00-50-C2                      (hex)                         Private                                      
+0BF000-0BFFFF                 (base 16)                     Private                                      
+
 00-50-C2                      (hex)                         EMAC, Inc.                                   
 0E0000-0E0FFF                 (base 16)                     EMAC, Inc.                                   
                                                             2390 EMAC Way                                
@@ -5198,12 +5198,6 @@ FE5000-FE5FFF                 (base 16)                     Scandinova Systems A
                                                               Hong Kong  000008                          
                                                             HK                                           
 
-00-50-C2                      (hex)                         Enyx SA                                      
-FD1000-FD1FFF                 (base 16)                     Enyx SA                                      
-                                                            21, rue le Peletier                          
-                                                            Paris  Ile de France  75009                  
-                                                            FR                                           
-
 00-50-C2                      (hex)                         KOYO ELECTRIC                                
 FCE000-FCEFFF                 (base 16)                     KOYO ELECTRIC                                
                                                             2-11-7 Hacchobori                            
@@ -5699,12 +5693,6 @@ DB0000-DB0FFF                 (base 16)                     IMAGO Technologies G
                                                             Friedberg  Hessen  D-61169                   
                                                             DE                                           
 
-00-50-C2                      (hex)                         Selex Systems Integration Inc                
-DD8000-DD8FFF                 (base 16)                     Selex Systems Integration Inc                
-                                                            11300 W 89th St                              
-                                                            Overland Park  Kansas  66214                 
-                                                            US                                           
-
 00-50-C2                      (hex)                         Friend Spring Industrial Co., Ltd.           
 DD5000-DD5FFF                 (base 16)                     Friend Spring Industrial Co., Ltd.           
                                                             4F., No. 8, Lane 50, Sec. 3                  
@@ -6368,12 +6356,6 @@ C34000-C34FFF                 (base 16)                     Kyuhen
                                                             fukutsu  fukuoka  811-3216                   
                                                             JP                                           
 
-00-50-C2                      (hex)                         Insitu, Inc.                                 
-C35000-C35FFF                 (base 16)                     Insitu, Inc.                                 
-                                                            118 E Columbia River Way                     
-                                                            Bingen  WA  98605                            
-                                                            US                                           
-
 00-50-C2                      (hex)                         DISMUNTEL SAL                                
 C2E000-C2EFFF                 (base 16)                     DISMUNTEL SAL                                
                                                             Pol ind cotes                                
@@ -6446,12 +6428,6 @@ A83000-A83FFF                 (base 16)                     Techno Sobi Co. Ltd.
                                                             Takarazuka-shi  Hyogo-ken  6650833           
                                                             JP                                           
 
-00-50-C2                      (hex)                         ARD SA                                       
-A80000-A80FFF                 (base 16)                     ARD SA                                       
-                                                            Micropolis BP 169                            
-                                                            GAP    05005                                 
-                                                            FR                                           
-
 00-50-C2                      (hex)                         Saintronic                                   
 A79000-A79FFF                 (base 16)                     Saintronic                                   
                                                             Parc Atlantique                              
@@ -6962,12 +6938,6 @@ A20000-A20FFF                 (base 16)                     Quorum Technologies
                                                             Auckland  ---  1141                          
                                                             NZ                                           
 
-00-50-C2                      (hex)                         Ex-i Flow Measurement Ltd.                   
-945000-945FFF                 (base 16)                     Ex-i Flow Measurement Ltd.                   
-                                                            Hawthorn Road                                
-                                                            Littlehampton  West Sussex  BN17 7LT         
-                                                            GB                                           
-
 00-50-C2                      (hex)                         Keith & Koep GmbH                            
 942000-942FFF                 (base 16)                     Keith & Koep GmbH                            
                                                             Uellendahler Str. 199                        
@@ -8294,12 +8264,6 @@ A20000-A20FFF                 (base 16)                     Quorum Technologies
                                                             Helsinki    00510                            
                                                             FI                                           
 
-00-50-C2                      (hex)                         Hytec Geraetebau GmbH                        
-3F3000-3F3FFF                 (base 16)                     Hytec Geraetebau GmbH                        
-                                                            Cochemer Straße 12 - 14                      
-                                                            Mannheim    68309                            
-                                                            DE                                           
-
 00-50-C2                      (hex)                         dAFTdATA Limited                             
 3F6000-3F6FFF                 (base 16)                     dAFTdATA Limited                             
                                                             dAFT HQ                                      
@@ -9494,18 +9458,6 @@ FBA000-FBAFFF                 (base 16)                     Elbit Systems of Ame
                                                             Jerusalem    95463                           
                                                             IL                                           
 
-00-50-C2                      (hex)                         Sicon srl                                    
-E0A000-E0AFFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-00-50-C2                      (hex)                         Sicon srl                                    
-60D000-60DFFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
 40-D8-55                      (hex)                          GD Mission Systems                          
 16D000-16DFFF                 (base 16)                      GD Mission Systems                          
                                                             8220 E. Roosevelt St.                        
@@ -9656,6 +9608,60 @@ C63000-C63FFF                 (base 16)                     Potter Electric Sign
                                                             Maple Grove  MN  55369                       
                                                             US                                           
 
+00-50-C2                      (hex)                         Telecor Inc.                                 
+A3A000-A3AFFF                 (base 16)                     Telecor Inc.                                 
+                                                            6205 Kestrel Road                            
+                                                            Mississauga  Ontario  L5T 2A1                
+                                                            CA                                           
+
+00-50-C2                      (hex)                         Ace Axis Limited                             
+6E7000-6E7FFF                 (base 16)                     Ace Axis Limited                             
+                                                            602 Delta Business Park, Welton Road         
+                                                            Swindon    SN5 7XP                           
+                                                            GB                                           
+
+00-50-C2                      (hex)                         Thales UK Limited                            
+A48000-A48FFF                 (base 16)                     Thales UK Limited                            
+                                                            1 Linthouse Road                             
+                                                            Glasgow    G51 4BZ                           
+                                                            GB                                           
+
+40-D8-55                      (hex)                         Mettler Toledo Hi Speed                      
+0C8000-0C8FFF                 (base 16)                     Mettler Toledo Hi Speed                      
+                                                            5 Barr Rd                                    
+                                                            Ithaca  NY  14850                            
+                                                            US                                           
+
+00-50-C2                      (hex)                         Leonardo MW Ltd (Land & Naval Defence Electronic)
+DD8000-DD8FFF                 (base 16)                     Leonardo MW Ltd (Land & Naval Defence Electronic)
+                                                            11300 W 89th St                              
+                                                            Overland Park  Kansas  66214                 
+                                                            US                                           
+
+00-50-C2                      (hex)                         Insitu, Inc                                  
+C35000-C35FFF                 (base 16)                     Insitu, Inc                                  
+                                                            118 E Columbia River Way                     
+                                                            Bingen  WA  98605                            
+                                                            US                                           
+
+00-50-C2                      (hex)                         ABB AG - Power Grids - Grid Automation       
+3F3000-3F3FFF                 (base 16)                     ABB AG - Power Grids - Grid Automation       
+                                                            Kallstadter Strasse 1                        
+                                                            Mannheim    68309                            
+                                                            DE                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+60D000-60DFFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+E0A000-E0AFFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
 00-50-C2                      (hex)                         Computerwise, Inc.                           
 9A3000-9A3FFF                 (base 16)                     Computerwise, Inc.                           
                                                             302 N. Winchester                            
@@ -9722,29 +9728,23 @@ A47000-A47FFF                 (base 16)                     PRIMETECH ENGINEERIN
                                                             Minneapolis  MN  55401                       
                                                             US                                           
 
-00-50-C2                      (hex)                         Telecor Inc.                                 
-A3A000-A3AFFF                 (base 16)                     Telecor Inc.                                 
-                                                            6205 Kestrel Road                            
-                                                            Mississauga  Ontario  L5T 2A1                
-                                                            CA                                           
-
-00-50-C2                      (hex)                         Ace Axis Limited                             
-6E7000-6E7FFF                 (base 16)                     Ace Axis Limited                             
-                                                            602 Delta Business Park, Welton Road         
-                                                            Swindon    SN5 7XP                           
+00-50-C2                      (hex)                         Exi Flow Measurement Ltd                     
+945000-945FFF                 (base 16)                     Exi Flow Measurement Ltd                     
+                                                            Hawthorn Road                                
+                                                            Littlehampton  West Sussex  BN17 7LT         
                                                             GB                                           
 
-00-50-C2                      (hex)                         Thales UK Limited                            
-A48000-A48FFF                 (base 16)                     Thales UK Limited                            
-                                                            1 Linthouse Road                             
-                                                            Glasgow    G51 4BZ                           
-                                                            GB                                           
+00-50-C2                      (hex)                         ard sa                                       
+A80000-A80FFF                 (base 16)                     ard sa                                       
+                                                            Micropolis Bat Clematis                      
+                                                            Gap  France  05000                           
+                                                            FR                                           
 
-40-D8-55                      (hex)                         Mettler Toledo Hi Speed                      
-0C8000-0C8FFF                 (base 16)                     Mettler Toledo Hi Speed                      
-                                                            5 Barr Rd                                    
-                                                            Ithaca  NY  14850                            
-                                                            US                                           
+00-50-C2                      (hex)                         Enyx SA                                      
+FD1000-FD1FFF                 (base 16)                     Enyx SA                                      
+                                                            8 rue greneta                                
+                                                            Paris    75003                               
+                                                            FR                                           
 
 40-D8-55                      (hex)                         Patria Aviation Oy                           
 19F000-19FFFF                 (base 16)                     Patria Aviation Oy                           
@@ -10919,12 +10919,6 @@ DDD000-DDDFFF                 (base 16)                     A&A GENERAL SRL
                                                             Bucuresti    010066                          
                                                             RO                                           
 
-00-50-C2                      (hex)                         metraTec GmbH                                
-DA2000-DA2FFF                 (base 16)                     metraTec GmbH                                
-                                                            Werner-Heisenberg-Str. 1                     
-                                                            Magdeburg  Sachsen-Anh.  39106               
-                                                            DE                                           
-
 00-50-C2                      (hex)                         MangoDSP                                     
 DA1000-DA1FFF                 (base 16)                     MangoDSP                                     
                                                             8 Hartom St. Beck Science Center             
@@ -15254,12 +15248,6 @@ B76000-B76FFF                 (base 16)                     ITF Fröschl GmbH
                                                             Delta  British Columbia  V3M 6V5             
                                                             CA                                           
 
-00-50-C2                      (hex)                         Sicon srl                                    
-7E9000-7E9FFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
 00-50-C2                      (hex)                          GD Mission Systems                          
 21B000-21BFFF                 (base 16)                      GD Mission Systems                          
                                                             8220 E. Roosevelt Street                     
@@ -15608,6 +15596,18 @@ E67000-E67FFF                 (base 16)                     Critical Link LLC
                                                             Syracuse  New York  13212                    
                                                             US                                           
 
+00-50-C2                      (hex)                         Sicon srl                                    
+7E9000-7E9FFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+00-50-C2                      (hex)                         metraTec GmbH                                
+DA2000-DA2FFF                 (base 16)                     metraTec GmbH                                
+                                                            Niels-Bohr-Str. 5                            
+                                                            Magdeburg  Sachsen-Anh.  39106               
+                                                            DE                                           
+
 00-50-C2                      (hex)                         Aeroflex GmbH                                
 B51000-B51FFF                 (base 16)                     Aeroflex GmbH                                
                                                             Gutenbergstrasse 2-4                         
@@ -16025,12 +16025,6 @@ B51000-B51FFF                 (base 16)                     Aeroflex GmbH
                                                             Bangalore  Karnataka  560062                 
                                                             IN                                           
 
-40-D8-55                      (hex)                         ard sa                                       
-082000-082FFF                 (base 16)                     ard sa                                       
-                                                            Micropolis Bat Clematis                      
-                                                            Gap  France  05000                           
-                                                            FR                                           
-
 40-D8-55                      (hex)                         Sphere Medical Ltd                           
 074000-074FFF                 (base 16)                     Sphere Medical Ltd                           
                                                             Harston Mill                                 
@@ -16349,12 +16343,6 @@ F8B000-F8BFFF                 (base 16)                     comlet Verteilte Sys
                                                             Zweibruecken  Rheinland-Pfalz  66482         
                                                             DE                                           
 
-00-50-C2                      (hex)                         Insitu, Inc.                                 
-FD4000-FD4FFF                 (base 16)                     Insitu, Inc.                                 
-                                                            118 East Columbia River Way                  
-                                                            Bingen  WA  98605                            
-                                                            US                                           
-
 00-50-C2                      (hex)                         Propagation Systems Limited                  
 FCB000-FCBFFF                 (base 16)                     Propagation Systems Limited                  
                                                             Unit219A, 2/F, Enterprise Place, No.5 Science Park Science Park,
@@ -16463,12 +16451,6 @@ F44000-F44FFF                 (base 16)                     Steinbichler Optotec
                                                             Neubeuern  Bavaria  83115                    
                                                             DE                                           
 
-00-50-C2                      (hex)                         Triax A/S                                    
-F63000-F63FFF                 (base 16)                     Triax A/S                                    
-                                                            Bjørnkærvej 3                                
-                                                            Hornsyld    8783                             
-                                                            US                                           
-
 00-50-C2                      (hex)                         EMAC, Inc.                                   
 F62000-F62FFF                 (base 16)                     EMAC, Inc.                                   
                                                             2390 EMAC Way                                
@@ -17882,12 +17864,6 @@ B26000-B26FFF                 (base 16)                     Elko Systems
                                                             Pretoria  Gauteng  0081                      
                                                             ZA                                           
 
-00-50-C2                      (hex)                         Triax A/S                                    
-B25000-B25FFF                 (base 16)                     Triax A/S                                    
-                                                            Bjørnkærvej 3                                
-                                                            Hornsyld    DK-8783                          
-                                                            DK                                           
-
 00-50-C2                      (hex)                         Spider Tecnologia Ind. e Com. Ltda.          
 B03000-B03FFF                 (base 16)                     Spider Tecnologia Ind. e Com. Ltda.          
                                                             Rua Alencar Araripe, 1440                    
@@ -18248,12 +18224,6 @@ A41000-A41FFF                 (base 16)                     Meiryo Denshi Corp.
                                                             Utting am Ammersee  Bayern  86919            
                                                             DE                                           
 
-00-50-C2                      (hex)                         Selex Ex Ltd                                 
-913000-913FFF                 (base 16)                     Selex Ex Ltd                                 
-                                                            A Finmeccanica Company                       
-                                                            Basildon  Essex  SS14 3EL                    
-                                                            GB                                           
-
 00-50-C2                      (hex)                         AS Solar GmbH                                
 95B000-95BFFF                 (base 16)                     AS Solar GmbH                                
                                                             Am Toenniesberg 4A                           
@@ -21380,12 +21350,6 @@ A41000-A41FFF                 (base 16)                     Meiryo Denshi Corp.
                                                             71634 Ludwigsburg                            
                                                             DE                                           
 
-00-50-C2                      (hex)                         ARD SA                                       
-083000-083FFF                 (base 16)                     ARD SA                                       
-                                                            Micropolis BP 169                            
-                                                            C5 005 GAP cedex                             
-                                                            FR                                           
-
 00-50-C2                      (hex)                         Innocor LTD                                  
 02D000-02DFFF                 (base 16)                     Innocor LTD                                  
                                                             210 - 362 Terry Fox Drive                    
@@ -21533,36 +21497,6 @@ F80000-F80FFF                 (base 16)                     SYS TEC electronic G
                                                             Heinsdorfergrund     D-08468                 
                                                             DE                                           
 
-40-D8-55                      (hex)                         Sicon srl                                    
-171000-171FFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-00-50-C2                      (hex)                         Sicon srl                                    
-D8B000-D8BFFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-00-50-C2                      (hex)                         Sicon srl                                    
-956000-956FFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-00-50-C2                      (hex)                         Sicon srl                                    
-52B000-52BFFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-40-D8-55                      (hex)                         Sicon srl                                    
-081000-081FFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
 00-50-C2                      (hex)                         Linn Products Ltd                            
 217000-217FFF                 (base 16)                     Linn Products Ltd                            
                                                             Glasgow Road                                 
@@ -21821,6 +21755,54 @@ B30000-B30FFF                 (base 16)                     Applied Micro Electr
                                                             Syracuse  NY  13211                          
                                                             US                                           
 
+00-50-C2                      (hex)                         Insitu, Inc                                  
+FD4000-FD4FFF                 (base 16)                     Insitu, Inc                                  
+                                                            118 E Columbia River Way                     
+                                                            Bingen  WA  98605                            
+                                                            US                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+52B000-52BFFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+956000-956FFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+D8B000-D8BFFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+40-D8-55                      (hex)                         Sicon srl                                    
+171000-171FFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+40-D8-55                      (hex)                         Sicon srl                                    
+081000-081FFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+40-D8-55                      (hex)                         ard sa                                       
+082000-082FFF                 (base 16)                     ard sa                                       
+                                                            Micropolis Bat Clematis                      
+                                                            Gap  France  05000                           
+                                                            FR                                           
+
+00-50-C2                      (hex)                         ard sa                                       
+083000-083FFF                 (base 16)                     ard sa                                       
+                                                            Micropolis Bat Clematis                      
+                                                            Gap  France  05000                           
+                                                            FR                                           
+
 00-50-C2                      (hex)                         Thales Communications Inc                    
 8AD000-8ADFFF                 (base 16)                     Thales Communications Inc                    
                                                             22605 Gateway Center Drive                   
@@ -21833,6 +21815,24 @@ B30000-B30FFF                 (base 16)                     Applied Micro Electr
                                                             F-13752  LES PENNES MIRABEAU  CS30084        
                                                             FR                                           
 
+00-50-C2                      (hex)                         Leonardo MW Ltd (Land & Naval Defence Electronic)
+913000-913FFF                 (base 16)                     Leonardo MW Ltd (Land & Naval Defence Electronic)
+                                                            A Finmeccanica Company                       
+                                                            Basildon  Essex  SS14 3EL                    
+                                                            GB                                           
+
+00-50-C2                      (hex)                         Triax A/S                                    
+F63000-F63FFF                 (base 16)                     Triax A/S                                    
+                                                            Bjornkaervej 3                               
+                                                            Hornsyld  Denmark  8783                      
+                                                            DK                                           
+
+00-50-C2                      (hex)                         Triax A/S                                    
+B25000-B25FFF                 (base 16)                     Triax A/S                                    
+                                                            Bjornkaervej 3                               
+                                                            Hornsyld  Denmark  8783                      
+                                                            DK                                           
+
 00-50-C2                      (hex)                         Baxter International Inc                     
 2E0000-2E0FFF                 (base 16)                     Baxter International Inc                     
                                                             One Baxter Parkway                           
@@ -22487,12 +22487,6 @@ F4C000-F4CFFF                 (base 16)                     Enistic Limited
                                                             Oxford  Oxfordshire  OX4 2RD                 
                                                             GB                                           
 
-00-50-C2                      (hex)                         Midas Technology DBA Phoenix Audio Technologies
-F48000-F48FFF                 (base 16)                     Midas Technology DBA Phoenix Audio Technologies
-                                                            2934 N. Naomi Street                         
-                                                            Burbank  CA  91504                           
-                                                            US                                           
-
 00-50-C2                      (hex)                         Sanmina                                      
 EFD000-EFDFFF                 (base 16)                     Sanmina                                      
                                                             PO 106                                       
@@ -23225,12 +23219,6 @@ D8F000-D8FFFF                 (base 16)                     Syes srl
                                                             Lissone  MB  20035                           
                                                             IT                                           
 
-00-50-C2                      (hex)                         T+A elektroakustik GmbH & Co KG              
-D88000-D88FFF                 (base 16)                     T+A elektroakustik GmbH & Co KG              
-                                                            Planckstraße 9-11                            
-                                                            Herford  NRW  32052                          
-                                                            DE                                           
-
 00-50-C2                      (hex)                         AeroMechanical Services Ltd, FLYHT           
 CED000-CEDFFF                 (base 16)                     AeroMechanical Services Ltd, FLYHT           
                                                             Suite 200W                                   
@@ -25946,12 +25934,6 @@ A18000-A18FFF                 (base 16)                     Eoslink
                                                             Plainview  NY  11803                         
                                                             US                                           
 
-00-50-C2                      (hex)                         ABB Power Technologies S.p.A. Unità  Operativa SACE (PTMV)
-3DE000-3DEFFF                 (base 16)                     ABB Power Technologies S.p.A. Unità  Operativa SACE (PTMV)
-                                                            via Friuli 4                                 
-                                                            Dalmine  Bergamo  24044                      
-                                                            IT                                           
-
 00-50-C2                      (hex)                         Braintronics BV                              
 3D1000-3D1FFF                 (base 16)                     Braintronics BV                              
                                                             Gildemark 130                                
@@ -27110,18 +27092,6 @@ A0E000-A0EFFF                 (base 16)                     ENGICAM s.r.l.
                                                             Biel    CH-2502                              
                                                             CH                                           
 
-00-50-C2                      (hex)                         Sicon srl                                    
-F97000-F97FFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
-00-50-C2                      (hex)                         Sicon srl                                    
-CE2000-CE2FFF                 (base 16)                     Sicon srl                                    
-                                                            Via Sila 1/3                                 
-                                                            Isola Vicentina  Vicenza  36033              
-                                                            IT                                           
-
 00-50-C2                      (hex)                         9Solutions Oy                                
 C78000-C78FFF                 (base 16)                     9Solutions Oy                                
                                                             Teknologiantie 2                             
@@ -27296,6 +27266,42 @@ D43000-D43FFF                 (base 16)                     DSP4YOU LTd
                                                             Zamudio  Vizcaya  E-48170                    
                                                             ES                                           
 
+00-50-C2                      (hex)                         Mettler Toledo Hi Speed                      
+AB5000-AB5FFF                 (base 16)                     Mettler Toledo Hi Speed                      
+                                                            5 Barr Rd                                    
+                                                            Ithaca  NY  14850                            
+                                                            US                                           
+
+00-50-C2                      (hex)                         Secure Systems & Services                    
+5DB000-5DBFFF                 (base 16)                     Secure Systems & Services                    
+                                                            24, Chemin de la Pouranque                   
+                                                            F-13752  LES PENNES MIRABEAU  CS30084        
+                                                            FR                                           
+
+00-50-C2                      (hex)                         Midas Technology DBA Phoenix Audio Technologies
+F48000-F48FFF                 (base 16)                     Midas Technology DBA Phoenix Audio Technologies
+                                                            2934 N. Naomi Street                         
+                                                            Burbank  CA  91504                           
+                                                            US                                           
+
+00-50-C2                      (hex)                         ABB Power Technologies S.p.A.  Unità  Operativa SACE (PTMV)
+3DE000-3DEFFF                 (base 16)                     ABB Power Technologies S.p.A.  Unità  Operativa SACE (PTMV)
+                                                            via Friuli 4                                 
+                                                            Dalmine  Bergamo  24044                      
+                                                            IT                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+CE2000-CE2FFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
+00-50-C2                      (hex)                         Sicon srl                                    
+F97000-F97FFF                 (base 16)                     Sicon srl                                    
+                                                            Via Sila 1/3                                 
+                                                            Isola Vicentina  Vicenza  36033              
+                                                            IT                                           
+
 40-D8-55                      (hex)                         Nanjing TIANSU Automation Control System Co., Ltd.
 0B1000-0B1FFF                 (base 16)                     Nanjing TIANSU Automation Control System Co., Ltd.
                                                             Building 5, New Town Science & Technology Park
@@ -27368,14 +27374,8 @@ EF9000-EF9FFF                 (base 16)                     HORIBA ABX SAS
                                                             Biberach  D-BW  88483                        
                                                             DE                                           
 
-00-50-C2                      (hex)                         Mettler Toledo Hi Speed                      
-AB5000-AB5FFF                 (base 16)                     Mettler Toledo Hi Speed                      
-                                                            5 Barr Rd                                    
-                                                            Ithaca  NY  14850                            
-                                                            US                                           
-
-00-50-C2                      (hex)                         Secure Systems & Services                    
-5DB000-5DBFFF                 (base 16)                     Secure Systems & Services                    
-                                                            24, Chemin de la Pouranque                   
-                                                            F-13752  LES PENNES MIRABEAU  CS30084        
-                                                            FR                                           
+00-50-C2                      (hex)                         T+A elektroakustik GmbH & Co.KG              
+D88000-D88FFF                 (base 16)                     T+A elektroakustik GmbH & Co.KG              
+                                                            Planckstraße 9-11                            
+                                                            Herford  NRW  32052                          
+                                                            DE                                           

ids_parser.py

@@ -344,17 +344,17 @@ if __name__ == '__main__':
     args = sys.argv[1:]
 
     if not args or 'usb' in args:
-        p = usb_ids_grammar().parseFile(open('usb.ids'))
+        p = usb_ids_grammar().parseFile(open('usb.ids', errors='replace'))
         usb_vendor_model(p)
         usb_classes(p)
 
     if not args or 'pci' in args:
-        p = pci_ids_grammar().parseFile(open('pci.ids'))
+        p = pci_ids_grammar().parseFile(open('pci.ids', errors='replace'))
         pci_vendor_model(p)
         pci_classes(p)
 
     if not args or 'sdio' in args:
-        p = pci_ids_grammar().parseFile(open('sdio.ids'))
+        p = pci_ids_grammar().parseFile(open('sdio.ids', errors='replace'))
         sdio_vendor_model(p)
         sdio_classes(p)
 

udev/20-acpi-vendor.hwdb

@@ -120,6 +120,9 @@ acpi:IHSE*:
 acpi:IMPJ*:
  ID_VENDOR_FROM_DATABASE=Impinj
 
+acpi:INSY*:
+ ID_VENDOR_FROM_DATABASE=Insyde Software
+
 acpi:INTC*:
  ID_VENDOR_FROM_DATABASE=Intel Corporation
 
@@ -171,6 +174,9 @@ acpi:NVDA*:
 acpi:NVTN*:
  ID_VENDOR_FROM_DATABASE=Nuvoton Technology Corporation
 
+acpi:NXGO*:
+ ID_VENDOR_FROM_DATABASE=Nexstgo Company Limited
+
 acpi:OBDA*:
  ID_VENDOR_FROM_DATABASE=REALTEK Semiconductor Corp.
 
@@ -882,6 +888,9 @@ acpi:AVO*:
 acpi:AVR*:
  ID_VENDOR_FROM_DATABASE=AVer Information Inc.
 
+acpi:AVS*:
+ ID_VENDOR_FROM_DATABASE=Avatron Software Inc.
+
 acpi:AVT*:
  ID_VENDOR_FROM_DATABASE=Avtek (Electronics) Pty Ltd
 
@@ -963,6 +972,9 @@ acpi:BBH*:
 acpi:BBL*:
  ID_VENDOR_FROM_DATABASE=Brain Boxes Limited
 
+acpi:BBV*:
+ ID_VENDOR_FROM_DATABASE=BlueBox Video Limited
+
 acpi:BBX*:
  ID_VENDOR_FROM_DATABASE=Black Box Corporation
 
@@ -1341,6 +1353,9 @@ acpi:CHO*:
 acpi:CHP*:
  ID_VENDOR_FROM_DATABASE=CH Products
 
+acpi:CHR*:
+ ID_VENDOR_FROM_DATABASE=christmann informationstechnik + medien GmbH & Co. KG
+
 acpi:CHS*:
  ID_VENDOR_FROM_DATABASE=Agentur Chairos
 
@@ -2736,6 +2751,9 @@ acpi:GFN*:
 acpi:GGL*:
  ID_VENDOR_FROM_DATABASE=Google Inc.
 
+acpi:GGT*:
+ ID_VENDOR_FROM_DATABASE=G2TOUCH KOREA
+
 acpi:GIC*:
  ID_VENDOR_FROM_DATABASE=General Inst. Corporation
 
@@ -4371,6 +4389,9 @@ acpi:MNL*:
 acpi:MNP*:
  ID_VENDOR_FROM_DATABASE=Microcom
 
+acpi:MOC*:
+ ID_VENDOR_FROM_DATABASE=Matrix Orbital Corporation
+
 acpi:MOD*:
  ID_VENDOR_FROM_DATABASE=Modular Technology
 
@@ -4548,6 +4569,9 @@ acpi:MVM*:
 acpi:MVN*:
  ID_VENDOR_FROM_DATABASE=Meta Company
 
+acpi:MVR*:
+ ID_VENDOR_FROM_DATABASE=MediCapture, Inc.
+
 acpi:MVS*:
  ID_VENDOR_FROM_DATABASE=Microvision
 
@@ -4758,6 +4782,9 @@ acpi:NPA*:
 acpi:NPI*:
  ID_VENDOR_FROM_DATABASE=Network Peripherals Inc
 
+acpi:NRI*:
+ ID_VENDOR_FROM_DATABASE=Noritake Itron Corporation
+
 acpi:NRL*:
  ID_VENDOR_FROM_DATABASE=U.S. Naval Research Lab
 
@@ -4791,6 +4818,9 @@ acpi:NTC*:
 acpi:NTI*:
  ID_VENDOR_FROM_DATABASE=New Tech Int'l Company
 
+acpi:NTK*:
+ ID_VENDOR_FROM_DATABASE=NewTek
+
 acpi:NTL*:
  ID_VENDOR_FROM_DATABASE=National Transcomm. Ltd
 
@@ -5259,6 +5289,9 @@ acpi:PNR*:
 acpi:PNS*:
  ID_VENDOR_FROM_DATABASE=PanaScope
 
+acpi:PNT*:
+ ID_VENDOR_FROM_DATABASE=HOYA Corporation PENTAX Lifecare Division
+
 acpi:PNX*:
  ID_VENDOR_FROM_DATABASE=Phoenix Technologies, Ltd.
 
@@ -5271,6 +5304,9 @@ acpi:PON*:
 acpi:POR*:
  ID_VENDOR_FROM_DATABASE=Portalis LC
 
+acpi:POS*:
+ ID_VENDOR_FROM_DATABASE=Positivo Tecnologia S.A.
+
 acpi:POT*:
  ID_VENDOR_FROM_DATABASE=Parrot
 
@@ -5308,7 +5344,7 @@ acpi:PRD*:
  ID_VENDOR_FROM_DATABASE=Praim S.R.L.
 
 acpi:PRF*:
- ID_VENDOR_FROM_DATABASE=Digital Electronics Corporation
+ ID_VENDOR_FROM_DATABASE=Schneider Electric Japan Holdings, Ltd.
 
 acpi:PRG*:
  ID_VENDOR_FROM_DATABASE=The Phoenix Research Group Inc
@@ -6513,12 +6549,18 @@ acpi:TEK*:
 acpi:TEL*:
  ID_VENDOR_FROM_DATABASE=Promotion and Display Technology Ltd.
 
+acpi:TEN*:
+ ID_VENDOR_FROM_DATABASE=Tencent
+
 acpi:TER*:
  ID_VENDOR_FROM_DATABASE=TerraTec Electronic GmbH
 
 acpi:TET*:
  ID_VENDOR_FROM_DATABASE=TETRADYNE CO., LTD.
 
+acpi:TEV*:
+ ID_VENDOR_FROM_DATABASE=Televés, S.A.
+
 acpi:TEX*:
  ID_VENDOR_FROM_DATABASE=Texas Instruments
 
@@ -7146,9 +7188,15 @@ acpi:VQ@*:
 acpi:VRC*:
  ID_VENDOR_FROM_DATABASE=Virtual Resources Corporation
 
+acpi:VRG*:
+ ID_VENDOR_FROM_DATABASE=VRgineers, Inc.
+
 acpi:VRM*:
  ID_VENDOR_FROM_DATABASE=VRmagic Holding AG
 
+acpi:VRS*:
+ ID_VENDOR_FROM_DATABASE=VRstudios, Inc.
+
 acpi:VSC*:
  ID_VENDOR_FROM_DATABASE=ViewSonic Corporation
 
@@ -7344,6 +7392,9 @@ acpi:XAD*:
 acpi:XDM*:
  ID_VENDOR_FROM_DATABASE=XDM Ltd.
 
+acpi:XES*:
+ ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
+
 acpi:XFG*:
  ID_VENDOR_FROM_DATABASE=Jan Strapko - FOTO
 

udev/60-evdev.hwdb

@@ -47,6 +47,7 @@
 evdev:input:b0003v05ACp021B*
 # Macbook4,1
 evdev:input:b0003v05ACp0229*
+evdev:input:b0003v05ACp022A*
  EVDEV_ABS_00=256:1471:12
  EVDEV_ABS_01=256:831:12
 
@@ -94,6 +95,11 @@ evdev:input:b0003v05ACp025B*
 # ASUS
 #########################################
 
+# Asus F3Sg
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnASUSTeKComputerInc.:pnF3Sg:*
+ EVDEV_ABS_00=0:6143:136
+ EVDEV_ABS_01=1103:5856:61
+
 # Asus VivoBook E402SA
 evdev:name:Elan Touchpad:dmi:*svnASUSTeKCOMPUTERINC.:pnE402SA*
  EVDEV_ABS_00=::29
@@ -145,6 +151,11 @@ evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnInsp
  EVDEV_ABS_35=25:2000:22
  EVDEV_ABS_36=0:1351:28
 
+# Dell Inspiron MM061
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*bvn*:bvr*:bd*:svnDellInc.:pnMM061:*
+ EVDEV_ABS_00=1008:5793:66
+ EVDEV_ABS_01=687:5176:107
+
 # Dell Latitude E6220
 evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6220*
  EVDEV_ABS_00=76:1815:22
@@ -161,10 +172,10 @@ evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLati
 
 # Dell Latitude E7470
 evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE7470*
- EVDEV_ABS_00=39:5856:59
- EVDEV_ABS_01=10:1532:29
- EVDEV_ABS_35=39:5856:59
- EVDEV_ABS_36=10:1532:29
+ EVDEV_ABS_00=29:2930:30
+ EVDEV_ABS_01=26:1533:29
+ EVDEV_ABS_35=29:2930:30
+ EVDEV_ABS_36=26:1533:29
 
 # Dell Precision 5510
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnPrecision5510*

udev/60-keyboard.hwdb

@@ -162,8 +162,9 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*C3[01]0*:pvr*
  KEYBOARD_KEY_6b=fn
  KEYBOARD_KEY_6c=screenlock                             # FIXME: lock tablet device/buttons
 
-# Travelmate P648-G2-MG
+# Travelmate P648-G2-MG and P645-S
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*P648-G2-MG*:pvr*
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*P645-S*:pvr*
  KEYBOARD_KEY_8a=f20                                    # Microphone mute button; should be micmute
 
 # on some models this isn't brightnessup
@@ -478,6 +479,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*Pavilion*dv7*Notebook*PC:
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[pP][aA][vV][iI][lL][iI][oO][nN]*13*x360*:pvr*
  KEYBOARD_KEY_d7=unknown
 
+# Purism Librem 13 V2
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPurism*:pn*Librem13v2*:pvr*
+ KEYBOARD_KEY_56=backslash
+
 # Elitebook
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*Compaq*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*EliteBook*:pvr*
@@ -557,6 +562,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*ProBook4*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHP*ProBook*4*:pvr*
 # HP ZBook
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPZBook*:pvr*
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBook*:pvr*
  KEYBOARD_KEY_81=f20                                    # Fn+F8; Microphone mute button, should be micmute
 
 # HP Folio 1040g2
@@ -763,14 +769,14 @@ evdev:input:b0003v046DpC308*
 
 # Cordless Desktop S510
 evdev:input:b0003v046DpC50C*
- KEYBOARD_KEY_d4=zoomin
- KEYBOARD_KEY_cc=zoomout
+ KEYBOARD_KEY_d4=up                                     # zoomin
+ KEYBOARD_KEY_cc=down                                   # zoomout
 
 # Wave cordless
 evdev:input:b0003v046DpC317*
  KEYBOARD_KEY_9001c=scale                               # expo
- KEYBOARD_KEY_9001f=zoomout
- KEYBOARD_KEY_90020=zoomin
+ KEYBOARD_KEY_9001f=down                                # zoomout
+ KEYBOARD_KEY_90020=up                                  # zoomin
  KEYBOARD_KEY_9003d=prog1                               # gadget
  KEYBOARD_KEY_90005=camera
  KEYBOARD_KEY_90018=media
@@ -787,8 +793,8 @@ evdev:input:b0003v046DpC317*
 
 # Wave cordless
 evdev:input:b0003v046DpC517*
- KEYBOARD_KEY_c101f=zoomout
- KEYBOARD_KEY_c1020=zoomin
+ KEYBOARD_KEY_c101f=down                                # zoomout
+ KEYBOARD_KEY_c1020=up                                  # zoomin
  KEYBOARD_KEY_c1005=camera
  KEYBOARD_KEY_c0183=media
  KEYBOARD_KEY_c1041=wordprocessor
@@ -813,8 +819,8 @@ evdev:input:b0003v046DpC52[9B]*
  KEYBOARD_KEY_0c018a=mail
  KEYBOARD_KEY_0c0221=search
  KEYBOARD_KEY_0c00b8=ejectcd
- KEYBOARD_KEY_0c022d=zoomin
- KEYBOARD_KEY_0c022e=zoomout
+ KEYBOARD_KEY_0c022d=up                                 # zoomin
+ KEYBOARD_KEY_0c022e=down                               # zoomout
 
 # Logitech Presenter R400
 evdev:input:b0003v046DpC52D*
@@ -889,8 +895,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMEDIONNB:pnA555*:pvr*
 
 # Microsoft Natural Ergonomic Keyboard 4000
 evdev:input:b0003v045Ep00DB*
- KEYBOARD_KEY_c022d=zoomin
- KEYBOARD_KEY_c022e=zoomout
+ KEYBOARD_KEY_c022d=up                                  # zoomin
+ KEYBOARD_KEY_c022e=down                                # zoomout
 
 ###########################################################
 # Micro Star
@@ -925,6 +931,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U-100*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U100*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*N033:*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*VR420*:pvr*
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*PR200*:pvr*
  KEYBOARD_KEY_f7=reserved
  KEYBOARD_KEY_f8=reserved
 
@@ -1182,8 +1189,8 @@ evdev:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-Z21*:pvr*
  KEYBOARD_KEY_00=brightnessdown                         # Fn+F5
  KEYBOARD_KEY_10=brightnessup                           # Fn+F6
  KEYBOARD_KEY_11=switchvideomode                        # Fn+F7
- KEYBOARD_KEY_12=zoomout
- KEYBOARD_KEY_14=zoomin
+ KEYBOARD_KEY_12=down                                   # zoomout
+ KEYBOARD_KEY_14=up                                     # zoomin
  KEYBOARD_KEY_15=suspend                                # Fn+F12
  KEYBOARD_KEY_17=prog1
  KEYBOARD_KEY_20=media
@@ -1193,8 +1200,15 @@ evdev:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-FW250*:pvr*
 
 evdev:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVPC*:pvr*
  KEYBOARD_KEY_05=f21                                    # Fn+F1 -> KEY_F21 (The actual touchpad toggle)
- KEYBOARD_KEY_0d=zoomout                                # Fn+F9
- KEYBOARD_KEY_0e=zoomin                                 # Fn+F10
+ KEYBOARD_KEY_0d=down                                   # Fn+F9 zoomout
+ KEYBOARD_KEY_0e=up                                     # Fn+F10 zoomin
+
+###########################################################
+# T-bao
+###########################################################
+
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnT-bao:pnTbookair:pvr*
+ KEYBOARD_KEY_76=f21                                    # Touchpad toggle
 
 ###########################################################
 # Toshiba
@@ -1256,6 +1270,13 @@ evdev:name:Toshiba*input*device:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSatellite*P75-A:
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnVIA:pnK8N800:pvr*
  KEYBOARD_KEY_81=prog1
 
+###########################################################
+# VIOS
+###########################################################
+
+evdev:name:SIPODEV USB Composite Device:dmi:bvn*:bvr*:bd*:svnVIOS:pnLTH17:pvr*
+ KEYBOARD_KEY_70073=f21                                 # Touchpad toggle
+
 ###########################################################
 # Zepto
 ###########################################################
@@ -1283,6 +1304,68 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnZepto:pnZnote*6615WD:*
  KEYBOARD_KEY_ae=!                                      # volume down
  KEYBOARD_KEY_b0=!                                      # volume up
 
+##########################################
+# Ideazon
+##########################################
+
+# Ideazon Zboard Merc
+evdev:input:b0003v1038p0210*
+ KEYBOARD_KEY_c0227=q
+ KEYBOARD_KEY_c0223=w
+ KEYBOARD_KEY_c0221=e
+ KEYBOARD_KEY_c0224=a
+ KEYBOARD_KEY_c0226=s
+ KEYBOARD_KEY_c0225=d
+ KEYBOARD_KEY_c0192=tab
+ KEYBOARD_KEY_c018a=leftalt
+ KEYBOARD_KEY_c022a=r
+ KEYBOARD_KEY_c0183=f10
+ KEYBOARD_KEY_70059=1
+ KEYBOARD_KEY_7005a=2
+ KEYBOARD_KEY_7005b=3
+ KEYBOARD_KEY_7005c=4
+ KEYBOARD_KEY_7005d=5
+ KEYBOARD_KEY_7005e=6
+ KEYBOARD_KEY_7005f=7
+ KEYBOARD_KEY_70060=8
+ KEYBOARD_KEY_70061=9
+ KEYBOARD_KEY_70062=0
+ KEYBOARD_KEY_70057=equal
+ KEYBOARD_KEY_70077=capslock
+ KEYBOARD_KEY_70054=leftshift
+ KEYBOARD_KEY_70063=leftctrl
+ KEYBOARD_KEY_7006b=t
+ KEYBOARD_KEY_70067=f
+ KEYBOARD_KEY_7006c=g
+ KEYBOARD_KEY_7006d=v
+ KEYBOARD_KEY_7006e=b
+ KEYBOARD_KEY_70074=p
+ KEYBOARD_KEY_7006f=c
+ KEYBOARD_KEY_70055=space
+ KEYBOARD_KEY_70076=f9
+ KEYBOARD_KEY_70046=f11
+ KEYBOARD_KEY_70079=f6
+
+# Ideazon Zboard Fang
+evdev:input:b0003v1038p0310*
+ KEYBOARD_KEY_70059=1
+ KEYBOARD_KEY_7005b=3
+ KEYBOARD_KEY_70040=equal
+ KEYBOARD_KEY_70042=l
+ KEYBOARD_KEY_7002b=tab
+ KEYBOARD_KEY_7005e=capslock
+ KEYBOARD_KEY_700e2=leftalt
+ KEYBOARD_KEY_700e1=leftshift
+ KEYBOARD_KEY_700e0=leftctrl
+ KEYBOARD_KEY_70038=z
+ KEYBOARD_KEY_7003e=t
+ KEYBOARD_KEY_70015=r
+ KEYBOARD_KEY_70010=g
+ KEYBOARD_KEY_70050=n
+ KEYBOARD_KEY_70030=f9
+ KEYBOARD_KEY_7002f=f11
+ KEYBOARD_KEY_70046=f6
+
 ###########################################################
 # Other
 ###########################################################

udev/60-sensor.hwdb

@@ -38,12 +38,22 @@
 #
 # [1]: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dfc57732ad38f93ae6232a3b4e64fd077383a0f1
 #
+# Note for devices where the display (LCD panel) is mounted non upright
+# in the device's casing, e.g. mounted upside-down or 90 degree rotated,
+# the ACCEL_MOUNT_MATRIX should be such that the x and y axis matches the
+# x and y axis of the display, not those of the casing, so that desktop
+# environments using the accelerometer data for rotation will e.g.
+# automatically flip their output for an upside-down display when the device
+# is held upright.
 #
 # Sort by brand, model
 
 #########################################
 # Acer
 #########################################
+sensor:modalias:acpi:INVN6500*:dmi:*svn*Acer*:*pn*AspireSW5-012*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
 sensor:modalias:acpi:BMA250E*:dmi:*:svnAcer:pnIconiaW1-810:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
@@ -56,24 +66,58 @@ sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:*pnT100CHI*
 sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:*pnT100TA*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
+sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:pnT200TA*
+ ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
+
+sensor:modalias:acpi:INVN6500*:dmi:*svn*ASUSTeK*:*pn*TP300LA*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
 sensor:modalias:acpi:INVN6500*:dmi:*svn*ASUSTeK*:*pn*TP300LD*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
 sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP300LJ*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
+sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP500LB*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
+#########################################
+# Axxo
+#########################################
+sensor:modalias:acpi:SMO8500*:dmi:*:svnStandard:pnWCBT1011:*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
+
 #########################################
 # Chuwi
 #########################################
 
-# Chuwi Vi8 Plus
+# Chuwi Vi8 (CWI506)
+sensor:modalias:acpi:BMA250E*:dmi:bvnINSYDECorp.:bvrCHUWI.D86JLBNR*:svnInsyde:pni86:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
+# Chuwi Vi8 Plus (CWI519)
 sensor:modalias:acpi:BOSC0200*:dmi:*:svnHampoo:pnD2D3_Vi8A1:*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
+# Chuwi Hi8 Pro
+sensor:modalias:acpi:BOSC0200*:dmi:*:svnHampoo:pnX1D3_C806N:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
+# Chuwi Hi10 Pro
+sensor:modalias:acpi:BOSC0200*:dmi:*:svn*CHUWIINNOVATIONANDTECHNOLOGY*:pnHi10protablet:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
 # Chuwi Hi13
 sensor:modalias:acpi:KIOX000A*:dmi:svnChuwi*:pnHi13
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
+# Chuwi HiBook
+# Chuwi HiBook does not have its product name filled, so we
+# match the entire dmi-alias, assuming that the use of a BOSC0200 +
+# bios-version + bios-date combo is unique
+sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd05/07/2016:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnHampoo:rnCherryTrailCR:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+ ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
+
 #########################################
 # Cube
 #########################################
@@ -86,6 +130,10 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svncube:pni1-TF:*
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni7Stylus:*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
 
+# Cube i7 Book (i16)
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnCube:pni16:*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
+
 #########################################
 # Endless
 #########################################
@@ -96,7 +144,7 @@ sensor:modalias:acpi:ACCE0001*:dmi:*svnEndless*:*pnELT-NL3*
 # GP-electronic
 #########################################
 sensor:modalias:acpi:KIOX000A*:dmi:bvnINSYDECorp.:bvrBYT70A.YNCHENG.WIN.007:*:svnInsyde:pnT701:*
- ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
 #########################################
 # HP
@@ -106,6 +154,7 @@ sensor:modalias:platform:lis3lv02d:dmi:*svn*Hewlett-Packard*:*pn*HPEliteBook8560
   ACCEL_MOUNT_MATRIX=1, 0, 0; 0, 0, -1; 0, 1, 0
 
 sensor:modalias:acpi:SMO8500*:dmi:*:svnHewlett-Packard:pnHPStream7Tablet:*
+sensor:modalias:acpi:SMO8500*:dmi:*:svnHewlett-Packard:pnHPStream8Tablet:*
   ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
 #########################################
@@ -126,6 +175,10 @@ sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:*:svnTobefilledbyO.
 sensor:modalias:acpi:BOSC0200*:dmi:bvnINSYDECorp.:bvrjumperx.T87.KFBNEE*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
+# EZpad 6 Pro
+sensor:modalias:acpi:BOSC0200*:dmi:*:svnJumper:pnEZpad:*:rvr.A006:*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, 1
+
 #########################################
 # Lamina
 #########################################
@@ -141,6 +194,17 @@ sensor:modalias:acpi:KIOX000A*:dmi:*svnLAMINA:pnT-1016BNORD*
 sensor:modalias:acpi:NCPE0388*:dmi:*:rnLenovoYOGA510-14IKB:*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, 1
 
+sensor:modalias:acpi:BOSC0200:BOSC0200:dmi:*ThinkPadYoga11e3rdGen*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; -1, 0, 0; 0, 0, 1
+
+# Miix3-1030
+sensor:modalias:acpi:BMA250E*:dmi:bvnLENOVO:*:pvrLenovoMIIX3-1030:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
+# IdeaPad Miix 320
+sensor:modalias:acpi:*BOSC0200*:dmi:*:svnLENOVO*:pn80XF:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
 #########################################
 # Peaq
 #########################################
@@ -169,10 +233,20 @@ sensor:modalias:acpi:BMA250E*:dmi:*:svnShenzhenPLOYER*:pnMOMO7W:*
 sensor:modalias:acpi:BMA250E*:dmi:bvnAmericanMegatrendsInc.:bvr3BAIR1013:bd08/22/2014:svnTobefilledbyO.E.M.:pnTobefilledbyO.E.M.:pvrTobefilledbyO.E.M.:rvnAMICorporation:rnAptioCRB:rvrTobefilledbyO.E.M.:cvnToBeFilledByO.E.M.:ct3:cvrToBeFilledByO.E.M.:
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
+#########################################
+# Teclast
+#########################################
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnX80Pro:*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnX98PlusII:*
+ ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
+
 #########################################
 # Trekstor
 #########################################
 sensor:modalias:acpi:BMA250*:dmi:*:bvrTREK.G.WI71C.JGBMRBA*:*:svnInsyde:pnST70416-6:*
+sensor:modalias:acpi:BMA250*:dmi:*:bvrTREK.G.WI71C.JGBMRBA*:*:svnTrekStor:pnSurfTabwintron7.0ST70416-6:*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
 #########################################
@@ -180,4 +254,3 @@ sensor:modalias:acpi:BMA250*:dmi:*:bvrTREK.G.WI71C.JGBMRBA*:*:svnInsyde:pnST7041
 #########################################
 sensor:modalias:acpi:*KIOX000A*:dmi:*svn*CytrixTechnology:*pn*Complex11t*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
-

udev/70-mouse.hwdb

@@ -438,6 +438,10 @@ mouse:usb:v046dp402d:name:Logitech M560:
 mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:402d:
  MOUSE_DPI=1000@125
 
+# Logitech M305 Wireless Optical Mouse
+mouse:usb:v046dpc52f:name:Logitech USB Receiver:
+ MOUSE_DPI=1000@170
+
 # Logitech Performance MX
 mouse:usb:v046dp101a:name:Logitech Performance MX:
  MOUSE_DPI=1000@166
@@ -451,6 +455,15 @@ mouse:usb:v046dp4041:name:Logitech MX Master:
  MOUSE_WHEEL_CLICK_COUNT=24
  MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14
 
+# Logitech MX Master 2s
+# Horiz wheel has 14 stops, angle is rounded up
+mouse:usb:v046dp4069:name:Logitech MX Master 2s:
+ MOUSE_DPI=1000@125
+ MOUSE_WHEEL_CLICK_ANGLE=15
+ MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL=26
+ MOUSE_WHEEL_CLICK_COUNT=24
+ MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14
+
 # Logitech MK260 Wireless Combo Receiver aka M-R0011
 mouse:usb:v046dpc52e:name:Logitech USB Receiver:
  MOUSE_DPI=1000@200
@@ -539,6 +552,10 @@ mouse:usb:v045ep07b1:name:Microsoft Microsoft® Nano Transceiver v1.0:
 mouse:bluetooth:v045ep0702:name:Microsoft  Wireless Laser Mouse 8000:
  MOUSE_DPI=1000@1000
 
+# Microsoft Sculpt Comfort Mouse
+mouse:bluetooth:v045ep07a2:name:Microsoft Sculpt Comfort Mouse:
+ MOUSE_DPI=1000@2000
+
 # Microsoft Arc Touch Mouse SE:
 mouse:bluetooth:v045ep07f3:name:Arc Touch Mouse SE:
  MOUSE_DPI=1000@2000

udev/70-pointingstick.hwdb

@@ -108,6 +108,9 @@ evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX220
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX230:*
 # Lenovo Thinkpad X230 tablet
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX230Tablet:*
+# Lenovo ThinkPad *30 series
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPad??30:*
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPad??30?:*
 # Lenovo Thinkpad *40 series
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPad??40:*
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPad??40?:*

udev/70-touchpad.hwdb

@@ -36,27 +36,15 @@
 
 touchpad:i8042:*
 touchpad:rmi:*
+touchpad:usb:*
  ID_INPUT_TOUCHPAD_INTEGRATION=internal
 
 touchpad:bluetooth:*
-touchpad:usb:*
  ID_INPUT_TOUCHPAD_INTEGRATION=external
 
-###########################################################
-# Apple
-###########################################################
-touchpad:usb:v05ac*
- ID_INPUT_TOUCHPAD_INTEGRATION=internal
-
 ###########################################################
 # Wacom
 ###########################################################
 touchpad:usb:v056a*
  ID_INPUT_TOUCHPAD_INTEGRATION=external
 
-###########################################################
-# Microsoft (Surface Type Covers)
-###########################################################
-touchpad:usb:v045ep07*
- ID_INPUT_TOUCHPAD_INTEGRATION=internal
- 

usb.ids

@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2017.09.10
-# Date:    2017-09-10 20:34:07
+# Version: 2018.01.04
+# Date:    2018-01-04 20:34:07
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -61,6 +61,8 @@
 	0499  SE340D PC Remote Control
 03da  Bernd Walter Computer Technology
 	0002  HD44780 LCD interface
+03e7  Intel
+	2150  Myriad VPU [Movidius Neural Compute Stick]
 03e8  EndPoints, Inc.
 	0004  SE401 Webcam
 	0008  101 Ethernet [klsi]
@@ -109,6 +111,7 @@
 	2106  STK600 development board
 	2107  AVR Dragon
 	2109  STK541 ZigBee Development Board
+	210a  AT86RF230 [RZUSBSTICK] transceiver
 	210d  XPLAIN evaluation kit (CDC ACM)
 	2110  AVR JTAGICE3 Debugger and Programmer
 	2111  Xplained Pro board debugger and programmer
@@ -202,6 +205,7 @@
 	0217  LaserJet 2200
 	0218  APOLLO P2500/2600
 	0221  StreamSmart 400 [F2235AA]
+	0223  Digital Drive Flash Reader
 	022a  Laserjet CP1525nw
 	0241  Link-5 micro dongle
 	0304  DeskJet 810c/812c
@@ -236,6 +240,7 @@
 	0611  OfficeJet K60xi
 	0612  business inkjet 3000
 	0624  Bluetooth Dongle
+	0641  X1200 Optical Mouse
 	0701  ScanJet 5300c/5370c
 	0704  DeskJet 825c
 	0705  ScanJet 4400c
@@ -314,6 +319,7 @@
 	1524  Smart Card Keyboard - KR
 	1539  Mini Magnetic Stripe Reader
 	1541  Prime [G8X92AA]
+	154a  Laser Mouse
 	1602  PhotoSmart 330 series
 	1604  DeskJet 940c
 	1605  ScanJet 5530C PhotoSmart
@@ -528,6 +534,7 @@
 	5307  v165w Stick
 	5311  OfficeJet 6300
 	5312  Officejet Pro 8500A
+	5317  Color LaserJet CP2025 series
 	5411  OfficeJet 4300
 	5511  DeskJet F300 series
 	5611  PhotoSmart C3180
@@ -648,6 +655,7 @@
 	9c02  PhotoSmart M440 series
 	a004  DeskJet 5850c
 	a011  Deskjet 3050A
+	a407  Wireless Optical Comfort Mouse
 	b002  PhotoSmart 7200 series
 	b102  PhotoSmart 7200 series
 	b107  v255w/c310w Flash Drive
@@ -781,6 +789,8 @@
 	a951  HCP HIT GSM/GPRS modem [Cinterion MC55i]
 	a9a0  FT2232D - Dual UART/FIFO IC - FTDI
 	abb8  Lego Mindstorms NXTCam
+	b0c2  iID contactless RFID device
+	b0c3  iID contactless RFID device
 	b810  US Interface Navigator (CAT and 2nd PTT lines)
 	b811  US Interface Navigator (WKEY and FSK lines)
 	b812  US Interface Navigator (RS232 and CONFIG lines)
@@ -1114,6 +1124,7 @@
 	602a  i900
 040b  Weltrend Semiconductor
 	0a68  Func MS-3 gaming mouse [WT6573F MCU]
+	2367  Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad]
 	6510  Weltrend Bar Code Reader
 	6520  XBOX Xploder
 	6533  Speed-Link Competition Pro
@@ -1431,6 +1442,10 @@
 	0104  ADL Re-Flashing Engine Parent
 	0105  Nokia Firmware Upgrade Mode
 	0106  ROM Parent
+	010d  E75 (Storage Mode)
+	010e  E75 (PC Suite mode)
+	010f  E75 (Media transfer mode)
+	0110  E75 (Imaging Mode)
 	0154  5800 XpressMusic (PC Suite mode)
 	0155  5800 XpressMusic (Multimedia mode)
 	0156  5800 XpressMusic (Storage mode)
@@ -2318,6 +2333,7 @@
 	0736  Sidewinder X5 Mouse
 	0737  Compact Optical Mouse 500
 	0745  Nano Transceiver v1.0 for Bluetooth
+	074a  LifeCam VX-500 [1357]
 	0750  Wired Keyboard 600
 	0752  Wired Keyboard 400
 	075d  LifeCam Cinema
@@ -2327,11 +2343,13 @@
 	0768  Sidewinder X4
 	076c  Comfort Mouse 4500
 	076d  LifeCam HD-5000
+	0770  LifeCam VX-700
 	0772  LifeCam Studio
 	0779  LifeCam HD-3000
 	077f  LifeChat LX-6000 Headset
 	0780  Comfort Curve Keyboard 3000
 	0797  Optical Mouse 200
+	0799  Surface Pro embedded keyboard
 	07a5  Wireless Receiver 1461C
 	07b9  Wired Keyboard 200
 	07ca  Surface Pro 3 Docking Station Audio Device
@@ -2387,7 +2405,7 @@
 	081c  Elitegroup ECS-C11 Camera
 	081d  Elitegroup ECS-C11 Storage
 	0a00  Micro Innovations Web Cam 320
-	4d01  Comfort Keyboard
+	4d01  Comfort Keyboard / Kensington Orbit Elite
 	4d02  Mouse-in-a-Box
 	4d03  Kensington Mouse-in-a-box
 	4d04  Mouse
@@ -2405,6 +2423,7 @@
 	4d75  Rocketfish RF-FLBTAD Bluetooth Adapter
 	4d81  Dell N889 Optical Mouse
 	4de7  webcam
+	4e04  Lenovo Keyboard KB1021
 0463  MGE UPS Systems
 	0001  UPS
 	ffff  UPS
@@ -2586,6 +2605,7 @@
 	0a45  960 Headset
 	0a4d  G430 Surround Sound Gaming Headset
 	0a5b  G933 Wireless Headset Dongle
+	0a66  [G533 Wireless Headset Dongle]
 	0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
 	8801  Video Camera
 	b014  Bluetooth Mouse M336/M337/M535
@@ -2758,6 +2778,7 @@
 	c31c  Keyboard K120
 	c31d  Media Keyboard K200
 	c31f  Comfort Keyboard K290
+	c328  Corded Keyboard K280e
 	c332  G502 Proteus Spectrum Optical Mouse
 	c335  G910 Orion Spectrum Mechanical Keyboard
 	c401  TrackMan Marble Wheel
@@ -3121,6 +3142,7 @@
 	0203  AH-K3001V
 	0204  iBurst Terminal
 	0408  FS-1320D Printer
+	069b  ECOSYS M2635dn
 0483  STMicroelectronics
 	0137  BeWAN ADSL USB ST (blue or green)
 	0138  Unicorn II (ST70138B + MTC-20174TQ chipset)
@@ -3251,6 +3273,7 @@
 	1054  S90XS Keyboard/Music Synthesizer
 	160f  P-105
 	1613  Clavinova CLP535
+	1704  Steinberg UR44
 	2000  DGP-7
 	2001  DGP-5
 	3001  YST-MS55D USB Speaker
@@ -3673,12 +3696,12 @@
 	2229  CanoScan 8600F
 	2602  MultiPASS C555
 	2603  MultiPASS C755
-	260a  CAPT Printer
+	260a  LBP810
 	260e  LBP-2000
 	2610  MPC600F
 	2611  SmartBase MPC400
 	2612  MultiPASS C855
-	2617  CAPT Printer
+	2617  LBP1210
 	261a  iR1600
 	261b  iR1610
 	261c  iC2300
@@ -3733,9 +3756,9 @@
 	2671  iR5570/iR6570
 	2672  iR C3170
 	2673  iR 3170C EUR
-	2674  L120
+	2674  FAX-L120
 	2675  iR2830
-	2676  CAPT Device
+	2676  LBP2900
 	2677  iR C2570
 	2678  iR 2570C EUR
 	2679  CAPT Device
@@ -3746,6 +3769,7 @@
 	2686  MF6500 series
 	2687  iR4530
 	2688  LBP3460
+	2689  FAX-L180/L380S/L398S
 	268c  iR C6870
 	268d  iR 6870C EUR
 	268e  iR C5870
@@ -3757,6 +3781,7 @@
 	26b5  MF4200 series
 	26da  LBP3010B printer
 	26e6  iR1024
+	271a  LBP6000
 	2736  I-SENSYS MF4550d
 	2737  MF4410
 	3041  PowerShot S10
@@ -4067,6 +4092,7 @@
 	32ad  PowerShot SX410 IS
 	32b1  SELPHY CP1200
 	32b2  PowerShot G9 X
+	32b4  EOS Rebel T6
 	32bb  EOS M5
 	32bf  PowerShot SX420 IS
 	32c1  PowerShot ELPH 180 / IXUS 175
@@ -4528,6 +4554,8 @@
 	10fe  S500
 	1150  fi-6230
 	125a  PalmSecure Sensor Device - MP
+	200f  Sigma DP2 (Mass Storage)
+	2010  Sigma DP2 (PictBridge)
 	201d  SATA 3.0 6Gbit/s Adaptor [GROOVY]
 04c6  Toshiba America Electronic Components
 04c7  Micro Macro Technologies
@@ -4633,6 +4661,7 @@
 	01bf  FinePix F6000fd/S6500fd Zoom (PTP)
 	01c0  FinePix F20 (PTP)
 	01c1  FinePix F31fd (PTP)
+	01c3  FinePix S5 Pro
 	01c4  FinePix S5700 Zoom (PTP)
 	01c5  FinePix F40fd (PTP)
 	01c6  FinePix A820 Zoom (PTP)
@@ -4646,6 +4675,8 @@
 	0240  FinePix S2950 Digital Camera
 	0241  FinePix S3200 Digital Camera
 	0278  FinePix JV300
+	02c5  FinePix S9900W Digital Camera (PTP)
+	5006  ASK-300
 04cc  ST-Ericsson
 	1122  Hub
 	1520  USB 2.0 Hub (Avocent KVM)
@@ -4745,9 +4776,11 @@
 	a01c  wireless multimedia keyboard with trackball [Trust ADURA 17911]
 	a050  Chatman V1
 	a055  Keyboard
+	a096  Keyboard
 	a09f  E-Signal LUOM G10 Mechanical Gaming Mouse
 	a100  Mouse [HV-MS735]
 	a11b  Mouse [MX-3200]
+	e002  MCU
 04da  Panasonic (Matsushita)
 	0901  LS-120 Camera
 	0912  SDR-S10
@@ -5234,6 +5267,7 @@
 	b104  CNF7069 Webcam
 	b107  CNF7070 Webcam
 	b14c  CNF8050 Webcam
+	b159  CNF8243 Webcam
 	b15c  Sony Vaio Integrated Camera
 	b175  4-Port Hub
 	b1aa  Webcam-101
@@ -5265,6 +5299,7 @@
 04f3  Elan Microelectronics Corp.
 	000a  Touchscreen
 	0103  ActiveJet K-2024 Multimedia Keyboard
+	016f  Touchscreen
 	01a4  Wireless Keyboard
 	0201  Touchscreen
 	0210  Optical Mouse
@@ -5320,6 +5355,7 @@
 	002c  Printer
 	002d  Printer
 	0039  HL-5340 series
+	0041  HL-2250DN Laser Printer
 	0042  HL-2270DW Laser Printer
 	0100  MFC8600/9650 series
 	0101  MFC9600/9870 series
@@ -5507,6 +5543,7 @@
 	021c  MFC-9320CW
 	021d  MFC-9120CN
 	021e  DCP-9010CN
+	021f  DCP-8085DN
 	0220  MFC-9010CN
 	0222  DCP-195C
 	0223  DCP-365CN
@@ -5531,6 +5568,7 @@
 	023f  MFC-8680DN
 	0240  MFC-J950DN
 	0248  DCP-7055 scanner/printer
+	024e  MFC-7460DN
 	0253  DCP-J125
 	0254  DCP-J315W
 	0255  DCP-J515W
@@ -5550,6 +5588,7 @@
 	026d  MFC-J805D
 	026e  MFC-J855DN
 	026f  MFC-J270W
+	0270  MFC-7360N
 	0273  DCP-7057 scanner/printer
 	0276  MFC-5895CW
 	0278  MFC-J410W
@@ -5781,6 +5820,7 @@
 	2027  QL-560 P-touch Label Printer
 	2028  QL-570 P-touch Label Printer
 	202b  PT-7600 P-touch Label Printer
+	2041  PT-2730 P-touch Label Printer
 	2061  PT-P700 P-touch Label Printer
 	2064  PT-P700 P-touch Label Printer RemovableDisk
 	2100  Card Reader Writer
@@ -6162,6 +6202,7 @@
 	2727  Xircom PGUNET USB-USB Bridge
 	2750  EZ-Link (EZLNKUSB.SYS)
 	2810  Cypress ATAPI Bridge
+	4018  AmScope MU1803
 	4d90  AmScope MD1900 camera
 	6010  AmScope MU1000 camera
 	6510  Touptek UCMOS05100KPA
@@ -6358,6 +6399,7 @@
 	06bb  WALKMAN NWZ-F805
 	06c3  RC-S380
 	07c4  ILCE-6000 (aka Alpha-6000) in Mass Storage mode
+	0847  WG-C10 Portable Wireless Server
 	088c  Portable Headphone Amplifier
 	08b7  ILCE-6000 (aka Alpha-6000) in MTP mode
 	094e  ILCE-6000 (aka Alpha-6000) in PC Remote mode
@@ -6664,6 +6706,8 @@
 	0354  DTH-1620 [Cintiq Pro 16] touchscreen
 	0357  PTH-660 [Intuos Pro (M)]
 	0358  PTH-860 [Intuos Pro (L)]
+	035a  DTH-1152 tablet
+	0368  DTH-1152 touchscreen
 	0400  PenPartner 4x5
 	4001  TPC4001
 	4004  TPC4004
@@ -6684,6 +6728,7 @@
 	0003  Device Bay Controller
 056e  Elecom Co., Ltd
 	0002  29UO Mouse
+	0057  M-PGDL Mouse
 	0072  Mouse
 	200c  LD-USB/TX
 	4002  Laneed 100Mbps Ethernet LD-USB/TX [pegasus]
@@ -8334,6 +8379,7 @@
 0656  Glory Mark Electronic, Ltd
 0657  Tekcon Electronics Corp.
 0658  Sigma Designs, Inc.
+	0200  Aeotec Z-Stick Gen5 (ZW090) - UZB
 0659  Aethra
 065a  Optoelectronics Co., Ltd
 	0001  Opticon OPR-2001 / NLV-1001 (keyboard mode)
@@ -16115,6 +16161,35 @@
 	0002  HDReye (before firmware loads)
 1519  Comneon
 	0020  HSIC Device
+151f  Opal Kelly Incorporated
+	0020  XEM3001v1
+	0021  XEM3001v2
+	0022  XEM3010
+	0023  XEM3005
+	0028  XEM3050
+	002b  XEM5010
+	002c  XEM6001
+	002d  XEM6010-LX45
+	002e  XEM6010-LX150
+	0030  XEM6006-LX16
+	0033  XEM6002-LX9
+	0034  XEM7001-A15
+	0036  XEM7010-A50
+	0037  XEM7010-A200
+	0120  ZEM4310
+	0121  XEM6310-LX45
+	0122  XEM6310-LX150
+	0123  XEM6310MT-LX45T
+	0125  XEM7350-K70T
+	0126  XEM7350-K160T
+	0127  XEM7350-K410T
+	0128  XEM6310MT-LX150T
+	0129  ZEM5305-A2
+	012b  XEM7360-K160T
+	012c  XEM7360-K410T
+	012d  ZEM5310-A4
+	0130  XEM7310-A75
+	0131  XEM7310-A200
 1520  Bitwire Corp.
 1524  ENE Technology Inc
 	6680  UTS 6680
@@ -18627,6 +18702,19 @@
 24e1  Paratronic
 	3001  Adp-usb
 	3005  Radius
+2516  Cooler Master Co., Ltd.
+	0003  Storm Xornet
+	0004  Storm QuickFire Rapid Mechanical Keyboard
+	0006  Storm Recon
+	0007  Storm Sentinel Advance II
+	0009  Storm Quick Fire PRO
+	0011  Storm Quick Fire TK
+	0017  CM Storm Quick Fire Stealth
+	0020  QuickFire Rapid-i Keyboard
+	0027  CM Storm Coolermaster Novatouch TKL
+	002d  Alcor mouse
+	0047  MasterKeys Pro L
+	9494  Sirus Headset
 2632  TwinMOS
 	3209  7-in-1 Card Reader
 2639  Xsens