diff options
| author | imp <imp@FreeBSD.org> | 2005-01-24 06:48:26 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-01-24 06:48:26 +0000 |
| commit | ec27adbe26d4c756d1f3c3eb4f31ecc4c3dc9bd8 (patch) | |
| tree | b84a3ca12fc21d571702c9763fef3525ce3e6c5b | |
| parent | 5f1e82c424e269ad4d1104536d1b7c24cb34710e (diff) | |
| download | FreeBSD-src-ec27adbe26d4c756d1f3c3eb4f31ecc4c3dc9bd8.zip FreeBSD-src-ec27adbe26d4c756d1f3c3eb4f31ecc4c3dc9bd8.tar.gz | |
u_intXX_t -> uintXX_t
| -rw-r--r-- | sys/dev/pccard/card_if.m | 6 | ||||
| -rw-r--r-- | sys/dev/pccard/pccard.c | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m index 5328bc6..d5f3412 100644 --- a/sys/dev/pccard/card_if.m +++ b/sys/dev/pccard/card_if.m @@ -68,15 +68,15 @@ METHOD int set_memory_offset { device_t dev; device_t child; int rid; - u_int32_t cardaddr; - u_int32_t *deltap; + uint32_t cardaddr; + uint32_t *deltap; } METHOD int get_memory_offset { device_t dev; device_t child; int rid; - u_int32_t *offset; + uint32_t *offset; } # diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 9d969c4..4547537 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -106,9 +106,9 @@ static int pccard_get_resource(device_t dev, device_t child, int type, static void pccard_delete_resource(device_t dev, device_t child, int type, int rid); static int pccard_set_res_flags(device_t dev, device_t child, int type, - int rid, u_int32_t flags); + int rid, uint32_t flags); static int pccard_set_memory_offset(device_t dev, device_t child, int rid, - u_int32_t offset, u_int32_t *deltap); + uint32_t offset, uint32_t *deltap); static void pccard_probe_nomatch(device_t cbdev, device_t child); static int pccard_read_ivar(device_t bus, device_t child, int which, u_char *result); @@ -335,9 +335,9 @@ pccard_do_product_lookup(device_t bus, device_t dev, { const struct pccard_product *ent; int matches; - u_int32_t fcn; - u_int32_t vendor; - u_int32_t prod; + uint32_t fcn; + uint32_t vendor; + uint32_t prod; const char *vendorstr; const char *prodstr; const char *cis3str; @@ -959,7 +959,7 @@ pccard_delete_resource(device_t dev, device_t child, int type, int rid) static int pccard_set_res_flags(device_t dev, device_t child, int type, int rid, - u_int32_t flags) + uint32_t flags) { return (CARD_SET_RES_FLAGS(device_get_parent(dev), child, type, rid, flags)); @@ -967,7 +967,7 @@ pccard_set_res_flags(device_t dev, device_t child, int type, int rid, static int pccard_set_memory_offset(device_t dev, device_t child, int rid, - u_int32_t offset, u_int32_t *deltap) + uint32_t offset, uint32_t *deltap) { return (CARD_SET_MEMORY_OFFSET(device_get_parent(dev), child, rid, @@ -1028,23 +1028,23 @@ pccard_read_ivar(device_t bus, device_t child, int which, u_char *result) bcopy(func->pf_funce_lan_nid, result, ETHER_ADDR_LEN); break; case PCCARD_IVAR_VENDOR: - *(u_int32_t *) result = sc->card.manufacturer; + *(uint32_t *) result = sc->card.manufacturer; break; case PCCARD_IVAR_PRODUCT: - *(u_int32_t *) result = sc->card.product; + *(uint32_t *) result = sc->card.product; break; case PCCARD_IVAR_PRODEXT: - *(u_int16_t *) result = sc->card.prodext; + *(uint16_t *) result = sc->card.prodext; break; case PCCARD_IVAR_FUNCTION: - *(u_int32_t *) result = func->function; + *(uint32_t *) result = func->function; break; case PCCARD_IVAR_FUNCTION_NUMBER: if (!func) { device_printf(bus, "No function number, bug!\n"); return (ENOENT); } - *(u_int32_t *) result = func->number; + *(uint32_t *) result = func->number; break; case PCCARD_IVAR_VENDOR_STR: *(char **) result = sc->card.cis1_info[0]; |
