diff options
| author | Josef Karthauser <joe@FreeBSD.org> | 2003-07-14 17:58:26 +0000 |
|---|---|---|
| committer | Josef Karthauser <joe@FreeBSD.org> | 2003-07-14 17:58:26 +0000 |
| commit | bddc8bd3e948e12c512efb6d8e7c93e913a6080d (patch) | |
| tree | 8ad5935f788ce8c0ed6a6d0a1672de8c426a681d /sys/dev/usb/uhci.c | |
| parent | 753bb32e4905512d01e86a242053fcb1759307ad (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 2c6b978a0295..6573e0a22c39 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,6 +1,8 @@ /* $NetBSD: uhci.c,v 1.160 2002/05/28 12:42:39 augustss Exp $ */ /* $FreeBSD$ */ +/* Also incorporated from NetBSD: 1.165 */ + /* * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -283,11 +285,14 @@ void uhci_dump(void); #define UBARR(sc) bus_space_barrier((sc)->iot, (sc)->ioh, 0, (sc)->sc_size, \ BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE) #define UWRITE1(sc, r, x) \ - do { UBARR(sc); bus_space_write_1((sc)->iot, (sc)->ioh, (r), (x)); } while (0) + do { UBARR(sc); bus_space_write_1((sc)->iot, (sc)->ioh, (r), (x)); \ + } while (/*CONSTCOND*/0) #define UWRITE2(sc, r, x) \ - do { UBARR(sc); bus_space_write_2((sc)->iot, (sc)->ioh, (r), (x)); } while (0) + do { UBARR(sc); bus_space_write_2((sc)->iot, (sc)->ioh, (r), (x)); \ + } while (/*CONSTCOND*/0) #define UWRITE4(sc, r, x) \ - do { UBARR(sc); bus_space_write_4((sc)->iot, (sc)->ioh, (r), (x)); } while (0) + 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))) |