patch-2.1.43 linux/drivers/scsi/amiga7xx.c
Next file: linux/drivers/scsi/g_NCR5380.c
Previous file: linux/drivers/sbus/char/weitek.c
Back to the patch index
Back to the overall index
- Lines: 37
- Date:
Thu Jun 12 16:22:07 1997
- Orig file:
v2.1.42/linux/drivers/scsi/amiga7xx.c
- Orig date:
Sat May 24 09:10:24 1997
diff -u --recursive --new-file v2.1.42/linux/drivers/scsi/amiga7xx.c linux/drivers/scsi/amiga7xx.c
@@ -50,20 +50,20 @@
#ifdef CONFIG_WARPENGINE_SCSI
if ((key = zorro_find(MANUF_MACROSYSTEMS, PROD_WARP_ENGINE, 0, 0)))
{
- cd = zorro_get_board(key);
- address = (unsigned long)kernel_map((unsigned long)cd->cd_BoardAddr,
+ cd = zorro_get_board(key);
+ address = (unsigned long)kernel_map((unsigned long)cd->cd_BoardAddr,
cd->cd_BoardSize, KERNELMAP_NOCACHE_SER, NULL);
- options = OPTION_MEMORY_MAPPED|OPTION_DEBUG_TEST1|OPTION_INTFLY|OPTION_SYNCHRONOUS|OPTION_ALWAYS_SYNCHRONOUS|OPTION_DISCONNECT;
+ options = OPTION_MEMORY_MAPPED|OPTION_DEBUG_TEST1|OPTION_INTFLY|OPTION_SYNCHRONOUS|OPTION_ALWAYS_SYNCHRONOUS|OPTION_DISCONNECT;
clock = 50000000; /* 50MHz SCSI Clock */
- ncr53c7xx_init(tpnt, 0, 710, (u32)(unsigned char *)(address + 0x40000),
- 0, IRQ_AMIGA_PORTS & ~IRQ_MACHSPEC, DMA_NONE,
+ ncr53c7xx_init(tpnt, 0, 710, (u32)(unsigned char *)(address + 0x40000),
+ 0, IRQ_AMIGA_PORTS, DMA_NONE,
options, clock);
- zorro_config_board(key, 0);
- num++;
+ zorro_config_board(key, 0);
+ num++;
}
#endif
@@ -94,7 +94,7 @@
clock = 50000000; /* 50MHz SCSI Clock */
ncr53c7xx_init(tpnt, 0, 710, (u32)(unsigned char *)(address+0x800000),
- 0, IRQ_AMIGA_PORTS & ~IRQ_MACHSPEC, DMA_NONE,
+ 0, IRQ_AMIGA_PORTS, DMA_NONE,
options, clock);
zorro_config_board(key, 0);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov