patch-2.0.11 linux/drivers/scsi/eata_generic.h

• Lines: 45
• Date: Thu Aug 1 15:43:04 1996
• Orig file: v2.0.10/linux/drivers/scsi/eata_generic.h
• Orig date: Mon May 6 07:34:20 1996

diff -u --recursive --new-file v2.0.10/linux/drivers/scsi/eata_generic.h linux/drivers/scsi/eata_generic.h
@@ -5,7 +5,7 @@
 *             mike@i-Connect.Net                        *
 *             neuffer@mail.uni-mainz.de                 *
 *********************************************************
-* last change: 95/05/05                                 *
+* last change: 96/05/16                                 *
 ********************************************************/
 
 
@@ -90,10 +90,10 @@
 #define CD(cmd)	 ((struct eata_ccb *)(cmd->host_scribble))
 #define SD(host) ((hostdata *)&(host->hostdata))
 
-#define DELAY(x) { __u32 i; ulong flags;          \
+#define DELAY(x) { ulong flags, i;                \
                    save_flags(flags); sti();      \
                    i = jiffies + (x * HZ);        \
-                   while (jiffies < i) barrier(); \
+                   while (jiffies < i);           \
                    restore_flags(flags); }
 
 /***********************************************
@@ -130,6 +130,11 @@
 #define EATA_COLD_BOOT_HBA       0x06	   /* Only as a last resort	*/
 #define EATA_FORCE_IO            0x07
 
+#define HA_CTRLREG     0x206       /* control register for HBA    */
+#define HA_CTRL_DISINT 0x02        /* CTRLREG: disable interrupts */
+#define HA_CTRL_RESCPU 0x04        /* CTRLREG: reset processor    */
+#define HA_CTRL_8HEADS 0x08        /* CTRLREG: set for drives with* 
+				    * >=8 heads (WD1003 rudimentary :-) */
 
 #define HA_WCOMMAND    0x07	   /* command register offset	*/
 #define HA_WIFC        0x06	   /* immediate command offset  */
@@ -350,10 +355,6 @@
     __u32  reads_lat[12][4];
     __u32  writes_lat[12][4];
     __u32  all_lat[4];
-				 /* state of Target (RESET,..) */
-    __u8   t_state[MAXCHANNEL][MAXTARGET];   
-				 /* timeouts on target	       */
-    __u32  t_timeout[MAXCHANNEL][MAXTARGET]; 
     __u8   resetlevel[MAXCHANNEL]; 
     __u32  last_ccb;		 /* Last used ccb	       */
     __u32  cplen;		 /* size of CP in words	       */