patch-2.3.29 linux/drivers/scsi/dtc.c

• Lines: 45
• Date: Fri Nov 19 11:30:54 1999
• Orig file: v2.3.28/linux/drivers/scsi/dtc.c
• Orig date: Thu Nov 11 20:11:46 1999

diff -u --recursive --new-file v2.3.28/linux/drivers/scsi/dtc.c linux/drivers/scsi/dtc.c
@@ -147,7 +147,7 @@
 #define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))
 
 static struct base {
-   unsigned int address;
+   unsigned long address;
    int noauto;
 } bases[] __initdata = {{0xcc000, 0}, {0xc8000, 0}, {0xdc000, 0}, {0xd8000, 0}};
 
@@ -222,7 +222,7 @@
 #endif
 	 for (sig = 0; sig < NO_SIGNATURES; ++sig)
 	    if (!bases[current_base].noauto && 
-		check_signature(bases[current_base].address +
+		isa_check_signature(bases[current_base].address +
 				signatures[sig].offset,
 	      signatures[sig].string, strlen(signatures[sig].string))) {
 	    base = bases[current_base].address;
@@ -241,7 +241,7 @@
 	 break;
 
       instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata));
-      instance->base = (void *)base;
+      instance->base = base;
 
       NCR5380_init(instance, 0);
 
@@ -360,7 +360,7 @@
       while (NCR5380_read(DTC_CONTROL_REG) & CSR_HOST_BUF_NOT_RDY)
 	 ++i;
       rtrc(3);
-      memcpy_fromio(d, base + DTC_DATA_BUF, 128);
+      isa_memcpy_fromio(d, base + DTC_DATA_BUF, 128);
       d += 128;
       len -= 128;
       rtrc(7);	/*** with int's on, it sometimes hangs after here.
@@ -410,7 +410,7 @@
       while (NCR5380_read(DTC_CONTROL_REG) & CSR_HOST_BUF_NOT_RDY)
 	 ++i;
       rtrc(3);
-      memcpy_toio(base + DTC_DATA_BUF, src, 128);
+      isa_memcpy_toio(base + DTC_DATA_BUF, src, 128);
       src += 128;
       len -= 128;
    }