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

make [OU]READ[124]() real inline functions instead of macros.

Browse Source
This commit is contained in:
mrg 2006-05-12 01:25:00 +00:00
parent 3adabe6283
commit 0337fbac37
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/dev/usb/ohci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ohci.c,v 1.173 2006/04/15 01:07:51 christos Exp $ */
/* $NetBSD: ohci.c,v 1.174 2006/05/12 01:25:00 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.173 2006/04/15 01:07:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.174 2006/05/12 01:25:00 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -233,9 +233,29 @@ Static void ohci_dump_itds(ohci_softc_t *, ohci_soft_itd_t *);
do { OBARR(sc); bus_space_write_2((sc)->iot, (sc)->ioh, (r), (x)); } while (0)
#define OWRITE4(sc, r, x) \
do { OBARR(sc); bus_space_write_4((sc)->iot, (sc)->ioh, (r), (x)); } while (0)
#define OREAD1(sc, r) (OBARR(sc), bus_space_read_1((sc)->iot, (sc)->ioh, (r)))
#define OREAD2(sc, r) (OBARR(sc), bus_space_read_2((sc)->iot, (sc)->ioh, (r)))
#define OREAD4(sc, r) (OBARR(sc), bus_space_read_4((sc)->iot, (sc)->ioh, (r)))
static __inline uint8_t
OREAD1(ohci_softc_t *sc, bus_size_t r)
{
OBARR(sc);
return bus_space_read_1(sc->iot, sc->ioh, r);
}
static __inline uint16_t
OREAD2(ohci_softc_t *sc, bus_size_t r)
{
OBARR(sc);
return bus_space_read_2(sc->iot, sc->ioh, r);
}
static __inline uint32_t
OREAD4(ohci_softc_t *sc, bus_size_t r)
{
OBARR(sc);
return bus_space_read_4(sc->iot, sc->ioh, r);
}
/* Reverse the bits in a value 0 .. 31 */
Static u_int8_t revbits[OHCI_NO_INTRS] =

30
sys/dev/usb/uhci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uhci.c,v 1.195 2006/04/14 16:31:27 christos Exp $ */
/* $NetBSD: uhci.c,v 1.196 2006/05/12 01:25:00 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.195 2006/04/14 16:31:27 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.196 2006/05/12 01:25:00 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -286,9 +286,29 @@ void uhci_dump(void);
#define UWRITE4(sc, r, x) \
do { UBARR(sc); bus_space_write_4((sc)->iot, (sc)->ioh, (r), (x)); \
} while (/*CONSTCOND*/0)
#define UREAD1(sc, r) (UBARR(sc), bus_space_read_1((sc)->iot, (sc)->ioh, (r)))
#define UREAD2(sc, r) (UBARR(sc), bus_space_read_2((sc)->iot, (sc)->ioh, (r)))
#define UREAD4(sc, r) (UBARR(sc), bus_space_read_4((sc)->iot, (sc)->ioh, (r)))
static __inline uint8_t
UREAD1(uhci_softc_t *sc, bus_size_t r)
{
UBARR(sc);
return bus_space_read_1(sc->iot, sc->ioh, r);
}
static __inline uint16_t
UREAD2(uhci_softc_t *sc, bus_size_t r)
{
UBARR(sc);
return bus_space_read_2(sc->iot, sc->ioh, r);
}
static __inline uint32_t
UREAD4(uhci_softc_t *sc, bus_size_t r)
{
UBARR(sc);
return bus_space_read_4(sc->iot, sc->ioh, r);
}
#define UHCICMD(sc, cmd) UWRITE2(sc, UHCI_CMD, cmd)
#define UHCISTS(sc) UREAD2(sc, UHCI_STS)