diff options
author | joe <joe@FreeBSD.org> | 2002-01-28 01:03:19 +0000 |
---|---|---|
committer | joe <joe@FreeBSD.org> | 2002-01-28 01:03:19 +0000 |
commit | 3311f87be611f7f1570cc4b728eeadceb9169eec (patch) | |
tree | c7820152b3d171d7820a328b8adc34c87a71de86 /sys/dev/usb/usb_port.h | |
parent | df86bfa3eb425548b26d69e069bc8e2d80e9e5c9 (diff) | |
download | FreeBSD-src-3311f87be611f7f1570cc4b728eeadceb9169eec.zip FreeBSD-src-3311f87be611f7f1570cc4b728eeadceb9169eec.tar.gz |
Merge from NetBSD.
uhub.c: revision 1.37
usb.4: revision 1.30
usb.c: revision 1.38
usb.h: revision 1.40
usb_port.h: revision 1.21
usb_subr.c: revision 1.65
usbdi.h: revision 1.40
Split the attach/detach events up into device, driver and controller
attach and detach events.
The commit message from NetBSD was:
date: 2000/02/02 07:34:00; author: augustss; state: Exp;
Change the USB event mechanism to include more information
about devices and drivers. Partly from FreeBSD.
Also rework usbd to take these new event types into account.
Diffstat (limited to 'sys/dev/usb/usb_port.h')
-rw-r--r-- | sys/dev/usb/usb_port.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 3f78422..e2ac72f 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -70,6 +70,7 @@ typedef struct device *device_ptr_t; #define USBBASEDEVICE struct device #define USBDEV(bdev) (&(bdev)) #define USBDEVNAME(bdev) ((bdev).dv_xname) +#define USBDEVUNIT(bdev) ((bdev).dv_unit) #define USBDEVPTRNAME(bdevptr) ((bdevptr)->dv_xname) #define USBDEVUNIT(bdev) ((bdev).dv_unit) @@ -191,6 +192,7 @@ typedef struct device device_ptr_t; #define USBBASEDEVICE struct device #define USBDEV(bdev) (&(bdev)) #define USBDEVNAME(bdev) ((bdev).dv_xname) +#define USBDEVUNIT(bdev) ((bdev).dv_unit) #define USBDEVPTRNAME(bdevptr) ((bdevptr)->dv_xname) #define USBDEVUNIT(bdev) ((bdev).dv_unit) @@ -290,6 +292,7 @@ __CONCAT(dname,_detach)(self, flags) \ #define USBBASEDEVICE device_t #define USBDEV(bdev) (bdev) #define USBDEVNAME(bdev) device_get_nameunit(bdev) +#define USBDEVUNIT(bdev) device_get_unit(bdev) #define USBDEVPTRNAME(bdev) device_get_nameunit(bdev) #define USBDEVUNIT(bdev) device_get_unit(bdev) |