- Fix compilation after r285909 with USB_DEBUG defined.

- Regenerate usb.conf.
This commit is contained in:
Marius Strobl 2015-07-27 14:43:14 +00:00
parent d75accb539
commit 891c57d8a9
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=285913
2 changed files with 17 additions and 8 deletions

View File

@ -5433,6 +5433,15 @@ nomatch 32 {
action "kldload -n umodem";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "intclass" "0x02";
match "intsubclass" "0x02";
match "intprotocol" "0xff";
action "kldload -n if_urndis";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
@ -5576,5 +5585,5 @@ nomatch 32 {
action "kldload -n umass";
};
# 2687 USB entries processed
# 2688 USB entries processed

View File

@ -735,13 +735,13 @@ urndis_ctrl_query(struct urndis_softc *sc, uint32_t oid,
DPRINTF("type %u len %u rid %u oid 0x%x "
"infobuflen %u infobufoffset %u devicevchdl %u\n",
le32toh(msg.rm_type),
le32toh(msg.rm_len),
le32toh(msg.rm_rid),
le32toh(msg.rm_oid),
le32toh(msg.rm_infobuflen),
le32toh(msg.rm_infobufoffset),
le32toh(msg.rm_devicevchdl));
le32toh(msg->rm_type),
le32toh(msg->rm_len),
le32toh(msg->rm_rid),
le32toh(msg->rm_oid),
le32toh(msg->rm_infobuflen),
le32toh(msg->rm_infobufoffset),
le32toh(msg->rm_devicevchdl));
rval = urndis_ctrl_send(sc, msg, len);