From 1e089e7e7eff802b1e9230785498ddf334ec374f Mon Sep 17 00:00:00 2001 From: Hasso Tepper Date: Mon, 2 Jul 2007 06:43:31 +0000 Subject: [PATCH] Nuke USB_GET_SC and USB_GET_SC_OPEN macros. --- sys/bus/usb/usb.c | 8 +++++--- sys/dev/usbmisc/ucom/ucom.c | 20 +++++++++++--------- sys/dev/usbmisc/ufm/ufm.c | 10 ++++++---- sys/dev/usbmisc/ugen/ugen.c | 16 +++++++++------- sys/dev/usbmisc/uhid/uhid.c | 16 +++++++++------- sys/dev/usbmisc/ulpt/ulpt.c | 10 ++++++---- sys/dev/usbmisc/ums/ums.c | 14 ++++++++------ sys/dev/usbmisc/urio/urio.c | 14 ++++++++------ sys/dev/usbmisc/uscanner/uscanner.c | 14 ++++++++------ 9 files changed, 70 insertions(+), 52 deletions(-) diff --git a/sys/bus/usb/usb.c b/sys/bus/usb/usb.c index efb6a9b878..fb1b01b517 100644 --- a/sys/bus/usb/usb.c +++ b/sys/bus/usb/usb.c @@ -1,7 +1,7 @@ /* * $NetBSD: usb.c,v 1.68 2002/02/20 20:30:12 christos Exp $ * $FreeBSD: src/sys/dev/usb/usb.c,v 1.106 2005/03/27 15:31:23 iedowse Exp $ - * $DragonFly: src/sys/bus/usb/usb.c,v 1.36 2007/07/01 21:24:02 hasso Exp $ + * $DragonFly: src/sys/bus/usb/usb.c,v 1.37 2007/07/02 06:43:31 hasso Exp $ */ /* Also already merged from NetBSD: @@ -500,7 +500,9 @@ usbopen(struct dev_open_args *ap) return (0); } - USB_GET_SC_OPEN(usb, unit, sc); + sc = devclass_get_softc(usb_devclass, unit); + if (sc == NULL) + return (ENXIO); if (sc->sc_dying) return (EIO); @@ -579,7 +581,7 @@ usbioctl(struct dev_ioctl_args *ap) } } - USB_GET_SC(usb, unit, sc); + sc = devclass_get_softc(usb_devclass, unit); if (sc->sc_dying) return (EIO); diff --git a/sys/dev/usbmisc/ucom/ucom.c b/sys/dev/usbmisc/ucom/ucom.c index 8499f4ef2c..5075f1fbd2 100644 --- a/sys/dev/usbmisc/ucom/ucom.c +++ b/sys/dev/usbmisc/ucom/ucom.c @@ -2,7 +2,7 @@ * $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ * $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $ * $FreeBSD: src/sys/dev/usb/ucom.c,v 1.35 2003/11/16 11:58:21 akiyama Exp $ - * $DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.26 2007/06/28 13:55:12 hasso Exp $ + * $DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.27 2007/07/02 06:43:31 hasso Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -256,7 +256,9 @@ ucomopen(struct dev_open_args *ap) struct tty *tp; int error; - USB_GET_SC_OPEN(ucom, unit, sc); + sc = devclass_get_softc(ucom_devclass, unit); + if (sc == NULL) + return (ENXIO); if (sc->sc_dying) return (ENXIO); @@ -449,7 +451,7 @@ ucomclose(struct dev_close_args *ap) struct ucom_softc *sc; struct tty *tp; - USB_GET_SC(ucom, UCOMUNIT(dev), sc); + sc = devclass_get_softc(ucom_devclass, UCOMUNIT(dev)); tp = sc->sc_tty; @@ -500,7 +502,7 @@ ucomread(struct dev_read_args *ap) struct tty *tp; int error; - USB_GET_SC(ucom, UCOMUNIT(dev), sc); + sc = devclass_get_softc(ucom_devclass, UCOMUNIT(dev)); tp = sc->sc_tty; DPRINTF(("ucomread: tp = %p, flag = 0x%x\n", tp, ap->a_ioflag)); @@ -523,7 +525,7 @@ ucomwrite(struct dev_write_args *ap) struct tty *tp; int error; - USB_GET_SC(ucom, UCOMUNIT(dev), sc); + sc = devclass_get_softc(ucom_devclass, UCOMUNIT(dev)); tp = sc->sc_tty; DPRINTF(("ucomwrite: tp = %p, flag = 0x%x\n", tp, ap->a_ioflag)); @@ -547,7 +549,7 @@ ucomioctl(struct dev_ioctl_args *ap) int error; int d; - USB_GET_SC(ucom, UCOMUNIT(dev), sc); + sc = devclass_get_softc(ucom_devclass, UCOMUNIT(dev)); tp = sc->sc_tty; if (sc->sc_dying) @@ -776,7 +778,7 @@ ucomparam(struct tty *tp, struct termios *t) int error; usbd_status uerr; - USB_GET_SC(ucom, UCOMUNIT(tp->t_dev), sc); + sc = devclass_get_softc(ucom_devclass, UCOMUNIT(tp->t_dev)); if (sc->sc_dying) return (EIO); @@ -845,7 +847,7 @@ ucomstart(struct tty *tp) u_char *data; int cnt; - USB_GET_SC(ucom, UCOMUNIT(tp->t_dev), sc); + sc = devclass_get_softc(ucom_devclass, UCOMUNIT(tp->t_dev)); DPRINTF(("ucomstart: sc = %p\n", sc)); if (sc->sc_dying) @@ -932,7 +934,7 @@ ucomstop(struct tty *tp, int flag) { struct ucom_softc *sc; - USB_GET_SC(ucom, UCOMUNIT(tp->t_dev), sc); + sc = devclass_get_softc(ucom_devclass, UCOMUNIT(tp->t_dev)); DPRINTF(("ucomstop: %d\n", flag)); diff --git a/sys/dev/usbmisc/ufm/ufm.c b/sys/dev/usbmisc/ufm/ufm.c index 8cf8a72cc3..9ad48d2c29 100644 --- a/sys/dev/usbmisc/ufm/ufm.c +++ b/sys/dev/usbmisc/ufm/ufm.c @@ -30,7 +30,7 @@ /* * $FreeBSD: src/sys/dev/usb/ufm.c,v 1.16 2003/10/04 21:41:01 joe Exp $ - * $DragonFly: src/sys/dev/usbmisc/ufm/ufm.c,v 1.17 2007/07/01 21:24:03 hasso Exp $ + * $DragonFly: src/sys/dev/usbmisc/ufm/ufm.c,v 1.18 2007/07/02 06:43:31 hasso Exp $ */ #include @@ -189,7 +189,9 @@ ufmopen(struct dev_open_args *ap) struct ufm_softc *sc; int unit = UFMUNIT(dev); - USB_GET_SC_OPEN(ufm, unit, sc); + sc = devclass_get_softc(ufm_devclass, unit); + if (sc == NULL) + return (ENXIO); DPRINTFN(5, ("ufmopen: flag=%d, mode=%d, unit=%d\n", ap->a_oflags, ap->a_devtype, unit)); @@ -211,7 +213,7 @@ ufmclose(struct dev_close_args *ap) struct ufm_softc *sc; int unit = UFMUNIT(dev); - USB_GET_SC(ufm, unit, sc); + sc = devclass_get_softc(ufm_devclass, unit); DPRINTFN(5, ("ufmclose: flag=%d, mode=%d, unit=%d\n", ap->a_fflag, ap->a_devtype, unit)); @@ -338,7 +340,7 @@ ufmioctl(struct dev_ioctl_args *ap) int unit = UFMUNIT(dev); int error = 0; - USB_GET_SC(ufm, unit, sc); + sc = devclass_get_softc(ufm_devclass, unit); switch (ap->a_cmd) { case FM_SET_FREQ: diff --git a/sys/dev/usbmisc/ugen/ugen.c b/sys/dev/usbmisc/ugen/ugen.c index 5969a60843..6dfba26f25 100644 --- a/sys/dev/usbmisc/ugen/ugen.c +++ b/sys/dev/usbmisc/ugen/ugen.c @@ -2,7 +2,7 @@ * $NetBSD: ugen.c,v 1.27 1999/10/28 12:08:38 augustss Exp $ * $NetBSD: ugen.c,v 1.59 2002/07/11 21:14:28 augustss Exp $ * $FreeBSD: src/sys/dev/usb/ugen.c,v 1.81 2003/11/09 09:17:22 tanimura Exp $ - * $DragonFly: src/sys/dev/usbmisc/ugen/ugen.c,v 1.29 2007/07/01 21:24:03 hasso Exp $ + * $DragonFly: src/sys/dev/usbmisc/ugen/ugen.c,v 1.30 2007/07/02 06:43:31 hasso Exp $ */ /* @@ -392,7 +392,9 @@ ugenopen(struct dev_open_args *ap) void *buf; int i, j; - USB_GET_SC_OPEN(ugen, unit, sc); + sc = devclass_get_softc(ugen_devclass, unit); + if (sc == NULL) + return (ENXIO); DPRINTFN(5, ("ugenopen: flag=%d, mode=%d, unit=%d endpt=%d\n", ap->a_oflags, ap->a_devtype, unit, endpt)); @@ -528,7 +530,7 @@ ugenclose(struct dev_close_args *ap) int dir; int i; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); DPRINTFN(5, ("ugenclose: flag=%d, mode=%d, unit=%d, endpt=%d\n", ap->a_fflag, ap->a_devtype, UGENUNIT(dev), endpt)); @@ -742,7 +744,7 @@ ugenread(struct dev_read_args *ap) struct ugen_softc *sc; int error; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); sc->sc_refcnt++; error = ugen_do_read(sc, endpt, ap->a_uio, ap->a_ioflag); @@ -853,7 +855,7 @@ ugenwrite(struct dev_write_args *ap) struct ugen_softc *sc; int error; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); sc->sc_refcnt++; error = ugen_do_write(sc, endpt, ap->a_uio, ap->a_ioflag); @@ -1379,7 +1381,7 @@ ugenioctl(struct dev_ioctl_args *ap) struct ugen_softc *sc; int error; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); sc->sc_refcnt++; error = ugen_do_ioctl(sc, endpt, ap->a_cmd, ap->a_data, ap->a_fflag); @@ -1396,7 +1398,7 @@ ugenpoll(struct dev_poll_args *ap) struct ugen_endpoint *sce; int revents = 0; - USB_GET_SC(ugen, UGENUNIT(dev), sc); + sc = devclass_get_softc(ugen_devclass, UGENUNIT(dev)); if (sc->sc_dying) return (EIO); diff --git a/sys/dev/usbmisc/uhid/uhid.c b/sys/dev/usbmisc/uhid/uhid.c index ae7586916c..402dba8f7b 100644 --- a/sys/dev/usbmisc/uhid/uhid.c +++ b/sys/dev/usbmisc/uhid/uhid.c @@ -1,7 +1,7 @@ /* * $NetBSD: uhid.c,v 1.46 2001/11/13 06:24:55 lukem Exp $ * $FreeBSD: src/sys/dev/usb/uhid.c,v 1.65 2003/11/09 09:17:22 tanimura Exp $ - * $DragonFly: src/sys/dev/usbmisc/uhid/uhid.c,v 1.26 2007/07/01 21:24:03 hasso Exp $ + * $DragonFly: src/sys/dev/usbmisc/uhid/uhid.c,v 1.27 2007/07/02 06:43:31 hasso Exp $ */ /* Also already merged from NetBSD: @@ -336,7 +336,9 @@ uhidopen(struct dev_open_args *ap) struct uhid_softc *sc; usbd_status err; - USB_GET_SC_OPEN(uhid, UHIDUNIT(dev), sc); + sc = devclass_get_softc(uhid_devclass, UHIDUNIT(dev)); + if (sc == NULL) + return (ENXIO); DPRINTF(("uhidopen: sc=%p\n", sc)); @@ -383,7 +385,7 @@ uhidclose(struct dev_close_args *ap) cdev_t dev = ap->a_head.a_dev; struct uhid_softc *sc; - USB_GET_SC(uhid, UHIDUNIT(dev), sc); + sc = devclass_get_softc(uhid_devclass, UHIDUNIT(dev)); DPRINTF(("uhidclose: sc=%p\n", sc)); @@ -474,7 +476,7 @@ uhidread(struct dev_read_args *ap) struct uhid_softc *sc; int error; - USB_GET_SC(uhid, UHIDUNIT(dev), sc); + sc = devclass_get_softc(uhid_devclass, UHIDUNIT(dev)); sc->sc_refcnt++; error = uhid_do_read(sc, ap->a_uio, ap->a_ioflag); @@ -521,7 +523,7 @@ uhidwrite(struct dev_write_args *ap) struct uhid_softc *sc; int error; - USB_GET_SC(uhid, UHIDUNIT(dev), sc); + sc = devclass_get_softc(uhid_devclass, UHIDUNIT(dev)); sc->sc_refcnt++; error = uhid_do_write(sc, ap->a_uio, ap->a_ioflag); @@ -647,7 +649,7 @@ uhidioctl(struct dev_ioctl_args *ap) struct uhid_softc *sc; int error; - USB_GET_SC(uhid, UHIDUNIT(dev), sc); + sc = devclass_get_softc(uhid_devclass, UHIDUNIT(dev)); sc->sc_refcnt++; error = uhid_do_ioctl(sc, ap->a_cmd, ap->a_data, ap->a_fflag); @@ -663,7 +665,7 @@ uhidpoll(struct dev_poll_args *ap) struct uhid_softc *sc; int revents = 0; - USB_GET_SC(uhid, UHIDUNIT(dev), sc); + sc = devclass_get_softc(uhid_devclass, UHIDUNIT(dev)); if (sc->sc_dying) return (EIO); diff --git a/sys/dev/usbmisc/ulpt/ulpt.c b/sys/dev/usbmisc/ulpt/ulpt.c index 2cfe4b77b5..da951a86b8 100644 --- a/sys/dev/usbmisc/ulpt/ulpt.c +++ b/sys/dev/usbmisc/ulpt/ulpt.c @@ -1,7 +1,7 @@ /* * $NetBSD: ulpt.c,v 1.55 2002/10/23 09:14:01 jdolecek Exp $ * $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.59 2003/09/28 20:48:13 phk Exp $ - * $DragonFly: src/sys/dev/usbmisc/ulpt/ulpt.c,v 1.20 2007/07/01 21:24:03 hasso Exp $ + * $DragonFly: src/sys/dev/usbmisc/ulpt/ulpt.c,v 1.21 2007/07/02 06:43:31 hasso Exp $ */ /* @@ -441,7 +441,9 @@ ulptopen(struct dev_open_args *ap) usbd_status err; int spin, error; - USB_GET_SC_OPEN(ulpt, ULPTUNIT(dev), sc); + sc = devclass_get_softc(ulpt_devclass, ULPTUNIT(dev)); + if (sc == NULL) + return (ENXIO); if (sc == NULL || sc->sc_iface == NULL || sc->sc_dying) return (ENXIO); @@ -574,7 +576,7 @@ ulptclose(struct dev_close_args *ap) cdev_t dev = ap->a_head.a_dev; struct ulpt_softc *sc; - USB_GET_SC(ulpt, ULPTUNIT(dev), sc); + sc = devclass_get_softc(ulpt_devclass, ULPTUNIT(dev)); if (sc->sc_state != ULPT_OPEN) /* We are being forced to close before the open completed. */ @@ -648,7 +650,7 @@ ulptwrite(struct dev_write_args *ap) struct ulpt_softc *sc; int error; - USB_GET_SC(ulpt, ULPTUNIT(dev), sc); + sc = devclass_get_softc(ulpt_devclass, ULPTUNIT(dev)); if (sc->sc_dying) return (EIO); diff --git a/sys/dev/usbmisc/ums/ums.c b/sys/dev/usbmisc/ums/ums.c index b8ba93cc02..35eac3ef11 100644 --- a/sys/dev/usbmisc/ums/ums.c +++ b/sys/dev/usbmisc/ums/ums.c @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/dev/usb/ums.c,v 1.64 2003/11/09 09:17:22 tanimura Exp $ - * $DragonFly: src/sys/dev/usbmisc/ums/ums.c,v 1.25 2007/07/01 21:24:03 hasso Exp $ + * $DragonFly: src/sys/dev/usbmisc/ums/ums.c,v 1.26 2007/07/02 06:43:31 hasso Exp $ */ /* @@ -566,7 +566,9 @@ ums_open(struct dev_open_args *ap) cdev_t dev = ap->a_head.a_dev; struct ums_softc *sc; - USB_GET_SC_OPEN(ums, UMSUNIT(dev), sc); + sc = devclass_get_softc(ums_devclass, UMSUNIT(dev)); + if (sc == NULL) + return (ENXIO); return ums_enable(sc); } @@ -577,7 +579,7 @@ ums_close(struct dev_close_args *ap) cdev_t dev = ap->a_head.a_dev; struct ums_softc *sc; - USB_GET_SC(ums, UMSUNIT(dev), sc); + sc = devclass_get_softc(ums_devclass, UMSUNIT(dev)); if (!sc) return 0; @@ -598,7 +600,7 @@ ums_read(struct dev_read_args *ap) int l = 0; int error; - USB_GET_SC(ums, UMSUNIT(dev), sc); + sc = devclass_get_softc(ums_devclass, UMSUNIT(dev)); crit_enter(); if (!sc) { @@ -665,7 +667,7 @@ ums_poll(struct dev_poll_args *ap) struct ums_softc *sc; int revents = 0; - USB_GET_SC(ums, UMSUNIT(dev), sc); + sc = devclass_get_softc(ums_devclass, UMSUNIT(dev)); if (!sc) { ap->a_events = 0; @@ -694,7 +696,7 @@ ums_ioctl(struct dev_ioctl_args *ap) int error = 0; mousemode_t mode; - USB_GET_SC(ums, UMSUNIT(dev), sc); + sc = devclass_get_softc(ums_devclass, UMSUNIT(dev)); if (!sc) return EIO; diff --git a/sys/dev/usbmisc/urio/urio.c b/sys/dev/usbmisc/urio/urio.c index de325149b9..8240af2845 100644 --- a/sys/dev/usbmisc/urio/urio.c +++ b/sys/dev/usbmisc/urio/urio.c @@ -30,7 +30,7 @@ /* * $FreeBSD: src/sys/dev/usb/urio.c,v 1.28 2003/08/25 22:01:06 joe Exp $ - * $DragonFly: src/sys/dev/usbmisc/urio/urio.c,v 1.20 2007/07/01 21:24:04 hasso Exp $ + * $DragonFly: src/sys/dev/usbmisc/urio/urio.c,v 1.21 2007/07/02 06:43:31 hasso Exp $ */ /* @@ -238,7 +238,9 @@ urioopen(struct dev_open_args *ap) struct urio_softc * sc; #endif int unit = URIOUNIT(dev); - USB_GET_SC_OPEN(urio, unit, sc); + sc = devclass_get_softc(urio_devclass, unit); + if (sc == NULL) + return (ENXIO); DPRINTFN(5, ("urioopen: flag=%d, mode=%d, unit=%d\n", ap->a_oflags, ap->a_devtype, unit)); @@ -279,7 +281,7 @@ urioclose(struct dev_close_args *ap) struct urio_softc * sc; #endif int unit = URIOUNIT(dev); - USB_GET_SC(urio, unit, sc); + sc = devclass_get_softc(urio_devclass, unit); DPRINTFN(5, ("urioclose: flag=%d, mode=%d, unit=%d\n", ap->a_fflag, ap->a_devtype, unit)); @@ -316,7 +318,7 @@ urioread(struct dev_read_args *ap) u_int32_t n, tn; int error = 0; - USB_GET_SC(urio, unit, sc); + sc = devclass_get_softc(urio_devclass, unit); DPRINTFN(5, ("urioread: %d\n", unit)); if (!sc->sc_opened) @@ -389,7 +391,7 @@ uriowrite(struct dev_write_args *ap) u_int32_t n; int error = 0; - USB_GET_SC(urio, unit, sc); + sc = devclass_get_softc(urio_devclass, unit); DPRINTFN(5, ("uriowrite: %d\n", unit)); if (!sc->sc_opened) @@ -459,7 +461,7 @@ urioioctl(struct dev_ioctl_args *ap) int error = 0; usbd_status r; - USB_GET_SC(urio, unit, sc); + sc = devclass_get_softc(urio_devclass, unit); switch (ap->a_cmd) { case RIO_RECV_COMMAND: diff --git a/sys/dev/usbmisc/uscanner/uscanner.c b/sys/dev/usbmisc/uscanner/uscanner.c index 9e4178393b..3d5ff235d8 100644 --- a/sys/dev/usbmisc/uscanner/uscanner.c +++ b/sys/dev/usbmisc/uscanner/uscanner.c @@ -1,7 +1,7 @@ /* * $NetBSD: uscanner.c,v 1.30 2002/07/11 21:14:36 augustss Exp $ * $FreeBSD: src/sys/dev/usb/uscanner.c,v 1.48 2003/12/22 19:58:27 sanpei Exp $ - * $DragonFly: src/sys/dev/usbmisc/uscanner/uscanner.c,v 1.20 2007/07/01 21:24:04 hasso Exp $ + * $DragonFly: src/sys/dev/usbmisc/uscanner/uscanner.c,v 1.21 2007/07/02 06:43:31 hasso Exp $ */ /* Also already merged from NetBSD: @@ -370,7 +370,9 @@ uscanneropen(struct dev_open_args *ap) int unit = USCANNERUNIT(dev); usbd_status err; - USB_GET_SC_OPEN(uscanner, unit, sc); + sc = devclass_get_softc(uscanner_devclass, unit); + if (sc == NULL) + return (ENXIO); DPRINTFN(5, ("uscanneropen: flag=%d, mode=%d, unit=%d\n", ap->a_oflags, ap->a_devtype, unit)); @@ -432,7 +434,7 @@ uscannerclose(struct dev_close_args *ap) cdev_t dev = ap->a_head.a_dev; struct uscanner_softc *sc; - USB_GET_SC(uscanner, USCANNERUNIT(dev), sc); + sc = devclass_get_softc(uscanner_devclass, USCANNERUNIT(dev)); DPRINTFN(5, ("uscannerclose: flag=%d, mode=%d, unit=%d\n", ap->a_fflag, ap->a_devtype, USCANNERUNIT(dev))); @@ -532,7 +534,7 @@ uscannerread(struct dev_read_args *ap) struct uscanner_softc *sc; int error; - USB_GET_SC(uscanner, USCANNERUNIT(dev), sc); + sc = devclass_get_softc(uscanner_devclass, USCANNERUNIT(dev)); sc->sc_refcnt++; error = uscanner_do_read(sc, ap->a_uio, ap->a_ioflag); @@ -583,7 +585,7 @@ uscannerwrite(struct dev_write_args *ap) struct uscanner_softc *sc; int error; - USB_GET_SC(uscanner, USCANNERUNIT(dev), sc); + sc = devclass_get_softc(uscanner_devclass, USCANNERUNIT(dev)); sc->sc_refcnt++; error = uscanner_do_write(sc, ap->a_uio, ap->a_ioflag); @@ -631,7 +633,7 @@ uscannerpoll(struct dev_poll_args *ap) struct uscanner_softc *sc; int revents = 0; - USB_GET_SC(uscanner, USCANNERUNIT(dev), sc); + sc = devclass_get_softc(uscanner_devclass, USCANNERUNIT(dev)); if (sc->sc_dying) return (EIO); -- 2.41.0