Commit b04860b1 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Russell King

[PCMCIA] Move socket_info_t

This patch introduces "struct pcmcia_socket" which is 100% equal to
the "socket_info_t" defined previously in drivers/pcmcia/cs_internal.h

Unfortunately, a few other definitons need to be moved as well.

 drivers/pcmcia/cs.c          |    4 -
 drivers/pcmcia/cs_internal.h |   73 ---------------------------------
 include/pcmcia/ss.h          |   94 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 97 insertions(+), 74 deletions(-)
parent 96092a79
...@@ -322,10 +322,10 @@ int pcmcia_register_socket(struct class_device *class_dev) ...@@ -322,10 +322,10 @@ int pcmcia_register_socket(struct class_device *class_dev)
DEBUG(0, "cs: pcmcia_register_socket(0x%p)\n", cls_d->ops); DEBUG(0, "cs: pcmcia_register_socket(0x%p)\n", cls_d->ops);
s_info = kmalloc(cls_d->nsock * sizeof(struct socket_info_t), GFP_KERNEL); s_info = kmalloc(cls_d->nsock * sizeof(struct pcmcia_socket), GFP_KERNEL);
if (!s_info) if (!s_info)
return -ENOMEM; return -ENOMEM;
memset(s_info, 0, cls_d->nsock * sizeof(socket_info_t)); memset(s_info, 0, cls_d->nsock * sizeof(struct pcmcia_socket));
cls_d->s_info = s_info; cls_d->s_info = s_info;
ret = 0; ret = 0;
......
...@@ -21,13 +21,6 @@ ...@@ -21,13 +21,6 @@
#include <linux/config.h> #include <linux/config.h>
typedef struct erase_busy_t {
eraseq_entry_t *erase;
client_handle_t client;
struct timer_list timeout;
struct erase_busy_t *prev, *next;
} erase_busy_t;
#define ERASEQ_MAGIC 0xFA67 #define ERASEQ_MAGIC 0xFA67
typedef struct eraseq_t { typedef struct eraseq_t {
u_short eraseq_magic; u_short eraseq_magic;
...@@ -63,23 +56,6 @@ typedef struct client_t { ...@@ -63,23 +56,6 @@ typedef struct client_t {
#define CLIENT_WIN_REQ(i) (0x20<<(i)) #define CLIENT_WIN_REQ(i) (0x20<<(i))
#define CLIENT_CARDBUS 0x8000 #define CLIENT_CARDBUS 0x8000
typedef struct io_window_t {
u_int Attributes;
ioaddr_t BasePort, NumPorts;
ioaddr_t InUse, Config;
} io_window_t;
#define WINDOW_MAGIC 0xB35C
typedef struct window_t {
u_short magic;
u_short index;
client_handle_t handle;
struct socket_info_t *sock;
u_long base;
u_long size;
pccard_mem_map ctl;
} window_t;
#define REGION_MAGIC 0xE3C9 #define REGION_MAGIC 0xE3C9
typedef struct region_t { typedef struct region_t {
u_short region_magic; u_short region_magic;
...@@ -108,12 +84,6 @@ typedef struct config_t { ...@@ -108,12 +84,6 @@ typedef struct config_t {
} irq; } irq;
} config_t; } config_t;
/* Maximum number of IO windows per socket */
#define MAX_IO_WIN 2
/* Maximum number of memory windows per socket */
#define MAX_WIN 4
struct cis_cache_entry { struct cis_cache_entry {
struct list_head node; struct list_head node;
unsigned int addr; unsigned int addr;
...@@ -122,47 +92,8 @@ struct cis_cache_entry { ...@@ -122,47 +92,8 @@ struct cis_cache_entry {
unsigned char cache[0]; unsigned char cache[0];
}; };
typedef struct socket_info_t { /* deprecated - use struct pcmcia_socket instead */
spinlock_t lock; typedef struct pcmcia_socket socket_info_t;
struct pccard_operations * ss_entry;
u_int sock;
socket_state_t socket;
socket_cap_t cap;
u_int state;
u_short functions;
u_short lock_count;
client_handle_t clients;
u_int real_clients;
pccard_mem_map cis_mem;
u_char *cis_virt;
config_t *config;
#ifdef CONFIG_CARDBUS
struct resource * cb_cis_res;
u_char *cb_cis_virt;
#endif
struct {
u_int AssignedIRQ;
u_int Config;
} irq;
io_window_t io[MAX_IO_WIN];
window_t win[MAX_WIN];
region_t *c_region, *a_region;
erase_busy_t erase_busy;
struct list_head cis_cache;
u_int fake_cis_len;
char *fake_cis;
#ifdef CONFIG_PROC_FS
struct proc_dir_entry *proc;
#endif
struct semaphore skt_sem; /* protects socket h/w state */
struct task_struct *thread;
struct completion thread_done;
wait_queue_head_t thread_wait;
spinlock_t thread_lock; /* protects thread_events */
unsigned int thread_events;
} socket_info_t;
/* Flags in config state */ /* Flags in config state */
#define CONFIG_LOCKED 0x01 #define CONFIG_LOCKED 0x01
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#define _LINUX_SS_H #define _LINUX_SS_H
#include <pcmcia/cs_types.h> #include <pcmcia/cs_types.h>
#include <pcmcia/cs.h>
#include <pcmcia/bulkmem.h>
#include <linux/device.h> #include <linux/device.h>
/* Definitions for card status flags for GetStatus */ /* Definitions for card status flags for GetStatus */
...@@ -141,13 +143,14 @@ struct pccard_operations { ...@@ -141,13 +143,14 @@ struct pccard_operations {
/* /*
* Calls to set up low-level "Socket Services" drivers * Calls to set up low-level "Socket Services" drivers
*/ */
struct pcmcia_socket;
struct pcmcia_socket_class_data { struct pcmcia_socket_class_data {
unsigned int nsock; /* number of sockets */ unsigned int nsock; /* number of sockets */
unsigned int sock_offset; /* socket # (which is unsigned int sock_offset; /* socket # (which is
* returned to driver) = sock_offset + (0, 1, .. , (nsock-1) */ * returned to driver) = sock_offset + (0, 1, .. , (nsock-1) */
struct pccard_operations *ops; /* see above */ struct pccard_operations *ops; /* see above */
void *s_info; /* socket_info_t */ struct pcmcia_socket *s_info;
struct class_device class_dev; /* generic class structure */ struct class_device class_dev; /* generic class structure */
}; };
...@@ -157,4 +160,93 @@ extern struct class pcmcia_socket_class; ...@@ -157,4 +160,93 @@ extern struct class pcmcia_socket_class;
extern int pcmcia_socket_dev_suspend(struct pcmcia_socket_class_data *cls_d, u32 state, u32 level); extern int pcmcia_socket_dev_suspend(struct pcmcia_socket_class_data *cls_d, u32 state, u32 level);
extern int pcmcia_socket_dev_resume(struct pcmcia_socket_class_data *cls_d, u32 level); extern int pcmcia_socket_dev_resume(struct pcmcia_socket_class_data *cls_d, u32 level);
typedef struct erase_busy_t {
eraseq_entry_t *erase;
client_handle_t client;
struct timer_list timeout;
struct erase_busy_t *prev, *next;
} erase_busy_t;
typedef struct io_window_t {
u_int Attributes;
ioaddr_t BasePort, NumPorts;
ioaddr_t InUse, Config;
} io_window_t;
#define WINDOW_MAGIC 0xB35C
typedef struct window_t {
u_short magic;
u_short index;
client_handle_t handle;
struct pcmcia_socket *sock;
u_long base;
u_long size;
pccard_mem_map ctl;
} window_t;
/* Maximum number of IO windows per socket */
#define MAX_IO_WIN 2
/* Maximum number of memory windows per socket */
#define MAX_WIN 4
struct config_t;
struct region_t;
/* in parts of drivers/pcmcia/ this is still known as
* socket_info_t
*/
struct pcmcia_socket {
spinlock_t lock;
struct pccard_operations * ss_entry;
u_int sock;
socket_state_t socket;
socket_cap_t cap;
u_int state;
u_short functions;
u_short lock_count;
client_handle_t clients;
u_int real_clients;
pccard_mem_map cis_mem;
u_char *cis_virt;
struct config_t *config;
struct {
u_int AssignedIRQ;
u_int Config;
} irq;
io_window_t io[MAX_IO_WIN];
window_t win[MAX_WIN];
struct region_t *c_region, *a_region;
erase_busy_t erase_busy;
struct list_head cis_cache;
u_int fake_cis_len;
char *fake_cis;
/* deprecated */
#ifdef CONFIG_PROC_FS
struct proc_dir_entry *proc;
#endif
/* state thread */
struct semaphore skt_sem; /* protects socket h/w state */
struct task_struct *thread;
struct completion thread_done;
wait_queue_head_t thread_wait;
spinlock_t thread_lock; /* protects thread_events */
unsigned int thread_events;
/* pcmcia (16-bit) */
/* cardbus (32-bit) */
#ifdef CONFIG_CARDBUS
struct resource * cb_cis_res;
u_char *cb_cis_virt;
#endif
};
#endif /* _LINUX_SS_H */ #endif /* _LINUX_SS_H */
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