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

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

diff -u --recursive --new-file v2.3.28/linux/drivers/scsi/seagate.c linux/drivers/scsi/seagate.c
@@ -245,10 +245,10 @@
 static int irq = IRQ;
 
 #define retcode(result) (((result) << 16) | (message << 8) | status)
-#define STATUS ((u8) readb(st0x_cr_sr))
-#define DATA ((u8) readb(st0x_dr))
-#define WRITE_CONTROL(d) { writeb((d), st0x_cr_sr); }
-#define WRITE_DATA(d) { writeb((d), st0x_dr); }
+#define STATUS ((u8) isa_readb(st0x_cr_sr))
+#define DATA ((u8) isa_readb(st0x_dr))
+#define WRITE_CONTROL(d) { isa_writeb((d), st0x_cr_sr); }
+#define WRITE_DATA(d) { isa_writeb((d), st0x_dr); }
 
 void st0x_setup (char *str, int *ints)
 {
@@ -447,7 +447,7 @@
     for (i = 0; i < (sizeof (seagate_bases) / sizeof (unsigned int)); ++i)
 
       for (j = 0; !base_address && j < NUM_SIGNATURES; ++j)
-        if (check_signature (seagate_bases[i] + signatures[j].offset,
+        if (isa_check_signature (seagate_bases[i] + signatures[j].offset,
                              signatures[j].signature, signatures[j].length))
         {
           base_address = seagate_bases[i];