From f02993557a43d32e67f8d677bb685ad0e265e2d1 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 14 Nov 2002 05:15:50 +0000 Subject: [PATCH] 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 --- sys/dev/pccard/pccardvar.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 0914f813e4bc..84d44d5ba134 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;