diff options
| author |   mbalmer <mbalmer@openbsd.org> | 2007-06-10 14:49:00 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@openbsd.org> | 2007-06-10 14:49:00 +0000 |
| commit | 4ab2b9fe17d15fc7440b52cb1fd3d63a58560829 (patch) | |
| tree | d200ff63c3118d93390caa0680e934056f66554f /sys/dev/usb/uipaq.c | |
| parent | refactor the code a bit, so that lists through ftp and htpp share more (diff) | |
| download | wireguard-openbsd-4ab2b9fe17d15fc7440b52cb1fd3d63a58560829.tar.xz wireguard-openbsd-4ab2b9fe17d15fc7440b52cb1fd3d63a58560829.zip | |
Remove the definition and use of the USBDEVNAME macro.
(This might look easy, but it was a big diff. Thanks to dlg and especially jsg
for looking over it; we found at least four mistakes in the initial diff.)
ok jsg.
Diffstat (limited to 'sys/dev/usb/uipaq.c')
| -rw-r--r-- | sys/dev/usb/uipaq.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c index 457be69965e..7128403d63d 100644 --- a/sys/dev/usb/uipaq.c +++ b/sys/dev/usb/uipaq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipaq.c,v 1.8 2007/06/10 10:53:48 mbalmer Exp $ */ +/* $OpenBSD: uipaq.c,v 1.9 2007/06/10 14:49:01 mbalmer Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -157,7 +157,7 @@ uipaq_attach(struct device *parent, struct device *self, void *aux) usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; char *devinfop; - char *devname = USBDEVNAME(sc->sc_dev); + char *devname = sc->sc_dev.dv_xname; int i; usbd_status err; struct ucom_attach_args uca; @@ -203,7 +203,7 @@ uipaq_attach(struct device *parent, struct device *self, void *aux) /* err = uipaq_init(sc); if (err) { - printf("%s: init failed, %s\n", USBDEVNAME(sc->sc_dev), + printf("%s: init failed, %s\n", sc->sc_dev.dv_xname, usbd_errstr(err)); goto bad; }*/ @@ -249,7 +249,7 @@ uipaq_dtr(struct uipaq_softc* sc, int onoff) usbd_status err; int retries = 3; - DPRINTF(("%s: uipaq_dtr: onoff=%x\n", USBDEVNAME(sc->sc_dev), onoff)); + DPRINTF(("%s: uipaq_dtr: onoff=%x\n", sc->sc_dev.dv_xname, onoff)); /* Avoid sending unnecessary requests */ if (onoff && (sc->sc_lcr & UCDC_LINE_DTR)) @@ -282,7 +282,7 @@ uipaq_rts(struct uipaq_softc* sc, int onoff) usbd_status err; int retries = 3; - DPRINTF(("%s: uipaq_rts: onoff=%x\n", USBDEVNAME(sc->sc_dev), onoff)); + DPRINTF(("%s: uipaq_rts: onoff=%x\n", sc->sc_dev.dv_xname, onoff)); /* Avoid sending unnecessary requests */ if (onoff && (sc->sc_lcr & UCDC_LINE_RTS)) return; @@ -311,7 +311,7 @@ uipaq_break(struct uipaq_softc* sc, int onoff) usbd_status err; int retries = 3; - DPRINTF(("%s: uipaq_break: onoff=%x\n", USBDEVNAME(sc->sc_dev), onoff)); + DPRINTF(("%s: uipaq_break: onoff=%x\n", sc->sc_dev.dv_xname, onoff)); req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SEND_BREAK; @@ -346,7 +346,7 @@ uipaq_set(void *addr, int portno, int reg, int onoff) break; default: printf("%s: unhandled set request: reg=%x onoff=%x\n", - USBDEVNAME(sc->sc_dev), reg, onoff); + sc->sc_dev.dv_xname, reg, onoff); return; } } |