diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2014-11-12 06:12:17 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-11-20 09:11:18 +0100 |
| commit | 8dad0c51dac3f906b213ef3486cad39a06419252 (patch) | |
| tree | ee9ef9bafaaff110f9b5f588e94eebdc4e76e9f8 /drivers/scsi/sun3_scsi.c | |
| parent | atari_NCR5380: Merge from sun3_NCR5380.c (diff) | |
| download | linux-8dad0c51dac3f906b213ef3486cad39a06419252.tar.xz linux-8dad0c51dac3f906b213ef3486cad39a06419252.zip | |
sun3_scsi: Adopt atari_NCR5380 core driver and remove sun3_NCR5380.c
Given the preceding changes to atari_NCR5380.c, this patch should not change
behaviour of the sun3_scsi and sun3_scsi_vme modules.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to '')
| -rw-r--r-- | drivers/scsi/sun3_scsi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c index 446c8e58a8db..985a6b36756e 100644 --- a/drivers/scsi/sun3_scsi.c +++ b/drivers/scsi/sun3_scsi.c @@ -41,6 +41,8 @@ #define REAL_DMA #define RESET_RUN_DONE /* #define SUPPORT_TAGS */ +/* minimum number of bytes to do dma on */ +#define DMA_MIN_SIZE 129 /* #define MAX_TAGS 32 */ @@ -64,6 +66,9 @@ #define NCR5380_dma_xfer_len(instance, cmd, phase) \ sun3scsi_dma_xfer_len(cmd->SCp.this_residual, cmd, !((phase) & SR_IO)) +#define NCR5380_acquire_dma_irq(instance) (1) +#define NCR5380_release_dma_irq(instance) + #include "NCR5380.h" @@ -92,9 +97,6 @@ module_param(setup_hostid, int, 0); /* dvma buffer to allocate -- 32k should hopefully be more than sufficient */ #define SUN3_DVMA_BUFSIZE 0xe000 -/* minimum number of bytes to do dma on */ -#define SUN3_DMA_MINSIZE 128 - static struct scsi_cmnd *sun3_dma_setup_done; static unsigned char *sun3_scsi_regp; static volatile struct sun3_dma_regs *dregs; @@ -486,7 +488,7 @@ static int sun3scsi_dma_finish(int write_flag) } -#include "sun3_NCR5380.c" +#include "atari_NCR5380.c" #ifdef SUN3_SCSI_VME #define SUN3_SCSI_NAME "Sun3 NCR5380 VME SCSI" |