summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uhub.c
diff options
context:
space:
mode:
authoraugustss <augustss@NetBSD.org>1999-09-05 19:32:18 +0000
committeraugustss <augustss@NetBSD.org>1999-09-05 19:32:18 +0000
commit24251055bcbdaca83cc7cc043cc753efbe81f77d (patch)
treefa6a6f0889830166db177c559e00d5b6777e85a9 /sys/dev/usb/uhub.c
parent6cbab8a4739a11007b61d38de8407b28527ae8dc (diff)
Change the way the `struct device' base part of all driver softc are
declared and accessed to make it more portable. Idea from Nick Hibma, FreeBSD. No functional changes.
Diffstat (limited to 'sys/dev/usb/uhub.c')
-rw-r--r--sys/dev/usb/uhub.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 56d3830fc39..18fb9d21714 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.25 1999/09/02 18:13:50 augustss Exp $ */
+/* $NetBSD: uhub.c,v 1.26 1999/09/05 19:32:18 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ extern int usbdebug;
#endif
struct uhub_softc {
- bdevice sc_dev; /* base device */
+ USBBASEDEVICE sc_dev; /* base device */
usbd_device_handle sc_hub; /* USB device */
usbd_pipe_handle sc_ipipe; /* interrupt pipe */
u_int8_t sc_status[1]; /* XXX more ports */
@@ -180,8 +180,7 @@ USB_ATTACH(uhub)
if (!dev->self_powered && dev->powersrc->parent &&
!dev->powersrc->parent->self_powered) {
printf("%s: bus powered hub connected to bus powered hub, "
- "ignored\n",
- USBDEVNAME(sc->sc_dev));
+ "ignored\n", USBDEVNAME(sc->sc_dev));
goto bad;
}
@@ -395,7 +394,7 @@ uhub_explore(dev)
continue;
/* Get device info and set its address. */
- r = usbd_new_device(&sc->sc_dev, dev->bus,
+ r = usbd_new_device(USBDEV(sc->sc_dev), dev->bus,
dev->depth + 1, status & UPS_LOW_SPEED,
port, up);
/* XXX retry a few times? */
@@ -467,10 +466,10 @@ uhub_disconnect_port(up)
}
if (dev->subdevs) {
- hubname = USBDEVNAME(*up->parent->subdevs[0]);
+ hubname = USBDEVPTRNAME(up->parent->subdevs[0]);
for (i = 0; dev->subdevs[i]; i++) {
printf("%s: at %s port %d (addr %d) disconnected\n",
- USBDEVNAME(*dev->subdevs[i]), hubname,
+ USBDEVPTRNAME(dev->subdevs[i]), hubname,
up->portno, dev->address);
config_detach(dev->subdevs[i], DETACH_FORCE);
}
@@ -489,7 +488,7 @@ uhub_disconnect_port(up)
int
uhub_activate(self, act)
- bdevice *self;
+ device_ptr_t self;
enum devact act;
{
switch (act) {
@@ -509,7 +508,7 @@ uhub_activate(self, act)
*/
int
uhub_detach(self, flags)
- bdevice *self;
+ device_ptr_t self;
int flags;
{
struct uhub_softc *sc = (struct uhub_softc *)self;