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
This commit was manufactured by cvs2svn to create tag
[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
59aca6b
..
4f80bcf
100644
(file)
--- a/
drivers/scsi/pcmcia/fdomain_stub.c
+++ b/
drivers/scsi/pcmcia/fdomain_stub.c
@@
-45,7
+45,6
@@
#include "scsi.h"
#include <scsi/scsi_host.h>
#include "scsi.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>
@@
-85,6
+84,10
@@
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,
@@
-186,7
+189,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;
+ int i, last_ret, last_fn
, ints[3]
;
u_char tuple_data[64];
char str[16];
struct Scsi_Host *host;
u_char tuple_data[64];
char str[16];
struct Scsi_Host *host;
@@
-226,8
+229,11
@@
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);
+ fdomain_setup(str
, ints
);
host = __fdomain_16x0_detect(&fdomain_driver_template);
if (!host) {
host = __fdomain_16x0_detect(&fdomain_driver_template);
if (!host) {