patch-2.1.110 linux/drivers/acorn/scsi/cumana_2.c

• Lines: 47
• Date: Sat Jul 18 11:55:24 1998
• Orig file: v2.1.109/linux/drivers/acorn/scsi/cumana_2.c
• Orig date: Fri May 8 23:14:46 1998

diff -u --recursive --new-file v2.1.109/linux/drivers/acorn/scsi/cumana_2.c linux/drivers/acorn/scsi/cumana_2.c
@@ -8,6 +8,7 @@
  *  22-01-1998	RMK	0.0.1	Updated to 2.1.80
  *  15-04-1998	RMK	0.0.1	Only do PIO if FAS216 will allow it.
  *  02-05-1998	RMK	0.0.2	Updated & added DMA support
+ *  27-06-1998	RMK		Changed asm/delay.h to linux/delay.h
  */
 
 #include <linux/module.h>
@@ -19,8 +20,8 @@
 #include <linux/proc_fs.h>
 #include <linux/unistd.h>
 #include <linux/stat.h>
+#include <linux/delay.h>
 
-#include <asm/delay.h>
 #include <asm/dma.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
@@ -72,6 +73,11 @@
 
 static struct expansion_card *ecs[MAX_ECARDS];
 
+MODULE_AUTHOR("Russell King");
+MODULE_DESCRIPTION("Cumana SCSI II driver");
+MODULE_PARM(term, "1-8i");
+MODULE_PARM_DESC(term, "SCSI bus termination");
+
 /*
  * Use term=0,1,0,0,0 to turn terminators on/off
  */
@@ -250,7 +256,7 @@
 			if (!(status & STATUS_DRQ))
 				continue;
 
-			word = *addr | (*addr + 1) << 8;
+			word = *addr | *(addr + 1) << 8;
 			outw (info->dmaarea);
 			addr += 2;
 			length -= 2;
@@ -361,6 +367,7 @@
 		info->info.ifcfg.asyncperiod	= CUMANASCSI2_ASYNC_PERIOD;
 		info->info.ifcfg.sync_max_depth	= CUMANASCSI2_SYNC_DEPTH;
 		info->info.ifcfg.cntl3		= CNTL3_BS8 | CNTL3_FASTSCSI | CNTL3_FASTCLK;
+		info->info.ifcfg.disconnect_ok	= 1;
 		info->info.dma.setup		= cumanascsi_2_dma_setup;
 		info->info.dma.pseudo		= cumanascsi_2_dma_pseudo;
 		info->info.dma.stop		= cumanascsi_2_dma_stop;