summaryrefslogtreecommitdiffstats
path: root/sys/dev/pccard
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2002-11-14 05:15:50 +0000
committerimp <imp@FreeBSD.org>2002-11-14 05:15:50 +0000
commit01eae780964b30b86b5e74f7b28b62f02c1228bd (patch)
tree0c5452b2765a47da19e28ca89e9b761e2342850a /sys/dev/pccard
parent36d61097ba3677edae9c71be1c810fdd016f2325 (diff)
downloadFreeBSD-src-01eae780964b30b86b5e74f7b28b62f02c1228bd.zip
FreeBSD-src-01eae780964b30b86b5e74f7b28b62f02c1228bd.tar.gz
MFp4:
o Use 32-bit unsigned types for things that really are 32-bit quantities, not bus_addr_t. These are not the same as a bus_addr_t, so don't use that here. Harmless on i386, introduced problems on sparc64. Submitted by: jhb
Diffstat (limited to 'sys/dev/pccard')
-rw-r--r--sys/dev/pccard/pccardvar.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index 0914f81..84d44d5 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -132,8 +132,8 @@ struct pccard_function {
int number;
int function;
int last_config_index;
- u_long ccr_base;
- u_long ccr_mask;
+ uint32_t ccr_base; /* Offset with card's memory */
+ uint32_t ccr_mask;
struct resource *ccr_res;
int ccr_rid;
STAILQ_HEAD(, pccard_config_entry) cfe_head;
@@ -146,9 +146,9 @@ struct pccard_function {
#define pf_ccrt pf_pcmh.memt
#define pf_ccrh pf_pcmh.memh
#define pf_ccr_realsize pf_pcmh.realsize
- bus_addr_t pf_ccr_offset;
+ uint32_t pf_ccr_offset; /* Offset from ccr_base of CIS */
int pf_ccr_window;
- long pf_mfc_iobase;
+ long pf_mfc_iobase; /* Right type? */
long pf_mfc_iomax;
int pf_flags;
driver_intr_t *intr_handler;
OpenPOWER on IntegriCloud