git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
scsi
/
pcmcia
/
fdomain_stub.c
diff --git
a/drivers/scsi/pcmcia/fdomain_stub.c
b/drivers/scsi/pcmcia/fdomain_stub.c
index
344d2b5
..
3df7bc7
100644
(file)
--- a/
drivers/scsi/pcmcia/fdomain_stub.c
+++ b/
drivers/scsi/pcmcia/fdomain_stub.c
@@
-44,7
+44,8
@@
#include <scsi/scsi_ioctl.h>
#include "scsi.h"
#include <scsi/scsi_ioctl.h>
#include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
+#include "fdomain.h"
#include <pcmcia/version.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/version.h>
#include <pcmcia/cs_types.h>
@@
-60,15
+61,9
@@
MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>");
MODULE_DESCRIPTION("Future Domain PCMCIA SCSI driver");
MODULE_LICENSE("Dual MPL/GPL");
MODULE_DESCRIPTION("Future Domain PCMCIA SCSI driver");
MODULE_LICENSE("Dual MPL/GPL");
-/* Bit map of interrupts to choose from */
-static int irq_mask = 0xdeb8;
-MODULE_PARM(irq_mask, "i");
-static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
-
#ifdef PCMCIA_DEBUG
static int pc_debug = PCMCIA_DEBUG;
#ifdef PCMCIA_DEBUG
static int pc_debug = PCMCIA_DEBUG;
-
MODULE_PARM(pc_debug, "i"
);
+
module_param(pc_debug, int, 0
);
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
static char *version =
"fdomain_cs.c 1.47 2001/10/13 00:08:52 (David Hinds)";
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
static char *version =
"fdomain_cs.c 1.47 2001/10/13 00:08:52 (David Hinds)";
@@
-84,10
+79,6
@@
typedef struct scsi_info_t {
struct Scsi_Host *host;
} scsi_info_t;
struct Scsi_Host *host;
} scsi_info_t;
-extern Scsi_Host_Template fdomain_driver_template;
-extern void fdomain_setup(char *str, int *ints);
-extern struct Scsi_Host *__fdomain_16x0_detect( Scsi_Host_Template *tpnt );
-extern int fdomain_16x0_bus_reset(Scsi_Cmnd *SCpnt);
static void fdomain_release(dev_link_t *link);
static int fdomain_event(event_t event, int priority,
static void fdomain_release(dev_link_t *link);
static int fdomain_event(event_t event, int priority,
@@
-106,7
+97,7
@@
static dev_link_t *fdomain_attach(void)
scsi_info_t *info;
client_reg_t client_reg;
dev_link_t *link;
scsi_info_t *info;
client_reg_t client_reg;
dev_link_t *link;
- int
i,
ret;
+ int ret;
DEBUG(0, "fdomain_attach()\n");
DEBUG(0, "fdomain_attach()\n");
@@
-119,12
+110,7
@@
static dev_link_t *fdomain_attach(void)
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 10;
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
link->io.IOAddrLines = 10;
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
- link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
- if (irq_list[0] == -1)
- link->irq.IRQInfo2 = irq_mask;
- else
- for (i = 0; i < 4; i++)
- link->irq.IRQInfo2 |= 1 << irq_list[i];
+ link->irq.IRQInfo1 = IRQ_LEVEL_ID;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
@@
-134,7
+120,6
@@
static dev_link_t *fdomain_attach(void)
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.event_handler = &fdomain_event;
client_reg.EventMask =
CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET |
client_reg.event_handler = &fdomain_event;
client_reg.EventMask =
CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET |
@@
-189,7
+174,7
@@
static void fdomain_config(dev_link_t *link)
scsi_info_t *info = link->priv;
tuple_t tuple;
cisparse_t parse;
scsi_info_t *info = link->priv;
tuple_t tuple;
cisparse_t parse;
- int i, last_ret, last_fn
, ints[3]
;
+ int i, last_ret, last_fn;
u_char tuple_data[64];
char str[16];
struct Scsi_Host *host;
u_char tuple_data[64];
char str[16];
struct Scsi_Host *host;
@@
-229,11
+214,8
@@
static void fdomain_config(dev_link_t *link)
release_region(link->io.BasePort1, link->io.NumPorts1);
/* Set configuration options for the fdomain driver */
release_region(link->io.BasePort1, link->io.NumPorts1);
/* Set configuration options for the fdomain driver */
- ints[0] = 2;
- ints[1] = link->io.BasePort1;
- ints[2] = link->irq.AssignedIRQ;
sprintf(str, "%d,%d", link->io.BasePort1, link->irq.AssignedIRQ);
sprintf(str, "%d,%d", link->io.BasePort1, link->irq.AssignedIRQ);
- fdomain_setup(str
, ints
);
+ fdomain_setup(str);
host = __fdomain_16x0_detect(&fdomain_driver_template);
if (!host) {
host = __fdomain_16x0_detect(&fdomain_driver_template);
if (!host) {
@@
-334,10
+316,7
@@
static int __init init_fdomain_cs(void)
static void __exit exit_fdomain_cs(void)
{
pcmcia_unregister_driver(&fdomain_cs_driver);
static void __exit exit_fdomain_cs(void)
{
pcmcia_unregister_driver(&fdomain_cs_driver);
-
- /* XXX: this really needs to move into generic code.. */
- while (dev_list != NULL)
- fdomain_detach(dev_list);
+ BUG_ON(dev_list != NULL);
}
module_init(init_fdomain_cs);
}
module_init(init_fdomain_cs);