From 2ce4905e4da9f512b38f56a53ece9da2072dd164 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Sat, 24 Jul 2010 13:14:44 +0200 Subject: pcmcia: use struct resource for PCMCIA devices Introduce a new field into struct pcmcia_device named "resource" and of type struct resource *, which contains the IO port ranges allocated for this device. Memory window ranges and registration with the resource trees will follow at a later date. Signed-off-by: Dominik Brodowski --- include/pcmcia/cs.h | 3 --- include/pcmcia/ds.h | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index 7be0fcf78502..0cd8c70d8aaa 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h @@ -68,9 +68,6 @@ typedef struct io_req_t { } io_req_t; /* Attributes for RequestIO and ReleaseIO */ -#define IO_SHARED 0x01 -#define IO_FIRST_SHARED 0x02 -#define IO_FORCE_ALIAS_ACCESS 0x04 #define IO_DATA_PATH_WIDTH 0x18 #define IO_DATA_PATH_WIDTH_8 0x00 #define IO_DATA_PATH_WIDTH_16 0x08 diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index d494ce417b4f..3dafd7db34df 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h @@ -80,13 +80,13 @@ struct pcmcia_device { struct list_head socket_device_list; /* deprecated, will be cleaned up soon */ - u_int open; io_req_t io; config_req_t conf; window_handle_t win; /* device setup */ unsigned int irq; + struct resource *resource[MAX_IO_WIN]; /* Is the device suspended? */ u16 suspended:1; @@ -120,6 +120,7 @@ struct pcmcia_device { /* data private to drivers */ void *priv; + unsigned int open; }; #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev) -- cgit v1.2.3-59-g8ed1b