Switch from external keymaps to internal (hwdb) keymaps

This commit imports the new internal keyboard handling from upstream.
This is a combination of many upstream commits, including those
that added code, removed old code, and updated the hwdb.
Some commits (hwdb ones specifically) were unrelated but brought
in anyways to keep the whole hwdb consistent.  Each upstream
commit included is as follows:

9d7d42bc406a2ac04639674281ce3ff6beeda790 - internal keymap support
0c959b39175b126fdb70ae00de37ca6d9c8ca3a1 - hwdb: keyboard -- add file
e8193554925a22b63bef0e77b8397b56d63a91ff - hwdb: keyboard -- update comments
c79d894d590fc9df4861738555cc43c477e33376 - hwdb: import data
aedc2eddd16e48d468e6ad0aea2caf00c7d37365 - hwdb: keyboard update
97a9313cafccf772ce03f5ebd36fe4d9d8412583 - hwdb: drop non-existant Samsung 900XC3 from keymap
ddc77f62244bb41d5c8261517e2e1ff1b763fc94 - switch from udev keymaps to hwdb
0c3815773331b263713f4f7b9d80bc1ca159338e - also remove keymaps-force-release directory
1b6bce89b3383904d0dab619dd38bff673f7286e - keymap: re-add Logitech USB corded/cordless models
bf89b99c5a39115112c2eda4c2103e2db54988d2 - 60-keyboard.hwdb: Fix syntax error
ce39bb6909578017aa10031638e724e038f0b859 - hwdb: data update, upstream
884c86812c51479496edd50b278383d7bb67baf0 - rules: keyboard - use builtin command

All code from each of the above commits is attributed to the original
authors.

There were some adjustments made in order to support the code differences
between upstream and eudev, which was done by myself.

Also of note is that the code can still be disabled via the --disable-keymaps
configure option, which was removed from upstream.

Signed-off-by: Ian Stakenvicius <axs@gentoo.org>

1 files changed, 74 insertions, 2 deletions

diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
index de0b27cb37..2436a29e9a 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -1898,6 +1898,9 @@ pci:v00001002d00004242*
 pci:v00001002d00004242sv00001002sd000002AA*
  ID_MODEL_FROM_DATABASE=Radeon 8500 AIW DV Edition
 
+pci:v00001002d00004243*
+ ID_MODEL_FROM_DATABASE=R200 PCI Bridge [All-in-Wonder Radeon 8500DV]
+
 pci:v00001002d00004336*
  ID_MODEL_FROM_DATABASE=RS100 [Radeon IGP 320M]
 
@@ -3920,6 +3923,9 @@ pci:v00001002d00005A20*
 pci:v00001002d00005A23*
  ID_MODEL_FROM_DATABASE=RD990 I/O Memory Management Unit (IOMMU)
 
+pci:v00001002d00005A31*
+ ID_MODEL_FROM_DATABASE=RC410 Host Bridge
+
 pci:v00001002d00005A33*
  ID_MODEL_FROM_DATABASE=Radeon Xpress 200 Host Bridge
 
@@ -6183,7 +6189,7 @@ pci:v00001002d00006840sv000017AAsd00005103*
  ID_MODEL_FROM_DATABASE=Radeon HD 7670M
 
 pci:v00001002d00006841*
- ID_MODEL_FROM_DATABASE=Thames [Radeon 7550M/7570M/7650M]
+ ID_MODEL_FROM_DATABASE=Thames [Radeon HD 7550M/7570M/7650M]
 
 pci:v00001002d00006841sv00001028sd00000561*
  ID_MODEL_FROM_DATABASE=Radeon HD 7650M
@@ -8372,6 +8378,45 @@ pci:v00001002d00009552sv0000174Bsd00003000*
 pci:v00001002d00009553*
  ID_MODEL_FROM_DATABASE=RV710/M92 [Mobility Radeon HD 4530/4570/545v]
 
+pci:v00001002d00009553sv00001025sd0000015E*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
+pci:v00001002d00009553sv00001025sd0000017D*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
+pci:v00001002d00009553sv00001025sd00000205*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
+pci:v00001002d00009553sv00001025sd00000206*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
+pci:v00001002d00009553sv00001025sd00000237*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
+pci:v00001002d00009553sv00001028sd000002BE*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
+pci:v00001002d00009553sv00001028sd000002E8*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4530
+
+pci:v00001002d00009553sv0000103Csd00003624*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4530
+
+pci:v00001002d00009553sv0000103Csd00003628*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4530
+
+pci:v00001002d00009553sv0000103Csd00003636*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4530
+
+pci:v00001002d00009553sv00001043sd00001B32*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
+pci:v00001002d00009553sv00001043sd00001B42*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
+pci:v00001002d00009553sv0000104Dsd00009056*
+ ID_MODEL_FROM_DATABASE=Mobility Radeon HD 4570
+
 pci:v00001002d00009553sv00001179sd0000FF82*
  ID_MODEL_FROM_DATABASE=Satellite L505-13T GPU (Mobility Radeon HD 5145)
 
@@ -10904,6 +10949,12 @@ pci:v00001022d00007813*
 pci:v00001022d00007814*
  ID_MODEL_FROM_DATABASE=FCH USB XHCI Controller
 
+pci:v00001022d00007900*
+ ID_MODEL_FROM_DATABASE=CZ SATA Controller [IDE mode]
+
+pci:v00001022d0000790B*
+ ID_MODEL_FROM_DATABASE=CZ SMBus Controller
+
 pci:v00001022d00009600*
  ID_MODEL_FROM_DATABASE=RS780 Host Bridge
 
@@ -43791,7 +43842,7 @@ pci:v000014E4d00004720*
  ID_MODEL_FROM_DATABASE=BCM4712 MIPS CPU
 
 pci:v000014E4d00004727*
- ID_MODEL_FROM_DATABASE=BCM4313 802.11b/g/n Wireless LAN Controller
+ ID_MODEL_FROM_DATABASE=BCM4313 802.11bgn Wireless Network Adapter
 
 pci:v000014E4d00004727sv00001028sd00000010*
  ID_MODEL_FROM_DATABASE=Inspiron M5010 / XPS 8300
@@ -49016,6 +49067,9 @@ pci:v000018F7d00000025*
 pci:v000018F7d00000026*
  ID_MODEL_FROM_DATABASE=SuperFSCC-LVDS Serial PCI Adapter [Fastcom]
 
+pci:v000018F7d00000027*
+ ID_MODEL_FROM_DATABASE=FSCC/4 Serial PCIe Adapter [Fastcom]
+
 pci:v000018FB*
  ID_VENDOR_FROM_DATABASE=Resilience Corporation
 
@@ -50384,6 +50438,21 @@ pci:v00001AE8d00000A44*
 pci:v00001AE8d00000E44*
  ID_MODEL_FROM_DATABASE=microEnable IV-GigE x4
 
+pci:v00001AE9*
+ ID_VENDOR_FROM_DATABASE=Wilocity Ltd.
+
+pci:v00001AE9d00000101*
+ ID_MODEL_FROM_DATABASE=Wil6200 PCI Express Root Port
+
+pci:v00001AE9d00000200*
+ ID_MODEL_FROM_DATABASE=Wil6200 PCI Express Port
+
+pci:v00001AE9d00000201*
+ ID_MODEL_FROM_DATABASE=Wil6200 Wireless PCI Express Port
+
+pci:v00001AE9d00000301*
+ ID_MODEL_FROM_DATABASE=Wil6200 802.11ad Wireless Network Adapter
+
 pci:v00001AEC*
  ID_VENDOR_FROM_DATABASE=Wolfson Microelectronics
 
@@ -50663,6 +50732,9 @@ pci:v00001BB0*
 pci:v00001BB0d00000002*
  ID_MODEL_FROM_DATABASE=OmniCube Accelerator OA-3000
 
+pci:v00001BB0d00000010*
+ ID_MODEL_FROM_DATABASE=OmniCube Accelerator OA-3000-2
+
 pci:v00001BB3*
  ID_VENDOR_FROM_DATABASE=Bluecherry