summaryrefslogtreecommitdiff
path: root/sys/dev/usb/ulpt.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/ulpt.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/ulpt.c')
-rw-r--r--sys/dev/usb/ulpt.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 19b18c9a785..de8d0f53c8e 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.19 1999/09/04 22:26:12 augustss Exp $ */
+/* $NetBSD: ulpt.c,v 1.20 1999/09/05 19:32:18 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@ int ulptdebug = 0;
#define LPS_MASK (LPS_SELECT|LPS_NERR|LPS_NOPAPER)
struct ulpt_softc {
- bdevice sc_dev;
+ USBBASEDEVICE sc_dev;
usbd_device_handle sc_udev; /* device */
usbd_interface_handle sc_iface; /* interface */
int sc_ifaceno;
@@ -221,7 +221,7 @@ USB_ATTACH(ulpt)
int
ulpt_activate(self, act)
- bdevice *self;
+ device_ptr_t self;
enum devact act;
{
struct ulpt_softc *sc = (struct ulpt_softc *)self;
@@ -240,7 +240,7 @@ ulpt_activate(self, act)
int
ulpt_detach(self, flags)
- bdevice *self;
+ device_ptr_t self;
int flags;
{
struct ulpt_softc *sc = (struct ulpt_softc *)self;
@@ -257,7 +257,7 @@ ulpt_detach(self, flags)
if (--sc->sc_refcnt >= 0) {
/* There is noone to wake, aborting the pipe is enough */
/* Wait for processes to go away. */
- usb_detach_wait(&sc->sc_dev);
+ usb_detach_wait(USBDEV(sc->sc_dev));
}
splx(s);
@@ -453,7 +453,7 @@ ulptwrite(dev, uio, flags)
sc->sc_refcnt++;
error = ulpt_do_write(sc, uio, flags);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(&sc->sc_dev);
+ usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
}