diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2001-01-04 11:27:41 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2001-01-04 11:27:41 +0000 |
| commit | 2f8df952670f15f1f9c33fc7445ab58f6075ca8c (patch) | |
| tree | a04e378476381bbd6cedf008c1a26f3d454ef328 /sys/dev/usb | |
| parent | 613930f45afe077cb958d2371a18e94b530644bd (diff) | |
| download | FreeBSD-src-2f8df952670f15f1f9c33fc7445ab58f6075ca8c.zip FreeBSD-src-2f8df952670f15f1f9c33fc7445ab58f6075ca8c.tar.gz | |
UMASS_DEBUG implemented panic(9).
PR: 24044
Submitted by: Mike Bristow <mike@urgle.com>
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/umass.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usb_port.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 84032a9..fe847d7 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -700,6 +700,8 @@ USB_MATCH(umass) USB_MATCH_START(umass, uaa); struct umass_softc *sc = device_get_softc(self); + USB_MATCH_SETUP; + if (uaa->iface == NULL) return(UMATCH_NONE); diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 30e8225..c7a705b 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -107,6 +107,8 @@ __CONCAT(dname,_match)(parent, match, aux) \ #define USB_MATCH_START(dname, uaa) \ struct usb_attach_arg *uaa = aux +#define USB_MATCH_SETUP /* nop */ + #define USB_ATTACH(dname) \ void \ __CONCAT(dname,_attach)(parent, self, aux) \ @@ -221,6 +223,8 @@ __CONCAT(dname,_match)(parent, match, aux) \ #define USB_MATCH_START(dname, uaa) \ struct usb_attach_arg *uaa = aux +#define USB_MATCH_SETUP /* nop */ + #define USB_ATTACH(dname) \ void \ __CONCAT(dname,_attach)(parent, self, aux) \ @@ -332,6 +336,9 @@ __CONCAT(dname,_match)(device_t self) #define USB_MATCH_START(dname, uaa) \ struct usb_attach_arg *uaa = device_get_ivars(self) +#define USB_MATCH_SETUP \ + sc->sc_dev = self + #define USB_ATTACH(dname) \ Static int \ __CONCAT(dname,_attach)(device_t self) |
