diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
| commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
| tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /drivers/scsi/scsi.h | |
| parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) | |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'drivers/scsi/scsi.h')
| -rw-r--r-- | drivers/scsi/scsi.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h index e35bed8c1..4f9fdad07 100644 --- a/drivers/scsi/scsi.h +++ b/drivers/scsi/scsi.h @@ -23,6 +23,7 @@ #include <linux/random.h> +#include <asm/hardirq.h> /* * Some defs, in case these are not defined elsewhere. @@ -34,6 +35,7 @@ # define FALSE 0 #endif +#define MAX_SCSI_DEVICE_CODE 10 extern void scsi_make_blocked_list(void); extern volatile int in_scan_scsis; @@ -178,6 +180,7 @@ typedef struct scsi_device { unsigned disconnect:1; /* can disconnect */ unsigned soft_reset:1; /* Uses soft reset option */ unsigned sync:1; /* Negotiate for sync transfers */ + unsigned wide:1; /* Negotiate for WIDE transfers */ unsigned single_lun:1; /* Indicates we should only allow I/O to * one of the luns for the device at a * time. */ @@ -213,18 +216,8 @@ extern Scsi_Device * scsi_devices; extern int scsi_dev_init (void); -struct scatterlist { - char * address; /* Location data is to be transferred to */ - char * alt_address; /* Location of actual if address is a - * dma indirect buffer. NULL otherwise */ - unsigned int length; -}; - -#ifdef __alpha__ -# define ISA_DMA_THRESHOLD (~0UL) -#else -# define ISA_DMA_THRESHOLD (0x00ffffff) -#endif +#include <asm/scatterlist.h> + #define CONTIGUOUS_BUFFERS(X,Y) ((X->b_data+X->b_size) == Y->b_data) @@ -559,7 +552,7 @@ static Scsi_Cmnd * end_scsi_request(Scsi_Cmnd * SCpnt, int uptodate, int sectors for(;;) { \ current->state = TASK_UNINTERRUPTIBLE; \ if (CONDITION) { \ - if (intr_count) \ + if (in_interrupt()) \ panic("scsi: trying to call schedule() in interrupt" \ ", file %s, line %d.\n", __FILE__, __LINE__); \ schedule(); \ |