summaryrefslogtreecommitdiffstats
path: root/sys/dev/pccbb
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2003-08-07 15:04:27 +0000
committerjhb <jhb@FreeBSD.org>2003-08-07 15:04:27 +0000
commit37641f86f1a209d796b3679ab72c92f2ace89fb7 (patch)
treed28ecab1cd6104f6189a11004e6d3615215cf931 /sys/dev/pccbb
parent450c201b698a84880b8cd2d816cbc526ddc72f4a (diff)
downloadFreeBSD-src-37641f86f1a209d796b3679ab72c92f2ace89fb7.zip
FreeBSD-src-37641f86f1a209d796b3679ab72c92f2ace89fb7.tar.gz
Consistently use the BSD u_int and u_short instead of the SYSV uint and
ushort. In most of these files, there was a mixture of both styles and this change just makes them self-consistent. Requested by: bde (kern_ktrace.c)
Diffstat (limited to 'sys/dev/pccbb')
-rw-r--r--sys/dev/pccbb/pccbb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index fe4c445..91a22d9 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -240,7 +240,7 @@ static int cbb_cardbus_deactivate_resource(device_t brdev,
device_t child, int type, int rid, struct resource *res);
static struct resource *cbb_cardbus_alloc_resource(device_t brdev,
device_t child, int type, int *rid, u_long start,
- u_long end, u_long count, uint flags);
+ u_long end, u_long count, u_int flags);
static int cbb_cardbus_release_resource(device_t brdev, device_t child,
int type, int rid, struct resource *res);
static int cbb_power_enable_socket(device_t brdev, device_t child);
@@ -251,7 +251,7 @@ static int cbb_deactivate_resource(device_t brdev, device_t child,
int type, int rid, struct resource *r);
static struct resource *cbb_alloc_resource(device_t brdev, device_t child,
int type, int *rid, u_long start, u_long end, u_long count,
- uint flags);
+ u_int flags);
static int cbb_release_resource(device_t brdev, device_t child,
int type, int rid, struct resource *r);
static int cbb_read_ivar(device_t brdev, device_t child, int which,
@@ -1515,7 +1515,7 @@ cbb_cardbus_deactivate_resource(device_t brdev, device_t child, int type,
static struct resource *
cbb_cardbus_alloc_resource(device_t brdev, device_t child, int type,
- int *rid, u_long start, u_long end, u_long count, uint flags)
+ int *rid, u_long start, u_long end, u_long count, u_int flags)
{
struct cbb_softc *sc = device_get_softc(brdev);
int tmp;
@@ -1663,7 +1663,7 @@ cbb_pcic_deactivate_resource(device_t brdev, device_t child, int type,
static struct resource *
cbb_pcic_alloc_resource(device_t brdev, device_t child, int type, int *rid,
- u_long start, u_long end, u_long count, uint flags)
+ u_long start, u_long end, u_long count, u_int flags)
{
struct resource *res = NULL;
struct cbb_softc *sc = device_get_softc(brdev);
@@ -1800,7 +1800,7 @@ cbb_deactivate_resource(device_t brdev, device_t child, int type,
static struct resource *
cbb_alloc_resource(device_t brdev, device_t child, int type, int *rid,
- u_long start, u_long end, u_long count, uint flags)
+ u_long start, u_long end, u_long count, u_int flags)
{
struct cbb_softc *sc = device_get_softc(brdev);
OpenPOWER on IntegriCloud