diff options
author | imp <imp@FreeBSD.org> | 2000-04-19 08:31:21 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2000-04-19 08:31:21 +0000 |
commit | 45487d7f0a809050d1dc86acd6d4a2ae82b85581 (patch) | |
tree | 107084e97198d2a36b00244f6a2880d10b6ee36c /sys/dev/pccard/pccardvar.h | |
parent | 5b36470f2033fd9b5d9ae54ce79ef9909a5dba1b (diff) | |
download | FreeBSD-src-45487d7f0a809050d1dc86acd6d4a2ae82b85581.zip FreeBSD-src-45487d7f0a809050d1dc86acd6d4a2ae82b85581.tar.gz |
OK. Next step: we read in CIS.
I've done this by having requests to allocate memory propigate up the
tree. We'll see how well this works and reevaluate if it isn't
working well. Also initialize ptr in the tuple. As well as minor
reorg of memory allocation. Likely need to do similar things for I/O
when the time comes.
I've move all defines from pccardchip.h into pccardvar.h and
eliminated pccardchip.h.
Diffstat (limited to 'sys/dev/pccard/pccardvar.h')
-rw-r--r-- | sys/dev/pccard/pccardvar.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 281c5dd..19e9434 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -35,8 +35,6 @@ #include <machine/bus.h> -#include <dev/pccard/pccardchip.h> - extern int pccard_verbose; /* @@ -61,7 +59,6 @@ struct pccard_mem_handle { bus_space_handle_t memh; /* mapped space handle */ bus_addr_t addr; /* resulting address in bus space */ bus_size_t size; /* size of mem space */ - pccard_mem_handle_t mhandle; /* opaque memory handle */ bus_size_t realsize; /* how much we really allocated */ long offset; int kind; @@ -126,7 +123,6 @@ struct pccard_function { struct pccard_mem_handle pf_pcmh; #define pf_ccrt pf_pcmh.memt #define pf_ccrh pf_pcmh.memh -#define pf_ccr_mhandle pf_pcmh.mhandle #define pf_ccr_realsize pf_pcmh.realsize bus_addr_t pf_ccr_offset; int pf_ccr_window; @@ -161,6 +157,13 @@ struct pccard_card { STAILQ_HEAD(, pccard_function) pf_head; }; +#define PCCARD_MEM_ATTR 1 +#define PCCARD_MEM_COMMON 2 + +#define PCCARD_WIDTH_AUTO 0 +#define PCCARD_WIDTH_IO8 1 +#define PCCARD_WIDTH_IO16 2 + /* More later? */ struct pccard_ivar { struct resource_list resources; |