diff options
| author | hselasky <hselasky@FreeBSD.org> | 2011-06-24 04:16:06 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2011-06-24 04:16:06 +0000 |
| commit | 4f452fe5208cc332cd402007674b7f2ed324a9ac (patch) | |
| tree | 8125c0b01ab791a1758145eff4b518173a902ee7 /tools | |
| parent | 1621843c39a7f4d45be490ad53fae6944653b975 (diff) | |
| download | FreeBSD-src-4f452fe5208cc332cd402007674b7f2ed324a9ac.zip FreeBSD-src-4f452fe5208cc332cd402007674b7f2ed324a9ac.tar.gz | |
- Add additional information to the PnP info of USB HUBs children which
is now required by bus_autoconf.
- Allow interface class matching even if device class is vendor specific.
- Update bus_autoconf tool to not generate system and subsystem match lines
for the nomatch event.
PR: misc/157903
MFC after: 14 days
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/bus_autoconf/bus_autoconf.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/tools/bus_autoconf/bus_autoconf.c b/tools/tools/bus_autoconf/bus_autoconf.c index 68688af..0f7dbd5 100644 --- a/tools/tools/bus_autoconf/bus_autoconf.c +++ b/tools/tools/bus_autoconf/bus_autoconf.c @@ -148,15 +148,8 @@ usb_dump(struct usb_device_id *id, uint32_t nid) usb_dump_sub(id, &info); - if (info.is_iface) { + if (info.is_any) { printf("nomatch 10 {\n" - " match \"system\" \"USB\";\n" - " match \"subsystem\" \"INTERFACE\";\n" - " match \"mode\" \"%s\";\n", mode); - } else if (info.is_any) { - printf("nomatch 10 {\n" - " match \"system\" \"USB\";\n" - " match \"subsystem\" \"DEVICE\";\n" " match \"mode\" \"%s\";\n", mode); } else { return (n); |
