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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
scsi
/
dc395x.c
diff --git
a/drivers/scsi/dc395x.c
b/drivers/scsi/dc395x.c
index
2a062f1
..
bde847c
100644
(file)
--- a/
drivers/scsi/dc395x.c
+++ b/
drivers/scsi/dc395x.c
@@
-51,16
+51,20
@@
#include <linux/delay.h>
#include <linux/ctype.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/ctype.h>
#include <linux/blkdev.h>
-#include <asm/io.h>
-#include "scsi.h"
-#include "hosts.h"
-#include "dc395x.h"
-#include <scsi/scsicam.h> /* needed for scsicam_bios_param */
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/pci.h>
#include <linux/list.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/pci.h>
#include <linux/list.h>
+#include <asm/io.h>
+
+#include <scsi/scsi.h>
+#include <scsi/scsicam.h> /* needed for scsicam_bios_param */
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+
+#include "dc395x.h"
#define DC395X_NAME "dc395x"
#define DC395X_BANNER "Tekram DC395(U/UW/F), DC315(U) - ASIC TRM-S1040"
#define DC395X_NAME "dc395x"
#define DC395X_BANNER "Tekram DC395(U/UW/F), DC315(U) - ASIC TRM-S1040"
@@
-222,7
+226,7
@@
struct NvRamType {
struct ScsiReqBlk {
struct list_head list; /* next/prev ptrs for srb lists */
struct DeviceCtlBlk *dcb;
struct ScsiReqBlk {
struct list_head list; /* next/prev ptrs for srb lists */
struct DeviceCtlBlk *dcb;
-
Scsi_C
mnd *cmd;
+
struct scsi_c
mnd *cmd;
struct SGentry *segment_x; /* Linear array of hw sg entries (up to 64 entries) */
u32 sg_bus_addr; /* Bus address of sg list (ie, of segment_x) */
struct SGentry *segment_x; /* Linear array of hw sg entries (up to 64 entries) */
u32 sg_bus_addr; /* Bus address of sg list (ie, of segment_x) */
@@
-372,10
+376,10
@@
static void disconnect(struct AdapterCtlBlk *acb);
static void reselect(struct AdapterCtlBlk *acb);
static u8 start_scsi(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
struct ScsiReqBlk *srb);
static void reselect(struct AdapterCtlBlk *acb);
static u8 start_scsi(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
struct ScsiReqBlk *srb);
-static void build_srb(
Scsi_C
mnd *cmd, struct DeviceCtlBlk *dcb,
+static void build_srb(
struct scsi_c
mnd *cmd, struct DeviceCtlBlk *dcb,
struct ScsiReqBlk *srb);
static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_code,
struct ScsiReqBlk *srb);
static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_code,
-
Scsi_C
mnd *cmd, u8 force);
+
struct scsi_c
mnd *cmd, u8 force);
static void scsi_reset_detect(struct AdapterCtlBlk *acb);
static void pci_unmap_srb(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb);
static void pci_unmap_srb_sense(struct AdapterCtlBlk *acb,
static void scsi_reset_detect(struct AdapterCtlBlk *acb);
static void pci_unmap_srb(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb);
static void pci_unmap_srb_sense(struct AdapterCtlBlk *acb,
@@
-738,7
+742,7
@@
static void free_tag(struct DeviceCtlBlk *dcb, struct ScsiReqBlk *srb)
/* Find cmd in SRB list */
/* Find cmd in SRB list */
-inline static struct ScsiReqBlk *find_cmd(
Scsi_C
mnd *cmd,
+inline static struct ScsiReqBlk *find_cmd(
struct scsi_c
mnd *cmd,
struct list_head *head)
{
struct ScsiReqBlk *i;
struct list_head *head)
{
struct ScsiReqBlk *i;
@@
-973,10
+977,10
@@
static void send_srb(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb)
/* Prepare SRB for being sent to Device DCB w/ command *cmd */
/* Prepare SRB for being sent to Device DCB w/ command *cmd */
-static void build_srb(
Scsi_C
mnd *cmd, struct DeviceCtlBlk *dcb,
+static void build_srb(
struct scsi_c
mnd *cmd, struct DeviceCtlBlk *dcb,
struct ScsiReqBlk *srb)
{
struct ScsiReqBlk *srb)
{
-
int dir = scsi_to_pci_dma_dir(cmd->sc_data_direction)
;
+
enum dma_data_direction dir = cmd->sc_data_direction
;
dprintkdbg(DBG_0, "build_srb: (pid#%li) <%02i-%i>\n",
cmd->pid, dcb->target_id, dcb->target_lun);
dprintkdbg(DBG_0, "build_srb: (pid#%li) <%02i-%i>\n",
cmd->pid, dcb->target_id, dcb->target_lun);
@@
-1089,7
+1093,7
@@
static void build_srb(Scsi_Cmnd *cmd, struct DeviceCtlBlk *dcb,
* and is expected to be held on return.
*
**/
* and is expected to be held on return.
*
**/
-static int dc395x_queue_command(
Scsi_Cmnd *cmd, void (*done)(Scsi_C
mnd *))
+static int dc395x_queue_command(
struct scsi_cmnd *cmd, void (*done)(struct scsi_c
mnd *))
{
struct DeviceCtlBlk *dcb;
struct ScsiReqBlk *srb;
{
struct DeviceCtlBlk *dcb;
struct ScsiReqBlk *srb;
@@
-1304,7
+1308,7
@@
static void reset_dev_param(struct AdapterCtlBlk *acb)
* @cmd - some command for this host (for fetching hooks)
* Returns: SUCCESS (0x2002) on success, else FAILED (0x2003).
*/
* @cmd - some command for this host (for fetching hooks)
* Returns: SUCCESS (0x2002) on success, else FAILED (0x2003).
*/
-static int dc395x_eh_bus_reset(
Scsi_C
mnd *cmd)
+static int dc395x_eh_bus_reset(
struct scsi_c
mnd *cmd)
{
struct AdapterCtlBlk *acb =
(struct AdapterCtlBlk *)cmd->device->host->hostdata;
{
struct AdapterCtlBlk *acb =
(struct AdapterCtlBlk *)cmd->device->host->hostdata;
@@
-1356,7
+1360,7
@@
static int dc395x_eh_bus_reset(Scsi_Cmnd *cmd)
* @cmd - command to be aborted
* Returns: SUCCESS (0x2002) on success, else FAILED (0x2003).
*/
* @cmd - command to be aborted
* Returns: SUCCESS (0x2002) on success, else FAILED (0x2003).
*/
-static int dc395x_eh_abort(
Scsi_C
mnd *cmd)
+static int dc395x_eh_abort(
struct scsi_c
mnd *cmd)
{
/*
* Look into our command queues: If it has not been sent already,
{
/*
* Look into our command queues: If it has not been sent already,
@@
-1939,7
+1943,7
@@
static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
{
u8 idx;
struct scatterlist *sg;
{
u8 idx;
struct scatterlist *sg;
-
Scsi_C
mnd *cmd = srb->cmd;
+
struct scsi_c
mnd *cmd = srb->cmd;
int segment = cmd->use_sg;
u32 xferred = srb->total_xfer_length - left; /* bytes transfered */
struct SGentry *psge = srb->segment_x + srb->sg_index;
int segment = cmd->use_sg;
u32 xferred = srb->total_xfer_length - left; /* bytes transfered */
struct SGentry *psge = srb->segment_x + srb->sg_index;
@@
-3249,8
+3253,8
@@
static void add_dev(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
/* unmap mapped pci regions from SRB */
static void pci_unmap_srb(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb)
{
/* unmap mapped pci regions from SRB */
static void pci_unmap_srb(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb)
{
-
Scsi_C
mnd *cmd = srb->cmd;
-
int dir = scsi_to_pci_dma_dir(cmd->sc_data_direction)
;
+
struct scsi_c
mnd *cmd = srb->cmd;
+
enum dma_data_direction dir = cmd->sc_data_direction
;
if (cmd->use_sg && dir != PCI_DMA_NONE) {
/* unmap DC395x SG list */
dprintkdbg(DBG_SG, "pci_unmap_srb: list=%08x(%05x)\n",
if (cmd->use_sg && dir != PCI_DMA_NONE) {
/* unmap DC395x SG list */
dprintkdbg(DBG_SG, "pci_unmap_srb: list=%08x(%05x)\n",
@@
-3301,11
+3305,10
@@
static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
struct ScsiReqBlk *srb)
{
u8 tempcnt, status;
struct ScsiReqBlk *srb)
{
u8 tempcnt, status;
-
Scsi_C
mnd *cmd = srb->cmd;
+
struct scsi_c
mnd *cmd = srb->cmd;
struct ScsiInqData *ptr;
struct ScsiInqData *ptr;
-
int dir
;
+
enum dma_data_direction dir = cmd->sc_data_direction
;
- dir = scsi_to_pci_dma_dir(cmd->sc_data_direction);
if (cmd->use_sg) {
struct scatterlist* sg = (struct scatterlist *)cmd->request_buffer;
ptr = (struct ScsiInqData *)(page_address(sg->page) + sg->offset);
if (cmd->use_sg) {
struct scatterlist* sg = (struct scatterlist *)cmd->request_buffer;
ptr = (struct ScsiInqData *)(page_address(sg->page) + sg->offset);
@@
-3510,7
+3513,7
@@
static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
/* abort all cmds in our queues */
static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_flag,
/* abort all cmds in our queues */
static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_flag,
-
Scsi_C
mnd *cmd, u8 force)
+
struct scsi_c
mnd *cmd, u8 force)
{
struct DeviceCtlBlk *dcb;
dprintkl(KERN_INFO, "doing_srb_done: pids ");
{
struct DeviceCtlBlk *dcb;
dprintkl(KERN_INFO, "doing_srb_done: pids ");
@@
-3518,14
+3521,14
@@
static void doing_srb_done(struct AdapterCtlBlk *acb, u8 did_flag,
list_for_each_entry(dcb, &acb->dcb_list, list) {
struct ScsiReqBlk *srb;
struct ScsiReqBlk *tmp;
list_for_each_entry(dcb, &acb->dcb_list, list) {
struct ScsiReqBlk *srb;
struct ScsiReqBlk *tmp;
-
Scsi_C
mnd *p;
+
struct scsi_c
mnd *p;
list_for_each_entry_safe(srb, tmp, &dcb->srb_going_list, list) {
list_for_each_entry_safe(srb, tmp, &dcb->srb_going_list, list) {
+ enum dma_data_direction dir;
int result;
int result;
- int dir;
p = srb->cmd;
p = srb->cmd;
- dir =
scsi_to_pci_dma_dir(p->sc_data_direction)
;
+ dir =
p->sc_data_direction
;
result = MK_RES(0, did_flag, 0, 0);
printk("G:%li(%02i-%i) ", p->pid,
p->device->id, p->device->lun);
result = MK_RES(0, did_flag, 0, 0);
printk("G:%li(%02i-%i) ", p->pid,
p->device->id, p->device->lun);
@@
-3665,7
+3668,7
@@
static void scsi_reset_detect(struct AdapterCtlBlk *acb)
static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
struct ScsiReqBlk *srb)
{
static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
struct ScsiReqBlk *srb)
{
-
Scsi_C
mnd *cmd = srb->cmd;
+
struct scsi_c
mnd *cmd = srb->cmd;
dprintkdbg(DBG_1, "request_sense: (pid#%li) <%02i-%i>\n",
cmd->pid, cmd->device->id, cmd->device->lun);
dprintkdbg(DBG_1, "request_sense: (pid#%li) <%02i-%i>\n",
cmd->pid, cmd->device->id, cmd->device->lun);
@@
-4738,7
+4741,7
@@
static int dc395x_proc_info(struct Scsi_Host *host, char *buffer,
}
}
-static
Scsi_Host_T
emplate dc395x_driver_template = {
+static
struct scsi_host_t
emplate dc395x_driver_template = {
.module = THIS_MODULE,
.proc_name = DC395X_NAME,
.proc_info = dc395x_proc_info,
.module = THIS_MODULE,
.proc_name = DC395X_NAME,
.proc_info = dc395x_proc_info,