Messages in this thread Patch in this message | | | Date | Tue, 19 Oct 1999 05:35:40 -0400 | From | Jeff Garzik <> | Subject | PATCH 2.3.23 pre2 SCSI cleanup |
| |
Alan,
You asked another l-k poster to send you a patch like this, so I will do the same. This fixes compile errors in 2.3.23 pre2 which occur when pairs of SCSI drivers' symbols conflict with each other.
Jeffdiff -urN linux-2.3.23-pre2/drivers/scsi/ini9100u.h linux_2_3/drivers/scsi/ini9100u.h --- linux-2.3.23-pre2/drivers/scsi/ini9100u.h Mon Oct 11 18:00:08 1999 +++ linux_2_3/drivers/scsi/ini9100u.h Tue Oct 19 04:38:27 1999 @@ -173,8 +173,10 @@ #endif #endif - +#ifndef HOSTS_C #define VIRT_TO_BUS(i) (unsigned int) virt_to_bus((void *)(i)) +#endif /* !HOSTS_C */ + #define ULONG unsigned long #define USHORT unsigned short #define UCHAR unsigned char @@ -205,8 +207,10 @@ #define i91u_MAXQUEUE 2 #define TOTAL_SG_ENTRY 32 -#define MAX_TARGETS 16 #define SENSE_SIZE 14 +#ifndef HOSTS_C +#define MAX_TARGETS 16 +#endif /* !HOSTS_C */ #define INI_VENDOR_ID 0x1101 /* Initio's PCI vendor ID */ #define DMX_VENDOR_ID 0x134a /* Domex's PCI vendor ID */ diff -urN linux-2.3.23-pre2/drivers/scsi/inia100.h linux_2_3/drivers/scsi/inia100.h --- linux-2.3.23-pre2/drivers/scsi/inia100.h Mon Oct 18 23:32:00 1999 +++ linux_2_3/drivers/scsi/inia100.h Tue Oct 19 04:38:27 1999 @@ -227,9 +227,11 @@ #define ORC_OFFSET_SCB 16 #define ORC_MAX_SCBS 250 -#define MAX_CHANNELS 2 #define MAX_ESCB_ELE 64 #define TCF_DRV_255_63 0x0400 +#ifndef HOSTS_C +#define MAX_CHANNELS 2 +#endif /* !HOSTS_C */ /********************************************************/ /* Orchid Configuration Register Set */ @@ -418,6 +420,7 @@ /*********************************************************************** Host Adapter Control Structure ************************************************************************/ +#ifndef HOSTS_C typedef struct ORC_Ha_Ctrl_Struc { USHORT HCS_Base; /* 00 */ UBYTE HCS_Index; /* 02 */ @@ -450,6 +453,7 @@ spinlock_t pSRB_lock; #endif } ORC_HCS; +#endif /* !HOSTS_C */ /* Bit Definition for HCS_Flags */ diff -urN linux-2.3.23-pre2/drivers/scsi/ips.h linux_2_3/drivers/scsi/ips.h --- linux-2.3.23-pre2/drivers/scsi/ips.h Mon Oct 18 23:32:00 1999 +++ linux_2_3/drivers/scsi/ips.h Tue Oct 19 04:38:27 1999 @@ -72,7 +72,9 @@ #define HA(x) ((ips_ha_t *) x->hostdata) #define IPS_COMMAND_ID(ha, scb) (int) (scb - ha->scbs) + #ifndef HOSTS_C #define VIRT_TO_BUS(x) (unsigned int)virt_to_bus((void *) x) + #endif /* !HOSTS_C */ #define UDELAY udelay #define MDELAY mdelay @@ -147,8 +149,10 @@ #define IPS_BLKSIZE 512 #define MAX_SG_ELEMENTS 17 #define MAX_LOGICAL_DRIVES 8 + #ifndef HOSTS_C #define MAX_CHANNELS 3 #define MAX_TARGETS 15 + #endif /* !HOSTS_C */ #define MAX_CHUNKS 16 #define MAX_CMDS 64 #define IPS_MAX_XFER 0x10000 @@ -252,12 +256,15 @@ #define IPS_IN_ABORT 1 #define IPS_IN_RESET 2 + #ifndef HOSTS_C /* * SCB Flags */ #define SCB_ACTIVE 0x00001 #define SCB_WAITING 0x00002 + #endif /* !HOSTS_C */ + /* * Passthru stuff */ @@ -476,6 +483,7 @@ LOGICAL_DRIVE_INFO logical_drive_info; } ADAPTER_AREA, *PADAPTER_AREA; +#ifndef HOSTS_C typedef struct { u8 ucLogDriveCount; u8 ucMiscFlag; @@ -500,6 +508,7 @@ u8 reserved; u16 usAddrDeadDisk[MAX_CHANNELS * MAX_TARGETS]; } ENQCMD, *PENQCMD; +#endif /* !HOSTS_C */ typedef struct { u8 ucInitiator; @@ -540,6 +549,7 @@ u32 ulNvramSize; } HARDWARE_DISC, *PHARDWARE_DISC; +#ifndef HOSTS_C typedef struct { u8 ucLogDriveCount; u8 ucDateD; @@ -568,6 +578,7 @@ u8 reserved[512]; } CONFCMD, *PCONFCMD; +#endif /* !HOSTS_C */ typedef struct { u32 signature; @@ -733,6 +744,7 @@ unsigned int count; } ips_wait_queue_t; +#ifndef HOSTS_C typedef struct ips_ha { u8 ha_id[MAX_CHANNELS+1]; u32 io_addr; /* Base I/O address */ @@ -813,6 +825,7 @@ u8 ExtendedStatus; u16 reserved; } ips_passthru_t; +#endif /* !HOSTS_C */ #endif diff -urN linux-2.3.23-pre2/drivers/scsi/megaraid.h linux_2_3/drivers/scsi/megaraid.h --- linux-2.3.23-pre2/drivers/scsi/megaraid.h Mon Oct 11 17:59:41 1999 +++ linux_2_3/drivers/scsi/megaraid.h Tue Oct 19 04:38:27 1999 @@ -11,6 +11,7 @@ #define BOARD_QUARTZ 0x08000000L #define BOARD_40LD 0x04000000L +#ifndef HOSTS_C #define SCB_FREE 0x0 #define SCB_ACTIVE 0x1 #define SCB_WAITQ 0x2 @@ -18,6 +19,7 @@ #define SCB_COMPLETE 0x4 #define SCB_ABORTED 0x5 #define SCB_RESET 0x6 +#endif /* !HOSTS_C */ #define MEGA_CMD_TIMEOUT 10 | |