summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-10-22 18:23:08 +0200
committerKay Sievers <kay@vrfy.org>2012-10-23 16:43:32 +0200
commit796b06c21b62d13c9021e2fbd9c58a5c6edb2764 (patch)
treef46dc94e7589364887b9bb91589010f41d29706d /rules
parent59bb9d9a14889bee001706a32a518fe0a5009048 (diff)
udev: add hardware database support
Diffstat (limited to 'rules')
-rw-r--r--rules/50-udev-default.rules2
-rw-r--r--rules/75-net-description.rules4
-rw-r--r--rules/75-tty-description.rules4
-rw-r--r--rules/78-sound-card.rules5
4 files changed, 6 insertions, 9 deletions
diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
index 20ef5fda5a..758538caeb 100644
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -43,7 +43,7 @@ SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
# 'libusb' device nodes
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb"
# printer
KERNEL=="parport[0-9]*", GROUP="lp"
diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules
index ce57d48e86..4437a34eda 100644
--- a/rules/75-net-description.rules
+++ b/rules/75-net-description.rules
@@ -4,11 +4,11 @@ ACTION=="remove", GOTO="net_end"
SUBSYSTEM!="net", GOTO="net_end"
SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
-SUBSYSTEMS=="usb", IMPORT{builtin}="usb-db"
+SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb"
SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}"
SUBSYSTEMS=="usb", GOTO="net_end"
-SUBSYSTEMS=="pci", IMPORT{builtin}="pci-db"
+IMPORT{builtin}="hwdb"
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
LABEL="net_end"
diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules
index 2e63e140cb..59857c2d22 100644
--- a/rules/75-tty-description.rules
+++ b/rules/75-tty-description.rules
@@ -3,12 +3,12 @@
ACTION=="remove", GOTO="tty_end"
SUBSYSTEM!="tty", GOTO="tty_end"
+IMPORT{builtin}="hwdb"
+
SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
-SUBSYSTEMS=="usb", IMPORT{builtin}="usb-db"
SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}"
SUBSYSTEMS=="usb", GOTO="tty_end"
-SUBSYSTEMS=="pci", IMPORT{builtin}="pci-db"
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
LABEL="tty_end"
diff --git a/rules/78-sound-card.rules b/rules/78-sound-card.rules
index e564441893..295f490150 100644
--- a/rules/78-sound-card.rules
+++ b/rules/78-sound-card.rules
@@ -37,8 +37,8 @@ KERNEL!="card*", GOTO="sound_end"
ENV{SOUND_INITIALIZED}="1"
+IMPORT{builtin}="hwdb"
SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id"
-SUBSYSTEMS=="usb", IMPORT{builtin}="usb-db"
SUBSYSTEMS=="usb", GOTO="skip_pci"
SUBSYSTEMS=="firewire", ATTRS{vendor_name}=="?*", ATTRS{model_name}=="?*", \
@@ -46,10 +46,7 @@ SUBSYSTEMS=="firewire", ATTRS{vendor_name}=="?*", ATTRS{model_name}=="?*", \
SUBSYSTEMS=="firewire", ATTRS{guid}=="?*", ENV{ID_ID}="firewire-$attr{guid}"
SUBSYSTEMS=="firewire", GOTO="skip_pci"
-
-SUBSYSTEMS=="pci", IMPORT{builtin}="pci-db"
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
-
LABEL="skip_pci"
ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="?*", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_USB_INTERFACE_NUM}-$attr{id}"