This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / drivers / scsi / tmscsim.c
index ee9df02..8a1ed11 100644 (file)
  *                             suggested by CH.                        *
  ***********************************************************************/
 
+/* Uncomment SA_INTERRUPT, if the driver refuses to share its IRQ with other devices */
+#define DC390_IRQ SA_SHIRQ /* | SA_INTERRUPT */
+
 /* DEBUG options */
 //#define DC390_DEBUG0
 //#define DC390_DEBUG1
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
-#include <scsi/scsi_tcq.h>
 
 
 #define DC390_BANNER "Tekram DC390/AM53C974"
 
 #define PCI_DEVICE_ID_AMD53C974        PCI_DEVICE_ID_AMD_SCSI
 
-#include "tmscsim.h"
 
+ static struct pci_device_id tmscsim_pci_tbl[] = {
+       {
+               .vendor         = PCI_VENDOR_ID_AMD,
+               .device         = PCI_DEVICE_ID_AMD53C974,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+       },
+       { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(pci, tmscsim_pci_tbl);
+
+#include "tmscsim.h"
 
+static u8 dc390_StartSCSI( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb* pSRB );
 static void dc390_DataOut_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus);
 static void dc390_DataIn_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus);
 static void dc390_Command_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus);
@@ -272,18 +286,25 @@ static void dc390_SetXferRate( struct dc390_acb* pACB, struct dc390_dcb* pDCB );
 static void dc390_Disconnect( struct dc390_acb* pACB );
 static void dc390_Reselect( struct dc390_acb* pACB );
 static void dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb* pSRB );
+static void dc390_DoingSRB_Done( struct dc390_acb* pACB, struct scsi_cmnd * cmd);
 static void dc390_ScsiRstDetect( struct dc390_acb* pACB );
+static void dc390_ResetSCSIBus( struct dc390_acb* pACB );
 static void dc390_EnableMsgOut_Abort(struct dc390_acb*, struct dc390_srb*);
-static void dc390_dumpinfo(struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb* pSRB);
-static void dc390_ResetDevParam(struct dc390_acb* pACB);
+static irqreturn_t do_DC390_Interrupt( int, void *, struct pt_regs *);
+
+static int    dc390_initAdapter(struct Scsi_Host *psh, unsigned long io_port, u8 Irq, u8 index );
+static void   dc390_updateDCB (struct dc390_acb* pACB, struct dc390_dcb* pDCB);
 
+static struct dc390_acb*       dc390_pACB_start= NULL;
+static struct dc390_acb*       dc390_pACB_current = NULL;
 static u32     dc390_laststatus = 0;
 static u8      dc390_adapterCnt = 0;
 
 /* Startup values, to be overriden on the commandline */
 static int tmscsim[] = {-2, -2, -2, -2, -2, -2};
+static int tmscsim_paramnum = ARRAY_SIZE(tmscsim);
 
-module_param_array(tmscsim, int, NULL, 0);
+module_param_array(tmscsim, int, tmscsim_paramnum, 0);
 MODULE_PARM_DESC(tmscsim, "Host SCSI ID, Speed (0=10MHz), Device Flags, Adapter Flags, Max Tags (log2(tags)-1), DelayReset (s)");
 MODULE_AUTHOR("C.L. Huang / Kurt Garloff");
 MODULE_DESCRIPTION("SCSI host adapter driver for Tekram DC390 and other AMD53C974A based PCI SCSI adapters");
@@ -340,10 +361,242 @@ static char* dc390_p1_str[] = {
        };
 #endif   
 
+/* Devices erroneously pretending to be able to do TagQ */
+static u8  dc390_baddevname1[2][28] ={
+       "SEAGATE ST3390N         9546",
+       "HP      C3323-300       4269"};
+#define BADDEVCNT      2
+
+static char*  dc390_adapname = "DC390";
 static u8  dc390_eepromBuf[MAX_ADAPTER_NUM][EE_LEN];
 static u8  dc390_clock_period1[] = {4, 5, 6, 7, 8, 10, 13, 20};
 static u8  dc390_clock_speed[] = {100,80,67,57,50, 40, 31, 20};
 
+/***********************************************************************
+ * Functions for access to DC390 EEPROM
+ * and some to emulate it
+ *
+ **********************************************************************/
+
+
+static void __devinit dc390_EnDisableCE(u8 mode, struct pci_dev *pdev, u8 *regval)
+{
+    u8 bval;
+
+    bval = 0;
+    if(mode == ENABLE_CE)
+       *regval = 0xc0;
+    else
+       *regval = 0x80;
+    pci_write_config_byte(pdev, *regval, bval);
+    if(mode == DISABLE_CE)
+        pci_write_config_byte(pdev, *regval, bval);
+    udelay(160);
+}
+
+
+/* Override EEprom values with explicitly set values */
+static void __devinit dc390_EEprom_Override (u8 index)
+{
+    u8 *ptr = (u8 *) dc390_eepromBuf[index];
+    u8 id;
+    
+    /* Adapter Settings */
+    if (tmscsim[0] != -2)
+       ptr[EE_ADAPT_SCSI_ID] = (u8)tmscsim[0]; /* Adapter ID */
+    if (tmscsim[3] != -2)
+       ptr[EE_MODE2] = (u8)tmscsim[3];
+    if (tmscsim[5] != -2)
+       ptr[EE_DELAY] = tmscsim[5];                     /* Reset delay */
+    if (tmscsim[4] != -2)
+       ptr[EE_TAG_CMD_NUM] = (u8)tmscsim[4];   /* Tagged Cmds */
+    
+    /* Device Settings */
+    for (id = 0; id < MAX_SCSI_ID; id++)
+    {
+       if (tmscsim[2] != -2)
+               ptr[id<<2] = (u8)tmscsim[2];            /* EE_MODE1 */
+       if (tmscsim[1] != -2)
+               ptr[(id<<2) + 1] = (u8)tmscsim[1];      /* EE_Speed */
+    }
+}
+
+/* Handle "-1" case */
+static void __devinit dc390_check_for_safe_settings (void)
+{
+       if (tmscsim[0] == -1 || tmscsim[0] > 15) /* modules-2.0.0 passes -1 as string */
+       {
+               tmscsim[0] = 7; tmscsim[1] = 4;
+               tmscsim[2] = 0x09; tmscsim[3] = 0x0f;
+               tmscsim[4] = 2; tmscsim[5] = 10;
+               printk (KERN_INFO "DC390: Using safe settings.\n");
+       }
+}
+
+
+static int __initdata tmscsim_def[] = {7, 0 /* 10MHz */,
+               PARITY_CHK_ | SEND_START_ | EN_DISCONNECT_
+               | SYNC_NEGO_ | TAG_QUEUEING_,
+               MORE2_DRV | GREATER_1G | RST_SCSI_BUS | ACTIVE_NEGATION
+               /* | NO_SEEK */
+# ifdef CONFIG_SCSI_MULTI_LUN
+               | LUN_CHECK
+# endif
+               , 3 /* 16 Tags per LUN */, 1 /* s delay after Reset */ };
+
+/* Copy defaults over set values where missing */
+static void __devinit dc390_fill_with_defaults (void)
+{
+       int i;
+       PARSEDEBUG(printk(KERN_INFO "DC390: setup %08x %08x %08x %08x %08x %08x\n", tmscsim[0],\
+                         tmscsim[1], tmscsim[2], tmscsim[3], tmscsim[4], tmscsim[5]));
+       for (i = 0; i < 6; i++)
+       {
+               if (tmscsim[i] < 0 || tmscsim[i] > 255)
+                       tmscsim[i] = tmscsim_def[i];
+       }
+       /* Sanity checks */
+       if (tmscsim[0] >   7) tmscsim[0] =   7;
+       if (tmscsim[1] >   7) tmscsim[1] =   4;
+       if (tmscsim[4] >   5) tmscsim[4] =   4;
+       if (tmscsim[5] > 180) tmscsim[5] = 180;
+}
+
+#ifndef MODULE
+/* Override defaults on cmdline:
+ * tmscsim: AdaptID, MaxSpeed (Index), DevMode (Bitmapped), AdaptMode (Bitmapped)
+ */
+static int __init dc390_setup (char *str)
+{      
+       int ints[8];
+       int i, im;
+       (void)get_options (str, ARRAY_SIZE(ints), ints);
+       im = ints[0];
+       if (im > 6)
+       {
+               printk (KERN_NOTICE "DC390: ignore extra params!\n");
+               im = 6;
+       }
+       for (i = 0; i < im; i++)
+               tmscsim[i] = ints[i+1];
+       /* dc390_checkparams (); */
+       return 1;
+}
+
+__setup("tmscsim=", dc390_setup);
+#endif
+
+static void __devinit dc390_EEpromOutDI(struct pci_dev *pdev, u8 *regval, u8 Carry)
+{
+    u8 bval;
+
+    bval = 0;
+    if(Carry)
+    {
+       bval = 0x40;
+       *regval = 0x80;
+       pci_write_config_byte(pdev, *regval, bval);
+    }
+    udelay(160);
+    bval |= 0x80;
+    pci_write_config_byte(pdev, *regval, bval);
+    udelay(160);
+    bval = 0;
+    pci_write_config_byte(pdev, *regval, bval);
+    udelay(160);
+}
+
+
+static u8 __devinit dc390_EEpromInDO(struct pci_dev *pdev)
+{
+    u8 bval;
+
+    pci_write_config_byte(pdev, 0x80, 0x80);
+    udelay(160);
+    pci_write_config_byte(pdev, 0x80, 0x40);
+    udelay(160);
+    pci_read_config_byte(pdev, 0x00, &bval);
+    if(bval == 0x22)
+       return(1);
+    else
+       return(0);
+}
+
+
+static u16 __devinit dc390_EEpromGetData1(struct pci_dev *pdev)
+{
+    u8 i;
+    u8 carryFlag;
+    u16 wval;
+
+    wval = 0;
+    for(i=0; i<16; i++)
+    {
+       wval <<= 1;
+       carryFlag = dc390_EEpromInDO(pdev);
+       wval |= carryFlag;
+    }
+    return(wval);
+}
+
+
+static void __devinit dc390_Prepare(struct pci_dev *pdev, u8 *regval, u8 EEpromCmd)
+{
+    u8 i,j;
+    u8 carryFlag;
+
+    carryFlag = 1;
+    j = 0x80;
+    for(i=0; i<9; i++)
+    {
+       dc390_EEpromOutDI(pdev, regval, carryFlag);
+       carryFlag = (EEpromCmd & j) ? 1 : 0;
+       j >>= 1;
+    }
+}
+
+
+static void __devinit dc390_ReadEEprom(struct pci_dev *pdev, u16 *ptr)
+{
+    u8   regval,cmd;
+    u8   i;
+
+    cmd = EEPROM_READ;
+    for(i=0; i<0x40; i++)
+    {
+       dc390_EnDisableCE(ENABLE_CE, pdev, &regval);
+       dc390_Prepare(pdev, &regval, cmd++);
+       *ptr++ = dc390_EEpromGetData1(pdev);
+       dc390_EnDisableCE(DISABLE_CE, pdev, &regval);
+    }
+}
+
+
+static void __devinit dc390_interpret_delay (u8 index)
+{
+    char interpd [] = {1,3,5,10,16,30,60,120};
+    dc390_eepromBuf[index][EE_DELAY] = interpd [dc390_eepromBuf[index][EE_DELAY]];
+}
+
+static u8 __devinit dc390_CheckEEpromCheckSum(struct pci_dev *pdev, u8 index)
+{
+    u8  i;
+    char  EEbuf[128];
+    u16 wval, *ptr = (u16 *)EEbuf;
+
+    dc390_ReadEEprom(pdev, ptr);
+    memcpy (dc390_eepromBuf[index], EEbuf, EE_ADAPT_SCSI_ID);
+    memcpy (&dc390_eepromBuf[index][EE_ADAPT_SCSI_ID], 
+           &EEbuf[REAL_EE_ADAPT_SCSI_ID], EE_LEN - EE_ADAPT_SCSI_ID);
+    dc390_interpret_delay (index);
+    
+    wval = 0;
+    for(i=0; i<0x40; i++, ptr++)
+       wval += *ptr;
+    return (wval == 0x1234 ? 0 : 1);
+}
+
+
 /***********************************************************************
  * Functions for the management of the internal structures 
  * (DCBs, SRBs, Queueing)
@@ -363,6 +616,36 @@ static struct dc390_dcb __inline__ *dc390_findDCB ( struct dc390_acb* pACB, u8 i
    return pDCB;
 }
 
+/* Queueing philosphy:
+ * There are a couple of lists:
+ * - Query: Contains the Scsi Commands not yet turned into SRBs (per ACB)
+ *   (Note: For new EH, it is unnecessary!)
+ * - Waiting: Contains a list of SRBs not yet sent (per DCB)
+ * - Free: List of free SRB slots
+ * 
+ * If there are no waiting commands for the DCB, the new one is sent to the bus
+ * otherwise the oldest one is taken from the Waiting list and the new one is 
+ * queued to the Waiting List
+ * 
+ * Lists are managed using two pointers and eventually a counter
+ */
+
+/* Return next free SRB */
+static __inline__ struct dc390_srb* dc390_Free_get ( struct dc390_acb* pACB )
+{
+    struct dc390_srb*   pSRB;
+
+    pSRB = pACB->pFreeSRB;
+    DEBUG0(printk ("DC390: Get Free SRB %p\n", pSRB));
+    if( pSRB )
+    {
+       pACB->pFreeSRB = pSRB->pNextSRB;
+       pSRB->pNextSRB = NULL;
+    }
+
+    return( pSRB );
+}
+
 /* Insert SRB oin top of free list */
 static __inline__ void dc390_Free_insert (struct dc390_acb* pACB, struct dc390_srb* pSRB)
 {
@@ -371,6 +654,34 @@ static __inline__ void dc390_Free_insert (struct dc390_acb* pACB, struct dc390_s
     pACB->pFreeSRB = pSRB;
 }
 
+
+/* Inserts a SRB to the top of the Waiting list */
+static __inline__ void dc390_Waiting_insert ( struct dc390_dcb* pDCB, struct dc390_srb* pSRB )
+{
+    DEBUG0(printk ("DC390: Insert pSRB %p cmd %li to Waiting\n", pSRB, pSRB->pcmd->pid));
+    pSRB->pNextSRB = pDCB->pWaitingSRB;
+    if (!pDCB->pWaitingSRB)
+       pDCB->pWaitLast = pSRB;
+    pDCB->pWaitingSRB = pSRB;
+    pDCB->WaitSRBCnt++;
+}
+
+
+/* Queue SRB to waiting list */
+static __inline__ void dc390_Waiting_append ( struct dc390_dcb* pDCB, struct dc390_srb* pSRB)
+{
+       DEBUG0(printk ("DC390: Append pSRB %p cmd %li to Waiting\n", pSRB, pSRB->pcmd->pid));
+    if( pDCB->pWaitingSRB )
+       pDCB->pWaitLast->pNextSRB = pSRB;
+    else
+       pDCB->pWaitingSRB = pSRB;
+
+    pDCB->pWaitLast = pSRB;
+    pSRB->pNextSRB = NULL;
+    pDCB->WaitSRBCnt++;
+    pDCB->pDCBACB->CmdInQ++;
+}
+
 static __inline__ void dc390_Going_append (struct dc390_dcb* pDCB, struct dc390_srb* pSRB)
 {
     pDCB->GoingSRBCnt++;
@@ -405,6 +716,132 @@ static __inline__ void dc390_Going_remove (struct dc390_dcb* pDCB, struct dc390_
    pDCB->GoingSRBCnt--;
 }
 
+/* Moves SRB from Going list to the top of Waiting list */
+static void dc390_Going_to_Waiting ( struct dc390_dcb* pDCB, struct dc390_srb* pSRB )
+{
+    DEBUG0(printk(KERN_INFO "DC390: Going_to_Waiting (SRB %p) pid = %li\n", pSRB, pSRB->pcmd->pid));
+    /* Remove SRB from Going */
+    dc390_Going_remove (pDCB, pSRB);
+    /* Insert on top of Waiting */
+    dc390_Waiting_insert (pDCB, pSRB);
+    /* Tag Mask must be freed elsewhere ! (KG, 99/06/18) */
+}
+
+/* Moves first SRB from Waiting list to Going list */
+static __inline__ void dc390_Waiting_to_Going ( struct dc390_dcb* pDCB, struct dc390_srb* pSRB )
+{      
+       /* Remove from waiting list */
+       DEBUG0(printk("DC390: Remove SRB %p from head of Waiting\n", pSRB));
+       pDCB->pWaitingSRB = pSRB->pNextSRB;
+       if( !pDCB->pWaitingSRB ) pDCB->pWaitLast = NULL;
+       pDCB->WaitSRBCnt--;
+       dc390_Going_append (pDCB, pSRB);
+}
+
+static void DC390_waiting_timed_out (unsigned long ptr);
+/* Sets the timer to wake us up */
+static void dc390_waiting_timer (struct dc390_acb* pACB, unsigned long to)
+{
+       if (timer_pending (&pACB->Waiting_Timer)) return;
+       init_timer (&pACB->Waiting_Timer);
+       pACB->Waiting_Timer.function = DC390_waiting_timed_out;
+       pACB->Waiting_Timer.data = (unsigned long)pACB;
+       if (time_before (jiffies + to, pACB->pScsiHost->last_reset))
+               pACB->Waiting_Timer.expires = pACB->pScsiHost->last_reset + 1;
+       else
+               pACB->Waiting_Timer.expires = jiffies + to + 1;
+       add_timer (&pACB->Waiting_Timer);
+}
+
+
+/* Send the next command from the waiting list to the bus */
+static void dc390_Waiting_process ( struct dc390_acb* pACB )
+{
+    struct dc390_dcb *ptr, *ptr1;
+    struct dc390_srb *pSRB;
+
+    if( (pACB->pActiveDCB) || (pACB->ACBFlag & (RESET_DETECT+RESET_DONE+RESET_DEV) ) )
+       return;
+    if (timer_pending (&pACB->Waiting_Timer)) del_timer (&pACB->Waiting_Timer);
+    ptr = pACB->pDCBRunRobin;
+    if( !ptr )
+      {
+       ptr = pACB->pLinkDCB;
+       pACB->pDCBRunRobin = ptr;
+      }
+    ptr1 = ptr;
+    if (!ptr1) return;
+    do 
+      {
+       pACB->pDCBRunRobin = ptr1->pNextDCB;
+       if( !( pSRB = ptr1->pWaitingSRB ) ||
+           ( ptr1->MaxCommand <= ptr1->GoingSRBCnt ))
+         ptr1 = ptr1->pNextDCB;
+       else
+         {
+           /* Try to send to the bus */
+           if( !dc390_StartSCSI(pACB, ptr1, pSRB) )
+             dc390_Waiting_to_Going (ptr1, pSRB);
+           else
+             dc390_waiting_timer (pACB, HZ/5);
+           break;
+         }
+      } while (ptr1 != ptr);
+    return;
+}
+
+/* Wake up waiting queue */
+static void DC390_waiting_timed_out (unsigned long ptr)
+{
+       struct dc390_acb* pACB = (struct dc390_acb*)ptr;
+       unsigned long iflags;
+       DEBUG0(printk ("DC390: Debug: Waiting queue woken up by timer!\n"));
+       spin_lock_irqsave(pACB->pScsiHost->host_lock, iflags);
+       dc390_Waiting_process (pACB);
+       spin_unlock_irqrestore(pACB->pScsiHost->host_lock, iflags);
+}
+
+/***********************************************************************
+ * Function: static void dc390_SendSRB (struct dc390_acb* pACB, struct dc390_srb* pSRB)
+ *
+ * Purpose: Send SCSI Request Block (pSRB) to adapter (pACB)
+ *
+ ***********************************************************************/
+
+static void dc390_SendSRB( struct dc390_acb* pACB, struct dc390_srb* pSRB )
+{
+    struct dc390_dcb*   pDCB;
+
+    pDCB = pSRB->pSRBDCB;
+    if( (pDCB->MaxCommand <= pDCB->GoingSRBCnt) || (pACB->pActiveDCB) ||
+       (pACB->ACBFlag & (RESET_DETECT+RESET_DONE+RESET_DEV)) )
+    {
+       dc390_Waiting_append (pDCB, pSRB);
+       dc390_Waiting_process (pACB);
+       return;
+    }
+
+#if 0
+    if( pDCB->pWaitingSRB )
+    {
+       dc390_Waiting_append (pDCB, pSRB);
+/*     pSRB = GetWaitingSRB(pDCB); */  /* non-existent */
+       pSRB = pDCB->pWaitingSRB;
+       /* Remove from waiting list */
+       pDCB->pWaitingSRB = pSRB->pNextSRB;
+       pSRB->pNextSRB = NULL;
+       if (!pDCB->pWaitingSRB) pDCB->pWaitLast = NULL;
+    }
+#endif
+       
+    if (!dc390_StartSCSI(pACB, pDCB, pSRB))
+       dc390_Going_append (pDCB, pSRB);
+    else {
+       dc390_Waiting_insert (pDCB, pSRB);
+       dc390_waiting_timer (pACB, HZ/5);
+    }
+}
+
 static struct scatterlist* dc390_sg_build_single(struct scatterlist *sg, void *addr, unsigned int length)
 {
        memset(sg, 0, sizeof(struct scatterlist));
@@ -476,1554 +913,90 @@ static void dc390_pci_unmap (struct dc390_srb* pSRB)
                DEBUG1(printk("%s(): Unmapped SG at %p with %d elements\n", __FUNCTION__, pcmd->request_buffer, pcmd->use_sg));
        } else if (pcmd->request_buffer && pcmd->request_bufflen) {
                pci_unmap_sg(pdev, &pSRB->Segmentx, 1, pcmd->sc_data_direction);
-               DEBUG1(printk("%s(): Unmapped request buffer at %x\n", __FUNCTION__, cmdp->saved_dma_handle));
-       }
-}
-
-static void __inline__
-dc390_freetag (struct dc390_dcb* pDCB, struct dc390_srb* pSRB)
-{
-       if (pSRB->TagNumber != SCSI_NO_TAG) {
-               pDCB->TagMask &= ~(1 << pSRB->TagNumber);   /* free tag mask */
-               pSRB->TagNumber = SCSI_NO_TAG;
-       }
-}
-
-
-static int
-dc390_StartSCSI( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb* pSRB )
-{
-    struct scsi_cmnd *scmd = pSRB->pcmd;
-    struct scsi_device *sdev = scmd->device;
-    u8 cmd, disc_allowed, try_sync_nego;
-    char tag[2];
-
-    pSRB->ScsiPhase = SCSI_NOP0;
-
-    if (pACB->Connected)
-    {
-       // Should not happen normally
-       printk (KERN_WARNING "DC390: Can't select when connected! (%08x,%02x)\n",
-               pSRB->SRBState, pSRB->SRBFlag);
-       pSRB->SRBState = SRB_READY;
-       pACB->SelConn++;
-       return 1;
-    }
-    if (time_before (jiffies, pACB->pScsiHost->last_reset))
-    {
-       DEBUG0(printk ("DC390: We were just reset and don't accept commands yet!\n"));
-       return 1;
-    }
-    /* KG: Moved pci mapping here */
-    dc390_pci_map(pSRB);
-    /* TODO: error handling */
-    DC390_write8 (Scsi_Dest_ID, pDCB->TargetID);
-    DC390_write8 (Sync_Period, pDCB->SyncPeriod);
-    DC390_write8 (Sync_Offset, pDCB->SyncOffset);
-    DC390_write8 (CtrlReg1, pDCB->CtrlR1);
-    DC390_write8 (CtrlReg3, pDCB->CtrlR3);
-    DC390_write8 (CtrlReg4, pDCB->CtrlR4);
-    DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);            /* Flush FIFO */
-    DEBUG1(printk (KERN_INFO "DC390: Start SCSI command: %02x (Sync:%02x)\n",\
-            scmd->cmnd[0], pDCB->SyncMode));
-
-    /* Don't disconnect on AUTO_REQSENSE, cause it might be an
-     * Contingent Allegiance Condition (6.6), where no tags should be used.
-     * All other have to be allowed to disconnect to prevent Incorrect 
-     * Initiator Connection (6.8.2/6.5.2) */
-    /* Changed KG, 99/06/06 */
-    if (! (pSRB->SRBFlag & AUTO_REQSENSE))
-       disc_allowed = pDCB->DevMode & EN_DISCONNECT_;
-    else
-       disc_allowed = 0;
-
-    if ((pDCB->SyncMode & SYNC_ENABLE) && pDCB->TargetLUN == 0 && sdev->sdtr &&
-       (((scmd->cmnd[0] == REQUEST_SENSE || (pSRB->SRBFlag & AUTO_REQSENSE)) &&
-         !(pDCB->SyncMode & SYNC_NEGO_DONE)) || scmd->cmnd[0] == INQUIRY))
-      try_sync_nego = 1;
-    else
-      try_sync_nego = 0;
-
-    pSRB->MsgCnt = 0;
-    cmd = SEL_W_ATN;
-    DC390_write8 (ScsiFifo, IDENTIFY(disc_allowed, pDCB->TargetLUN));
-    /* Change 99/05/31: Don't use tags when not disconnecting (BUSY) */
-    if ((pDCB->SyncMode & EN_TAG_QUEUEING) && disc_allowed && scsi_populate_tag_msg(scmd, tag)) {
-       DC390_write8(ScsiFifo, tag[0]);
-       pDCB->TagMask |= 1 << tag[1];
-       pSRB->TagNumber = tag[1];
-       DC390_write8(ScsiFifo, tag[1]);
-       DEBUG1(printk(KERN_INFO "DC390: Select w/DisCn for Cmd %li (SRB %p), block tag %02x\n", scmd->pid, pSRB, tag[1]));
-       cmd = SEL_W_ATN3;
-    } else {
-       /* No TagQ */
-//no_tag:
-       DEBUG1(printk(KERN_INFO "DC390: Select w%s/DisCn for Cmd %li (SRB %p), No TagQ\n", disc_allowed ? "" : "o", scmd->pid, pSRB));
-    }
-
-    pSRB->SRBState = SRB_START_;
-
-    if (try_sync_nego)
-      { 
-       u8 Sync_Off = pDCB->SyncOffset;
-        DEBUG0(printk (KERN_INFO "DC390: NEW Sync Nego code triggered (%i %i)\n", pDCB->TargetID, pDCB->TargetLUN));
-       pSRB->MsgOutBuf[0] = EXTENDED_MESSAGE;
-       pSRB->MsgOutBuf[1] = 3;
-       pSRB->MsgOutBuf[2] = EXTENDED_SDTR;
-       pSRB->MsgOutBuf[3] = pDCB->NegoPeriod;
-       if (!(Sync_Off & 0x0f)) Sync_Off = SYNC_NEGO_OFFSET;
-       pSRB->MsgOutBuf[4] = Sync_Off;
-       pSRB->MsgCnt = 5;
-       //pSRB->SRBState = SRB_MSGOUT_;
-       pSRB->SRBState |= DO_SYNC_NEGO;
-       cmd = SEL_W_ATN_STOP;
-      }
-
-    /* Command is written in CommandPhase, if SEL_W_ATN_STOP ... */
-    if (cmd != SEL_W_ATN_STOP)
-      {
-       if( pSRB->SRBFlag & AUTO_REQSENSE )
-         {
-           DC390_write8 (ScsiFifo, REQUEST_SENSE);
-           DC390_write8 (ScsiFifo, pDCB->TargetLUN << 5);
-           DC390_write8 (ScsiFifo, 0);
-           DC390_write8 (ScsiFifo, 0);
-           DC390_write8 (ScsiFifo, sizeof(scmd->sense_buffer));
-           DC390_write8 (ScsiFifo, 0);
-           DEBUG1(printk (KERN_DEBUG "DC390: AutoReqSense !\n"));
-         }
-       else    /* write cmnd to bus */ 
-         {
-           u8 *ptr; u8 i;
-           ptr = (u8 *)scmd->cmnd;
-           for (i = 0; i < scmd->cmd_len; i++)
-             DC390_write8 (ScsiFifo, *(ptr++));
-         }
-      }
-    DEBUG0(if (pACB->pActiveDCB)       \
-          printk (KERN_WARNING "DC390: ActiveDCB != 0\n"));
-    DEBUG0(if (pDCB->pActiveSRB)       \
-          printk (KERN_WARNING "DC390: ActiveSRB != 0\n"));
-    //DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-    if (DC390_read8 (Scsi_Status) & INTERRUPT)
-    {
-       dc390_freetag (pDCB, pSRB);
-       DEBUG0(printk ("DC390: Interrupt during Start SCSI (pid %li, target %02i-%02i)\n",
-               scmd->pid, scmd->device->id, scmd->device->lun));
-       pSRB->SRBState = SRB_READY;
-       //DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-       pACB->SelLost++;
-       return 1;
-    }
-    DC390_write8 (ScsiCmd, cmd);
-    pACB->pActiveDCB = pDCB;
-    pDCB->pActiveSRB = pSRB;
-    pACB->Connected = 1;
-    pSRB->ScsiPhase = SCSI_NOP1;
-    return 0;
-}
-
-//#define DMA_INT EN_DMA_INT /*| EN_PAGE_INT*/
-#define DMA_INT 0
-
-#if DMA_INT
-/* This is similar to AM53C974.c ... */
-static u8 
-dc390_dma_intr (struct dc390_acb* pACB)
-{
-  struct dc390_srb* pSRB;
-  u8 dstate;
-  DEBUG0(u16 pstate; struct pci_dev *pdev = pACB->pdev);
-  
-  DEBUG0(pci_read_config_word(pdev, PCI_STATUS, &pstate));
-  DEBUG0(if (pstate & (PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY))\
-       { printk(KERN_WARNING "DC390: PCI state = %04x!\n", pstate); \
-         pci_write_config_word(pdev, PCI_STATUS, (PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY));});
-
-  dstate = DC390_read8 (DMA_Status); 
-
-  if (! pACB->pActiveDCB || ! pACB->pActiveDCB->pActiveSRB) return dstate;
-  else pSRB  = pACB->pActiveDCB->pActiveSRB;
-  
-  if (dstate & (DMA_XFER_ABORT | DMA_XFER_ERROR | POWER_DOWN | PCI_MS_ABORT))
-    {
-       printk (KERN_ERR "DC390: DMA error (%02x)!\n", dstate);
-       return dstate;
-    }
-  if (dstate & DMA_XFER_DONE)
-    {
-       u32 residual, xferCnt; int ctr = 6000000;
-       if (! (DC390_read8 (DMA_Cmd) & READ_DIRECTION))
-         {
-           do
-             {
-               DEBUG1(printk (KERN_DEBUG "DC390: read residual bytes ... \n"));
-               dstate = DC390_read8 (DMA_Status);
-               residual = DC390_read8 (CtcReg_Low) | DC390_read8 (CtcReg_Mid) << 8 |
-                 DC390_read8 (CtcReg_High) << 16;
-               residual += DC390_read8 (Current_Fifo) & 0x1f;
-             } while (residual && ! (dstate & SCSI_INTERRUPT) && --ctr);
-           if (!ctr) printk (KERN_CRIT "DC390: dma_intr: DMA aborted unfinished: %06x bytes remain!!\n", DC390_read32 (DMA_Wk_ByteCntr));
-           /* residual =  ... */
-         }
-       else
-           residual = 0;
-       
-       /* ??? */
-       
-       xferCnt = pSRB->SGToBeXferLen - residual;
-       pSRB->SGBusAddr += xferCnt;
-       pSRB->TotalXferredLen += xferCnt;
-       pSRB->SGToBeXferLen = residual;
-# ifdef DC390_DEBUG0
-       printk (KERN_INFO "DC390: DMA: residual = %i, xfer = %i\n", 
-               (unsigned int)residual, (unsigned int)xferCnt);
-# endif
-       
-       DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-    }
-  dc390_laststatus &= ~0xff000000; dc390_laststatus |= dstate << 24;
-  return dstate;
-}
-#endif
-
-
-static void __inline__
-dc390_InvalidCmd(struct dc390_acb* pACB)
-{
-       if (pACB->pActiveDCB->pActiveSRB->SRBState & (SRB_START_ | SRB_MSGOUT))
-               DC390_write8(ScsiCmd, CLEAR_FIFO_CMD);
-}
-
-
-static irqreturn_t __inline__
-DC390_Interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-    struct dc390_acb *pACB = (struct dc390_acb*)dev_id;
-    struct dc390_dcb *pDCB;
-    struct dc390_srb *pSRB;
-    u8  sstatus=0;
-    u8  phase;
-    void   (*stateV)( struct dc390_acb*, struct dc390_srb*, u8 *);
-    u8  istate, istatus;
-#if DMA_INT
-    u8  dstatus;
-#endif
-
-    sstatus = DC390_read8 (Scsi_Status);
-    if( !(sstatus & INTERRUPT) )
-       return IRQ_NONE;
-
-    DEBUG1(printk (KERN_DEBUG "sstatus=%02x,", sstatus));
-
-#if DMA_INT
-    spin_lock_irq(pACB->pScsiHost->host_lock);
-    dstatus = dc390_dma_intr (pACB);
-    spin_unlock_irq(pACB->pScsiHost->host_lock);
-
-    DEBUG1(printk (KERN_DEBUG "dstatus=%02x,", dstatus));
-    if (! (dstatus & SCSI_INTERRUPT))
-      {
-       DEBUG0(printk (KERN_WARNING "DC390 Int w/o SCSI actions (only DMA?)\n"));
-       return IRQ_NONE;
-      }
-#else
-    //DC390_write32 (DMA_ScsiBusCtrl, WRT_ERASE_DMA_STAT | EN_INT_ON_PCI_ABORT);
-    //dstatus = DC390_read8 (DMA_Status);
-    //DC390_write32 (DMA_ScsiBusCtrl, EN_INT_ON_PCI_ABORT);
-#endif
-
-    spin_lock_irq(pACB->pScsiHost->host_lock);
-
-    istate = DC390_read8 (Intern_State);
-    istatus = DC390_read8 (INT_Status); /* This clears Scsi_Status, Intern_State and INT_Status ! */
-
-    DEBUG1(printk (KERN_INFO "Istatus(Res,Inv,Dis,Serv,Succ,ReS,SelA,Sel)=%02x,",istatus));
-    dc390_laststatus &= ~0x00ffffff;
-    dc390_laststatus |= /* dstatus<<24 | */ sstatus<<16 | istate<<8 | istatus;
-
-    if (sstatus & ILLEGAL_OP_ERR)
-    {
-       printk ("DC390: Illegal Operation detected (%08x)!\n", dc390_laststatus);
-       dc390_dumpinfo (pACB, pACB->pActiveDCB, pACB->pActiveDCB->pActiveSRB);
-    }
-       
-    else if (istatus &  INVALID_CMD)
-    {
-       printk ("DC390: Invalid Command detected (%08x)!\n", dc390_laststatus);
-       dc390_InvalidCmd( pACB );
-       goto unlock;
-    }
-
-    if (istatus &  SCSI_RESET)
-    {
-       dc390_ScsiRstDetect( pACB );
-       goto unlock;
-    }
-
-    if (istatus &  DISCONNECTED)
-    {
-       dc390_Disconnect( pACB );
-       goto unlock;
-    }
-
-    if (istatus &  RESELECTED)
-    {
-       dc390_Reselect( pACB );
-       goto unlock;
-    }
-
-    else if (istatus & (SELECTED | SEL_ATTENTION))
-    {
-       printk (KERN_ERR "DC390: Target mode not supported!\n");
-       goto unlock;
-    }
-
-    if (istatus & (SUCCESSFUL_OP|SERVICE_REQUEST) )
-    {
-       pDCB = pACB->pActiveDCB;
-       if (!pDCB)
-       {
-               printk (KERN_ERR "DC390: Suc. op/ Serv. req: pActiveDCB = 0!\n");
-               goto unlock;
-       }
-       pSRB = pDCB->pActiveSRB;
-       if( pDCB->DCBFlag & ABORT_DEV_ )
-         dc390_EnableMsgOut_Abort (pACB, pSRB);
-
-       phase = pSRB->ScsiPhase;
-       DEBUG1(printk (KERN_INFO "DC390: [%i]%s(0) (%02x)\n", phase, dc390_p0_str[phase], sstatus));
-       stateV = (void *) dc390_phase0[phase];
-       ( *stateV )( pACB, pSRB, &sstatus );
-
-       pSRB->ScsiPhase = sstatus & 7;
-       phase = (u8) sstatus & 7;
-       DEBUG1(printk (KERN_INFO "DC390: [%i]%s(1) (%02x)\n", phase, dc390_p1_str[phase], sstatus));
-       stateV = (void *) dc390_phase1[phase];
-       ( *stateV )( pACB, pSRB, &sstatus );
-    }
-
- unlock:
-    spin_unlock_irq(pACB->pScsiHost->host_lock);
-    return IRQ_HANDLED;
-}
-
-static irqreturn_t do_DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs)
-{
-    irqreturn_t ret;
-    DEBUG1(printk (KERN_INFO "DC390: Irq (%i) caught: ", irq));
-    /* Locking is done in DC390_Interrupt */
-    ret = DC390_Interrupt(irq, dev_id, regs);
-    DEBUG1(printk (".. IRQ returned\n"));
-    return ret;
-}
-
-static void
-dc390_DataOut_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    u8   sstatus;
-    struct scatterlist *psgl;
-    u32    ResidCnt, xferCnt;
-    u8   dstate = 0;
-
-    sstatus = *psstatus;
-
-    if( !(pSRB->SRBState & SRB_XFERPAD) )
-    {
-       if( sstatus & (PARITY_ERR | ILLEGAL_OP_ERR) )
-           pSRB->SRBStatus |= PARITY_ERROR;
-
-       if( sstatus & COUNT_2_ZERO )
-       {
-           unsigned long timeout = jiffies + HZ;
-
-           /* Function called from the ISR with the host_lock held and interrupts disabled */
-           if (pSRB->SGToBeXferLen)
-               while (time_before(jiffies, timeout) && !((dstate = DC390_read8 (DMA_Status)) & DMA_XFER_DONE)) {
-                   spin_unlock_irq(pACB->pScsiHost->host_lock);
-                   udelay(50);
-                   spin_lock_irq(pACB->pScsiHost->host_lock);
-               }
-           if (!time_before(jiffies, timeout))
-               printk (KERN_CRIT "DC390: Deadlock in DataOut_0: DMA aborted unfinished: %06x bytes remain!!\n",
-                       DC390_read32 (DMA_Wk_ByteCntr));
-           dc390_laststatus &= ~0xff000000;
-           dc390_laststatus |= dstate << 24;
-           pSRB->TotalXferredLen += pSRB->SGToBeXferLen;
-           pSRB->SGIndex++;
-           if( pSRB->SGIndex < pSRB->SGcount )
-           {
-               pSRB->pSegmentList++;
-               psgl = pSRB->pSegmentList;
-
-               pSRB->SGBusAddr = cpu_to_le32(pci_dma_lo32(sg_dma_address(psgl)));
-               pSRB->SGToBeXferLen = cpu_to_le32(sg_dma_len(psgl));
-           }
-           else
-               pSRB->SGToBeXferLen = 0;
-       }
-       else
-       {
-           ResidCnt  = (u32) DC390_read8 (Current_Fifo) & 0x1f;
-           ResidCnt |= (u32) DC390_read8 (CtcReg_High) << 16;
-           ResidCnt |= (u32) DC390_read8 (CtcReg_Mid) << 8; 
-           ResidCnt += (u32) DC390_read8 (CtcReg_Low);
-
-           xferCnt = pSRB->SGToBeXferLen - ResidCnt;
-           pSRB->SGBusAddr += xferCnt;
-           pSRB->TotalXferredLen += xferCnt;
-           pSRB->SGToBeXferLen = ResidCnt;
-       }
-    }
-    if ((*psstatus & 7) != SCSI_DATA_OUT)
-    {
-           DC390_write8 (DMA_Cmd, WRITE_DIRECTION+DMA_IDLE_CMD); /* | DMA_INT */
-           DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-    }      
-}
-
-static void
-dc390_DataIn_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    u8   sstatus, residual, bval;
-    struct scatterlist *psgl;
-    u32    ResidCnt, i;
-    unsigned long   xferCnt;
-    u8      *ptr;
-
-    sstatus = *psstatus;
-
-    if( !(pSRB->SRBState & SRB_XFERPAD) )
-    {
-       if( sstatus & (PARITY_ERR | ILLEGAL_OP_ERR))
-           pSRB->SRBStatus |= PARITY_ERROR;
-
-       if( sstatus & COUNT_2_ZERO )
-       {
-           int dstate = 0;
-           unsigned long timeout = jiffies + HZ;
-
-           /* Function called from the ISR with the host_lock held and interrupts disabled */
-           if (pSRB->SGToBeXferLen)
-               while (time_before(jiffies, timeout) && !((dstate = DC390_read8 (DMA_Status)) & DMA_XFER_DONE)) {
-                   spin_unlock_irq(pACB->pScsiHost->host_lock);
-                   udelay(50);
-                   spin_lock_irq(pACB->pScsiHost->host_lock);
-               }
-           if (!time_before(jiffies, timeout)) {
-               printk (KERN_CRIT "DC390: Deadlock in DataIn_0: DMA aborted unfinished: %06x bytes remain!!\n",
-                       DC390_read32 (DMA_Wk_ByteCntr));
-               printk (KERN_CRIT "DC390: DataIn_0: DMA State: %i\n", dstate);
-           }
-           dc390_laststatus &= ~0xff000000;
-           dc390_laststatus |= dstate << 24;
-           DEBUG1(ResidCnt = ((unsigned long) DC390_read8 (CtcReg_High) << 16) \
-               + ((unsigned long) DC390_read8 (CtcReg_Mid) << 8)               \
-               + ((unsigned long) DC390_read8 (CtcReg_Low)));
-           DEBUG1(printk (KERN_DEBUG "Count_2_Zero (ResidCnt=%i,ToBeXfer=%li),", ResidCnt, pSRB->SGToBeXferLen));
-
-           DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD); /* | DMA_INT */
-
-           pSRB->TotalXferredLen += pSRB->SGToBeXferLen;
-           pSRB->SGIndex++;
-           if( pSRB->SGIndex < pSRB->SGcount )
-           {
-               pSRB->pSegmentList++;
-               psgl = pSRB->pSegmentList;
-
-               pSRB->SGBusAddr = cpu_to_le32(pci_dma_lo32(sg_dma_address(psgl)));
-               pSRB->SGToBeXferLen = cpu_to_le32(sg_dma_len(psgl));
-           }
-           else
-               pSRB->SGToBeXferLen = 0;
-       }
-       else    /* phase changed */
-       {
-           residual = 0;
-           bval = DC390_read8 (Current_Fifo);
-           while( bval & 0x1f )
-           {
-               DEBUG1(printk (KERN_DEBUG "Check for residuals,"));
-               if( (bval & 0x1f) == 1 )
-               {
-                   for(i=0; i < 0x100; i++)
-                   {
-                       bval = DC390_read8 (Current_Fifo);
-                       if( !(bval & 0x1f) )
-                           goto din_1;
-                       else if( i == 0x0ff )
-                       {
-                           residual = 1;   /* ;1 residual byte */
-                           goto din_1;
-                       }
-                   }
-               }
-               else
-                   bval = DC390_read8 (Current_Fifo);
-           }
-din_1:
-           DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_BLAST_CMD);
-           for (i = 0xa000; i; i--)
-           {
-               bval = DC390_read8 (DMA_Status);
-               if (bval & BLAST_COMPLETE)
-                   break;
-           }
-           /* It seems a DMA Blast abort isn't that bad ... */
-           if (!i) printk (KERN_ERR "DC390: DMA Blast aborted unfinished!\n");
-           //DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD); /* | DMA_INT */
-           dc390_laststatus &= ~0xff000000; dc390_laststatus |= bval << 24;
-
-           DEBUG1(printk (KERN_DEBUG "Blast: Read %i times DMA_Status %02x", 0xa000-i, bval));
-           ResidCnt = (u32) DC390_read8 (CtcReg_High);
-           ResidCnt <<= 8;
-           ResidCnt |= (u32) DC390_read8 (CtcReg_Mid);
-           ResidCnt <<= 8;
-           ResidCnt |= (u32) DC390_read8 (CtcReg_Low);
-
-           xferCnt = pSRB->SGToBeXferLen - ResidCnt;
-           pSRB->SGBusAddr += xferCnt;
-           pSRB->TotalXferredLen += xferCnt;
-           pSRB->SGToBeXferLen = ResidCnt;
-
-           if( residual )
-           {
-               bval = DC390_read8 (ScsiFifo);      /* get one residual byte */
-               ptr = (u8 *) bus_to_virt( pSRB->SGBusAddr );
-               *ptr = bval;
-               pSRB->SGBusAddr++; xferCnt++;
-               pSRB->TotalXferredLen++;
-               pSRB->SGToBeXferLen--;
-           }
-           DEBUG1(printk (KERN_DEBUG "Xfered: %li, Total: %li, Remaining: %li\n", xferCnt,\
-                          pSRB->TotalXferredLen, pSRB->SGToBeXferLen));
-
-       }
-    }
-    if ((*psstatus & 7) != SCSI_DATA_IN)
-    {
-           DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-           DC390_write8 (DMA_Cmd, READ_DIRECTION+DMA_IDLE_CMD); /* | DMA_INT */
-    }
-}
-
-static void
-dc390_Command_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-}
-
-static void
-dc390_Status_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-
-    pSRB->TargetStatus = DC390_read8 (ScsiFifo);
-    //udelay (1);
-    pSRB->EndMessage = DC390_read8 (ScsiFifo); /* get message */
-
-    *psstatus = SCSI_NOP0;
-    pSRB->SRBState = SRB_COMPLETED;
-    DC390_write8 (ScsiCmd, MSG_ACCEPTED_CMD);
-}
-
-static void
-dc390_MsgOut_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    if( pSRB->SRBState & (SRB_UNEXPECT_RESEL+SRB_ABORT_SENT) )
-       *psstatus = SCSI_NOP0;
-    //DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-}
-
-
-static void __inline__
-dc390_reprog (struct dc390_acb* pACB, struct dc390_dcb* pDCB)
-{
-  DC390_write8 (Sync_Period, pDCB->SyncPeriod);
-  DC390_write8 (Sync_Offset, pDCB->SyncOffset);
-  DC390_write8 (CtrlReg3, pDCB->CtrlR3);
-  DC390_write8 (CtrlReg4, pDCB->CtrlR4);
-  dc390_SetXferRate (pACB, pDCB);
-}
-
-
-#ifdef DC390_DEBUG0
-static void
-dc390_printMsg (u8 *MsgBuf, u8 len)
-{
-  int i;
-  printk (" %02x", MsgBuf[0]);
-  for (i = 1; i < len; i++)
-    printk (" %02x", MsgBuf[i]);
-  printk ("\n");
-}
-#endif
-
-#define DC390_ENABLE_MSGOUT DC390_write8 (ScsiCmd, SET_ATN_CMD)
-
-/* reject_msg */
-static void __inline__
-dc390_MsgIn_reject (struct dc390_acb* pACB, struct dc390_srb* pSRB)
-{
-  pSRB->MsgOutBuf[0] = MESSAGE_REJECT;
-  pSRB->MsgCnt = 1;
-  DC390_ENABLE_MSGOUT;
-  DEBUG0 (printk (KERN_INFO "DC390: Reject message\n"));
-}
-
-/* abort command */
-static void
-dc390_EnableMsgOut_Abort ( struct dc390_acb* pACB, struct dc390_srb* pSRB )
-{
-    pSRB->MsgOutBuf[0] = ABORT; 
-    pSRB->MsgCnt = 1; DC390_ENABLE_MSGOUT;
-    pSRB->pSRBDCB->DCBFlag &= ~ABORT_DEV_;
-}
-
-static struct dc390_srb*
-dc390_MsgIn_QTag (struct dc390_acb* pACB, struct dc390_dcb* pDCB, s8 tag)
-{
-  struct dc390_srb* pSRB = pDCB->pGoingSRB;
-
-  if (pSRB)
-    {
-       struct scsi_cmnd *scmd = scsi_find_tag(pSRB->pcmd->device, tag);
-       pSRB = (struct dc390_srb *)scmd->host_scribble;
-
-       if (pDCB->DCBFlag & ABORT_DEV_)
-       {
-         pSRB->SRBState = SRB_ABORT_SENT;
-         dc390_EnableMsgOut_Abort( pACB, pSRB );
-       }
-
-       if (!(pSRB->SRBState & SRB_DISCONNECT))
-               goto mingx0;
-
-       pDCB->pActiveSRB = pSRB;
-       pSRB->SRBState = SRB_DATA_XFER;
-    }
-  else
-    {
-    mingx0:
-      pSRB = pACB->pTmpSRB;
-      pSRB->SRBState = SRB_UNEXPECT_RESEL;
-      pDCB->pActiveSRB = pSRB;
-      pSRB->MsgOutBuf[0] = ABORT_TAG;
-      pSRB->MsgCnt = 1; DC390_ENABLE_MSGOUT;
-    }
-  return pSRB;
-}
-
-
-/* set async transfer mode */
-static void 
-dc390_MsgIn_set_async (struct dc390_acb* pACB, struct dc390_srb* pSRB)
-{
-  struct dc390_dcb* pDCB = pSRB->pSRBDCB;
-  if (!(pSRB->SRBState & DO_SYNC_NEGO)) 
-    printk (KERN_INFO "DC390: Target %i initiates Non-Sync?\n", pDCB->TargetID);
-  pSRB->SRBState &= ~DO_SYNC_NEGO;
-  pDCB->SyncMode &= ~(SYNC_ENABLE+SYNC_NEGO_DONE);
-  pDCB->SyncPeriod = 0;
-  pDCB->SyncOffset = 0;
-  //pDCB->NegoPeriod = 50; /* 200ns <=> 5 MHz */
-  pDCB->CtrlR3 = FAST_CLK;     /* fast clock / normal scsi */
-  pDCB->CtrlR4 &= 0x3f;
-  pDCB->CtrlR4 |= pACB->glitch_cfg;    /* glitch eater */
-  dc390_reprog (pACB, pDCB);
-}
-
-/* set sync transfer mode */
-static void
-dc390_MsgIn_set_sync (struct dc390_acb* pACB, struct dc390_srb* pSRB)
-{
-  u8 bval;
-  u16 wval, wval1;
-  struct dc390_dcb* pDCB = pSRB->pSRBDCB;
-  u8 oldsyncperiod = pDCB->SyncPeriod;
-  u8 oldsyncoffset = pDCB->SyncOffset;
-  
-  if (!(pSRB->SRBState & DO_SYNC_NEGO))
-    {
-      printk (KERN_INFO "DC390: Target %i initiates Sync: %ins %i ... answer ...\n", 
-             pDCB->TargetID, pSRB->MsgInBuf[3]<<2, pSRB->MsgInBuf[4]);
-
-      /* reject */
-      //dc390_MsgIn_reject (pACB, pSRB);
-      //return dc390_MsgIn_set_async (pACB, pSRB);
-
-      /* Reply with corrected SDTR Message */
-      if (pSRB->MsgInBuf[4] > 15)
-       { 
-         printk (KERN_INFO "DC390: Lower Sync Offset to 15\n");
-         pSRB->MsgInBuf[4] = 15;
-       }
-      if (pSRB->MsgInBuf[3] < pDCB->NegoPeriod)
-       {
-         printk (KERN_INFO "DC390: Set sync nego period to %ins\n", pDCB->NegoPeriod << 2);
-         pSRB->MsgInBuf[3] = pDCB->NegoPeriod;
-       }
-      memcpy (pSRB->MsgOutBuf, pSRB->MsgInBuf, 5);
-      pSRB->MsgCnt = 5;
-      DC390_ENABLE_MSGOUT;
-    }
-
-  pSRB->SRBState &= ~DO_SYNC_NEGO;
-  pDCB->SyncMode |= SYNC_ENABLE+SYNC_NEGO_DONE;
-  pDCB->SyncOffset &= 0x0f0;
-  pDCB->SyncOffset |= pSRB->MsgInBuf[4];
-  pDCB->NegoPeriod = pSRB->MsgInBuf[3];
-
-  wval = (u16) pSRB->MsgInBuf[3];
-  wval = wval << 2; wval -= 3; wval1 = wval / 25;      /* compute speed */
-  if( (wval1 * 25) != wval) wval1++;
-  bval = FAST_CLK+FAST_SCSI;   /* fast clock / fast scsi */
-
-  pDCB->CtrlR4 &= 0x3f;                /* Glitch eater: 12ns less than normal */
-  if (pACB->glitch_cfg != NS_TO_GLITCH(0))
-    pDCB->CtrlR4 |= NS_TO_GLITCH(((GLITCH_TO_NS(pACB->glitch_cfg)) - 1));
-  else
-    pDCB->CtrlR4 |= NS_TO_GLITCH(0);
-  if (wval1 < 4) pDCB->CtrlR4 |= NS_TO_GLITCH(0); /* Ultra */
-
-  if (wval1 >= 8)
-    {
-      wval1--; /* Timing computation differs by 1 from FAST_SCSI */
-      bval = FAST_CLK;         /* fast clock / normal scsi */
-      pDCB->CtrlR4 |= pACB->glitch_cfg;        /* glitch eater */
-    }
-
-  pDCB->CtrlR3 = bval;
-  pDCB->SyncPeriod = (u8)wval1;
-  
-  if ((oldsyncperiod != wval1 || oldsyncoffset != pDCB->SyncOffset) && pDCB->TargetLUN == 0)
-    {
-      if (! (bval & FAST_SCSI)) wval1++;
-      printk (KERN_INFO "DC390: Target %i: Sync transfer %i.%1i MHz, Offset %i\n", pDCB->TargetID, 
-             40/wval1, ((40%wval1)*10+wval1/2)/wval1, pDCB->SyncOffset & 0x0f);
-    }
-  
-  dc390_reprog (pACB, pDCB);
-}
-
-
-/* handle RESTORE_PTR */
-/* I presume, this command is already mapped, so, have to remap. */
-static void 
-dc390_restore_ptr (struct dc390_acb* pACB, struct dc390_srb* pSRB)
-{
-    struct scsi_cmnd *pcmd = pSRB->pcmd;
-    struct scatterlist *psgl;
-    pSRB->TotalXferredLen = 0;
-    pSRB->SGIndex = 0;
-    if (pcmd->use_sg) {
-       pSRB->pSegmentList = (struct scatterlist *)pcmd->request_buffer;
-       psgl = pSRB->pSegmentList;
-       //dc390_pci_sync(pSRB);
-
-       while (pSRB->TotalXferredLen + (unsigned long) sg_dma_len(psgl) < pSRB->Saved_Ptr)
-       {
-           pSRB->TotalXferredLen += (unsigned long) sg_dma_len(psgl);
-           pSRB->SGIndex++;
-           if( pSRB->SGIndex < pSRB->SGcount )
-           {
-               pSRB->pSegmentList++;
-               psgl = pSRB->pSegmentList;
-               pSRB->SGBusAddr = cpu_to_le32(pci_dma_lo32(sg_dma_address(psgl)));
-               pSRB->SGToBeXferLen = cpu_to_le32(sg_dma_len(psgl));
-           }
-           else
-               pSRB->SGToBeXferLen = 0;
-       }
-       pSRB->SGToBeXferLen -= (pSRB->Saved_Ptr - pSRB->TotalXferredLen);
-       pSRB->SGBusAddr += (pSRB->Saved_Ptr - pSRB->TotalXferredLen);
-       printk (KERN_INFO "DC390: Pointer restored. Segment %i, Total %li, Bus %08lx\n",
-               pSRB->SGIndex, pSRB->Saved_Ptr, pSRB->SGBusAddr);
-
-    } else if(pcmd->request_buffer) {
-       //dc390_pci_sync(pSRB);
-
-       sg_dma_len(&pSRB->Segmentx) = pcmd->request_bufflen - pSRB->Saved_Ptr;
-       pSRB->SGcount = 1;
-       pSRB->pSegmentList = (struct scatterlist *) &pSRB->Segmentx;
-    } else {
-        pSRB->SGcount = 0;
-        printk (KERN_INFO "DC390: RESTORE_PTR message for Transfer without Scatter-Gather ??\n");
-    }
-
-  pSRB->TotalXferredLen = pSRB->Saved_Ptr;
-}
-
-
-/* According to the docs, the AM53C974 reads the message and 
- * generates a Successful Operation IRQ before asserting ACK for
- * the last byte (how does it know whether it's the last ?) */
-/* The old code handled it in another way, indicating, that on
- * every message byte an IRQ is generated and every byte has to
- * be manually ACKed. Hmmm ?  (KG, 98/11/28) */
-/* The old implementation was correct. Sigh! */
-
-/* Check if the message is complete */
-static u8 __inline__
-dc390_MsgIn_complete (u8 *msgbuf, u32 len)
-{ 
-  if (*msgbuf == EXTENDED_MESSAGE)
-  {
-       if (len < 2) return 0;
-       if (len < msgbuf[1] + 2) return 0;
-  }
-  else if (*msgbuf >= 0x20 && *msgbuf <= 0x2f) // two byte messages
-       if (len < 2) return 0;
-  return 1;
-}
-
-
-
-/* read and eval received messages */
-static void
-dc390_MsgIn_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    struct dc390_dcb*   pDCB = pACB->pActiveDCB;
-
-    /* Read the msg */
-
-    pSRB->MsgInBuf[pACB->MsgLen++] = DC390_read8 (ScsiFifo);
-    //pSRB->SRBState = 0;
-
-    /* Msg complete ? */
-    if (dc390_MsgIn_complete (pSRB->MsgInBuf, pACB->MsgLen))
-      {
-       DEBUG0 (printk (KERN_INFO "DC390: MsgIn:"); dc390_printMsg (pSRB->MsgInBuf, pACB->MsgLen));
-       /* Now eval the msg */
-       switch (pSRB->MsgInBuf[0]) 
-         {
-         case DISCONNECT: 
-           pSRB->SRBState = SRB_DISCONNECT; break;
-           
-         case SIMPLE_QUEUE_TAG:
-         case HEAD_OF_QUEUE_TAG:
-         case ORDERED_QUEUE_TAG:
-           pSRB = dc390_MsgIn_QTag (pACB, pDCB, pSRB->MsgInBuf[1]);
-           break;
-           
-         case MESSAGE_REJECT: 
-           DC390_write8 (ScsiCmd, RESET_ATN_CMD);
-           pDCB->NegoPeriod = 50; /* 200ns <=> 5 MHz */
-           if( pSRB->SRBState & DO_SYNC_NEGO)
-             dc390_MsgIn_set_async (pACB, pSRB);
-           break;
-           
-         case EXTENDED_MESSAGE:
-           /* reject every extended msg but SDTR */
-           if (pSRB->MsgInBuf[1] != 3 || pSRB->MsgInBuf[2] != EXTENDED_SDTR)
-             dc390_MsgIn_reject (pACB, pSRB);
-           else
-             {
-               if (pSRB->MsgInBuf[3] == 0 || pSRB->MsgInBuf[4] == 0)
-                 dc390_MsgIn_set_async (pACB, pSRB);
-               else
-                 dc390_MsgIn_set_sync (pACB, pSRB);
-             }
-           
-           // nothing has to be done
-         case COMMAND_COMPLETE: break;
-           
-           // SAVE POINTER may be ignored as we have the struct dc390_srb* associated with the
-           // scsi command. Thanks, Gerard, for pointing it out.
-         case SAVE_POINTERS: 
-           pSRB->Saved_Ptr = pSRB->TotalXferredLen;
-           break;
-           // The device might want to restart transfer with a RESTORE
-         case RESTORE_POINTERS:
-           DEBUG0(printk ("DC390: RESTORE POINTER message received ... try to handle\n"));
-           dc390_restore_ptr (pACB, pSRB);
-           break;
-
-           // reject unknown messages
-         default: dc390_MsgIn_reject (pACB, pSRB);
-         }
-       
-       /* Clear counter and MsgIn state */
-       pSRB->SRBState &= ~SRB_MSGIN;
-       pACB->MsgLen = 0;
-      }
-
-    *psstatus = SCSI_NOP0;
-    DC390_write8 (ScsiCmd, MSG_ACCEPTED_CMD);
-    //DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-}
-
-
-static void
-dc390_DataIO_Comm( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 ioDir)
-{
-    struct scatterlist *psgl;
-    unsigned long  lval;
-    struct dc390_dcb*   pDCB = pACB->pActiveDCB;
-
-    if (pSRB == pACB->pTmpSRB)
-    {
-       if (pDCB)
-               printk(KERN_ERR "DC390: pSRB == pTmpSRB! (TagQ Error?) (%02i-%i)\n", pDCB->TargetID, pDCB->TargetLUN);
-       else
-               printk(KERN_ERR "DC390: pSRB == pTmpSRB! (TagQ Error?) (DCB 0!)\n");
-
-       /* Try to recover - some broken disks react badly to tagged INQUIRY */
-       if (pDCB && pACB->scan_devices && pDCB->GoingSRBCnt == 1) {
-               pSRB = pDCB->pGoingSRB;
-               pDCB->pActiveSRB = pSRB;
-       } else {
-               pSRB->pSRBDCB = pDCB;
-               dc390_EnableMsgOut_Abort(pACB, pSRB);
-               if (pDCB)
-                       pDCB->DCBFlag |= ABORT_DEV;
-               return;
-       }
-    }
-
-    if( pSRB->SGIndex < pSRB->SGcount )
-    {
-       DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir /* | DMA_INT */);
-       if( !pSRB->SGToBeXferLen )
-       {
-           psgl = pSRB->pSegmentList;
-           pSRB->SGBusAddr = cpu_to_le32(pci_dma_lo32(sg_dma_address(psgl)));
-           pSRB->SGToBeXferLen = cpu_to_le32(sg_dma_len(psgl));
-           DEBUG1(printk (KERN_DEBUG " DC390: Next SG segment."));
-       }
-       lval = pSRB->SGToBeXferLen;
-       DEBUG1(printk (KERN_DEBUG " DC390: Start transfer: %li bytes (address %08lx)\n", lval, pSRB->SGBusAddr));
-       DC390_write8 (CtcReg_Low, (u8) lval);
-       lval >>= 8;
-       DC390_write8 (CtcReg_Mid, (u8) lval);
-       lval >>= 8;
-       DC390_write8 (CtcReg_High, (u8) lval);
-
-       DC390_write32 (DMA_XferCnt, pSRB->SGToBeXferLen);
-       DC390_write32 (DMA_XferAddr, pSRB->SGBusAddr);
-
-       //DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir); /* | DMA_INT; */
-       pSRB->SRBState = SRB_DATA_XFER;
-
-       DC390_write8 (ScsiCmd, DMA_COMMAND+INFO_XFER_CMD);
-
-       DC390_write8 (DMA_Cmd, DMA_START_CMD | ioDir | DMA_INT);
-       //DEBUG1(DC390_write32 (DMA_ScsiBusCtrl, WRT_ERASE_DMA_STAT | EN_INT_ON_PCI_ABORT));
-       //DEBUG1(printk (KERN_DEBUG "DC390: DMA_Status: %02x\n", DC390_read8 (DMA_Status)));
-       //DEBUG1(DC390_write32 (DMA_ScsiBusCtrl, EN_INT_ON_PCI_ABORT));
-    }
-    else    /* xfer pad */
-    {
-       if( pSRB->SGcount )
-       {
-           pSRB->AdaptStatus = H_OVER_UNDER_RUN;
-           pSRB->SRBStatus |= OVER_RUN;
-           DEBUG0(printk (KERN_WARNING " DC390: Overrun -"));
-       }
-       DEBUG0(printk (KERN_WARNING " Clear transfer pad \n"));
-       DC390_write8 (CtcReg_Low, 0);
-       DC390_write8 (CtcReg_Mid, 0);
-       DC390_write8 (CtcReg_High, 0);
-
-       pSRB->SRBState |= SRB_XFERPAD;
-       DC390_write8 (ScsiCmd, DMA_COMMAND+XFER_PAD_BYTE);
-/*
-       DC390_write8 (DMA_Cmd, DMA_IDLE_CMD | ioDir); // | DMA_INT;
-       DC390_write8 (DMA_Cmd, DMA_START_CMD | ioDir | DMA_INT);
-*/
-    }
-}
-
-
-static void
-dc390_DataOutPhase( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    dc390_DataIO_Comm (pACB, pSRB, WRITE_DIRECTION);
-}
-
-static void
-dc390_DataInPhase( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    dc390_DataIO_Comm (pACB, pSRB, READ_DIRECTION);
-}
-
-static void
-dc390_CommandPhase( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    struct dc390_dcb*   pDCB;
-    u8  i, cnt;
-    u8     *ptr;
-
-    DC390_write8 (ScsiCmd, RESET_ATN_CMD);
-    DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-    if( !(pSRB->SRBFlag & AUTO_REQSENSE) )
-    {
-       cnt = (u8) pSRB->pcmd->cmd_len;
-       ptr = (u8 *) pSRB->pcmd->cmnd;
-       for(i=0; i < cnt; i++)
-           DC390_write8 (ScsiFifo, *(ptr++));
-    }
-    else
-    {
-       DC390_write8 (ScsiFifo, REQUEST_SENSE);
-       pDCB = pACB->pActiveDCB;
-       DC390_write8 (ScsiFifo, pDCB->TargetLUN << 5);
-       DC390_write8 (ScsiFifo, 0);
-       DC390_write8 (ScsiFifo, 0);
-       DC390_write8 (ScsiFifo, sizeof(pSRB->pcmd->sense_buffer));
-       DC390_write8 (ScsiFifo, 0);
-       DEBUG0(printk(KERN_DEBUG "DC390: AutoReqSense (CmndPhase)!\n"));
-    }
-    pSRB->SRBState = SRB_COMMAND;
-    DC390_write8 (ScsiCmd, INFO_XFER_CMD);
-}
-
-static void
-dc390_StatusPhase( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-    pSRB->SRBState = SRB_STATUS;
-    DC390_write8 (ScsiCmd, INITIATOR_CMD_CMPLTE);
-    //DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-}
-
-static void
-dc390_MsgOutPhase( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    u8   bval, i, cnt;
-    u8     *ptr;
-    struct dc390_dcb*    pDCB;
-
-    DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-    pDCB = pACB->pActiveDCB;
-    if( !(pSRB->SRBState & SRB_MSGOUT) )
-    {
-       cnt = pSRB->MsgCnt;
-       if( cnt )
-       {
-           ptr = (u8 *) pSRB->MsgOutBuf;
-           for(i=0; i < cnt; i++)
-               DC390_write8 (ScsiFifo, *(ptr++));
-           pSRB->MsgCnt = 0;
-           if( (pDCB->DCBFlag & ABORT_DEV_) &&
-               (pSRB->MsgOutBuf[0] == ABORT) )
-               pSRB->SRBState = SRB_ABORT_SENT;
-       }
-       else
-       {
-           bval = ABORT;       /* ??? MSG_NOP */
-           if( (pSRB->pcmd->cmnd[0] == INQUIRY ) ||
-               (pSRB->pcmd->cmnd[0] == REQUEST_SENSE) ||
-               (pSRB->SRBFlag & AUTO_REQSENSE) )
-           {
-               if( pDCB->SyncMode & SYNC_ENABLE )
-                   goto  mop1;
-           }
-           DC390_write8 (ScsiFifo, bval);
-       }
-       DC390_write8 (ScsiCmd, INFO_XFER_CMD);
-    }
-    else
-    {
-mop1:
-        printk (KERN_ERR "DC390: OLD Sync Nego code triggered! (%i %i)\n", pDCB->TargetID, pDCB->TargetLUN);
-       DC390_write8 (ScsiFifo, EXTENDED_MESSAGE);
-       DC390_write8 (ScsiFifo, 3);     /*    ;length of extended msg */
-       DC390_write8 (ScsiFifo, EXTENDED_SDTR); /*    ; sync nego */
-       DC390_write8 (ScsiFifo, pDCB->NegoPeriod);
-       if (pDCB->SyncOffset & 0x0f)
-                   DC390_write8 (ScsiFifo, pDCB->SyncOffset);
-       else
-                   DC390_write8 (ScsiFifo, SYNC_NEGO_OFFSET);              
-       pSRB->SRBState |= DO_SYNC_NEGO;
-       DC390_write8 (ScsiCmd, INFO_XFER_CMD);
-    }
-}
-
-static void
-dc390_MsgInPhase( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-    DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-    if( !(pSRB->SRBState & SRB_MSGIN) )
-    {
-       pSRB->SRBState &= ~SRB_DISCONNECT;
-       pSRB->SRBState |= SRB_MSGIN;
-    }
-    DC390_write8 (ScsiCmd, INFO_XFER_CMD);
-    //DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-}
-
-static void
-dc390_Nop_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-}
-
-static void
-dc390_Nop_1( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
-{
-}
-
-
-static void
-dc390_SetXferRate( struct dc390_acb* pACB, struct dc390_dcb* pDCB )
-{
-    u8  bval, i, cnt;
-    struct dc390_dcb*   ptr;
-
-    if( !(pDCB->TargetLUN) )
-    {
-       if( !pACB->scan_devices )
-       {
-           ptr = pACB->pLinkDCB;
-           cnt = pACB->DCBCnt;
-           bval = pDCB->TargetID;
-           for(i=0; i<cnt; i++)
-           {
-               if( ptr->TargetID == bval )
-               {
-                   ptr->SyncPeriod = pDCB->SyncPeriod;
-                   ptr->SyncOffset = pDCB->SyncOffset;
-                   ptr->CtrlR3 = pDCB->CtrlR3;
-                   ptr->CtrlR4 = pDCB->CtrlR4;
-                   ptr->SyncMode = pDCB->SyncMode;
-               }
-               ptr = ptr->pNextDCB;
-           }
-       }
-    }
-    return;
-}
-
-
-static void
-dc390_Disconnect( struct dc390_acb* pACB )
-{
-    struct dc390_dcb *pDCB;
-    struct dc390_srb *pSRB, *psrb;
-    u8  i, cnt;
-
-    DEBUG0(printk(KERN_INFO "DISC,"));
-
-    if (!pACB->Connected) printk(KERN_ERR "DC390: Disconnect not-connected bus?\n");
-    pACB->Connected = 0;
-    pDCB = pACB->pActiveDCB;
-    if (!pDCB)
-     {
-       DEBUG0(printk(KERN_ERR "ACB:%p->ActiveDCB:%p IOPort:%04x IRQ:%02x !\n",\
-              pACB, pDCB, pACB->IOPortBase, pACB->IRQLevel));
-       mdelay(400);
-       DC390_read8 (INT_Status);       /* Reset Pending INT */
-       DC390_write8 (ScsiCmd, EN_SEL_RESEL);
-       return;
-     }
-    DC390_write8 (ScsiCmd, EN_SEL_RESEL);
-    pSRB = pDCB->pActiveSRB;
-    pACB->pActiveDCB = NULL;
-    pSRB->ScsiPhase = SCSI_NOP0;
-    if( pSRB->SRBState & SRB_UNEXPECT_RESEL )
-       pSRB->SRBState = 0;
-    else if( pSRB->SRBState & SRB_ABORT_SENT )
-    {
-       pDCB->TagMask = 0;
-       pDCB->DCBFlag = 0;
-       cnt = pDCB->GoingSRBCnt;
-       pDCB->GoingSRBCnt = 0;
-       pSRB = pDCB->pGoingSRB;
-       for( i=0; i < cnt; i++)
-       {
-           psrb = pSRB->pNextSRB;
-           dc390_Free_insert (pACB, pSRB);
-           pSRB = psrb;
-       }
-       pDCB->pGoingSRB = NULL;
-    }
-    else
-    {
-       if( (pSRB->SRBState & (SRB_START_+SRB_MSGOUT)) ||
-          !(pSRB->SRBState & (SRB_DISCONNECT+SRB_COMPLETED)) )
-       {       /* Selection time out */
-               pSRB->TargetStatus = SCSI_STAT_SEL_TIMEOUT;
-               goto  disc1;
-       }
-       else if (!(pSRB->SRBState & SRB_DISCONNECT) && (pSRB->SRBState & SRB_COMPLETED))
-       {
-disc1:
-           dc390_freetag (pDCB, pSRB);
-           pDCB->pActiveSRB = NULL;
-           pSRB->SRBState = SRB_FREE;
-           dc390_SRBdone( pACB, pDCB, pSRB);
-       }
-    }
-    pACB->MsgLen = 0;
-}
-
-
-static void
-dc390_Reselect( struct dc390_acb* pACB )
-{
-    struct dc390_dcb*   pDCB;
-    struct dc390_srb*   pSRB;
-    u8  id, lun;
-
-    DEBUG0(printk(KERN_INFO "RSEL,"));
-    pACB->Connected = 1;
-    pDCB = pACB->pActiveDCB;
-    if( pDCB )
-    {  /* Arbitration lost but Reselection won */
-       DEBUG0(printk ("DC390: (ActiveDCB != 0: Arb. lost but resel. won)!\n"));
-       pSRB = pDCB->pActiveSRB;
-       if( !( pACB->scan_devices ) )
-       {
-           struct scsi_cmnd *pcmd = pSRB->pcmd;
-           pcmd->resid = pcmd->request_bufflen;
-           SET_RES_DID(pcmd->result, DID_SOFT_ERROR);
-           dc390_Going_remove(pDCB, pSRB);
-           dc390_Free_insert(pACB, pSRB);
-           pcmd->scsi_done (pcmd);
-           DEBUG0(printk(KERN_DEBUG"DC390: Return SRB %p to free\n", pSRB));
-       }
-    }
-    /* Get ID */
-    lun = DC390_read8 (ScsiFifo);
-    DEBUG0(printk ("Dev %02x,", lun));
-    if (!(lun & (1 << pACB->pScsiHost->this_id)))
-      printk (KERN_ERR "DC390: Reselection must select host adapter: %02x!\n", lun);
-    else
-      lun ^= 1 << pACB->pScsiHost->this_id; /* Mask AdapterID */
-    id = 0; while (lun >>= 1) id++;
-    /* Get LUN */
-    lun = DC390_read8 (ScsiFifo);
-    if (!(lun & IDENTIFY_BASE)) printk (KERN_ERR "DC390: Resel: Expect identify message!\n");
-    lun &= 7;
-    DEBUG0(printk ("(%02i-%i),", id, lun));
-    pDCB = dc390_findDCB (pACB, id, lun);
-    if (!pDCB)
-    {
-       printk (KERN_ERR "DC390: Reselect from non existing device (%02i-%i)\n",
-                   id, lun);
-       return;
-    }
-    pACB->pActiveDCB = pDCB;
-    /* TagQ: We expect a message soon, so never mind the exact SRB */
-    if( pDCB->SyncMode & EN_TAG_QUEUEING )
-    {
-       pSRB = pACB->pTmpSRB;
-       pDCB->pActiveSRB = pSRB;
-    }
-    else
-    {
-       pSRB = pDCB->pActiveSRB;
-       if( !pSRB || !(pSRB->SRBState & SRB_DISCONNECT) )
-       {
-           pSRB= pACB->pTmpSRB;
-           pSRB->SRBState = SRB_UNEXPECT_RESEL;
-           printk (KERN_ERR "DC390: Reselect without outstanding cmnd (%02i-%i)\n",
-                   id, lun);
-           pDCB->pActiveSRB = pSRB;
-           dc390_EnableMsgOut_Abort ( pACB, pSRB );
-       }
-       else
-       {
-           if( pDCB->DCBFlag & ABORT_DEV_ )
-           {
-               pSRB->SRBState = SRB_ABORT_SENT;
-               printk (KERN_INFO "DC390: Reselect: Abort (%02i-%i)\n",
-                       id, lun);
-               dc390_EnableMsgOut_Abort( pACB, pSRB );
-           }
-           else
-               pSRB->SRBState = SRB_DATA_XFER;
-       }
-    }
-
-    DEBUG1(printk (KERN_DEBUG "Resel SRB(%p): TagNum (%02x)\n", pSRB, pSRB->TagNumber));
-    pSRB->ScsiPhase = SCSI_NOP0;
-    DC390_write8 (Scsi_Dest_ID, pDCB->TargetID);
-    DC390_write8 (Sync_Period, pDCB->SyncPeriod);
-    DC390_write8 (Sync_Offset, pDCB->SyncOffset);
-    DC390_write8 (CtrlReg1, pDCB->CtrlR1);
-    DC390_write8 (CtrlReg3, pDCB->CtrlR3);
-    DC390_write8 (CtrlReg4, pDCB->CtrlR4);     /* ; Glitch eater */
-    DC390_write8 (ScsiCmd, MSG_ACCEPTED_CMD);  /* ;to release the /ACK signal */
-}
-
-static int __inline__
-dc390_RequestSense(struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb* pSRB)
-{
-       struct scsi_cmnd *pcmd;
-
-       pcmd = pSRB->pcmd;
-
-       REMOVABLEDEBUG(printk(KERN_INFO "DC390: RequestSense(Cmd %02x, Id %02x, LUN %02x)\n",\
-                             pcmd->cmnd[0], pDCB->TargetID, pDCB->TargetLUN));
-
-       pSRB->SRBFlag |= AUTO_REQSENSE;
-       pSRB->SavedSGCount = pcmd->use_sg;
-       pSRB->SavedTotXLen = pSRB->TotalXferredLen;
-       pSRB->AdaptStatus = 0;
-       pSRB->TargetStatus = 0; /* CHECK_CONDITION<<1; */
-
-       /* We are called from SRBdone, original PCI mapping has been removed
-        * already, new one is set up from StartSCSI */
-       pSRB->SGIndex = 0;
-
-       pSRB->TotalXferredLen = 0;
-       pSRB->SGToBeXferLen = 0;
-       return dc390_StartSCSI(pACB, pDCB, pSRB);
-}
-
-
-static void
-dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb* pSRB )
-{
-    u8 status;
-    struct scsi_cmnd *pcmd;
-
-    pcmd = pSRB->pcmd;
-    /* KG: Moved pci_unmap here */
-    dc390_pci_unmap(pSRB);
-
-    status = pSRB->TargetStatus;
-
-    DEBUG0(printk (" SRBdone (%02x,%08x), SRB %p, pid %li\n", status, pcmd->result,\
-               pSRB, pcmd->pid));
-    if(pSRB->SRBFlag & AUTO_REQSENSE)
-    {  /* Last command was a Request Sense */
-       pSRB->SRBFlag &= ~AUTO_REQSENSE;
-       pSRB->AdaptStatus = 0;
-       pSRB->TargetStatus = CHECK_CONDITION << 1;
-
-       //pcmd->result = MK_RES(DRIVER_SENSE,DID_OK,0,status);
-       if (status == (CHECK_CONDITION << 1))
-           pcmd->result = MK_RES_LNX(0, DID_BAD_TARGET, 0, /*CHECK_CONDITION*/0);
-       else /* Retry */
-       {
-           if( pSRB->pcmd->cmnd[0] == TEST_UNIT_READY /* || pSRB->pcmd->cmnd[0] == START_STOP */)
-           {
-               /* Don't retry on TEST_UNIT_READY */
-               pcmd->result = MK_RES_LNX(DRIVER_SENSE,DID_OK,0,CHECK_CONDITION);
-               REMOVABLEDEBUG(printk(KERN_INFO "Cmd=%02x, Result=%08x, XferL=%08x\n",pSRB->pcmd->cmnd[0],\
-                      (u32) pcmd->result, (u32) pSRB->TotalXferredLen));
-           } else {
-               SET_RES_DRV(pcmd->result, DRIVER_SENSE);
-               pcmd->use_sg = pSRB->SavedSGCount;
-               //pSRB->ScsiCmdLen       = (u8) (pSRB->Segment1[0] >> 8);
-               DEBUG0 (printk ("DC390: RETRY pid %li (%02x), target %02i-%02i\n", pcmd->pid, pcmd->cmnd[0], pcmd->device->id, pcmd->device->lun));
-               pSRB->TotalXferredLen = 0;
-               SET_RES_DID(pcmd->result, DID_SOFT_ERROR);
-           }
-       }
-       goto cmd_done;
-    }
-    if( status )
-    {
-       if( status_byte(status) == CHECK_CONDITION )
-       {
-           if (dc390_RequestSense(pACB, pDCB, pSRB)) {
-               SET_RES_DID(pcmd->result, DID_ERROR);
-               goto cmd_done;
-           }
-           return;
-       }
-       else if( status_byte(status) == QUEUE_FULL )
-       {
-           scsi_track_queue_full(pcmd->device, pDCB->GoingSRBCnt - 1);
-           pcmd->use_sg = pSRB->SavedSGCount;
-           DEBUG0 (printk ("DC390: RETRY pid %li (%02x), target %02i-%02i\n", pcmd->pid, pcmd->cmnd[0], pcmd->device->id, pcmd->device->lun));
-           pSRB->TotalXferredLen = 0;
-           SET_RES_DID(pcmd->result, DID_SOFT_ERROR);
-       }
-       else if(status == SCSI_STAT_SEL_TIMEOUT)
-       {
-           pSRB->AdaptStatus = H_SEL_TIMEOUT;
-           pSRB->TargetStatus = 0;
-           pcmd->result = MK_RES(0,DID_NO_CONNECT,0,0);
-           /* Devices are removed below ... */
-       }
-       else if (status_byte(status) == BUSY && 
-                (pcmd->cmnd[0] == TEST_UNIT_READY || pcmd->cmnd[0] == INQUIRY) &&
-                pACB->scan_devices)
-       {
-           pSRB->AdaptStatus = 0;
-           pSRB->TargetStatus = status;
-           pcmd->result = MK_RES(0,0,pSRB->EndMessage,/*status*/0);
-       }
-       else
-       {   /* Another error */
-           pSRB->TotalXferredLen = 0;
-           SET_RES_DID(pcmd->result, DID_SOFT_ERROR);
-           goto cmd_done;
-       }
-    }
-    else
-    {  /*  Target status == 0 */
-       status = pSRB->AdaptStatus;
-       if(status & H_OVER_UNDER_RUN)
-       {
-           pSRB->TargetStatus = 0;
-           SET_RES_DID(pcmd->result,DID_OK);
-           SET_RES_MSG(pcmd->result,pSRB->EndMessage);
-       }
-       else if( pSRB->SRBStatus & PARITY_ERROR)
-       {
-           //pcmd->result = MK_RES(0,DID_PARITY,pSRB->EndMessage,0);
-           SET_RES_DID(pcmd->result,DID_PARITY);
-           SET_RES_MSG(pcmd->result,pSRB->EndMessage);
-       }
-       else                   /* No error */
-       {
-           pSRB->AdaptStatus = 0;
-           pSRB->TargetStatus = 0;
-           SET_RES_DID(pcmd->result,DID_OK);
-       }
-    }
-
-cmd_done:
-    pcmd->resid = pcmd->request_bufflen - pSRB->TotalXferredLen;
-
-    dc390_Going_remove (pDCB, pSRB);
-    /* Add to free list */
-    dc390_Free_insert (pACB, pSRB);
-
-    DEBUG0(printk (KERN_DEBUG "DC390: SRBdone: done pid %li\n", pcmd->pid));
-    pcmd->scsi_done (pcmd);
-
-    return;
-}
-
-
-/* Remove all SRBs from Going list and inform midlevel */
-static void
-dc390_DoingSRB_Done(struct dc390_acb* pACB, struct scsi_cmnd *cmd)
-{
-    struct dc390_dcb *pDCB, *pdcb;
-    struct dc390_srb *psrb, *psrb2;
-    int i;
-    struct scsi_cmnd *pcmd;
-
-    pDCB = pACB->pLinkDCB;
-    pdcb = pDCB;
-    if (! pdcb) return;
-    do
-    {
-       psrb = pdcb->pGoingSRB;
-       for (i = 0; i < pdcb->GoingSRBCnt; i++)
-       {
-           psrb2 = psrb->pNextSRB;
-           pcmd = psrb->pcmd;
-           dc390_Free_insert (pACB, psrb);
-           psrb  = psrb2;
-       }
-       pdcb->GoingSRBCnt = 0;
-       pdcb->pGoingSRB = NULL;
-       pdcb->TagMask = 0;
-       pdcb = pdcb->pNextDCB;
-    } while( pdcb != pDCB );
-}
-
-
-static void
-dc390_ResetSCSIBus( struct dc390_acb* pACB )
-{
-    //DC390_write8 (ScsiCmd, RST_DEVICE_CMD);
-    //udelay (250);
-    //DC390_write8 (ScsiCmd, NOP_CMD);
-
-    DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-    DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-    DC390_write8 (ScsiCmd, RST_SCSI_BUS_CMD);
-    pACB->Connected = 0;
-
-    return;
+               DEBUG1(printk("%s(): Unmapped request buffer at %x\n", __FUNCTION__, cmdp->saved_dma_handle));
+       }
 }
 
-static void
-dc390_ScsiRstDetect( struct dc390_acb* pACB )
-{
-    printk ("DC390: Rst_Detect: laststat = %08x\n", dc390_laststatus);
-    //DEBUG0(printk(KERN_INFO "RST_DETECT,"));
 
-    DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
-    /* Unlock before ? */
-    /* delay half a second */
-    udelay (1000);
-    DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
-    pACB->pScsiHost->last_reset = jiffies + 5*HZ/2
-                   + HZ * dc390_eepromBuf[pACB->AdapterIndex][EE_DELAY];
-    pACB->Connected = 0;
+/***********************************************************************
+ * Function: static void dc390_BuildSRB (Scsi_Cmd *pcmd, struct dc390_dcb* pDCB, 
+ *                                      struct dc390_srb* pSRB)
+ *
+ * Purpose: Prepare SRB for being sent to Device DCB w/ command *pcmd
+ *
+ ***********************************************************************/
 
-    if( pACB->ACBFlag & RESET_DEV )
-       pACB->ACBFlag |= RESET_DONE;
+static void dc390_BuildSRB (struct scsi_cmnd *pcmd, struct dc390_dcb* pDCB, struct dc390_srb* pSRB)
+{
+    pSRB->pSRBDCB = pDCB;
+    pSRB->pcmd = pcmd;
+    
+    pSRB->SGIndex = 0;
+    pSRB->AdaptStatus = 0;
+    pSRB->TargetStatus = 0;
+    pSRB->MsgCnt = 0;
+    if( pDCB->DevType != TYPE_TAPE )
+       pSRB->RetryCnt = 1;
     else
-    {   /* Reset was issued by sb else */
-       pACB->ACBFlag |= RESET_DETECT;
-
-       dc390_ResetDevParam( pACB );
-       dc390_DoingSRB_Done( pACB, NULL);
-       //dc390_RecoverSRB( pACB );
-       pACB->pActiveDCB = NULL;
-       pACB->ACBFlag = 0;
-    }
-    return;
+       pSRB->RetryCnt = 0;
+    pSRB->SRBStatus = 0;
+    pSRB->SRBFlag = 0;
+    pSRB->SRBState = 0;
+    pSRB->TotalXferredLen = 0;
+    pSRB->SGBusAddr = 0;
+    pSRB->SGToBeXferLen = 0;
+    pSRB->ScsiPhase = 0;
+    pSRB->EndMessage = 0;
+    pSRB->TagNumber = 255;
+    /* KG: deferred PCI mapping to dc390_StartSCSI */
 }
 
-static int DC390_queuecommand(struct scsi_cmnd *cmd,
-               void (*done)(struct scsi_cmnd *))
+/***********************************************************************
+ * Function : static int DC390_queue_command (struct scsi_cmnd *cmd,
+ *                                            void (*done)(struct scsi_cmnd *))
+ *
+ * Purpose : enqueues a SCSI command
+ *
+ * Inputs : cmd - SCSI command, done - callback function called on 
+ *         completion, with a pointer to the command descriptor.
+ *
+ * Returns : (depending on kernel version)
+ * 2.0.x: always return 0
+ * 2.1.x: old model: (use_new_eh_code == 0): like 2.0.x
+ *       TO BE DONE:
+ *       new model: return 0 if successful, or must not be re-queued
+ *                  return 1 if command cannot be queued (queue full)
+ *                  command will be inserted in midlevel queue then ...
+ *
+ ***********************************************************************/
+
+static int DC390_queue_command(struct scsi_cmnd *cmd,
+               void (* done)(struct scsi_cmnd *))
 {
-       struct scsi_device *sdev = cmd->device;
-       struct dc390_acb *acb = (struct dc390_acb *)sdev->host->hostdata;
-       struct dc390_dcb *dcb = sdev->hostdata;
-       struct dc390_srb *srb;
-
-       if (sdev->queue_depth <= dcb->GoingSRBCnt)
-               goto device_busy;
-       if (acb->pActiveDCB)
-               goto host_busy;
-       if (acb->ACBFlag & (RESET_DETECT|RESET_DONE|RESET_DEV))
-               goto host_busy;
-
-       srb = acb->pFreeSRB;
-       if (unlikely(srb == NULL))
-               goto host_busy;
-
-       cmd->scsi_done = done;
-       cmd->result = 0;
-       acb->Cmds++;
-
-       acb->pFreeSRB = srb->pNextSRB;
-       srb->pNextSRB = NULL;
-
-       srb->pSRBDCB = dcb;
-       srb->pcmd = cmd;
-       cmd->host_scribble = (char *)srb;
-    
-       srb->SGIndex = 0;
-       srb->AdaptStatus = 0;
-       srb->TargetStatus = 0;
-       srb->MsgCnt = 0;
-
-       srb->SRBStatus = 0;
-       srb->SRBFlag = 0;
-       srb->SRBState = 0;
-       srb->TotalXferredLen = 0;
-       srb->SGBusAddr = 0;
-       srb->SGToBeXferLen = 0;
-       srb->ScsiPhase = 0;
-       srb->EndMessage = 0;
-       srb->TagNumber = SCSI_NO_TAG;
-
-       if (dc390_StartSCSI(acb, dcb, srb)) {
-               dc390_Free_insert(acb, srb);
-               goto host_busy;
-       }
+    struct dc390_dcb*   pDCB = (struct dc390_dcb*) cmd->device->hostdata;
+    struct dc390_srb*   pSRB;
+    struct dc390_acb*   pACB = (struct dc390_acb*) cmd->device->host->hostdata;
 
-       dc390_Going_append(dcb, srb);
+    pACB->Cmds++;
+    cmd->scsi_done = done;
+    cmd->result = 0;
 
-       return 0;
+    pSRB = dc390_Free_get(pACB);
+    if (!pSRB)
+           goto requeue;
+
+    dc390_BuildSRB(cmd, pDCB, pSRB);
+    if (pDCB->pWaitingSRB) {
+           dc390_Waiting_append(pDCB, pSRB);
+           dc390_Waiting_process(pACB);
+    } else
+           dc390_SendSRB(pACB, pSRB);
 
- host_busy:
-       return SCSI_MLQUEUE_HOST_BUSY;
+    DEBUG1(printk (KERN_DEBUG " ... command (pid %li) queued successfully.\n", cmd->pid));
+    return(0);
 
device_busy:
-       return SCSI_MLQUEUE_DEVICE_BUSY;
requeue:
+    return 1;
 }
 
 static void dc390_dumpinfo (struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb* pSRB)
@@ -2076,14 +1049,45 @@ static int DC390_abort(struct scsi_cmnd *cmd)
 {
        struct dc390_acb *pACB = (struct dc390_acb*) cmd->device->host->hostdata;
        struct dc390_dcb *pDCB = (struct dc390_dcb*) cmd->device->hostdata;
+       struct dc390_srb *pSRB, *psrb;
 
        printk("DC390: Abort command (pid %li, Device %02i-%02i)\n",
               cmd->pid, cmd->device->id, cmd->device->lun);
 
+       pSRB = pDCB->pWaitingSRB;
+       if (!pSRB)
+               goto on_going;
+
+       /* Now scan Waiting queue */
+       if (pSRB->pcmd != cmd) {
+               psrb = pSRB;
+               if (!(psrb->pNextSRB))
+                       goto on_going;
+
+               while (psrb->pNextSRB->pcmd != cmd) {
+                       psrb = psrb->pNextSRB;
+                       if (!(psrb->pNextSRB) || psrb == pSRB)
+                               goto on_going;
+               }
+
+               pSRB = psrb->pNextSRB;
+               psrb->pNextSRB = pSRB->pNextSRB;
+               if (pSRB == pDCB->pWaitLast)
+                       pDCB->pWaitLast = psrb;
+       } else
+               pDCB->pWaitingSRB = pSRB->pNextSRB;
+
+       dc390_Free_insert(pACB, pSRB);
+       pDCB->WaitSRBCnt--;
+       INIT_LIST_HEAD((struct list_head*)&cmd->SCp);
+
+       return SUCCESS;
+
+on_going:
        /* abort() is too stupid for already sent commands at the moment. 
         * If it's called we are in trouble anyway, so let's dump some info 
         * into the syslog at least. (KG, 98/08/20,99/06/20) */
-       dc390_dumpinfo(pACB, pDCB, NULL);
+       dc390_dumpinfo(pACB, pDCB, pSRB);
 
        pDCB->DCBFlag |= ABORT_DEV_;
        printk(KERN_INFO "DC390: Aborted pid %li\n", cmd->pid);
@@ -2120,6 +1124,8 @@ static int DC390_bus_reset (struct scsi_cmnd *cmd)
        struct dc390_acb*    pACB = (struct dc390_acb*) cmd->device->host->hostdata;
        u8   bval;
 
+       del_timer (&pACB->Waiting_Timer);
+
        bval = DC390_read8(CtrlReg1) | DIS_INT_ON_SCSI_RST;
        DC390_write8(CtrlReg1, bval);   /* disable IRQ on bus reset */
 
@@ -2142,9 +1148,231 @@ static int DC390_bus_reset (struct scsi_cmnd *cmd)
        bval = DC390_read8(CtrlReg1) & ~DIS_INT_ON_SCSI_RST;
        DC390_write8(CtrlReg1, bval);   /* re-enable interrupt */
 
+       dc390_Waiting_process(pACB);
+
        return SUCCESS;
 }
 
+#include "scsiiom.c"
+
+/***********************************************************************
+ * Function : static void dc390_updateDCB()
+ *
+ * Purpose :  Set the configuration dependent DCB parameters
+ ***********************************************************************/
+
+static void dc390_updateDCB (struct dc390_acb* pACB, struct dc390_dcb* pDCB)
+{
+  pDCB->SyncMode &= EN_TAG_QUEUEING | SYNC_NEGO_DONE /*| EN_ATN_STOP*/;
+  if (pDCB->DevMode & TAG_QUEUEING_) {
+       //if (pDCB->SyncMode & EN_TAG_QUEUEING) pDCB->MaxCommand = pACB->TagMaxNum;
+  } else {
+       pDCB->SyncMode &= ~EN_TAG_QUEUEING;
+       pDCB->MaxCommand = 1;
+  }
+
+  if( pDCB->DevMode & SYNC_NEGO_ )
+       pDCB->SyncMode |= SYNC_ENABLE;
+  else {
+       pDCB->SyncMode &= ~(SYNC_NEGO_DONE | SYNC_ENABLE);
+       pDCB->SyncOffset &= ~0x0f;
+  }
+
+  //if (! (pDCB->DevMode & EN_DISCONNECT_)) pDCB->SyncMode &= ~EN_ATN_STOP; 
+
+  pDCB->CtrlR1 = pACB->pScsiHost->this_id;
+  if( pDCB->DevMode & PARITY_CHK_ )
+       pDCB->CtrlR1 |= PARITY_ERR_REPO;
+}  
+
+/***********************************************************************
+ * Function : static void dc390_initSRB()
+ *
+ * Purpose :  initialize the internal structures for a given SRB
+ *
+ * Inputs : psrb - pointer to this scsi request block structure
+ ***********************************************************************/
+
+static void __inline__ dc390_initSRB( struct dc390_srb* psrb )
+{
+  /* psrb->PhysSRB = virt_to_phys( psrb ); */
+}
+
+
+static void dc390_linkSRB( struct dc390_acb* pACB )
+{
+    u32   count, i;
+
+    count = pACB->SRBCount;
+    for( i=0; i<count; i++)
+    {
+       if( i != count-1 )
+           pACB->SRB_array[i].pNextSRB = &pACB->SRB_array[i+1];
+       else
+           pACB->SRB_array[i].pNextSRB = NULL;
+       dc390_initSRB( &pACB->SRB_array[i] );
+    }
+}
+
+
+/***********************************************************************
+ * Function : static void dc390_initACB ()
+ *
+ * Purpose :  initialize the internal structures for a given SCSI host
+ *
+ * Inputs : psh - pointer to this host adapter's structure
+ *         io_port, Irq, index: Resources and adapter index
+ ***********************************************************************/
+
+static void __devinit dc390_initACB (struct Scsi_Host *psh, unsigned long io_port, u8 Irq, u8 index)
+{
+    struct dc390_acb*    pACB;
+
+    psh->can_queue = MAX_CMD_QUEUE;
+    psh->cmd_per_lun = MAX_CMD_PER_LUN;
+    psh->this_id = (int) dc390_eepromBuf[index][EE_ADAPT_SCSI_ID];
+    psh->io_port = io_port;
+    psh->n_io_port = 0x80;
+    psh->irq = Irq;
+    psh->base = io_port;
+    psh->unique_id = io_port;
+    psh->dma_channel = -1;
+    psh->last_reset = jiffies;
+       
+    pACB = (struct dc390_acb*) psh->hostdata;
+
+    pACB->pScsiHost = psh;
+    pACB->IOPortBase = (u16) io_port;
+    pACB->IRQLevel = Irq;
+
+    DEBUG0(printk (KERN_INFO "DC390: Adapter index %i, ID %i, IO 0x%08x, IRQ 0x%02x\n",        \
+                  index, psh->this_id, (int)io_port, Irq));
+   
+    psh->max_id = 8;
+
+    if( psh->max_id - 1 == dc390_eepromBuf[index][EE_ADAPT_SCSI_ID] )
+       psh->max_id--;
+    psh->max_lun = 1;
+    if( dc390_eepromBuf[index][EE_MODE2] & LUN_CHECK )
+       psh->max_lun = 8;
+
+    pACB->pLinkDCB = NULL;
+    pACB->pDCBRunRobin = NULL;
+    pACB->pActiveDCB = NULL;
+    pACB->pFreeSRB = pACB->SRB_array;
+    pACB->SRBCount = MAX_SRB_CNT;
+    pACB->AdapterIndex = index;
+    pACB->status = 0;
+    pACB->DCBCnt = 0;
+    pACB->TagMaxNum = 2 << dc390_eepromBuf[index][EE_TAG_CMD_NUM];
+    pACB->ACBFlag = 0;
+    pACB->scan_devices = 1;
+    pACB->MsgLen = 0;
+    pACB->Ignore_IRQ = 0;
+    pACB->Gmode2 = dc390_eepromBuf[index][EE_MODE2];
+    dc390_linkSRB( pACB );
+    pACB->pTmpSRB = &pACB->TmpSRB;
+    dc390_initSRB( pACB->pTmpSRB );
+    pACB->sel_timeout = SEL_TIMEOUT;
+    pACB->glitch_cfg = EATER_25NS;
+    pACB->Cmds = pACB->CmdInQ = pACB->CmdOutOfSRB = 0;
+    pACB->SelLost = pACB->SelConn = 0;
+    init_timer (&pACB->Waiting_Timer);
+}
+
+
+/***********************************************************************
+ * Function : static int dc390_initAdapter ()
+ *
+ * Purpose :  initialize the SCSI chip ctrl registers
+ *
+ * Inputs : psh - pointer to this host adapter's structure
+ *         io_port, Irq, index: Resources
+ *
+ * Outputs: 0 on success, -1 on error
+ ***********************************************************************/
+
+static int __devinit dc390_initAdapter (struct Scsi_Host *psh, unsigned long io_port, u8 Irq, u8 index)
+{
+    struct dc390_acb *pACB, *pACB2;
+    u8  dstate;
+    int    i;
+    
+    pACB = (struct dc390_acb*) psh->hostdata;
+
+    if (request_region (io_port, psh->n_io_port, "tmscsim") == NULL) {
+       printk(KERN_ERR "DC390: register IO ports error!\n");
+       return( -1 );
+    }
+
+    DC390_read8_ (INT_Status, io_port);                /* Reset Pending INT */
+
+    if( (i = request_irq(Irq, do_DC390_Interrupt, DC390_IRQ, "tmscsim", pACB) ))
+      {
+       printk(KERN_ERR "DC390: register IRQ error!\n");
+       release_region (io_port, psh->n_io_port);
+       return( -1 );
+      }
+
+    if( !dc390_pACB_start )
+      {
+       pACB2 = NULL;
+       dc390_pACB_start = pACB;
+       dc390_pACB_current = pACB;
+       pACB->pNextACB = NULL;
+      }
+    else
+      {
+       pACB2 = dc390_pACB_current;
+       dc390_pACB_current->pNextACB = pACB;
+       dc390_pACB_current = pACB;
+       pACB->pNextACB = NULL;
+      }
+
+    DC390_write8 (CtrlReg1, DIS_INT_ON_SCSI_RST | psh->this_id);       /* Disable SCSI bus reset interrupt */
+
+    if (pACB->Gmode2 & RST_SCSI_BUS)
+    {
+       dc390_ResetSCSIBus( pACB );
+       udelay (1000);
+       pACB->pScsiHost->last_reset = jiffies + HZ/2
+                   + HZ * dc390_eepromBuf[pACB->AdapterIndex][EE_DELAY];
+       /*
+       for( i=0; i<(500 + 1000*dc390_eepromBuf[pACB->AdapterIndex][EE_DELAY]); i++ )
+               udelay(1000);
+        */
+    }
+    pACB->ACBFlag = 0;
+    DC390_read8 (INT_Status);                          /* Reset Pending INT */
+    
+    DC390_write8 (Scsi_TimeOut, SEL_TIMEOUT);          /* 250ms selection timeout */
+    DC390_write8 (Clk_Factor, CLK_FREQ_40MHZ);         /* Conversion factor = 0 , 40MHz clock */
+    DC390_write8 (ScsiCmd, NOP_CMD);                   /* NOP cmd - clear command register */
+    DC390_write8 (CtrlReg2, EN_FEATURE+EN_SCSI2_CMD);  /* Enable Feature and SCSI-2 */
+    DC390_write8 (CtrlReg3, FAST_CLK);                 /* fast clock */
+    DC390_write8 (CtrlReg4, pACB->glitch_cfg |                 /* glitch eater */
+               (dc390_eepromBuf[index][EE_MODE2] & ACTIVE_NEGATION) ? NEGATE_REQACKDATA : 0);  /* Negation */
+    DC390_write8 (CtcReg_High, 0);                     /* Clear Transfer Count High: ID */
+    DC390_write8 (DMA_Cmd, DMA_IDLE_CMD);
+    DC390_write8 (ScsiCmd, CLEAR_FIFO_CMD);
+    DC390_write32 (DMA_ScsiBusCtrl, EN_INT_ON_PCI_ABORT);
+    dstate = DC390_read8 (DMA_Status);
+    DC390_write8 (DMA_Status, dstate); /* clear */
+
+    return(0);
+}
+
+
+static void __devinit dc390_set_pci_cfg (struct pci_dev *pdev)
+{
+       u16 cmd;
+
+       pci_read_config_word(pdev, PCI_COMMAND, &cmd);
+       cmd |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_IO;
+       pci_write_config_word(pdev, PCI_COMMAND, cmd);
+       pci_write_config_word(pdev, PCI_STATUS, (PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY));
+}
+
 /**
  * dc390_slave_alloc - Called by the scsi mid layer to tell us about a new
  * scsi device that we need to deal with.
@@ -2176,6 +1404,7 @@ static int dc390_slave_alloc(struct scsi_device *scsi_device)
        pDCB->pDCBACB = pACB;
        pDCB->TargetID = id;
        pDCB->TargetLUN = lun;
+       pDCB->MaxCommand = 1;
 
        /*
         * Some values are for all LUNs: Copy them 
@@ -2183,13 +1412,14 @@ static int dc390_slave_alloc(struct scsi_device *scsi_device)
         */
        if (lun && (pDCB2 = dc390_findDCB(pACB, id, 0))) {
                pDCB->DevMode = pDCB2->DevMode;
-               pDCB->SyncMode = pDCB2->SyncMode & SYNC_NEGO_DONE;
+               pDCB->SyncMode = pDCB2->SyncMode;
                pDCB->SyncPeriod = pDCB2->SyncPeriod;
                pDCB->SyncOffset = pDCB2->SyncOffset;
                pDCB->NegoPeriod = pDCB2->NegoPeriod;
       
                pDCB->CtrlR3 = pDCB2->CtrlR3;
                pDCB->CtrlR4 = pDCB2->CtrlR4;
+               pDCB->Inquiry7 = pDCB2->Inquiry7;
        } else {
                u8 index = pACB->AdapterIndex;
                PEEprom prom = (PEEprom) &dc390_eepromBuf[index][id << 2];
@@ -2203,16 +1433,7 @@ static int dc390_slave_alloc(struct scsi_device *scsi_device)
                        pDCB->CtrlR4 |= NEGATE_REQACKDATA | NEGATE_REQACK;
        }
 
-       if (pDCB->DevMode & SYNC_NEGO_)
-               pDCB->SyncMode |= SYNC_ENABLE;
-       else {
-               pDCB->SyncMode = 0;
-               pDCB->SyncOffset &= ~0x0f;
-       }
-
-       pDCB->CtrlR1 = pACB->pScsiHost->this_id;
-       if (pDCB->DevMode & PARITY_CHK_)
-               pDCB->CtrlR1 |= PARITY_ERR_REPO;
+       dc390_updateDCB(pACB, pDCB);
 
        pACB->scan_devices = 1;
        scsi_device->hostdata = pDCB;
@@ -2260,17 +1481,10 @@ static void dc390_slave_destroy(struct scsi_device *scsi_device)
        pACB->DCBCnt--;
 }
 
-static int dc390_slave_configure(struct scsi_device *sdev)
+static int dc390_slave_configure(struct scsi_device *scsi_device)
 {
-       struct dc390_acb *acb = (struct dc390_acb *)sdev->host->hostdata;
-       struct dc390_dcb *dcb = (struct dc390_dcb *)sdev->hostdata;
-
-       acb->scan_devices = 0;
-       if (sdev->tagged_supported && (dcb->DevMode & TAG_QUEUEING_)) {
-               dcb->SyncMode |= EN_TAG_QUEUEING;
-               scsi_activate_tcq(sdev, acb->TagMaxNum);
-       }
-
+       struct dc390_acb* pACB = (struct dc390_acb*) scsi_device->host->hostdata;
+       pACB->scan_devices = 0;
        return 0;
 }
 
@@ -2281,326 +1495,87 @@ static struct scsi_host_template driver_template = {
        .slave_alloc            = dc390_slave_alloc,
        .slave_configure        = dc390_slave_configure,
        .slave_destroy          = dc390_slave_destroy,
-       .queuecommand           = DC390_queuecommand,
+       .queuecommand           = DC390_queue_command,
        .eh_abort_handler       = DC390_abort,
        .eh_bus_reset_handler   = DC390_bus_reset,
-       .can_queue              = 1,
+       .can_queue              = 42,
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,
-       .cmd_per_lun            = 1,
+       .cmd_per_lun            = 16,
        .use_clustering         = DISABLE_CLUSTERING,
 };
 
-/***********************************************************************
- * Functions for access to DC390 EEPROM
- * and some to emulate it
- *
- **********************************************************************/
-
-static void __devinit dc390_eeprom_prepare_read(struct pci_dev *pdev, u8 cmd)
-{
-       u8 carryFlag = 1, j = 0x80, bval;
-       int i;
-
-       for (i = 0; i < 9; i++) {
-               if (carryFlag) {
-                       pci_write_config_byte(pdev, 0x80, 0x40);
-                       bval = 0xc0;
-               } else
-                       bval = 0x80;
-
-               udelay(160);
-               pci_write_config_byte(pdev, 0x80, bval);
-               udelay(160);
-               pci_write_config_byte(pdev, 0x80, 0);
-               udelay(160);
-
-               carryFlag = (cmd & j) ? 1 : 0;
-               j >>= 1;
-       }
-}
-
-static u16 __devinit dc390_eeprom_get_data(struct pci_dev *pdev)
-{
-       int i;
-       u16 wval = 0;
-       u8 bval;
-
-       for (i = 0; i < 16; i++) {
-               wval <<= 1;
-
-               pci_write_config_byte(pdev, 0x80, 0x80);
-               udelay(160);
-               pci_write_config_byte(pdev, 0x80, 0x40);
-               udelay(160);
-               pci_read_config_byte(pdev, 0x00, &bval);
-
-               if (bval == 0x22)
-                       wval |= 1;
-       }
-
-       return wval;
-}
-
-static void __devinit dc390_read_eeprom(struct pci_dev *pdev, u16 *ptr)
-{
-       u8 cmd = EEPROM_READ, i;
-
-       for (i = 0; i < 0x40; i++) {
-               pci_write_config_byte(pdev, 0xc0, 0);
-               udelay(160);
-
-               dc390_eeprom_prepare_read(pdev, cmd++);
-               *ptr++ = dc390_eeprom_get_data(pdev);
-
-               pci_write_config_byte(pdev, 0x80, 0);
-               pci_write_config_byte(pdev, 0x80, 0);
-               udelay(160);
-       }
-}
-
-/* Override EEprom values with explicitly set values */
-static void __devinit dc390_eeprom_override(u8 index)
-{
-       u8 *ptr = (u8 *) dc390_eepromBuf[index], id;
-
-       /* Adapter Settings */
-       if (tmscsim[0] != -2)
-               ptr[EE_ADAPT_SCSI_ID] = (u8)tmscsim[0]; /* Adapter ID */
-       if (tmscsim[3] != -2)
-               ptr[EE_MODE2] = (u8)tmscsim[3];
-       if (tmscsim[5] != -2)
-               ptr[EE_DELAY] = tmscsim[5];             /* Reset delay */
-       if (tmscsim[4] != -2)
-               ptr[EE_TAG_CMD_NUM] = (u8)tmscsim[4];   /* Tagged Cmds */
-
-       /* Device Settings */
-       for (id = 0; id < MAX_SCSI_ID; id++) {
-               if (tmscsim[2] != -2)
-                       ptr[id << 2] = (u8)tmscsim[2];          /* EE_MODE1 */
-               if (tmscsim[1] != -2)
-                       ptr[(id << 2) + 1] = (u8)tmscsim[1];    /* EE_Speed */
-       }
-}
-
-static int __devinitdata tmscsim_def[] = {
-       7,
-       0 /* 10MHz */,
-       PARITY_CHK_ | SEND_START_ | EN_DISCONNECT_ | SYNC_NEGO_ | TAG_QUEUEING_,
-       MORE2_DRV | GREATER_1G | RST_SCSI_BUS | ACTIVE_NEGATION | LUN_CHECK,
-       3 /* 16 Tags per LUN */,
-       1 /* s delay after Reset */,
-};
-
-/* Copy defaults over set values where missing */
-static void __devinit dc390_fill_with_defaults (void)
+static int __devinit dc390_init_one(struct pci_dev *dev,
+                                   const struct pci_device_id *id)
 {
-       int i;
-
-       for (i = 0; i < 6; i++) {
-               if (tmscsim[i] < 0 || tmscsim[i] > 255)
-                       tmscsim[i] = tmscsim_def[i];
-       }
-
-       /* Sanity checks */
-       if (tmscsim[0] > 7)
-               tmscsim[0] = 7;
-       if (tmscsim[1] > 7)
-               tmscsim[1] = 4;
-       if (tmscsim[4] > 5)
-               tmscsim[4] = 4;
-       if (tmscsim[5] > 180)
-               tmscsim[5] = 180;
-}
+       struct Scsi_Host *scsi_host;
+       unsigned long io_port;
+       u8 irq;
+       struct dc390_acb*  pACB;
+       int ret = -ENOMEM;
 
-static void __devinit dc390_check_eeprom(struct pci_dev *pdev, u8 index)
-{
-       u8 interpd[] = {1, 3, 5, 10, 16, 30, 60, 120};
-       u8 EEbuf[128];
-       u16 *ptr = (u16 *)EEbuf, wval = 0;
-       int i;
+       if (pci_enable_device(dev))
+               return -ENODEV;
 
-       dc390_read_eeprom(pdev, ptr);
-       memcpy(dc390_eepromBuf[index], EEbuf, EE_ADAPT_SCSI_ID);
-       memcpy(&dc390_eepromBuf[index][EE_ADAPT_SCSI_ID], 
-              &EEbuf[REAL_EE_ADAPT_SCSI_ID], EE_LEN - EE_ADAPT_SCSI_ID);
+       io_port = pci_resource_start(dev, 0);
+       irq = dev->irq;
 
-       dc390_eepromBuf[index][EE_DELAY] = interpd[dc390_eepromBuf[index][EE_DELAY]];
+       /* allocate scsi host information (includes out adapter) */
+       scsi_host = scsi_host_alloc(&driver_template, sizeof(struct dc390_acb));
+       if (!scsi_host)
+               goto nomem;
 
-       for (i = 0; i < 0x40; i++, ptr++)
-               wval += *ptr;
+       pACB = (struct dc390_acb*) scsi_host->hostdata;
 
-       /* no Tekram EEprom found */
-       if (wval != 0x1234) {
+       if (dc390_CheckEEpromCheckSum (dev, dc390_adapterCnt)) {
                int speed;
-
+               dc390_adapname = "AM53C974";
                printk(KERN_INFO "DC390_init: No EEPROM found! Trying default settings ...\n");
-
-               /*
-                * XXX(hch): bogus, because we might have tekram and
-                *           non-tekram hbas in a single machine.
-                */
+               dc390_check_for_safe_settings();
                dc390_fill_with_defaults();
-
+               dc390_EEprom_Override(dc390_adapterCnt);
                speed = dc390_clock_speed[tmscsim[1]];
-               printk(KERN_INFO "DC390: Used defaults: AdaptID=%i, SpeedIdx=%i (%i.%i MHz), "
-                      "DevMode=0x%02x, AdaptMode=0x%02x, TaggedCmnds=%i (%i), DelayReset=%is\n", 
-                      tmscsim[0], tmscsim[1], speed / 10, speed % 10,
+               printk(KERN_INFO "DC390: Used defaults: AdaptID=%i, SpeedIdx=%i (%i.%i MHz),"
+                      " DevMode=0x%02x, AdaptMode=0x%02x, TaggedCmnds=%i (%i), DelayReset=%is\n", 
+                      tmscsim[0], tmscsim[1], speed/10, speed%10,
                       (u8)tmscsim[2], (u8)tmscsim[3], tmscsim[4], 2 << (tmscsim[4]), tmscsim[5]);
+       } else {
+               dc390_check_for_safe_settings();
+               dc390_EEprom_Override(dc390_adapterCnt);
        }
-}
-
-static void __devinit dc390_init_hw(struct dc390_acb *pACB, u8 index)
-{
-       struct Scsi_Host *shost = pACB->pScsiHost;
-       u8 dstate;
-
-       /* Disable SCSI bus reset interrupt */
-       DC390_write8(CtrlReg1, DIS_INT_ON_SCSI_RST | shost->this_id);
-
-       if (pACB->Gmode2 & RST_SCSI_BUS) {
-               dc390_ResetSCSIBus(pACB);
-               udelay(1000);
-               shost->last_reset = jiffies + HZ/2 +
-                       HZ * dc390_eepromBuf[pACB->AdapterIndex][EE_DELAY];
-       }
-
-       pACB->ACBFlag = 0;
-
-       /* Reset Pending INT */
-       DC390_read8(INT_Status);
-       
-       /* 250ms selection timeout */
-       DC390_write8(Scsi_TimeOut, SEL_TIMEOUT);
-       
-       /* Conversion factor = 0 , 40MHz clock */
-       DC390_write8(Clk_Factor, CLK_FREQ_40MHZ);
-       
-       /* NOP cmd - clear command register */
-       DC390_write8(ScsiCmd, NOP_CMD);
-       
-       /* Enable Feature and SCSI-2 */
-       DC390_write8(CtrlReg2, EN_FEATURE+EN_SCSI2_CMD);
-       
-       /* Fast clock */
-       DC390_write8(CtrlReg3, FAST_CLK);
-
-       /* Negation */
-       DC390_write8(CtrlReg4, pACB->glitch_cfg | /* glitch eater */
-               (dc390_eepromBuf[index][EE_MODE2] & ACTIVE_NEGATION) ?
-                NEGATE_REQACKDATA : 0);
-       
-       /* Clear Transfer Count High: ID */
-       DC390_write8(CtcReg_High, 0);
-       DC390_write8(DMA_Cmd, DMA_IDLE_CMD);
-       DC390_write8(ScsiCmd, CLEAR_FIFO_CMD);
-       DC390_write32(DMA_ScsiBusCtrl, EN_INT_ON_PCI_ABORT);
 
-       dstate = DC390_read8(DMA_Status);
-       DC390_write8(DMA_Status, dstate);
-}
-
-static int __devinit dc390_probe_one(struct pci_dev *pdev,
-                                   const struct pci_device_id *id)
-{
-       struct dc390_acb *pACB;
-       struct Scsi_Host *shost;
-       unsigned long io_port;
-       int error = -ENODEV, i;
-
-       if (pci_enable_device(pdev))
-               goto out;
-
-       pci_set_master(pdev);
-
-       error = -ENOMEM;
-       shost = scsi_host_alloc(&driver_template, sizeof(struct dc390_acb));
-       if (!shost)
-               goto out_disable_device;
+       DEBUG0(printk(KERN_INFO "DC390: pSH = %8x, Index %02i\n", (u32) scsi_host, dc390_adapterCnt));
 
-       pACB = (struct dc390_acb *)shost->hostdata;
-       memset(pACB, 0, sizeof(struct dc390_acb));
-
-       dc390_check_eeprom(pdev, dc390_adapterCnt);
-       dc390_eeprom_override(dc390_adapterCnt);
-
-       io_port = pci_resource_start(pdev, 0);
-
-       shost->this_id = dc390_eepromBuf[dc390_adapterCnt][EE_ADAPT_SCSI_ID];
-       shost->io_port = io_port;
-       shost->n_io_port = 0x80;
-       shost->irq = pdev->irq;
-       shost->base = io_port;
-       shost->unique_id = io_port;
-       shost->last_reset = jiffies;
-       
-       pACB->pScsiHost = shost;
-       pACB->IOPortBase = (u16) io_port;
-       pACB->IRQLevel = pdev->irq;
-       
-       shost->max_id = 8;
-
-       if (shost->max_id - 1 ==
-           dc390_eepromBuf[dc390_adapterCnt][EE_ADAPT_SCSI_ID])
-               shost->max_id--;
-
-       if (dc390_eepromBuf[dc390_adapterCnt][EE_MODE2] & LUN_CHECK)
-               shost->max_lun = 8;
-       else
-               shost->max_lun = 1;
-
-       pACB->pFreeSRB = pACB->SRB_array;
-       pACB->SRBCount = MAX_SRB_CNT;
-       pACB->AdapterIndex = dc390_adapterCnt;
-       pACB->TagMaxNum =
-               2 << dc390_eepromBuf[dc390_adapterCnt][EE_TAG_CMD_NUM];
-       pACB->Gmode2 = dc390_eepromBuf[dc390_adapterCnt][EE_MODE2];
-
-       for (i = 0; i < pACB->SRBCount-1; i++)
-               pACB->SRB_array[i].pNextSRB = &pACB->SRB_array[i+1];
-       pACB->SRB_array[pACB->SRBCount-1].pNextSRB = NULL;
-       pACB->pTmpSRB = &pACB->TmpSRB;
-
-       pACB->sel_timeout = SEL_TIMEOUT;
-       pACB->glitch_cfg = EATER_25NS;
-       pACB->pdev = pdev;
-
-       if (!request_region(io_port, shost->n_io_port, "tmscsim")) {
-               printk(KERN_ERR "DC390: register IO ports error!\n");
-               goto out_host_put;
-       }
+       dc390_initACB(scsi_host, io_port, irq, dc390_adapterCnt);
 
-       /* Reset Pending INT */
-       DC390_read8_(INT_Status, io_port);
+       pACB->pdev = dev;
 
-       if (request_irq(pdev->irq, do_DC390_Interrupt, SA_SHIRQ,
-                               "tmscsim", pACB)) {
-               printk(KERN_ERR "DC390: register IRQ error!\n");
-               goto out_release_region;
+       if (dc390_initAdapter(scsi_host, io_port, irq, dc390_adapterCnt)) {
+               scsi_unregister(scsi_host);
+               ret = -EBUSY;
+               goto busy;
        }
 
-       dc390_init_hw(pACB, dc390_adapterCnt);
-       
+       pci_set_master(dev);
+       dc390_set_pci_cfg(dev);
        dc390_adapterCnt++;
 
-       pci_set_drvdata(pdev, shost);
+       /* get the scsi mid level to scan for new devices on the bus */
+       if (scsi_add_host(scsi_host, &dev->dev)) {
+               ret = -ENODEV;
+               goto nodev;
+       }
+       pci_set_drvdata(dev, scsi_host);
+       scsi_scan_host(scsi_host);
 
-       error = scsi_add_host(shost, &pdev->dev);
-       if (error)
-               goto out_free_irq;
-       scsi_scan_host(shost);
        return 0;
 
- out_free_irq:
-       free_irq(pdev->irq, pACB);
- out_release_region:
-       release_region(io_port, shost->n_io_port);
- out_host_put:
-       scsi_host_put(shost);
- out_disable_device:
-       pci_disable_device(pdev);
- out:
-       return error;
+nodev:
+busy:
+       scsi_host_put(scsi_host);
+nomem:
+       pci_disable_device(dev);
+       return ret;
 }
 
 /**
@@ -2625,6 +1600,8 @@ static void __devexit dc390_remove_one(struct pci_dev *dev)
                dc390_ResetSCSIBus(pACB);
        spin_unlock_irqrestore(scsi_host->host_lock, iflags);
 
+       del_timer_sync(&pACB->Waiting_Timer);
+
        free_irq(scsi_host->irq, pACB);
        release_region(scsi_host->io_port, scsi_host->n_io_port);
 
@@ -2633,32 +1610,15 @@ static void __devexit dc390_remove_one(struct pci_dev *dev)
        pci_set_drvdata(dev, NULL);
 }
 
-static struct pci_device_id tmscsim_pci_tbl[] = {
-       { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD53C974,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { }
-};
-MODULE_DEVICE_TABLE(pci, tmscsim_pci_tbl);
-
 static struct pci_driver dc390_driver = {
        .name           = "tmscsim",
        .id_table       = tmscsim_pci_tbl,
-       .probe          = dc390_probe_one,
+       .probe          = dc390_init_one,
        .remove         = __devexit_p(dc390_remove_one),
 };
 
 static int __init dc390_module_init(void)
 {
-       if (tmscsim[0] == -1 || tmscsim[0] > 15) {
-               tmscsim[0] = 7;
-               tmscsim[1] = 4;
-               tmscsim[2] = PARITY_CHK_ | TAG_QUEUEING_;
-               tmscsim[3] = MORE2_DRV | GREATER_1G | RST_SCSI_BUS | ACTIVE_NEGATION;
-               tmscsim[4] = 2;
-               tmscsim[5] = 10;
-               printk (KERN_INFO "DC390: Using safe settings.\n");
-       }
-
        return pci_module_init(&dc390_driver);
 }
 
@@ -2669,25 +1629,3 @@ static void __exit dc390_module_exit(void)
 
 module_init(dc390_module_init);
 module_exit(dc390_module_exit);
-
-#ifndef MODULE
-static int __init dc390_setup (char *str)
-{      
-       int ints[8],i, im;
-
-       get_options(str, ARRAY_SIZE(ints), ints);
-       im = ints[0];
-
-       if (im > 6) {
-               printk (KERN_NOTICE "DC390: ignore extra params!\n");
-               im = 6;
-       }
-
-       for (i = 0; i < im; i++)
-               tmscsim[i] = ints[i+1];
-       /* dc390_checkparams (); */
-       return 1;
-}
-
-__setup("tmscsim=", dc390_setup);
-#endif