X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fwd33c93.h;h=6a7ebbc602224b4ebaa463d87c8b99294a6d3071;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=b5d2a2a4d2dd5c71860422d21885304710822e0f;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h index b5d2a2a4d..6a7ebbc60 100644 --- a/drivers/scsi/wd33c93.h +++ b/drivers/scsi/wd33c93.h @@ -196,9 +196,9 @@ typedef struct { } wd33c93_regs; -typedef int (*dma_setup_t) (Scsi_Cmnd *SCpnt, int dir_in); -typedef void (*dma_stop_t) (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, - int status); +typedef int (*dma_setup_t) (struct scsi_cmnd *SCpnt, int dir_in); +typedef void (*dma_stop_t) (struct Scsi_Host *instance, + struct scsi_cmnd *SCpnt, int status); #define ILLEGAL_STATUS_BYTE 0xff @@ -234,10 +234,10 @@ struct WD33C93_hostdata { uchar *dma_bounce_buffer; unsigned int dma_bounce_len; volatile uchar busy[8]; /* index = target, bit = lun */ - volatile Scsi_Cmnd *input_Q; /* commands waiting to be started */ - volatile Scsi_Cmnd *selecting; /* trying to select this command */ - volatile Scsi_Cmnd *connected; /* currently connected command */ - volatile Scsi_Cmnd *disconnected_Q;/* commands waiting for reconnect */ + volatile struct scsi_cmnd *input_Q; /* commands waiting to be started */ + volatile struct scsi_cmnd *selecting; /* trying to select this command */ + volatile struct scsi_cmnd *connected; /* currently connected command */ + volatile struct scsi_cmnd *disconnected_Q;/* commands waiting for reconnect */ uchar state; /* what we are currently doing */ uchar dma; /* current state of DMA (on/off) */ uchar level2; /* extent to which Level-2 commands are used */ @@ -335,11 +335,12 @@ struct WD33C93_hostdata { void wd33c93_init (struct Scsi_Host *instance, const wd33c93_regs regs, dma_setup_t setup, dma_stop_t stop, int clock_freq); -int wd33c93_abort (Scsi_Cmnd *cmd); -int wd33c93_queuecommand (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)); +int wd33c93_abort (struct scsi_cmnd *cmd); +int wd33c93_queuecommand (struct scsi_cmnd *cmd, + void (*done)(struct scsi_cmnd *)); void wd33c93_intr (struct Scsi_Host *instance); int wd33c93_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int); -int wd33c93_host_reset (Scsi_Cmnd *); +int wd33c93_host_reset (struct scsi_cmnd *); void wd33c93_release(void); #endif /* WD33C93_H */