patch-2.3.29 linux/drivers/scsi/53c7xx.h

• Lines: 82
• Date: Tue Nov 23 10:29:15 1999
• Orig file: v2.3.28/linux/drivers/scsi/53c7xx.h
• Orig date: Thu Jul 30 11:17:10 1998

diff -u --recursive --new-file v2.3.28/linux/drivers/scsi/53c7xx.h linux/drivers/scsi/53c7xx.h
@@ -51,14 +51,7 @@
 
 #ifndef NCR53c710_H
 #define NCR53c710_H
-#if !defined(LINUX_1_2) && !defined(LINUX_1_3)
 #include <linux/version.h>
-#if LINUX_VERSION_CODE > 65536 + 3 * 256
-#define LINUX_1_3
-#else
-#define LINUX_1_2
-#endif
-#endif
 
 /* 
  * Prevent name space pollution in hosts.c, and only provide the 
@@ -79,14 +72,6 @@
 #define NCR53c7xx_release NULL
 #endif
 
-#ifdef LINUX_1_2
-#define NCR53c7xx {NULL, NULL, "NCR53c{7,8}xx (rel 17)", NCR53c7xx_detect,\
-	NULL, /* info */ NULL, /* command, deprecated */ NULL, 		\
-	NCR53c7xx_queue_command, NCR53c7xx_abort, NCR53c7xx_reset,	\
-	NULL /* slave attach */, scsicam_bios_param, /* can queue */ 24, \
-	/* id */ 7, 127 /* old SG_ALL */, /* cmd per lun */ 3, 		\
-	/* present */ 0, /* unchecked isa dma */ 0, DISABLE_CLUSTERING} 
-#else
 #define NCR53c7xx {NULL, NULL, NULL, NULL, \
         "NCR53c{7,8}xx (rel 17)", NCR53c7xx_detect,\
         NULL, /* info */ NULL, /* command, deprecated */ NULL,		\
@@ -94,51 +79,10 @@
 	NULL /* slave attach */, scsicam_bios_param, /* can queue */ 24, \
 	/* id */ 7, 127 /* old SG_ALL */, /* cmd per lun */ 3, 		\
 	/* present */ 0, /* unchecked isa dma */ 0, DISABLE_CLUSTERING} 
-#endif
 
 #endif /* defined(HOSTS_C) || defined(MODULE) */ 
 
 #ifndef HOSTS_C
-#ifdef LINUX_1_2
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are trivial on the 1:1 Linux/i386 mapping (but if we ever
- * make the kernel segment mapped at 0, we need to do translation
- * on the i386 as well)
- */
-extern inline unsigned long virt_to_phys(volatile void * address)
-{       
-	return (unsigned long) address;
-}       
-
-extern inline void * phys_to_virt(unsigned long address)
-{
-	return (void *) address;      
-}
-
-/*
- * IO bus memory addresses are also 1:1 with the physical address
- */
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-
-/*
- * readX/writeX() are used to access memory mapped devices. On some
- * architectures the memory mapped IO stuff needs to be accessed
- * differently. On the x86 architecture, we just read/write the
- * memory location directly.
- */
-#define readb(addr) (*(volatile unsigned char *) (addr))
-#define readw(addr) (*(volatile unsigned short *) (addr))
-#define readl(addr) (*(volatile unsigned int *) (addr))
-
-#define writeb(b,addr) ((*(volatile unsigned char *) (addr)) = (b))
-#define writew(b,addr) ((*(volatile unsigned short *) (addr)) = (b))
-#define writel(b,addr) ((*(volatile unsigned int *) (addr)) = (b))
-
-#define mb()
-
-#endif /* def LINUX_1_2 */
 
 /* SCSI control 0 rw, default = 0xc0 */ 
 #define SCNTL0_REG 		0x00