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
/
u14-34f.c
diff --git
a/drivers/scsi/u14-34f.c
b/drivers/scsi/u14-34f.c
index
b2f69d7
..
dca2154
100644
(file)
--- a/
drivers/scsi/u14-34f.c
+++ b/
drivers/scsi/u14-34f.c
@@
-421,22
+421,26
@@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/spinlock.h>
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/spinlock.h>
-#include <scsi/scsicam.h>
-#include "scsi.h"
-#include <scsi/scsi_host.h>
#include <asm/dma.h>
#include <asm/irq.h>
#include <asm/dma.h>
#include <asm/irq.h>
-static int u14_34f_detect(Scsi_Host_Template *);
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_tcq.h>
+#include <scsi/scsicam.h>
+
+static int u14_34f_detect(struct scsi_host_template *);
static int u14_34f_release(struct Scsi_Host *);
static int u14_34f_release(struct Scsi_Host *);
-static int u14_34f_queuecommand(
Scsi_Cmnd *, void (*done)(Scsi_C
mnd *));
-static int u14_34f_eh_abort(
Scsi_C
mnd *);
-static int u14_34f_eh_host_reset(
Scsi_C
mnd *);
+static int u14_34f_queuecommand(
struct scsi_cmnd *, void (*done)(struct scsi_c
mnd *));
+static int u14_34f_eh_abort(
struct scsi_c
mnd *);
+static int u14_34f_eh_host_reset(
struct scsi_c
mnd *);
static int u14_34f_bios_param(struct scsi_device *, struct block_device *,
sector_t, int *);
static int u14_34f_bios_param(struct scsi_device *, struct block_device *,
sector_t, int *);
-static int u14_34f_slave_configure(
Scsi_D
evice *);
+static int u14_34f_slave_configure(
struct scsi_d
evice *);
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.name = "UltraStor 14F/34F rev. 8.10.00 ",
.detect = u14_34f_detect,
.release = u14_34f_release,
.name = "UltraStor 14F/34F rev. 8.10.00 ",
.detect = u14_34f_detect,
.release = u14_34f_release,
@@
-575,7
+579,7
@@
struct mscp {
unsigned int sense_addr PACKED;
/* Additional fields begin here. */
unsigned int sense_addr PACKED;
/* Additional fields begin here. */
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
unsigned int cpp_index; /* cp index */
/* All the cp structure is zero filled by queuecommand except the
unsigned int cpp_index; /* cp index */
/* All the cp structure is zero filled by queuecommand except the
@@
-608,7
+612,7
@@
struct hostdata {
static struct Scsi_Host *sh[MAX_BOARDS + 1];
static const char *driver_name = "Ux4F";
static char sha[MAX_BOARDS];
static struct Scsi_Host *sh[MAX_BOARDS + 1];
static const char *driver_name = "Ux4F";
static char sha[MAX_BOARDS];
-static
spinlock_t driver_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(driver_lock)
;
/* Initialize num_boards so that ihdlr can work while detect is in progress */
static unsigned int num_boards = MAX_BOARDS;
/* Initialize num_boards so that ihdlr can work while detect is in progress */
static unsigned int num_boards = MAX_BOARDS;
@@
-634,7
+638,7
@@
static unsigned long io_port[] = {
#define DEV2H(x) le32_to_cpu(x)
static irqreturn_t do_interrupt_handler(int, void *, struct pt_regs *);
#define DEV2H(x) le32_to_cpu(x)
static irqreturn_t do_interrupt_handler(int, void *, struct pt_regs *);
-static void flush_dev(
Scsi_D
evice *, unsigned long, unsigned int, unsigned int);
+static void flush_dev(
struct scsi_d
evice *, unsigned long, unsigned int, unsigned int);
static int do_trace = FALSE;
static int setup_done = FALSE;
static int link_statistics;
static int do_trace = FALSE;
static int setup_done = FALSE;
static int link_statistics;
@@
-682,7
+686,7
@@
MODULE_DESCRIPTION("UltraStor 14F/34F SCSI Driver");
#endif
#endif
-static int u14_34f_slave_configure(
Scsi_D
evice *dev) {
+static int u14_34f_slave_configure(
struct scsi_d
evice *dev) {
int j, tqd, utqd;
char *tag_suffix, *link_suffix;
struct Scsi_Host *host = dev->host;
int j, tqd, utqd;
char *tag_suffix, *link_suffix;
struct Scsi_Host *host = dev->host;
@@
-794,7
+798,7
@@
static int board_inquiry(unsigned int j) {
}
static int port_detect \
}
static int port_detect \
- (unsigned long port_base, unsigned int j,
Scsi_Host_T
emplate *tpnt) {
+ (unsigned long port_base, unsigned int j,
struct scsi_host_t
emplate *tpnt) {
unsigned char irq, dma_channel, subversion, i;
unsigned char in_byte;
char *bus_type, dma_name[16];
unsigned char irq, dma_channel, subversion, i;
unsigned char in_byte;
char *bus_type, dma_name[16];
@@
-1080,7
+1084,7
@@
static int option_setup(char *str) {
return 1;
}
return 1;
}
-static int u14_34f_detect(
Scsi_Host_T
emplate *tpnt) {
+static int u14_34f_detect(
struct scsi_host_t
emplate *tpnt) {
unsigned int j = 0, k;
tpnt->proc_name = "u14-34f";
unsigned int j = 0, k;
tpnt->proc_name = "u14-34f";
@@
-1113,10
+1117,10
@@
static void map_dma(unsigned int i, unsigned int j) {
unsigned int k, count, pci_dir;
struct scatterlist *sgpnt;
struct mscp *cpp;
unsigned int k, count, pci_dir;
struct scatterlist *sgpnt;
struct mscp *cpp;
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
cpp = &HD(j)->cp[i]; SCpnt = cpp->SCpnt;
cpp = &HD(j)->cp[i]; SCpnt = cpp->SCpnt;
- pci_dir =
scsi_to_pci_dma_dir(SCpnt->sc_data_direction)
;
+ pci_dir =
SCpnt->sc_data_direction
;
if (SCpnt->sense_buffer)
cpp->sense_addr = H2DEV(pci_map_single(HD(j)->pdev, SCpnt->sense_buffer,
if (SCpnt->sense_buffer)
cpp->sense_addr = H2DEV(pci_map_single(HD(j)->pdev, SCpnt->sense_buffer,
@@
-1156,10
+1160,10
@@
static void map_dma(unsigned int i, unsigned int j) {
static void unmap_dma(unsigned int i, unsigned int j) {
unsigned int pci_dir;
struct mscp *cpp;
static void unmap_dma(unsigned int i, unsigned int j) {
unsigned int pci_dir;
struct mscp *cpp;
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
cpp = &HD(j)->cp[i]; SCpnt = cpp->SCpnt;
cpp = &HD(j)->cp[i]; SCpnt = cpp->SCpnt;
- pci_dir =
scsi_to_pci_dma_dir(SCpnt->sc_data_direction)
;
+ pci_dir =
SCpnt->sc_data_direction
;
if (DEV2H(cpp->sense_addr))
pci_unmap_single(HD(j)->pdev, DEV2H(cpp->sense_addr),
if (DEV2H(cpp->sense_addr))
pci_unmap_single(HD(j)->pdev, DEV2H(cpp->sense_addr),
@@
-1178,10
+1182,10
@@
static void unmap_dma(unsigned int i, unsigned int j) {
static void sync_dma(unsigned int i, unsigned int j) {
unsigned int pci_dir;
struct mscp *cpp;
static void sync_dma(unsigned int i, unsigned int j) {
unsigned int pci_dir;
struct mscp *cpp;
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
cpp = &HD(j)->cp[i]; SCpnt = cpp->SCpnt;
cpp = &HD(j)->cp[i]; SCpnt = cpp->SCpnt;
- pci_dir =
scsi_to_pci_dma_dir(SCpnt->sc_data_direction)
;
+ pci_dir =
SCpnt->sc_data_direction
;
if (DEV2H(cpp->sense_addr))
pci_dma_sync_single_for_cpu(HD(j)->pdev, DEV2H(cpp->sense_addr),
if (DEV2H(cpp->sense_addr))
pci_dma_sync_single_for_cpu(HD(j)->pdev, DEV2H(cpp->sense_addr),
@@
-1214,24
+1218,24
@@
static void scsi_to_dev_dir(unsigned int i, unsigned int j) {
};
struct mscp *cpp;
};
struct mscp *cpp;
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
cpp = &HD(j)->cp[i]; SCpnt = cpp->SCpnt;
cpp = &HD(j)->cp[i]; SCpnt = cpp->SCpnt;
- if (SCpnt->sc_data_direction ==
SCSI_DATA_READ
) {
+ if (SCpnt->sc_data_direction ==
DMA_FROM_DEVICE
) {
cpp->xdir = DTD_IN;
return;
}
cpp->xdir = DTD_IN;
return;
}
- else if (SCpnt->sc_data_direction ==
SCSI_DATA_WRIT
E) {
+ else if (SCpnt->sc_data_direction ==
DMA_FROM_DEVIC
E) {
cpp->xdir = DTD_OUT;
return;
}
cpp->xdir = DTD_OUT;
return;
}
- else if (SCpnt->sc_data_direction ==
SCSI_DAT
A_NONE) {
+ else if (SCpnt->sc_data_direction ==
DM
A_NONE) {
cpp->xdir = DTD_NONE;
return;
}
cpp->xdir = DTD_NONE;
return;
}
- if (SCpnt->sc_data_direction !=
SCSI_DATA_UNKNOWN
)
+ if (SCpnt->sc_data_direction !=
DMA_BIDIRECTIONAL
)
panic("%s: qcomm, invalid SCpnt->sc_data_direction.\n", BN(j));
cpp->xdir = DTD_IN;
panic("%s: qcomm, invalid SCpnt->sc_data_direction.\n", BN(j));
cpp->xdir = DTD_IN;
@@
-1251,7
+1255,7
@@
static void scsi_to_dev_dir(unsigned int i, unsigned int j) {
}
}
-static int u14_34f_queuecommand(
Scsi_Cmnd *SCpnt, void (*done)(Scsi_C
mnd *)) {
+static int u14_34f_queuecommand(
struct scsi_cmnd *SCpnt, void (*done)(struct scsi_c
mnd *)) {
unsigned int i, j, k;
struct mscp *cpp;
unsigned int i, j, k;
struct mscp *cpp;
@@
-1332,7
+1336,7
@@
static int u14_34f_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *)) {
return 0;
}
return 0;
}
-static int u14_34f_eh_abort(
Scsi_C
mnd *SCarg) {
+static int u14_34f_eh_abort(
struct scsi_c
mnd *SCarg) {
unsigned int i, j;
j = ((struct hostdata *) SCarg->device->host->hostdata)->board_number;
unsigned int i, j;
j = ((struct hostdata *) SCarg->device->host->hostdata)->board_number;
@@
-1406,10
+1410,10
@@
static int u14_34f_eh_abort(Scsi_Cmnd *SCarg) {
panic("%s: abort, mbox %d, invalid cp_stat.\n", BN(j), i);
}
panic("%s: abort, mbox %d, invalid cp_stat.\n", BN(j), i);
}
-static int u14_34f_eh_host_reset(
Scsi_C
mnd *SCarg) {
+static int u14_34f_eh_host_reset(
struct scsi_c
mnd *SCarg) {
unsigned int i, j, time, k, c, limit = 0;
int arg_done = FALSE;
unsigned int i, j, time, k, c, limit = 0;
int arg_done = FALSE;
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
j = ((struct hostdata *) SCarg->device->host->hostdata)->board_number;
printk("%s: reset, enter, target %d.%d:%d, pid %ld.\n",
j = ((struct hostdata *) SCarg->device->host->hostdata)->board_number;
printk("%s: reset, enter, target %d.%d:%d, pid %ld.\n",
@@
-1589,7
+1593,7
@@
static void sort(unsigned long sk[], unsigned int da[], unsigned int n,
static int reorder(unsigned int j, unsigned long cursec,
unsigned int ihdlr, unsigned int il[], unsigned int n_ready) {
static int reorder(unsigned int j, unsigned long cursec,
unsigned int ihdlr, unsigned int il[], unsigned int n_ready) {
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
struct mscp *cpp;
unsigned int k, n;
unsigned int rev = FALSE, s = TRUE, r = TRUE;
struct mscp *cpp;
unsigned int k, n;
unsigned int rev = FALSE, s = TRUE, r = TRUE;
@@
-1685,9
+1689,9
@@
static int reorder(unsigned int j, unsigned long cursec,
return overlap;
}
return overlap;
}
-static void flush_dev(
Scsi_D
evice *dev, unsigned long cursec, unsigned int j,
+static void flush_dev(
struct scsi_d
evice *dev, unsigned long cursec, unsigned int j,
unsigned int ihdlr) {
unsigned int ihdlr) {
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
struct mscp *cpp;
unsigned int k, n, n_ready = 0, il[MAX_MAILBOXES];
struct mscp *cpp;
unsigned int k, n, n_ready = 0, il[MAX_MAILBOXES];
@@
-1725,7
+1729,7
@@
static void flush_dev(Scsi_Device *dev, unsigned long cursec, unsigned int j,
}
static irqreturn_t ihdlr(int irq, unsigned int j) {
}
static irqreturn_t ihdlr(int irq, unsigned int j) {
-
Scsi_C
mnd *SCpnt;
+
struct scsi_c
mnd *SCpnt;
unsigned int i, k, c, status, tstatus, reg, ret;
struct mscp *spp, *cpp;
unsigned int i, k, c, status, tstatus, reg, ret;
struct mscp *spp, *cpp;