Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

G/C unnecessary IPL_HARDUSB

This commit is contained in:
rmind 2011-11-27 14:36:20 +00:00
parent 4a00a690f3
commit 398c78517c
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/ic/sl811hs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sl811hs.c,v 1.30 2011/10/17 13:06:08 isaki Exp $ */ /* $NetBSD: sl811hs.c,v 1.31 2011/11/27 14:36:20 rmind Exp $ */
/* /*
* Not (c) 2007 Matthew Orgass * Not (c) 2007 Matthew Orgass
@ -84,7 +84,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.30 2011/10/17 13:06:08 isaki Exp $"); __KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.31 2011/11/27 14:36:20 rmind Exp $");
#include "opt_slhci.h" #include "opt_slhci.h"
@ -881,9 +881,9 @@ slhci_transfer(struct usbd_xfer *xfer)
* so start it first. * so start it first.
*/ */
/* Start next is always done at splsoftusb, so we do this here so /* Start next is always done at splusb, so we do this here so
* start functions are always called at softusb. XXX */ * start functions are always called at softusb. XXX */
s = splsoftusb(); s = splusb();
error = xfer->pipe->methods->start(SIMPLEQ_FIRST(&xfer->pipe->queue)); error = xfer->pipe->methods->start(SIMPLEQ_FIRST(&xfer->pipe->queue));
splx(s); splx(s);
@ -1269,7 +1269,7 @@ slhci_abort(struct usbd_xfer *xfer)
callback: callback:
xfer->status = USBD_CANCELLED; xfer->status = USBD_CANCELLED;
/* Abort happens at splsoftusb. */ /* Abort happens at splusb. */
usb_transfer_complete(xfer); usb_transfer_complete(xfer);
} }
@ -1382,7 +1382,7 @@ slhci_lock_call(struct slhci_softc *sc, LockCallFunc lcf, struct slhci_pipe
usbd_status ret; usbd_status ret;
int x, s; int x, s;
x = splsoftusb(); x = splusb();
s = splhardusb(); s = splhardusb();
simple_lock(&sc->sc_lock); simple_lock(&sc->sc_lock);
ret = (*lcf)(sc, spipe, xfer); ret = (*lcf)(sc, spipe, xfer);
@ -1431,7 +1431,7 @@ slhci_callback_entry(void *arg)
sc = (struct slhci_softc *)arg; sc = (struct slhci_softc *)arg;
x = splsoftusb(); x = splusb();
s = splhardusb(); s = splhardusb();
simple_lock(&sc->sc_lock); simple_lock(&sc->sc_lock);
t = &sc->sc_transfers; t = &sc->sc_transfers;
@ -2328,8 +2328,8 @@ slhci_dotransfer(struct slhci_softc *sc)
} }
} }
/* slhci_callback is called after the lock is taken from splsoftusb. /* slhci_callback is called after the lock is taken from splusb.
* s is pointer to old spl (splsoftusb). */ * s is pointer to old spl (splusb). */
static void static void
slhci_callback(struct slhci_softc *sc, int *s) slhci_callback(struct slhci_softc *sc, int *s)
{ {
@ -2495,7 +2495,7 @@ slhci_do_callback_schedule(struct slhci_softc *sc)
} }
#if 0 #if 0
/* must be called with lock taken from splsoftusb */ /* must be called with lock taken from splusb */
/* XXX static */ void /* XXX static */ void
slhci_pollxfer(struct slhci_softc *sc, struct usbd_xfer *xfer, int *s) slhci_pollxfer(struct slhci_softc *sc, struct usbd_xfer *xfer, int *s)
{ {

6
sys/dev/pcmcia/slhci_pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: slhci_pcmcia.c,v 1.8 2011/03/08 04:58:21 kiyohara Exp $ */ /* $NetBSD: slhci_pcmcia.c,v 1.9 2011/11/27 14:36:20 rmind Exp $ */
/* /*
* Not (c) 2007 Matthew Orgass * Not (c) 2007 Matthew Orgass
* This file is public domain, meaning anyone can make any use of part or all * This file is public domain, meaning anyone can make any use of part or all
@ -11,7 +11,7 @@
/* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */ /* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.8 2011/03/08 04:58:21 kiyohara Exp $"); __KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.9 2011/11/27 14:36:20 rmind Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -140,7 +140,7 @@ slhci_pcmcia_enable(struct slhci_pcmcia_softc *psc, int enable)
*/ */
slhci_preinit(sc, NULL, pioh->iot, pioh->ioh, 100, 2); slhci_preinit(sc, NULL, pioh->iot, pioh->ioh, 100, 2);
psc->sc_ih = pcmcia_intr_establish(pf, IPL_HARDUSB, psc->sc_ih = pcmcia_intr_establish(pf, IPL_USB,
slhci_intr, sc); slhci_intr, sc);
if (psc->sc_ih == NULL) { if (psc->sc_ih == NULL) {

6
sys/dev/usb/usbdi.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: usbdi.h,v 1.79 2009/09/04 17:53:12 dyoung Exp $ */ /* $NetBSD: usbdi.h,v 1.80 2011/11/27 14:36:21 rmind Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/* /*
@ -273,13 +273,9 @@ struct usbif_attach_arg {
/* No match */ /* No match */
#define UMATCH_NONE 0 #define UMATCH_NONE 0
/* XXX Perhaps USB should have its own levels? */
#define splusb splsoftnet #define splusb splsoftnet
#define splhardusb splbio #define splhardusb splbio
#define IPL_USB IPL_BIO #define IPL_USB IPL_BIO
#define splsoftusb splusb
#define IPL_SOFTUSB IPL_SOFTNET #define IPL_SOFTUSB IPL_SOFTNET
#define IPL_HARDUSB IPL_USB
#endif /* _USBDI_H_ */ #endif /* _USBDI_H_ */