diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2003-04-01 04:42:38 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-01 04:42:38 -0800 |
commit | 68e737ecc02b800109dfcb5f6b91d6f9c0ddac4b (patch) | |
tree | bc01246cf942d2e9bc7fac389fae27297c29253b /scripts | |
parent | c17794bb23576b30c6ccc3112ba06ea1cd766b6d (diff) | |
download | history-68e737ecc02b800109dfcb5f6b91d6f9c0ddac4b.tar.gz |
[PATCH] Subdivide PCI class for aliases
The previous handling of PCI class masks was too primitive: the
class field is not "all or nothing" but has base class, subclass
and interface fields. This patch changes the alias form from:
pci:vNdNsvNsdNcN to pci:vNdNsvNsdNbcNscNiN.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/file2alias.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/scripts/file2alias.c b/scripts/file2alias.c index cdb1e4c6a350b..113ce6e91075a 100644 --- a/scripts/file2alias.c +++ b/scripts/file2alias.c @@ -81,10 +81,14 @@ static int do_usb_entry(const char *filename, return 1; } -/* Looks like: pci:vNdNsvNsdNcN. */ +/* Looks like: pci:vNdNsvNsdNbcNscNiN. */ static int do_pci_entry(const char *filename, struct pci_device_id *id, char *alias) { + /* Class field can be divided into these three. */ + unsigned char baseclass, subclass, interface, + baseclass_mask, subclass_mask, interface_mask; + id->vendor = TO_NATIVE(id->vendor); id->device = TO_NATIVE(id->device); id->subvendor = TO_NATIVE(id->subvendor); @@ -97,13 +101,26 @@ static int do_pci_entry(const char *filename, ADD(alias, "d", id->device != PCI_ANY_ID, id->device); ADD(alias, "sv", id->subvendor != PCI_ANY_ID, id->subvendor); ADD(alias, "sd", id->subdevice != PCI_ANY_ID, id->subdevice); - if (id->class_mask != 0 && id->class_mask != ~0) { + + baseclass = (id->class) >> 16; + baseclass_mask = (id->class_mask) >> 16; + subclass = (id->class) >> 8; + subclass_mask = (id->class_mask) >> 8; + interface = id->class; + interface_mask = id->class_mask; + + if ((baseclass_mask != 0 && baseclass_mask != 0xFF) + || (subclass_mask != 0 && subclass_mask != 0xFF) + || (interface_mask != 0 && interface_mask != 0xFF)) { fprintf(stderr, - "*** Warning: Can't handle class_mask in %s:%04X\n", + "*** Warning: Can't handle masks in %s:%04X\n", filename, id->class_mask); return 0; } - ADD(alias, "c", id->class_mask == ~0, id->class); + + ADD(alias, "bc", baseclass_mask == 0xFF, baseclass); + ADD(alias, "sc", subclass_mask == 0xFF, subclass); + ADD(alias, "i", interface_mask == 0xFF, interface); return 1; } |