Commit 8dad0c51 authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig

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: default avatarFinn Thain <[email protected]>
Reviewed-by: Hannes Reinecke's avatarHannes Reinecke <[email protected]>
Signed-off-by: default avatarChristoph Hellwig <[email protected]>
parent e3f463b0
......@@ -6304,7 +6304,6 @@ F: drivers/scsi/g_NCR5380.*
F: drivers/scsi/g_NCR5380_mmio.c
F: drivers/scsi/mac_scsi.*
F: drivers/scsi/pas16.*
F: drivers/scsi/sun3_NCR5380.c
F: drivers/scsi/sun3_scsi.*
F: drivers/scsi/sun3_scsi_vme.c
F: drivers/scsi/t128.*
......
This diff is collapsed.
......@@ -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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment