Browse Source

Update data

Mike Gilbert 7 years ago
parent
commit
ae25707c75
13 changed files with 4015 additions and 1018 deletions
  1. 1 1
      Makefile
  2. 183 189
      iab.txt
  3. 910 247
      ma-medium.txt
  4. 1120 199
      ma-small.txt
  5. 588 225
      oui.txt
  6. 349 60
      pci.ids
  7. 24 0
      udev/20-acpi-vendor.hwdb
  8. 293 2
      udev/20-bluetooth-vendor-product.hwdb
  9. 46 3
      udev/60-evdev.hwdb
  10. 30 23
      udev/60-keyboard.hwdb
  11. 62 8
      udev/70-mouse.hwdb
  12. 22 31
      udev/70-pointingstick.hwdb
  13. 387 30
      usb.ids

+ 1 - 1
Makefile

@@ -42,7 +42,7 @@ install: $(INSTALL_TARGETS-yes)
 
 # OUI/IAB: https://regauth.standards.ieee.org/standards-ra-web/pub/view.html#registries
 fetch:
-	$(Q)curl -z pci.ids -o pci.ids -R https://pci-ids.ucw.cz/v2.2/pci.ids
+	$(Q)curl -z pci.ids -o pci.ids -R http://pci-ids.ucw.cz/v2.2/pci.ids
 	$(Q)curl -z usb.ids -o usb.ids -R http://www.linux-usb.org/usb.ids
 	$(Q)curl -z oui.txt -o oui.txt -R http://standards-oui.ieee.org/oui/oui.txt
 	$(Q)curl -z ma-medium.txt -o ma-medium.txt -R http://standards-oui.ieee.org/oui28/mam.txt

+ 183 - 189
iab.txt

@@ -875,12 +875,6 @@ EA2000-EA2FFF                 (base 16)                     ThinkRF Corp
                                                             Ottawa  Ontario  K2K 0G7                     
                                                             CA                                           
 
-00-50-C2                      (hex)                         i3 International Inc.                        
-E98000-E98FFF                 (base 16)                     i3 International Inc.                        
-                                                            780 Birchmount Road                          
-                                                            Toronto  Ontario  M1K5H4                     
-                                                            CA                                           
-
 00-50-C2                      (hex)                         Monsoon Solutions, Inc.                      
 EB6000-EB6FFF                 (base 16)                     Monsoon Solutions, Inc.                      
                                                             2405 140th Ave NE                            
@@ -1580,12 +1574,6 @@ AA6000-AA6FFF                 (base 16)                     Bassett Electronic S
                                                             Wootton Bassett  Wiltshire  SN4 7DB          
                                                             GB                                           
 
-00-50-C2                      (hex)                         Eberspächer Electronics GmbH & Co. KG        
-A9C000-A9CFFF                 (base 16)                     Eberspächer Electronics GmbH & Co. KG        
-                                                            Robert-Bosch-Straße 6                        
-                                                            Göppingen  BW  73037                         
-                                                            DE                                           
-
 00-50-C2                      (hex)                         Power Medical Interventions                  
 AE2000-AE2FFF                 (base 16)                     Power Medical Interventions                  
                                                             2021 Cabot Blvd. West                        
@@ -1676,12 +1664,6 @@ AC4000-AC4FFF                 (base 16)                     Orion Technologies,
                                                             Vienna    1190                               
                                                             AT                                           
 
-00-50-C2                      (hex)                         CODEC Co., Ltd.                              
-9DF000-9DFFFF                 (base 16)                     CODEC Co., Ltd.                              
-                                                            1021-1 Kuriki Asao-ward                      
-                                                            Kawasaki  Kanagawa  215-0033                 
-                                                            JP                                           
-
 00-50-C2                      (hex)                         NEUTRONIK e.K.                               
 9DA000-9DAFFF                 (base 16)                     NEUTRONIK e.K.                               
                                                             Taitinger Str. 14                            
@@ -2642,12 +2624,6 @@ A1F000-A1FFFF                 (base 16)                     Flight Data Systems
                                                             Yokohama  Kanagawa  221-0052                 
                                                             JP                                           
 
-00-50-C2                      (hex)                         DCN                                          
-6FA000-6FAFFF                 (base 16)                     DCN                                          
-                                                            DCN Services Brest                           
-                                                            BREST    29228                               
-                                                            FR                                           
-
 00-50-C2                      (hex)                         Dain                                         
 741000-741FFF                 (base 16)                     Dain                                         
                                                             Dongmun Vision Building, Sinjeong 6-dong, Yangcheon-gu,
@@ -3422,12 +3398,6 @@ A1F000-A1FFFF                 (base 16)                     Flight Data Systems
                                                             Wells  Somerset  BA5 3DG                     
                                                             GB                                           
 
-00-50-C2                      (hex)                         EDA Industries Srl                           
-3C0000-3C0FFF                 (base 16)                     EDA Industries Srl                           
-                                                            Via dell'elettronica                         
-                                                            Cittaducale  Rieti  02015                    
-                                                            IT                                           
-
 00-50-C2                      (hex)                         Fluke Biomedical, Radiation Management Services
 3D5000-3D5FFF                 (base 16)                     Fluke Biomedical, Radiation Management Services
                                                             6045 Cochran Rd.                             
@@ -4628,6 +4598,30 @@ F3E000-F3EFFF                 (base 16)                     Vtron Pty Ltd
                                                             Porcia  PN  33170                            
                                                             IT                                           
 
+00-50-C2                      (hex)                         DCNS                                         
+6FA000-6FAFFF                 (base 16)                     DCNS                                         
+                                                            DCN Services Brest                           
+                                                            BREST    29228                               
+                                                            FR                                           
+
+00-50-C2                      (hex)                         EDA Industries Pte. Ltd                      
+3C0000-3C0FFF                 (base 16)                     EDA Industries Pte. Ltd                      
+                                                            Via dell'elettronica                         
+                                                            Cittaducale  Rieti  02015                    
+                                                            IT                                           
+
+00-50-C2                      (hex)                         CODEC Co., Ltd.                              
+9DF000-9DFFFF                 (base 16)                     CODEC Co., Ltd.                              
+                                                            1-29-18 Tamagawa                             
+                                                            Choufu-shi  Tokyo  182-0025                  
+                                                            JP                                           
+
+00-50-C2                      (hex)                         Star Electronics GmbH & Co. KG               
+A9C000-A9CFFF                 (base 16)                     Star Electronics GmbH & Co. KG               
+                                                            Jahnstraße 86                                
+                                                            Göppingen  BW  73037                         
+                                                            DE                                           
+
 00-50-C2                      (hex)                         EMAC, Inc.                                   
 0E0000-0E0FFF                 (base 16)                     EMAC, Inc.                                   
                                                             2390 EMAC Way                                
@@ -6020,12 +6014,6 @@ C66000-C66FFF                 (base 16)                     KS Beschallungstechn
                                                             Hettenleidelheim  Rhineland-Palatinate  67310
                                                             DE                                           
 
-00-50-C2                      (hex)                         Potter Electric Signal Company               
-C63000-C63FFF                 (base 16)                     Potter Electric Signal Company               
-                                                            11790 Troy Lane North                        
-                                                            Maple Grove  MN  55369                       
-                                                            US                                           
-
 00-50-C2                      (hex)                         Integration Technologies Limited             
 C60000-C60FFF                 (base 16)                     Integration Technologies Limited             
                                                             Level 4 City Council Building                
@@ -9188,12 +9176,6 @@ A20000-A20FFF                 (base 16)                     Quorum Technologies
                                                             Hermosa Beach  CA  90254-0870                
                                                             US                                           
 
-00-50-C2                      (hex)                         Helmut Mauell GmbH                           
-0B9000-0B9FFF                 (base 16)                     Helmut Mauell GmbH                           
-                                                            Am Rosenhugel 1-7                            
-                                                            42553 Velbert                                
-                                                            DE                                           
-
 00-50-C2                      (hex)                         Infolink Software AG                         
 0BC000-0BCFFF                 (base 16)                     Infolink Software AG                         
                                                             Bernstrasse 49                               
@@ -9620,6 +9602,48 @@ E0A000-E0AFFF                 (base 16)                     Sicon srl
                                                             Scottsdale  AZ  85257                        
                                                             US                                           
 
+00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+7A3000-7A3FFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
+                                                            Xiamen   Fujian  361006                      
+                                                            CN                                           
+
+00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+9F9000-9F9FFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
+                                                            Xiamen   Fujian  361006                      
+                                                            CN                                           
+
+00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+C0A000-C0AFFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
+                                                            Xiamen   Fujian  361006                      
+                                                            CN                                           
+
+00-50-C2                      (hex)                         PYRAMID Computer GmbH                        
+5E2000-5E2FFF                 (base 16)                     PYRAMID Computer GmbH                        
+                                                            Boetzinger Strasse 60                        
+                                                            Freiburg  BW  79111                          
+                                                            DE                                           
+
+00-50-C2                      (hex)                         dresden-elektronik                           
+188000-188FFF                 (base 16)                     dresden-elektronik                           
+                                                            Glasewaldtstraße 22                          
+                                                            Dresden    D-01277                           
+                                                            DE                                           
+
+00-50-C2                      (hex)                         Partner Voxstream A/S                        
+178000-178FFF                 (base 16)                     Partner Voxstream A/S                        
+                                                            Trekanten 17                                 
+                                                            Vojens    D-6500                             
+                                                            DK                                           
+
+00-50-C2                      (hex)                         Helmut Mauell GmbH Werk Weida                
+0B9000-0B9FFF                 (base 16)                     Helmut Mauell GmbH Werk Weida                
+                                                            Am Rosenhugel 1-7                            
+                                                            42553 Velbert                                
+                                                            DE                                           
+
 00-50-C2                      (hex)                         Pixel Velocity, Inc                          
 594000-594FFF                 (base 16)                     Pixel Velocity, Inc                          
                                                             3917 Research Park Drive                     
@@ -9710,41 +9734,11 @@ FBD000-FBDFFF                 (base 16)                     EATON FHF Funke + Hu
                                                             Mülheim an der Ruhr  NRW  D-45478            
                                                             DE                                           
 
-00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-7A3000-7A3FFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
-                                                            Xiamen   Fujian  361006                      
-                                                            CN                                           
-
-00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-9F9000-9F9FFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
-                                                            Xiamen   Fujian  361006                      
-                                                            CN                                           
-
-00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-C0A000-C0AFFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
-                                                            Xiamen   Fujian  361006                      
-                                                            CN                                           
-
-00-50-C2                      (hex)                         PYRAMID Computer GmbH                        
-5E2000-5E2FFF                 (base 16)                     PYRAMID Computer GmbH                        
-                                                            Boetzinger Strasse 60                        
-                                                            Freiburg  BW  79111                          
-                                                            DE                                           
-
-00-50-C2                      (hex)                         dresden-elektronik                           
-188000-188FFF                 (base 16)                     dresden-elektronik                           
-                                                            Glasewaldtstraße 22                          
-                                                            Dresden    D-01277                           
-                                                            DE                                           
-
-00-50-C2                      (hex)                         Partner Voxstream A/S                        
-178000-178FFF                 (base 16)                     Partner Voxstream A/S                        
-                                                            Trekanten 17                                 
-                                                            Vojens    D-6500                             
-                                                            DK                                           
+00-50-C2                      (hex)                         Potter Electric Signal Co. LLC               
+C63000-C63FFF                 (base 16)                     Potter Electric Signal Co. LLC               
+                                                            11790 Troy Lane North                        
+                                                            Maple Grove  MN  55369                       
+                                                            US                                           
 
 00-50-C2                      (hex)                         Mettler Toledo Hi-Speed                      
 EA9000-EA9FFF                 (base 16)                     Mettler Toledo Hi-Speed                      
@@ -10853,12 +10847,6 @@ E01000-E01FFF                 (base 16)                     Tyco Traffic & Trans
                                                             Guildford   NSW  2161                        
                                                             AU                                           
 
-00-50-C2                      (hex)                         Potter Electric Signal                       
-DF4000-DF4FFF                 (base 16)                     Potter Electric Signal                       
-                                                            1609 Park 370 Place                          
-                                                            Hazelwood  Missouri  63042                   
-                                                            US                                           
-
 00-50-C2                      (hex)                         Koncar Electrical Engineering Institute      
 DF0000-DF0FFF                 (base 16)                     Koncar Electrical Engineering Institute      
                                                             Fallerovo setaliste 22                       
@@ -11933,12 +11921,6 @@ B3B000-B3BFFF                 (base 16)                     Sportvision Inc.
                                                             Mountain View  CA  94043                     
                                                             US                                           
 
-00-50-C2                      (hex)                         IAdea Corporation                            
-B37000-B37FFF                 (base 16)                     IAdea Corporation                            
-                                                            3F, NO.33, Lane 77, Xing-ai Road,            
-                                                            Taipei    114                                
-                                                            TW                                           
-
 00-50-C2                      (hex)                         Meisol co.,ltd                               
 B34000-B34FFF                 (base 16)                     Meisol co.,ltd                               
                                                             NAKA-KU YAMASHITA-CHO 74-1                   
@@ -12083,12 +12065,6 @@ A7C000-A7CFFF                 (base 16)                     Pneu-Logic Corporati
                                                             Portland  OR  97224                          
                                                             US                                           
 
-00-50-C2                      (hex)                         Apantac LLC                                  
-A78000-A78FFF                 (base 16)                     Apantac LLC                                  
-                                                            13500 SW Pacific HWY                         
-                                                            Portland  OR  97223                          
-                                                            US                                           
-
 00-50-C2                      (hex)                         Soft & Control Technology s.r.o.             
 ACA000-ACAFFF                 (base 16)                     Soft & Control Technology s.r.o.             
                                                             Magnezitarska 10                             
@@ -12449,12 +12425,6 @@ A05000-A05FFF                 (base 16)                     Adgil Design Inc.
                                                             Richardson  TX  75080                        
                                                             US                                           
 
-00-50-C2                      (hex)                         Elisra Electronic Systems                    
-909000-909FFF                 (base 16)                     Elisra Electronic Systems                    
-                                                            48, Mivtza Kadesh                            
-                                                            Bene Beraq    51203                          
-                                                            IL                                           
-
 00-50-C2                      (hex)                         Codex Digital Ltd                            
 908000-908FFF                 (base 16)                     Codex Digital Ltd                            
                                                             60 Poland Street                             
@@ -12629,12 +12599,6 @@ A05000-A05FFF                 (base 16)                     Adgil Design Inc.
                                                             Webb City  MO  64870                         
                                                             US                                           
 
-00-50-C2                      (hex)                         IADEA CORPORATION                            
-888000-888FFF                 (base 16)                     IADEA CORPORATION                            
-                                                            3F, NO.33, LANE 77, XING-AI ROAD             
-                                                            TAIPEI    114                                
-                                                            TW                                           
-
 00-50-C2                      (hex)                         Inventis Technology Pty Limited              
 887000-887FFF                 (base 16)                     Inventis Technology Pty Limited              
                                                             Block A, Unit 40                             
@@ -15608,6 +15572,36 @@ FF4000-FF4FFF                 (base 16)                     Burk Technology
                                                             Porcia  Pordenone  33080                     
                                                             IT                                           
 
+00-50-C2                      (hex)                         Potter Electric Signal Co. LLC               
+DF4000-DF4FFF                 (base 16)                     Potter Electric Signal Co. LLC               
+                                                            1609 Park 370 Place                          
+                                                            Hazelwood  Missouri  63042                   
+                                                            US                                           
+
+00-50-C2                      (hex)                         IAdea Corporation                            
+B37000-B37FFF                 (base 16)                     IAdea Corporation                            
+                                                            3F, NO.33, Lane 77, Xing-ai Road,            
+                                                            Taipei    114                                
+                                                            TW                                           
+
+00-50-C2                      (hex)                         IAdea Corporation                            
+888000-888FFF                 (base 16)                     IAdea Corporation                            
+                                                            3F, NO.33, LANE 77, XING-AI ROAD             
+                                                            TAIPEI    114                                
+                                                            TW                                           
+
+00-50-C2                      (hex)                         Elisra                                       
+909000-909FFF                 (base 16)                     Elisra                                       
+                                                            48, Mivtza Kadesh                            
+                                                            Bene Beraq    51203                          
+                                                            IL                                           
+
+00-50-C2                      (hex)                         Apantac LLC                                  
+A78000-A78FFF                 (base 16)                     Apantac LLC                                  
+                                                            13500 SW Pacific HWY                         
+                                                            Portland  OR  97223                          
+                                                            US                                           
+
 00-50-C2                      (hex)                         Aeroflex GmbH                                
 B51000-B51FFF                 (base 16)                     Aeroflex GmbH                                
                                                             Gutenbergstrasse 2-4                         
@@ -19556,12 +19550,6 @@ A41000-A41FFF                 (base 16)                     Meiryo Denshi Corp.
                                                             Inver Grove Heights  MN  55077               
                                                             US                                           
 
-00-50-C2                      (hex)                         Owasys Advanced Wireless Devices             
-681000-681FFF                 (base 16)                     Owasys Advanced Wireless Devices             
-                                                            Parque Tecnologico, 207-B                    
-                                                            Zamudio  Vizcaya  E-48170                    
-                                                            ES                                           
-
 00-50-C2                      (hex)                         SAIA Burgess Controls AG                     
 67E000-67EFFF                 (base 16)                     SAIA Burgess Controls AG                     
                                                             Bahnhofstrasse 18                            
@@ -21737,6 +21725,36 @@ D8B000-D8BFFF                 (base 16)                     Sicon srl
                                                             Scottsdale  AZ  85257                        
                                                             US                                           
 
+00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+66A000-66AFFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+                                                            ABB Industrial Park                          
+                                                            Xiamen  Fujian  361005                       
+                                                            CN                                           
+
+00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+B92000-B92FFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
+                                                            Xiamen   Fujian  361006                      
+                                                            CN                                           
+
+00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+E18000-E18FFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
+                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
+                                                            Xiamen   Fujian  361006                      
+                                                            CN                                           
+
+00-50-C2                      (hex)                         Xslent Energy Technologies. LLC              
+BC2000-BC2FFF                 (base 16)                     Xslent Energy Technologies. LLC              
+                                                            7428 Redwood Blvd Suite 102                  
+                                                            Novato  CA  94945                            
+                                                            US                                           
+
+00-50-C2                      (hex)                         DAVE SRL                                     
+B9C000-B9CFFF                 (base 16)                     DAVE SRL                                     
+                                                            Via  Talponedo 29                            
+                                                            Porcia  PN  A-33080                          
+                                                            IT                                           
+
 00-50-C2                      (hex)                         Wireless Cables Inc.                         
 8E2000-8E2FFF                 (base 16)                     Wireless Cables Inc.                         
                                                             1414 Soquel Ave, Ste 212                     
@@ -21803,35 +21821,11 @@ B04000-B04FFF                 (base 16)                     Ubiquiti Networks In
                                                             San Jose  CA  95134                          
                                                             US                                           
 
-00-50-C2                      (hex)                         DAVE SRL                                     
-B9C000-B9CFFF                 (base 16)                     DAVE SRL                                     
-                                                            Via  Talponedo 29                            
-                                                            Porcia  PN  A-33080                          
-                                                            IT                                           
-
-00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-66A000-66AFFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-                                                            ABB Industrial Park                          
-                                                            Xiamen  Fujian  361005                       
-                                                            CN                                           
-
-00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-B92000-B92FFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
-                                                            Xiamen   Fujian  361006                      
-                                                            CN                                           
-
-00-50-C2                      (hex)                         ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-E18000-E18FFF                 (base 16)                     ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd.
-                                                            ABB Industrial Park, Torch Hi-Tech Industrial Development Zone
-                                                            Xiamen   Fujian  361006                      
-                                                            CN                                           
-
-00-50-C2                      (hex)                         Xslent Energy Technologies. LLC              
-BC2000-BC2FFF                 (base 16)                     Xslent Energy Technologies. LLC              
-                                                            7428 Redwood Blvd Suite 102                  
-                                                            Novato  CA  94945                            
-                                                            US                                           
+00-50-C2                      (hex)                         Owasys Advanced Wireless Devices             
+681000-681FFF                 (base 16)                     Owasys Advanced Wireless Devices             
+                                                            Parque Tecnologico, 207-B                    
+                                                            Zamudio  Vizcaya  E-48170                    
+                                                            ES                                           
 
 00-50-C2                      (hex)                         Baxter International Inc                     
 2E0000-2E0FFF                 (base 16)                     Baxter International Inc                     
@@ -22217,12 +22211,6 @@ AB5000-AB5FFF                 (base 16)                     Mettler Toledo Hi-Sp
                                                             Isehara  Kanagawa  259-1146                  
                                                             JP                                           
 
-40-D8-55                      (hex)                         WUHAN XINGTUXINKE ELECTRONIC CO.,LTD         
-089000-089FFF                 (base 16)                     WUHAN XINGTUXINKE ELECTRONIC CO.,LTD         
-                                                            NO.C3-8F,SOFTWARE PARK                       
-                                                            Wuhan  Hubei  430074                         
-                                                            CN                                           
-
 40-D8-55                      (hex)                         Peek Traffic Corporation                     
 085000-085FFF                 (base 16)                     Peek Traffic Corporation                     
                                                             2906 Corporate Way                           
@@ -26120,12 +26108,6 @@ A18000-A18FFF                 (base 16)                     Eoslink
                                                             Montpellier  HR  34090                       
                                                             FR                                           
 
-00-50-C2                      (hex)                         Owasys Advanced Wireless Devices             
-374000-374FFF                 (base 16)                     Owasys Advanced Wireless Devices             
-                                                            Parque Tecnologico, 207-B                    
-                                                            Zamudio  Vizcaya  E-48170                    
-                                                            ES                                           
-
 00-50-C2                      (hex)                         Minicom Advanced Systems Ltd                 
 36E000-36EFFF                 (base 16)                     Minicom Advanced Systems Ltd                 
                                                             16 Hartom str                                
@@ -27260,6 +27242,48 @@ ADD000-ADDFFF                 (base 16)                      GD Mission Systems
                                                             Scottsdale  Arizona  85157-3812              
                                                             US                                           
 
+00-50-C2                      (hex)                         Pumatronix Equipamentos Eletronicos Ltda.    
+8C8000-8C8FFF                 (base 16)                     Pumatronix Equipamentos Eletronicos Ltda.    
+                                                            Rua Algacyr Munhoz Mader, 3775               
+                                                            Curitiba  Paraná  81350-010                  
+                                                            BR                                           
+
+00-50-C2                      (hex)                         NOVACOMM LTDA                                
+5FE000-5FEFFF                 (base 16)                     NOVACOMM LTDA                                
+                                                            R. Benjui , 79                               
+                                                            São Paulo  SP  04689-000                     
+                                                            BR                                           
+
+00-50-C2                      (hex)                         Vocality International Ltd                   
+667000-667FFF                 (base 16)                     Vocality International Ltd                   
+                                                            Lydling Barn                                 
+                                                            Shackleford  Surrey  GU8 6AP                 
+                                                            GB                                           
+
+00-50-C2                      (hex)                         Vocality International Ltd                   
+E3A000-E3AFFF                 (base 16)                     Vocality International Ltd                   
+                                                            Lydling Barn                                 
+                                                            Guildford  Surrey  GU86AP                    
+                                                            GB                                           
+
+00-50-C2                      (hex)                         Survalent Technology Corporation             
+199000-199FFF                 (base 16)                     Survalent Technology Corporation             
+                                                            7965 Heritage Road                           
+                                                            Brampton  Ontario  L6Y 5X5                   
+                                                            CA                                           
+
+00-50-C2                      (hex)                         Robert Bosch Healthcare Systems, Inc.        
+EA0000-EA0FFF                 (base 16)                     Robert Bosch Healthcare Systems, Inc.        
+                                                            2400 Geng Road                               
+                                                            Palo Alto  CA  94303                         
+                                                            US                                           
+
+40-D8-55                      (hex)                         Wuhan Xingtuxinke ELectronic Co.,Ltd         
+089000-089FFF                 (base 16)                     Wuhan Xingtuxinke ELectronic Co.,Ltd         
+                                                            NO.C3-8F,SOFTWARE PARK                       
+                                                            Wuhan  Hubei  430074                         
+                                                            CN                                           
+
 40-D8-55                      (hex)                         Aplex Technology Inc.                        
 1DC000-1DCFFF                 (base 16)                     Aplex Technology Inc.                        
                                                             2Q , NanYouTianAn industrial park Tower4 ,Nanshan District
@@ -27344,38 +27368,8 @@ D43000-D43FFF                 (base 16)                     DSP4YOU LTd
                                                             Hong Kong    0000                            
                                                             HK                                           
 
-00-50-C2                      (hex)                         Pumatronix Equipamentos Eletronicos Ltda.    
-8C8000-8C8FFF                 (base 16)                     Pumatronix Equipamentos Eletronicos Ltda.    
-                                                            Rua Algacyr Munhoz Mader, 3775               
-                                                            Curitiba  Paraná  81350-010                  
-                                                            BR                                           
-
-00-50-C2                      (hex)                         NOVACOMM LTDA                                
-5FE000-5FEFFF                 (base 16)                     NOVACOMM LTDA                                
-                                                            R. Benjui , 79                               
-                                                            São Paulo  SP  04689-000                     
-                                                            BR                                           
-
-00-50-C2                      (hex)                         Vocality International Ltd                   
-667000-667FFF                 (base 16)                     Vocality International Ltd                   
-                                                            Lydling Barn                                 
-                                                            Shackleford  Surrey  GU8 6AP                 
-                                                            GB                                           
-
-00-50-C2                      (hex)                         Vocality International Ltd                   
-E3A000-E3AFFF                 (base 16)                     Vocality International Ltd                   
-                                                            Lydling Barn                                 
-                                                            Guildford  Surrey  GU86AP                    
-                                                            GB                                           
-
-00-50-C2                      (hex)                         Survalent Technology Corporation             
-199000-199FFF                 (base 16)                     Survalent Technology Corporation             
-                                                            7965 Heritage Road                           
-                                                            Brampton  Ontario  L6Y 5X5                   
-                                                            CA                                           
-
-00-50-C2                      (hex)                         Robert Bosch Healthcare Systems, Inc.        
-EA0000-EA0FFF                 (base 16)                     Robert Bosch Healthcare Systems, Inc.        
-                                                            2400 Geng Road                               
-                                                            Palo Alto  CA  94303                         
-                                                            US                                           
+00-50-C2                      (hex)                         Owasys Advanced Wireless Devices             
+374000-374FFF                 (base 16)                     Owasys Advanced Wireless Devices             
+                                                            Parque Tecnologico, 207-B                    
+                                                            Zamudio  Vizcaya  E-48170                    
+                                                            ES                                           

File diff suppressed because it is too large
+ 910 - 247
ma-medium.txt


File diff suppressed because it is too large
+ 1120 - 199
ma-small.txt


File diff suppressed because it is too large
+ 588 - 225
oui.txt


File diff suppressed because it is too large
+ 349 - 60
pci.ids


+ 24 - 0
udev/20-acpi-vendor.hwdb

@@ -9,6 +9,9 @@
 acpi:3NOD*:
  ID_VENDOR_FROM_DATABASE=Shenzhen three Connaught Information Technology Co., Ltd. (3nod Group)
 
+acpi:AANT*:
+ ID_VENDOR_FROM_DATABASE=AAEON Technology Inc.
+
 acpi:AAVA*:
  ID_VENDOR_FROM_DATABASE=Aava Mobile Oy
 
@@ -72,6 +75,9 @@ acpi:FRSC*:
 acpi:FTSC*:
  ID_VENDOR_FROM_DATABASE=FocalTech Systems Co., Ltd.
 
+acpi:GHSW*:
+ ID_VENDOR_FROM_DATABASE=Green Hills Software
+
 acpi:GOOG*:
  ID_VENDOR_FROM_DATABASE=Google, Inc.
 
@@ -126,6 +132,9 @@ acpi:LNRO*:
 acpi:LNUX*:
  ID_VENDOR_FROM_DATABASE=The Linux Foundation
 
+acpi:MCHP*:
+ ID_VENDOR_FROM_DATABASE=Microchip Technology Inc
+
 acpi:MIPI*:
  ID_VENDOR_FROM_DATABASE=MIPI Alliance
 
@@ -228,6 +237,9 @@ acpi:AAE*:
 acpi:AAM*:
  ID_VENDOR_FROM_DATABASE=Aava Mobile Oy
 
+acpi:AAN*:
+ ID_VENDOR_FROM_DATABASE=AAEON Technology Inc.
+
 acpi:AAT*:
  ID_VENDOR_FROM_DATABASE=Ann Arbor Technologies
 
@@ -879,6 +891,9 @@ acpi:AXB*:
 acpi:AXC*:
  ID_VENDOR_FROM_DATABASE=AXIOMTEK CO., LTD.
 
+acpi:AXE*:
+ ID_VENDOR_FROM_DATABASE=Axell Corporation
+
 acpi:AXE*:
  ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
 
@@ -3684,6 +3699,9 @@ acpi:KOW*:
 acpi:KPC*:
  ID_VENDOR_FROM_DATABASE=King Phoenix Company
 
+acpi:KPT*:
+ ID_VENDOR_FROM_DATABASE=TPK Holding Co., Ltd
+
 acpi:KRL*:
  ID_VENDOR_FROM_DATABASE=Krell Industries Inc.
 
@@ -6420,6 +6438,9 @@ acpi:TDC*:
 acpi:TDD*:
  ID_VENDOR_FROM_DATABASE=Tandberg Data Display AS
 
+acpi:TDG*:
+ ID_VENDOR_FROM_DATABASE=Six15 Technologies
+
 acpi:TDK*:
  ID_VENDOR_FROM_DATABASE=TDK USA Corporation
 
@@ -6858,6 +6879,9 @@ acpi:UMG*:
 acpi:UMM*:
  ID_VENDOR_FROM_DATABASE=Universal Multimedia
 
+acpi:UMT*:
+ ID_VENDOR_FROM_DATABASE=UltiMachine
+
 acpi:UNA*:
  ID_VENDOR_FROM_DATABASE=Unisys DSD
 

+ 293 - 2
udev/20-bluetooth-vendor-product.hwdb

@@ -424,7 +424,7 @@ bluetooth:v008A*
  ID_VENDOR_FROM_DATABASE=Jawbone
 
 bluetooth:v008B*
- ID_VENDOR_FROM_DATABASE=Topcorn Positioning Systems, LLC
+ ID_VENDOR_FROM_DATABASE=Topcon Positioning Systems, LLC
 
 bluetooth:v008C*
  ID_VENDOR_FROM_DATABASE=Gimbal Inc. (formerly Qualcomm Labs, Inc. and Qualcomm Retail Solutions, Inc.)
@@ -1231,7 +1231,7 @@ bluetooth:v0197*
  ID_VENDOR_FROM_DATABASE=WiSilica Inc
 
 bluetooth:v0198*
- ID_VENDOR_FROM_DATABASE=Vengit Limited
+ ID_VENDOR_FROM_DATABASE=VENGIT Korlátolt Felelősségű Társaság
 
 bluetooth:v0199*
  ID_VENDOR_FROM_DATABASE=SALTO SYSTEMS S.L.
@@ -2828,3 +2828,294 @@ bluetooth:v03AB*
 
 bluetooth:v03AC*
  ID_VENDOR_FROM_DATABASE=Smablo LTD
+
+bluetooth:v03AD*
+ ID_VENDOR_FROM_DATABASE=XiQ
+
+bluetooth:v03AE*
+ ID_VENDOR_FROM_DATABASE=Allswell Inc.
+
+bluetooth:v03AF*
+ ID_VENDOR_FROM_DATABASE=Comm-N-Sense Corp DBA Verigo
+
+bluetooth:v03B0*
+ ID_VENDOR_FROM_DATABASE=VIBRADORM GmbH
+
+bluetooth:v03B1*
+ ID_VENDOR_FROM_DATABASE=Otodata Wireless Network Inc.
+
+bluetooth:v03B2*
+ ID_VENDOR_FROM_DATABASE=Propagation Systems Limited
+
+bluetooth:v03B3*
+ ID_VENDOR_FROM_DATABASE=Midwest Instruments & Controls
+
+bluetooth:v03B4*
+ ID_VENDOR_FROM_DATABASE=Alpha Nodus, inc.
+
+bluetooth:v03B5*
+ ID_VENDOR_FROM_DATABASE=petPOMM, Inc
+
+bluetooth:v03B6*
+ ID_VENDOR_FROM_DATABASE=Mattel
+
+bluetooth:v03B7*
+ ID_VENDOR_FROM_DATABASE=Airbly Inc.
+
+bluetooth:v03B8*
+ ID_VENDOR_FROM_DATABASE=A-Safe Limited
+
+bluetooth:v03B9*
+ ID_VENDOR_FROM_DATABASE=FREDERIQUE CONSTANT SA
+
+bluetooth:v03BA*
+ ID_VENDOR_FROM_DATABASE=Maxscend Microelectronics Company Limited
+
+bluetooth:v03BB*
+ ID_VENDOR_FROM_DATABASE=Abbott Diabetes Care
+
+bluetooth:v03BC*
+ ID_VENDOR_FROM_DATABASE=ASB Bank Ltd
+
+bluetooth:v03BD*
+ ID_VENDOR_FROM_DATABASE=amadas
+
+bluetooth:v03BE*
+ ID_VENDOR_FROM_DATABASE=Applied Science, Inc.
+
+bluetooth:v03BF*
+ ID_VENDOR_FROM_DATABASE=iLumi Solutions Inc.
+
+bluetooth:v03C0*
+ ID_VENDOR_FROM_DATABASE=Arch Systems Inc.
+
+bluetooth:v03C1*
+ ID_VENDOR_FROM_DATABASE=Ember Technologies, Inc.
+
+bluetooth:v03C2*
+ ID_VENDOR_FROM_DATABASE=Snapchat Inc
+
+bluetooth:v03C3*
+ ID_VENDOR_FROM_DATABASE=Casambi Technologies Oy
+
+bluetooth:v03C4*
+ ID_VENDOR_FROM_DATABASE=Pico Technology Inc.
+
+bluetooth:v03C5*
+ ID_VENDOR_FROM_DATABASE=St. Jude Medical, Inc.
+
+bluetooth:v03C6*
+ ID_VENDOR_FROM_DATABASE=Intricon
+
+bluetooth:v03C7*
+ ID_VENDOR_FROM_DATABASE=Structural Health Systems, Inc.
+
+bluetooth:v03C8*
+ ID_VENDOR_FROM_DATABASE=Avvel International
+
+bluetooth:v03C9*
+ ID_VENDOR_FROM_DATABASE=Gallagher Group
+
+bluetooth:v03CA*
+ ID_VENDOR_FROM_DATABASE=In2things Automation Pvt. Ltd.
+
+bluetooth:v03CB*
+ ID_VENDOR_FROM_DATABASE=SYSDEV Srl
+
+bluetooth:v03CC*
+ ID_VENDOR_FROM_DATABASE=Vonkil Technologies Ltd
+
+bluetooth:v03CD*
+ ID_VENDOR_FROM_DATABASE=Wynd Technologies, Inc.
+
+bluetooth:v03CE*
+ ID_VENDOR_FROM_DATABASE=CONTRINEX S.A.
+
+bluetooth:v03CF*
+ ID_VENDOR_FROM_DATABASE=MIRA, Inc.
+
+bluetooth:v03D0*
+ ID_VENDOR_FROM_DATABASE=Watteam Ltd
+
+bluetooth:v03D1*
+ ID_VENDOR_FROM_DATABASE=Density Inc.
+
+bluetooth:v03D2*
+ ID_VENDOR_FROM_DATABASE=IOT Pot India Private Limited
+
+bluetooth:v03D3*
+ ID_VENDOR_FROM_DATABASE=Sigma Connectivity AB
+
+bluetooth:v03D4*
+ ID_VENDOR_FROM_DATABASE=PEG PEREGO SPA
+
+bluetooth:v03D5*
+ ID_VENDOR_FROM_DATABASE=Wyzelink Systems Inc.
+
+bluetooth:v03D6*
+ ID_VENDOR_FROM_DATABASE=Yota Devices LTD
+
+bluetooth:v03D7*
+ ID_VENDOR_FROM_DATABASE=FINSECUR
+
+bluetooth:v03D8*
+ ID_VENDOR_FROM_DATABASE=Zen-Me Labs Ltd
+
+bluetooth:v03D9*
+ ID_VENDOR_FROM_DATABASE=3IWare Co., Ltd.
+
+bluetooth:v03DA*
+ ID_VENDOR_FROM_DATABASE=EnOcean GmbH
+
+bluetooth:v03DB*
+ ID_VENDOR_FROM_DATABASE=Instabeat, Inc
+
+bluetooth:v03DC*
+ ID_VENDOR_FROM_DATABASE=Nima Labs
+
+bluetooth:v03DD*
+ ID_VENDOR_FROM_DATABASE=Andreas Stihl AG & Co. KG
+
+bluetooth:v03DE*
+ ID_VENDOR_FROM_DATABASE=Nathan Rhoades LLC
+
+bluetooth:v03DF*
+ ID_VENDOR_FROM_DATABASE=Grob Technologies, LLC
+
+bluetooth:v03E0*
+ ID_VENDOR_FROM_DATABASE=Actions (Zhuhai) Technology Co., Limited
+
+bluetooth:v03E1*
+ ID_VENDOR_FROM_DATABASE=SPD Development Company Ltd
+
+bluetooth:v03E2*
+ ID_VENDOR_FROM_DATABASE=Sensoan Oy
+
+bluetooth:v03E3*
+ ID_VENDOR_FROM_DATABASE=Qualcomm Life Inc
+
+bluetooth:v03E4*
+ ID_VENDOR_FROM_DATABASE=Chip-ing AG
+
+bluetooth:v03E5*
+ ID_VENDOR_FROM_DATABASE=ffly4u
+
+bluetooth:v03E6*
+ ID_VENDOR_FROM_DATABASE=IoT Instruments Oy
+
+bluetooth:v03E7*
+ ID_VENDOR_FROM_DATABASE=TRUE Fitness Technology
+
+bluetooth:v03E8*
+ ID_VENDOR_FROM_DATABASE=Reiner Kartengeraete GmbH & Co. KG.
+
+bluetooth:v03E9*
+ ID_VENDOR_FROM_DATABASE=SHENZHEN LEMONJOY TECHNOLOGY CO., LTD.
+
+bluetooth:v03EA*
+ ID_VENDOR_FROM_DATABASE=Hello Inc.
+
+bluetooth:v03EB*
+ ID_VENDOR_FROM_DATABASE=Evollve Inc.
+
+bluetooth:v03EC*
+ ID_VENDOR_FROM_DATABASE=Jigowatts Inc.
+
+bluetooth:v03ED*
+ ID_VENDOR_FROM_DATABASE=BASIC MICRO.COM,INC.
+
+bluetooth:v03EE*
+ ID_VENDOR_FROM_DATABASE=CUBE TECHNOLOGIES
+
+bluetooth:v03EF*
+ ID_VENDOR_FROM_DATABASE=foolography GmbH
+
+bluetooth:v03F0*
+ ID_VENDOR_FROM_DATABASE=CLINK
+
+bluetooth:v03F1*
+ ID_VENDOR_FROM_DATABASE=Hestan Smart Cooking Inc.
+
+bluetooth:v03F2*
+ ID_VENDOR_FROM_DATABASE=WindowMaster A/S
+
+bluetooth:v03F3*
+ ID_VENDOR_FROM_DATABASE=Flowscape AB
+
+bluetooth:v03F4*
+ ID_VENDOR_FROM_DATABASE=PAL Technologies Ltd
+
+bluetooth:v03F5*
+ ID_VENDOR_FROM_DATABASE=WHERE, Inc.
+
+bluetooth:v03F6*
+ ID_VENDOR_FROM_DATABASE=Iton Technology Corp.
+
+bluetooth:v03F7*
+ ID_VENDOR_FROM_DATABASE=Owl Labs Inc.
+
+bluetooth:v03F8*
+ ID_VENDOR_FROM_DATABASE=Rockford Corp.
+
+bluetooth:v03F9*
+ ID_VENDOR_FROM_DATABASE=Becon Technologies Co.,Ltd.
+
+bluetooth:v03FA*
+ ID_VENDOR_FROM_DATABASE=Vyassoft Technologies Inc
+
+bluetooth:v03FB*
+ ID_VENDOR_FROM_DATABASE=Nox Medical
+
+bluetooth:v03FC*
+ ID_VENDOR_FROM_DATABASE=Kimberly-Clark
+
+bluetooth:v03FD*
+ ID_VENDOR_FROM_DATABASE=Trimble Navigation Ltd.
+
+bluetooth:v03FE*
+ ID_VENDOR_FROM_DATABASE=Littelfuse
+
+bluetooth:v03FF*
+ ID_VENDOR_FROM_DATABASE=Withings
+
+bluetooth:v0400*
+ ID_VENDOR_FROM_DATABASE=i-developer IT Beratung UG
+
+bluetooth:v0401*
+ ID_VENDOR_FROM_DATABASE=リレーションズ株式会社
+
+bluetooth:v0402*
+ ID_VENDOR_FROM_DATABASE=Sears Holdings Corporation
+
+bluetooth:v0403*
+ ID_VENDOR_FROM_DATABASE=Gantner Electronic GmbH
+
+bluetooth:v0404*
+ ID_VENDOR_FROM_DATABASE=Authomate Inc
+
+bluetooth:v0405*
+ ID_VENDOR_FROM_DATABASE=Vertex International, Inc.
+
+bluetooth:v0406*
+ ID_VENDOR_FROM_DATABASE=Airtago
+
+bluetooth:v0407*
+ ID_VENDOR_FROM_DATABASE=Swiss Audio SA
+
+bluetooth:v0408*
+ ID_VENDOR_FROM_DATABASE=ToGetHome Inc.
+
+bluetooth:v0409*
+ ID_VENDOR_FROM_DATABASE=AXIS
+
+bluetooth:v040A*
+ ID_VENDOR_FROM_DATABASE=Openmatics
+
+bluetooth:v040B*
+ ID_VENDOR_FROM_DATABASE=Jana Care Inc.
+
+bluetooth:v040C*
+ ID_VENDOR_FROM_DATABASE=Senix Corporation
+
+bluetooth:v040D*
+ ID_VENDOR_FROM_DATABASE=NorthStar Battery Company, LLC

+ 46 - 3
udev/60-evdev.hwdb

@@ -45,6 +45,8 @@
 
 #  Macbook2,1 (late 2006), single-button touchpad
 evdev:input:b0003v05ACp021B*
+# Macbook4,1
+evdev:input:b0003v05ACp0229*
  EVDEV_ABS_00=256:1471:12
  EVDEV_ABS_01=256:831:12
 
@@ -76,9 +78,9 @@ evdev:input:b0003v05ACp0254*
  EVDEV_ABS_36=::92
 
 # MacbookPro10,1 (unibody, June 2012)
-evdev:input:b0003v05ACp0259*
-evdev:input:b0003v05ACp025A*
-evdev:input:b0003v05ACp025B*
+evdev:input:b0003v05ACp0262*
+evdev:input:b0003v05ACp0263*
+evdev:input:b0003v05ACp0264*
 # MacbookPro10,2 (unibody, October 2012)
 evdev:input:b0003v05ACp0259*
 evdev:input:b0003v05ACp025A*
@@ -134,6 +136,13 @@ evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLati
  EVDEV_ABS_35=76:1815:22
  EVDEV_ABS_36=131:1330:30
 
+# Dell Precision 5510
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnPrecision5510*
+ EVDEV_ABS_00=::42
+ EVDEV_ABS_01=::43
+ EVDEV_ABS_35=::42
+ EVDEV_ABS_36=::43
+
 # Dell Precision M4700
 evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:*svnDellInc.:pnPrecisionM4700*
  EVDEV_ABS_00=0:1960:24
@@ -148,6 +157,11 @@ evdev:name:SynPS/2 Synaptics TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnXPS159550*
  EVDEV_ABS_35=::41
  EVDEV_ABS_36=::43
 
+# Dell XPS M1530
+evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:bvn*:bvr*:bd*:svnDellInc.:pnXPSM1530*
+ EVDEV_ABS_00=85:947:15
+ EVDEV_ABS_01=154:726:18
+
 #########################################
 # Google
 #########################################
@@ -181,6 +195,13 @@ evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:pn*ThinkPadEdgeE530*
  EVDEV_ABS_35=1241:5703:49
  EVDEV_ABS_36=1105:4820:68
 
+# Lenovo L430
+evdev:name:ETPS/2 Elantech Touchpad:dmi:*svnLENOVO*:pvrThinkPadL430*
+ EVDEV_ABS_00=19:2197:29
+ EVDEV_ABS_01=12:1151:25
+ EVDEV_ABS_35=19:2197:29
+ EVDEV_ABS_36=12:1151:25
+
 # Lenovo P50
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pn*ThinkPad*P50*
  EVDEV_ABS_00=::44
@@ -188,6 +209,14 @@ evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pn*ThinkPad*P50*
  EVDEV_ABS_35=::44
  EVDEV_ABS_36=::67
 
+# Lenovo *40 series
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPad??40:*
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPad??40?:*
+ EVDEV_ABS_00=::41
+ EVDEV_ABS_01=::37
+ EVDEV_ABS_35=::41
+ EVDEV_ABS_36=::37
+
 # Lenovo T460
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pn*ThinkPad*T460*
  EVDEV_ABS_00=1266:5677:44
@@ -226,6 +255,20 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoideapadY700-14ISK*
  EVDEV_ABS_35=::27
  EVDEV_ABS_36=::29
 
+# Lenovo Ideapad 500S-13ISK
+evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoideapad500S-13ISK*
+ EVDEV_ABS_00=125:3955:37
+ EVDEV_ABS_01=104:1959:27
+ EVDEV_ABS_35=125:3954:37
+ EVDEV_ABS_36=104:1959:27
+
+# Lenovo Yoga 500-14ISK
+evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoYoga500-14ISK*
+ EVDEV_ABS_00=124:3955:36
+ EVDEV_ABS_01=103:1959:26
+ EVDEV_ABS_35=124:3955:36
+ EVDEV_ABS_36=103:1959:26
+
 #########################################
 # Samsung
 #########################################

+ 30 - 23
udev/60-keyboard.hwdb

@@ -213,7 +213,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pn*
  KEYBOARD_KEY_8a=suspend                                # Fn+F1 hibernate
  KEYBOARD_KEY_8b=switchvideomode                        # Fn+F8 CRT/LCD (high keycode: "displaytoggle")
  KEYBOARD_KEY_8c=unknown                                # Fn+Right Auto Brightness
- KEYBOARD_KEY_8F=switchvideomode                        # Fn+F7 aspect ratio
+ KEYBOARD_KEY_8f=switchvideomode                        # Fn+F7 aspect ratio
  KEYBOARD_KEY_90=previoussong                           # Front panel previous song
  KEYBOARD_KEY_91=prog1                                  # Wi-Fi Catcher (Dell-specific)
  KEYBOARD_KEY_92=media                                  # MediaDirect button (house icon)
@@ -238,8 +238,9 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron*1110:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron*1210:pvr*
  KEYBOARD_KEY_84=wlan
 
-# Dell Inspiron 1520
+# Dell Inspiron 1520 and Latitude 2110
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron*1520:pvr*
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnLatitude*2110:pvr*
  KEYBOARD_KEY_85=unknown  # Brightness Down, also emitted by acpi-video, ignore
  KEYBOARD_KEY_86=unknown  # Brightness Up, also emitted by acpi-video, ignore
 
@@ -482,8 +483,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnFalco:pvr*
  KEYBOARD_KEY_43=volumedown
  KEYBOARD_KEY_44=volumeup
  KEYBOARD_KEY_db=search # Same position as caps lock key on most keyboards
-# KEYBOARD_KEY_3e=fullscreen, no defined key sym
-
+ # KEYBOARD_KEY_3e=fullscreen, no defined key sym
 
 # HP EliteBook 725 G2
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPLicrice:pvr*
@@ -694,7 +694,7 @@ evdev:input:b0003v046DpC308*
  KEYBOARD_KEY_90003=finance                             # Finance
  KEYBOARD_KEY_90004=prog1                               # My Sites
  KEYBOARD_KEY_90005=prog2                               # Community
- KEYBOARD_KEY_C0183=media                               # Media
+ KEYBOARD_KEY_c0183=media                               # Media
 
 # Cordless Desktop S510
 evdev:input:b0003v046DpC50C*
@@ -759,22 +759,22 @@ evdev:input:b0003v046DpC52D*
 
 # Internet Navigator
 evdev:input:b0003v046DpC309*
-  KEYBOARD_KEY_90001=chat         # Messenger/SMS
-  KEYBOARD_KEY_90002=camera       # webcam
-  KEYBOARD_KEY_90003=prog1        # iTouch
-  KEYBOARD_KEY_90004=shop         # Shopping
-  KEYBOARD_KEY_C0201=new          # New (F1)
-  KEYBOARD_KEY_C0289=reply        # Reply mail (F2)
-  KEYBOARD_KEY_C028B=forwardmail  # Forward mail (F3)
-  KEYBOARD_KEY_C028C=send         # Send (F4)
-  KEYBOARD_KEY_C021A=undo         # Undo (F5).
-  KEYBOARD_KEY_C0279=redo         # Redo (F6).
-  KEYBOARD_KEY_C0208=print        # Print (F7)
-  KEYBOARD_KEY_C0207=save         # Save (F8)
-  KEYBOARD_KEY_C0194=file         # My Computer (F9)
-  KEYBOARD_KEY_C01A7=documents    # My Documents (F10)
-  KEYBOARD_KEY_C01B6=images       # My Pictures (F11) ??
-  KEYBOARD_KEY_C01B7=sound        # My Music (F12) ??
+ KEYBOARD_KEY_90001=chat         # Messenger/SMS
+ KEYBOARD_KEY_90002=camera       # webcam
+ KEYBOARD_KEY_90003=prog1        # iTouch
+ KEYBOARD_KEY_90004=shop         # Shopping
+ KEYBOARD_KEY_c0201=new          # New (F1)
+ KEYBOARD_KEY_c0289=reply        # Reply mail (F2)
+ KEYBOARD_KEY_c028b=forwardmail  # Forward mail (F3)
+ KEYBOARD_KEY_c028c=send         # Send (F4)
+ KEYBOARD_KEY_c021a=undo         # Undo (F5)
+ KEYBOARD_KEY_c0279=redo         # Redo (F6)
+ KEYBOARD_KEY_c0208=print        # Print (F7)
+ KEYBOARD_KEY_c0207=save         # Save (F8)
+ KEYBOARD_KEY_c0194=file         # My Computer (F9)
+ KEYBOARD_KEY_c01a7=documents    # My Documents (F10)
+ KEYBOARD_KEY_c01b6=images       # My Pictures (F11) ??
+ KEYBOARD_KEY_c01b7=sound        # My Music (F12) ??
 
 
 ###########################################################
@@ -797,6 +797,14 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMAXDATA:pnPro*7000*:pvr*
 # Medion
 ###########################################################
 
+# Akoya
+evdev:atkbd:dmi:bvn*:bvr*:svnMedion*:pnAkoya*:pvr*
+ KEYBOARD_KEY_a0=!mute
+ KEYBOARD_KEY_ae=!volumedown
+ KEYBOARD_KEY_b0=!volumeup
+ KEYBOARD_KEY_19=!p
+ KEYBOARD_KEY_df=sleep
+
 # FID2060
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMEDION*:pn*FID2060*:pvr*
  KEYBOARD_KEY_6b=channeldown                            # Thottle Down
@@ -889,7 +897,6 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnOLPC:pnXO:*
  KEYBOARD_KEY_c2=f8
  KEYBOARD_KEY_c3=f9
  KEYBOARD_KEY_c4=f10
- KEYBOARD_KEY_c7=f11
  KEYBOARD_KEY_d8=f12
  KEYBOARD_KEY_f7=f13
  KEYBOARD_KEY_f6=f14
@@ -909,7 +916,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnOLPC:pnXO:*
  KEYBOARD_KEY_c9=pageup
  KEYBOARD_KEY_d1=pagedown
  KEYBOARD_KEY_c7=home
- KEYBOARD_KEY_cF=end
+ KEYBOARD_KEY_cf=end
  KEYBOARD_KEY_73=hp
  KEYBOARD_KEY_7e=hp
  KEYBOARD_KEY_db=leftmeta                               # left grab

+ 62 - 8
udev/70-mouse.hwdb

@@ -44,8 +44,19 @@
 #   udevadm info /dev/input/eventXX.
 #
 # Allowed properties are:
+#    ID_INPUT_TRACKBALL
 #    MOUSE_DPI
 #    MOUSE_WHEEL_CLICK_ANGLE
+#    MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL
+#    MOUSE_WHEEL_CLICK_COUNT
+#    MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL
+#
+#########################################
+#         ID_INPUT_TRACKBALL            #
+#########################################
+#
+# Specified *in additition* to ID_INPUT_MOUSE if the device is a trackball.
+# Removing ID_INPUT_MOUSE will break backwards compatibility.
 #
 #########################################
 #               MOUSE_DPI               #
@@ -95,12 +106,46 @@
 #     MOUSE_WHEEL_CLICK_ANGLE=<degrees>
 #
 # Most mice have a 15 degree click stop (24 clicks per full rotation).
+# For backwards-compatibility, the click angle must be an integer.
+# Where a device has non-integer click angles, the MOUSE_WHEEL_CLICK_COUNT
+# property should also be specified.
+#
+#########################################
+#   MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL  #
+#########################################
+#
+# Identical to MOUSE_WHEEL_CLICK_ANGLE but for the horizontal scroll wheel.
+# This property may only be specified if the angle for the horizontal
+# scroll wheel differs from the vertical wheel. If so, *both* click angles
+# must be specified.
+#
+#########################################
+#   MOUSE_WHEEL_CLICK_COUNT             #
+#   MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL  #
+#########################################
 #
+# The number of clicks the wheel sends per 360 degree rotation. This
+# property should only be used where the click angle is not an integer.
+# For backwards compatibility it must be specified in addition to
+# MOUSE_WHEEL_CLICK_ANGLE.
+# Clients should prefer MOUSE_WHEEL_CLICK_COUNT where available, it is more
+# precise than MOUSE_WHEEL_CLICK_ANGLE.
+#
+# MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL works the same way but also follows the
+# rules of MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL.
 
 #
 # Sort by brand, type (usb, bluetooth), DPI, frequency.
 # For mice with switchable resolution, sort by the starred entry.
 
+##########################################
+# Generic
+##########################################
+mouse:*:name:*Trackball*:
+mouse:*:name:*trackball*:
+mouse:*:name:*TrackBall*:
+ ID_INPUT_TRACKBALL=1
+
 ##########################################
 # Apple
 ##########################################
@@ -231,6 +276,7 @@ mouse:usb:v04b3p310c:name:USB Optical Mouse:
 # Logitech M570 trackball
 mouse:usb:v046dp1028:name:Logitech M570:
  MOUSE_DPI=540@167
+ ID_INPUT_TRACKBALL=1
 
 # Logitech USB-PS/2 M-BZ96C
 mouse:usb:v046dpc045:name:Logitech USB-PS/2 Optical Mouse:
@@ -280,7 +326,7 @@ mouse:usb:v046dpc049:name:Logitech USB Gaming Mouse:
 mouse:usb:v046dpc24e:name:Logitech G500s Laser Gaming Mouse:
  MOUSE_DPI=400@500 *800@500 2000@500
 
- # Logitech G9
+# Logitech G9
 mouse:usb:v046dpc048:name:Logitech G9 Laser Mouse:
  MOUSE_DPI=400@1000 800@1000 *1600@1000
 
@@ -325,13 +371,18 @@ mouse:usb:v046dp402d:name:Logitech M560:
 mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:402d:
  MOUSE_DPI=1000@125
 
-# Logitech V220 Cordless Optical Mouse
-mouse:usb:v046dpc51b:name:Logitech USB Receiver:
 # Logitech Performance MX
 mouse:usb:v046dp101a:name:Logitech Performance MX:
+ MOUSE_DPI=1000@166
+
 # Logitech MX Master
+# Horiz wheel has 14 stops, angle is rounded up
 mouse:usb:v046dp4041:name:Logitech MX Master:
  MOUSE_DPI=1000@166
+ 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:
@@ -356,11 +407,6 @@ mouse:usb:v046dp4027:name:Logitech T620:
 mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4027:
  MOUSE_DPI=1200@250
 
-# Logitech LX8 Cordless Laser Mouse
-mouse:usb:v046dpc51b:name:Logitech USB Receiver:
- MOUSE_DPI=1300@125
- MOUSE_WHEEL_CLICK_ANGLE=15
-
 # Logitech ZoneTouch Mouse T400
 mouse:usb:v046dp4026:name:Logitech T400:
 mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4026:
@@ -483,3 +529,11 @@ mouse:usb:v1038p1369:name:SteelSeries Sensei Raw Gaming Mouse:
 # Trust illuminated mouse gxt 152
 mouse:usb:v145fp01ac:name:HID-compliant Mouse Trust Gaming Mouse:
  MOUSE_DPI=*800@528 1200@537 1600@536 2400@521
+
+ ##########################################
+ # Zelotes
+ ##########################################
+
+# Zelotes 5500 DPI 7 Button USB Wired Gaming Mouse
+mouse:usb:v1d57pad17:*
+ MOUSE_DPI=1000@500 1600@500 2400@500 3200@500 5500@500 *1000@1000 1600@1000 2400@1000 3200@1000 5500@1000

+ 22 - 31
udev/70-pointingstick.hwdb

@@ -77,15 +77,19 @@
 
 # Latitude D620
 evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeD620*:pvr*
-  POINTINGSTICK_CONST_ACCEL=0.5
+ POINTINGSTICK_CONST_ACCEL=0.5
 
 # Latitude E6320
 evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6320*:pvr*
-  POINTINGSTICK_CONST_ACCEL=2.0
+ POINTINGSTICK_CONST_ACCEL=2.0
 
 # Latitude E6400
 evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6400*:pvr*
-  POINTINGSTICK_CONST_ACCEL=1.5
+ POINTINGSTICK_CONST_ACCEL=1.5
+
+# Latitude E7470
+evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE7470*:pvr*
+ POINTINGSTICK_CONST_ACCEL=0.6
 
 #########################################
 # Lenovo
@@ -95,41 +99,28 @@ evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6400*:pvr*
 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 X240
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX240:*
-# Lenovo Thinkpad T440p
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT440p:*
-# Lenovo Thinkpad T440s
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT440s:*
-# Lenovo Thinkpad T540p
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT540p:*
-# Lenovo Thinkpad L450
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadL450:*
-# Lenovo Thinkpad T450s
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT450s:*
-# Lenovo Thinkpad T550 / W550s
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT550:*
-# Lenovo Thinkpad X250
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX250:*
-# Lenovo Thinkpad L460
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadL460:*
-# Lenovo Thinkpad T460s
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT460s:*
-# Lenovo Thinkpad T560
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT560:*
-# Lenovo Thinkpad X260
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX260:*
+# 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?:*
+# Lenovo Thinkpad *50 series
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPad??50:*
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPad??50?:*
+# Lenovo Thinkpad *60 series
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPad??60:*
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPad??60?:*
 # Lenovo Thinkpad X1 Carbon 3rd gen
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX1Carbon3rd:*
 # Lenovo Thinkpad X1 Carbon 4th gen
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX1Carbon4th:*
-  POINTINGSTICK_SENSITIVITY=200
-  POINTINGSTICK_CONST_ACCEL=1.0
+# Lenovo Thinkpad X1 Tablet
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX1Tablet:*
+ POINTINGSTICK_SENSITIVITY=200
+ POINTINGSTICK_CONST_ACCEL=1.0
 
 # Lenovo Thinkpad X200s / X201s
 # Note these come with 2 revisions of keyboard, with the trackpoints having a
 # different sensitivity in the different revisions. 1.25 is a bit slow for the
 # least sensitive revision, but it is better to be a bit slow than too fast.
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20?s:*
-  POINTINGSTICK_SENSITIVITY=200
-  POINTINGSTICK_CONST_ACCEL=1.25
+ POINTINGSTICK_SENSITIVITY=200
+ POINTINGSTICK_CONST_ACCEL=1.25

File diff suppressed because it is too large
+ 387 - 30
usb.ids


Some files were not shown because too many files changed in this diff