Module Name: src Committed By: joerg Date: Sat Sep 14 13:13:59 UTC 2013
Modified Files: src/sys/dev/usb: ohci.c Log Message: GC OREAD1 and OREAD2 To generate a diff of this commit: cvs rdiff -u -r1.241 -r1.242 src/sys/dev/usb/ohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/ohci.c diff -u src/sys/dev/usb/ohci.c:1.241 src/sys/dev/usb/ohci.c:1.242 --- src/sys/dev/usb/ohci.c:1.241 Thu Apr 4 13:28:57 2013 +++ src/sys/dev/usb/ohci.c Sat Sep 14 13:13:59 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.241 2013/04/04 13:28:57 skrll Exp $ */ +/* $NetBSD: ohci.c,v 1.242 2013/09/14 13:13:59 joerg Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.241 2013/04/04 13:28:57 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.242 2013/09/14 13:13:59 joerg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -200,21 +200,6 @@ Static void ohci_dump_itds(ohci_softc_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) -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)