Commit ac1689ff authored by Russell King's avatar Russell King

[ARM] SA11x0 PCMCIA 1

Make SA11x0 generic pcmcia implementation fit better with Dominik's
work - pass around our socket structure rather than the socket number
itself.  Reference socket operations using the socket structure
rather than a static variable.
parent e61ed9f5
...@@ -150,6 +150,7 @@ static inline unsigned int sa1100_pcmcia_cmd_time(unsigned int cpu_clock_khz, ...@@ -150,6 +150,7 @@ static inline unsigned int sa1100_pcmcia_cmd_time(unsigned int cpu_clock_khz,
*/ */
#define SA1100_PCMCIA_POLL_PERIOD (2*HZ) #define SA1100_PCMCIA_POLL_PERIOD (2*HZ)
struct pcmcia_low_level;
/* This structure encapsulates per-socket state which we might need to /* This structure encapsulates per-socket state which we might need to
* use when responding to a Card Services query of some kind. * use when responding to a Card Services query of some kind.
...@@ -158,6 +159,7 @@ struct sa1100_pcmcia_socket { ...@@ -158,6 +159,7 @@ struct sa1100_pcmcia_socket {
/* /*
* Core PCMCIA state * Core PCMCIA state
*/ */
int nr;
socket_state_t cs_state; socket_state_t cs_state;
pccard_io_map io_map[MAX_IO_WIN]; pccard_io_map io_map[MAX_IO_WIN];
pccard_mem_map pc_mem_map[MAX_WIN]; pccard_mem_map pc_mem_map[MAX_WIN];
...@@ -173,6 +175,7 @@ struct sa1100_pcmcia_socket { ...@@ -173,6 +175,7 @@ struct sa1100_pcmcia_socket {
* Info from low level handler * Info from low level handler
*/ */
unsigned int irq; unsigned int irq;
struct pcmcia_low_level *ops;
}; };
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment