patch-2.3.29 linux/drivers/scsi/t128.h

Next file: linux/drivers/scsi/wd33c93.c
Previous file: linux/drivers/scsi/t128.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.28/linux/drivers/scsi/t128.h linux/drivers/scsi/t128.h
@@ -137,28 +137,28 @@
 #ifndef HOSTS_C
 
 #define NCR5380_implementation_fields \
-    volatile unsigned char *base
+    unsigned long base
 
 #define NCR5380_local_declare() \
-    volatile unsigned char *base
+    unsigned long base
 
 #define NCR5380_setup(instance) \
-    base = (volatile unsigned char *) (instance)->base
+    base = (instance)->base
 
 #define T128_address(reg) (base + T_5380_OFFSET + ((reg) * 0x20))
 
 #if !(TDEBUG & TDEBUG_TRANSFER) 
-#define NCR5380_read(reg) (*(T128_address(reg)))
-#define NCR5380_write(reg, value) (*(T128_address(reg)) = (value))
+#define NCR5380_read(reg) isa_readb(T128_address(reg))
+#define NCR5380_write(reg, value) isa_writeb((value),(T128_address(reg)))
 #else
 #define NCR5380_read(reg)						\
     (((unsigned char) printk("scsi%d : read register %d at address %08x\n"\
-    , instance->hostno, (reg), T128_address(reg))), *(T128_address(reg)))
+    , instance->hostno, (reg), T128_address(reg))), isa_readb(T128_address(reg)))
 
 #define NCR5380_write(reg, value) {					\
     printk("scsi%d : write %02x to register %d at address %08x\n", 	\
 	    instance->hostno, (value), (reg), T128_address(reg));	\
-    *(T128_address(reg)) = (value);					\
+    isa_writeb((value), (T128_address(reg)));				\
 }
 #endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)