diff options
| author | Henrik Kretzschmar <henne@nachtwindheim.de> | 2006-10-10 17:41:41 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-10-25 18:12:42 -0400 |
| commit | 0fc82d5e84825ab43006f40935633120d23c2e15 (patch) | |
| tree | 91b6c70efac493e06c7ba3076f9aa4f1ada32be7 /drivers/scsi/pcmcia/nsp_cs.h | |
| parent | c543a3739c2a3034c80d77a189bd187c43a00feb (diff) | |
[SCSI] convert ninja driver to struct scsi_cmnd
Changes the obsolete typedefd Scsi_Cmnd to struct scsi_cmnd in
the ninja scsi pcmcia driver.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/pcmcia/nsp_cs.h')
| -rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.h | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h index a88714f4c05b..625ca97da52d 100644 --- a/drivers/scsi/pcmcia/nsp_cs.h +++ b/drivers/scsi/pcmcia/nsp_cs.h | |||
| @@ -266,7 +266,7 @@ typedef struct _nsp_hw_data { | |||
| 266 | 266 | ||
| 267 | int TimerCount; | 267 | int TimerCount; |
| 268 | int SelectionTimeOut; | 268 | int SelectionTimeOut; |
| 269 | Scsi_Cmnd *CurrentSC; | 269 | struct scsi_cmnd *CurrentSC; |
| 270 | //int CurrnetTarget; | 270 | //int CurrnetTarget; |
| 271 | 271 | ||
| 272 | int FifoCount; | 272 | int FifoCount; |
| @@ -319,30 +319,34 @@ static int nsp_proc_info ( | |||
| 319 | int hostno, | 319 | int hostno, |
| 320 | #endif | 320 | #endif |
| 321 | int inout); | 321 | int inout); |
| 322 | static int nsp_queuecommand(Scsi_Cmnd *SCpnt, void (* done)(Scsi_Cmnd *SCpnt)); | 322 | static int nsp_queuecommand(struct scsi_cmnd *SCpnt, |
| 323 | void (* done)(struct scsi_cmnd *SCpnt)); | ||
| 323 | 324 | ||
| 324 | /* Error handler */ | 325 | /* Error handler */ |
| 325 | /*static int nsp_eh_abort (Scsi_Cmnd *SCpnt);*/ | 326 | /*static int nsp_eh_abort (struct scsi_cmnd *SCpnt);*/ |
| 326 | /*static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt);*/ | 327 | /*static int nsp_eh_device_reset(struct scsi_cmnd *SCpnt);*/ |
| 327 | static int nsp_eh_bus_reset (Scsi_Cmnd *SCpnt); | 328 | static int nsp_eh_bus_reset (struct scsi_cmnd *SCpnt); |
| 328 | static int nsp_eh_host_reset (Scsi_Cmnd *SCpnt); | 329 | static int nsp_eh_host_reset (struct scsi_cmnd *SCpnt); |
| 329 | static int nsp_bus_reset (nsp_hw_data *data); | 330 | static int nsp_bus_reset (nsp_hw_data *data); |
| 330 | 331 | ||
| 331 | /* */ | 332 | /* */ |
| 332 | static int nsphw_init (nsp_hw_data *data); | 333 | static int nsphw_init (nsp_hw_data *data); |
| 333 | static int nsphw_start_selection(Scsi_Cmnd *SCpnt); | 334 | static int nsphw_start_selection(struct scsi_cmnd *SCpnt); |
| 334 | static void nsp_start_timer (Scsi_Cmnd *SCpnt, int time); | 335 | static void nsp_start_timer (struct scsi_cmnd *SCpnt, int time); |
| 335 | static int nsp_fifo_count (Scsi_Cmnd *SCpnt); | 336 | static int nsp_fifo_count (struct scsi_cmnd *SCpnt); |
| 336 | static void nsp_pio_read (Scsi_Cmnd *SCpnt); | 337 | static void nsp_pio_read (struct scsi_cmnd *SCpnt); |
| 337 | static void nsp_pio_write (Scsi_Cmnd *SCpnt); | 338 | static void nsp_pio_write (struct scsi_cmnd *SCpnt); |
| 338 | static int nsp_nexus (Scsi_Cmnd *SCpnt); | 339 | static int nsp_nexus (struct scsi_cmnd *SCpnt); |
| 339 | static void nsp_scsi_done (Scsi_Cmnd *SCpnt); | 340 | static void nsp_scsi_done (struct scsi_cmnd *SCpnt); |
| 340 | static int nsp_analyze_sdtr (Scsi_Cmnd *SCpnt); | 341 | static int nsp_analyze_sdtr (struct scsi_cmnd *SCpnt); |
| 341 | static int nsp_negate_signal (Scsi_Cmnd *SCpnt, unsigned char mask, char *str); | 342 | static int nsp_negate_signal (struct scsi_cmnd *SCpnt, |
| 342 | static int nsp_expect_signal (Scsi_Cmnd *SCpnt, unsigned char current_phase, unsigned char mask); | 343 | unsigned char mask, char *str); |
| 343 | static int nsp_xfer (Scsi_Cmnd *SCpnt, int phase); | 344 | static int nsp_expect_signal (struct scsi_cmnd *SCpnt, |
| 344 | static int nsp_dataphase_bypass (Scsi_Cmnd *SCpnt); | 345 | unsigned char current_phase, |
| 345 | static int nsp_reselected (Scsi_Cmnd *SCpnt); | 346 | unsigned char mask); |
| 347 | static int nsp_xfer (struct scsi_cmnd *SCpnt, int phase); | ||
| 348 | static int nsp_dataphase_bypass (struct scsi_cmnd *SCpnt); | ||
| 349 | static int nsp_reselected (struct scsi_cmnd *SCpnt); | ||
| 346 | static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht); | 350 | static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht); |
| 347 | 351 | ||
| 348 | /* Interrupt handler */ | 352 | /* Interrupt handler */ |
| @@ -355,8 +359,8 @@ static void __exit nsp_cs_exit(void); | |||
| 355 | 359 | ||
| 356 | /* Debug */ | 360 | /* Debug */ |
| 357 | #ifdef NSP_DEBUG | 361 | #ifdef NSP_DEBUG |
| 358 | static void show_command (Scsi_Cmnd *SCpnt); | 362 | static void show_command (struct scsi_cmnd *SCpnt); |
| 359 | static void show_phase (Scsi_Cmnd *SCpnt); | 363 | static void show_phase (struct scsi_cmnd *SCpnt); |
| 360 | static void show_busphase(unsigned char stat); | 364 | static void show_busphase(unsigned char stat); |
| 361 | static void show_message (nsp_hw_data *data); | 365 | static void show_message (nsp_hw_data *data); |
| 362 | #else | 366 | #else |