patch-1.3.5 linux/drivers/scsi/eata_dma.c

Next file: linux/drivers/scsi/eata_dma.h
Previous file: linux/drivers/scsi/eata.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.4/linux/drivers/scsi/eata_dma.c linux/drivers/scsi/eata_dma.c
@@ -12,8 +12,10 @@
  *      -supports all PCI based EATA-DMA boards             *
  *      -supports multiple HBAs with & without IRQ sharing  *
  *      -supports all SCSI channels on multi channel boards *
- *      -displays (more or less useful) infos in /proc/scsi *
  *      -can be loaded as module                            *
+ *      -displays statistical and hardware information      *
+ *       in /proc/scsi/eata_dma                             *
+ *      -needs identical HBA ids on all channels            * 
  *                                                          *
  *  (c)1993,94,95 Michael Neuffer                           *
  *                neuffer@goofy.zdv.uni-mainz.de            *
@@ -44,7 +46,7 @@
  * Thanks also to Greg Hosler who did a lot of testing and  *
  * found quite a number of bugs during the development.     *
  ************************************************************
- *  last change: 95/04/10       OS: Linux 1.2.00 or higher  *
+ *  last change: 95/06/28 OS: Linux 1.3.4 + pre1.3 SCSI pat.*
  ************************************************************/
 
 /* Look in eata_dma.h for configuration and revision information */
@@ -62,6 +64,8 @@
 #include <linux/in.h>
 #include <linux/bios32.h>
 #include <linux/pci.h>
+#include <linux/proc_fs.h>
+#include <asm/byteorder.h>
 #include <asm/types.h>
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -71,14 +75,10 @@
 #include "hosts.h"
 #include <linux/scsicam.h>
 #include "eata_dma.h"
+#include "eata_dma_proc.h" 
 
-#if EATA_DMA_PROC  
-#include "eata_dma_proc.h"  /* If you're interested send me a mail */ 
-ulong  reads[13];           /* /proc/scsi probably won't get       */ 
-ulong  writes[13];          /* into the kernel before pl. 1.3      */
-#endif
 
-static uint ISAbases[] =
+static u32 ISAbases[] =
 {0x1F0, 0x170, 0x330, 0x230};
 static unchar EISAbases[] =
 {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
@@ -96,7 +96,6 @@
 static unchar HBA_interpret = FALSE;
 static u32 fake_int_base;
 static u32 fake_int_result;
-static struct geom_emul geometry;	/* Drive 1 & 2 geometry */
 
 static ulong int_counter = 0;
 static ulong queue_counter = 0;
@@ -104,34 +103,41 @@
 void eata_scsi_done (Scsi_Cmnd * SCpnt)
 {
     return;
-}	
+}   
 
 void eata_fake_int_handler(s32 irq, struct pt_regs * regs)
 {
     fake_int_result = inb(fake_int_base + HA_RSTATUS);
-    DBG(DBG_INTR3, printk("eata_fake_int_handler called irq%ld base %#lx res %#lx\n", 
-			  irq, fake_int_base, fake_int_result));
+    DBG(DBG_INTR3, printk("eata_fake_int_handler called irq%d base %#x"
+			  " res %#x\n", irq, fake_int_base, fake_int_result));
     return;
 }
 
-#if EATA_DMA_PROC 
 #include "eata_dma_proc.c"
-#endif
 
+#ifdef MODULE
 int eata_release(struct Scsi_Host *sh)
 {
-  if (sh->irq && reg_IRQ[sh->irq] == 1) free_irq(sh->irq);
-  else reg_IRQ[sh->irq]--;
+    uint i;
+    if (sh->irq && reg_IRQ[sh->irq] == 1) free_irq(sh->irq);
+    else reg_IRQ[sh->irq]--;
     
     scsi_init_free((void *)status, 512);
+    scsi_init_free((void *)dma_scratch, 512);
+    for (i = 0; i < sh->can_queue; i++){ /* Free all SG arrays */
+	if(SD(sh)->ccb[i].sg_list != NULL)
+	    scsi_init_free((void *) SD(sh)->ccb[i].sg_list, 
+			   sh->sg_tablesize * sizeof(struct eata_sg_list));
+    }
     
-  if (SD(sh)->channel == 0) {
-      if (sh->dma_channel != 0xff) free_dma(sh->dma_channel);
-      if (sh->io_port && sh->n_io_port)
-	  release_region(sh->io_port, sh->n_io_port);
-  }
-  return(TRUE);
+    if (SD(sh)->channel == 0) {
+	if (sh->dma_channel != 0xff) free_dma(sh->dma_channel);
+	if (sh->io_port && sh->n_io_port)
+	    release_region(sh->io_port, sh->n_io_port);
+    }
+    return(TRUE);
 }
+#endif
 
 const char *eata_info(struct Scsi_Host *host)
 {
@@ -155,44 +161,44 @@
     cli();
 
     for (x = 1, sh = first_HBA; x <= registered_HBAs; x++, sh = SD(sh)->prev) {
-        if (sh->irq != irq)
+	if (sh->irq != irq)
 	    continue;
-        if (!(inb((uint)sh->base + HA_RAUXSTAT) & HA_AIRQ))
+	if (!(inb((uint)sh->base + HA_RAUXSTAT) & HA_AIRQ))
 	    continue;
-
+	
 	int_counter++;
-
+	
 	sp=&SD(sh)->sp;
-
+	
 	cp = sp->ccb;
 	cmd = cp->cmd;
 	base = (uint) cmd->host->base;
-
+	
 	hba_stat = sp->hba_stat;
-
- 	scsi_stat = (sp->scsi_stat >> 1) && 0x1f; 
-
+	
+	scsi_stat = (sp->scsi_stat >> 1) & 0x1f; 
+       
 	if (sp->EOC == FALSE) {
 	    eata_stat = inb(base + HA_RSTATUS);
 	    printk("eata_dma: int_handler, board: %x cmd %lx returned "
 		   "unfinished.\nEATA: %x HBA: %x SCSI: %x spadr %lx spadrirq "
 		   "%lx, irq%d\n", base, (long)cp, eata_stat, hba_stat, 
 		   scsi_stat,(long)&status, (long)&status[irq], irq);
-	    DBG(DBG_DELAY,DEL2(800));
+	    DBG(DBG_DELAY, DEL2(800));
 	    restore_flags(flags);
 	    return;
 	} 
-
+	
 	if (cp->status == LOCKED) {
 	    cp->status = FREE;
 	    eata_stat = inb(base + HA_RSTATUS);
 	    printk("eata_dma: int_handler, freeing locked queueslot\n");
-	    DBG(DBG_INTR&&DBG_DELAY,DEL2(800));
+	    DBG(DBG_INTR && DBG_DELAY, DEL2(800));
 	    restore_flags(flags);
 	    return;
 	}
-
-	eata_stat = inb(base + HA_RSTATUS);	
+	
+	eata_stat = inb(base + HA_RSTATUS); 
 	DBG(DBG_INTR, printk("IRQ %d received, base %#.4x, pid %ld, target: "
 			     "%x, lun: %x, ea_s: %#.2x, hba_s: %#.2x \n", 
 			     irq, base, cmd->pid, cmd->target, cmd->lun, 
@@ -202,63 +208,67 @@
 	case HA_NO_ERROR:       /* NO Error */
 	    if (scsi_stat == CONDITION_GOOD
 		&& cmd->device->type == TYPE_DISK
-		&& (HD(cmd)->t_state[cmd->target] == RESET))
-	        result = DID_BUS_BUSY << 16;	    
-            else if (scsi_stat == GOOD)
-	      HD(cmd)->t_state[cmd->target] = FALSE;
+		&& (HD(cmd)->t_state[cp->cp_channel][cp->cp_id] == RESET))
+		result = DID_BUS_BUSY << 16;        
+	    else if (scsi_stat == GOOD)
+		HD(cmd)->t_state[cp->cp_channel][cp->cp_id] = OK;
 	    else if (scsi_stat == CHECK_CONDITION
-                     && cmd->device->type == TYPE_DISK
-                     && (cmd->sense_buffer[2] & 0xf) == RECOVERED_ERROR)
-	      result = DID_BUS_BUSY << 16;
+		     && cmd->device->type == TYPE_DISK
+		     && (cmd->sense_buffer[2] & 0xf) == RECOVERED_ERROR)
+		result = DID_BUS_BUSY << 16;
 	    else
-	        result = DID_OK << 16;
-	    HD(cmd)->t_timeout[cmd->target] = FALSE;
+		result = DID_OK << 16;
+	    HD(cmd)->t_timeout[cp->cp_channel][cp->cp_id] = OK;
 	    break;
-	case HA_ERR_SEL_TO:		/* Selection Timeout */
+	case HA_ERR_SEL_TO:     /* Selection Timeout */
 	    result = DID_BAD_TARGET << 16;  
 	    break;
-	case HA_ERR_CMD_TO:		/* Command Timeout   */
-	    if (HD(cmd)->t_timeout[cmd->target] > 1)
+	case HA_ERR_CMD_TO:     /* Command Timeout   */
+	    if (HD(cmd)->t_timeout[cp->cp_channel][cp->cp_id] > 1)
 		result = DID_ERROR << 16;
 	    else {
 		result = DID_TIME_OUT << 16;
-		HD(cmd)->t_timeout[cmd->target]++;
+		HD(cmd)->t_timeout[cp->cp_channel][cp->cp_id]++;
 	    }
 	    break;
-        case HA_ERR_RESET:              /* SCSI Bus Reset Received */
-        case HA_INIT_POWERUP:           /* Initial Controller Power-up */
+	case HA_ERR_RESET:              /* SCSI Bus Reset Received */
+	case HA_INIT_POWERUP:           /* Initial Controller Power-up */
 	    if (cmd->device->type != TYPE_TAPE)
 		result = DID_BUS_BUSY << 16;
 	    else
 		result = DID_ERROR << 16;
-
+	    
 	    for (i = 0; i < MAXTARGET; i++)
-		HD(cmd)->t_state[i] = RESET;
+		HD(cmd)->t_state[cp->cp_channel][i] = RESET;
 	    break;
-        case HA_UNX_BUSPHASE:       /* Unexpected Bus Phase */
-        case HA_UNX_BUS_FREE:       /* Unexpected Bus Free */
-        case HA_BUS_PARITY:         /* Bus Parity Error */
-        case HA_SCSI_HUNG:          /* SCSI Hung */
-        case HA_UNX_MSGRJCT:        /* Unexpected Message Reject */
-        case HA_RESET_STUCK:        /* SCSI Bus Reset Stuck */
-        case HA_RSENSE_FAIL:        /* Auto Request-Sense Failed */
-        case HA_PARITY_ERR:         /* Controller Ram Parity */
+	case HA_UNX_BUSPHASE:       /* Unexpected Bus Phase */
+	case HA_UNX_BUS_FREE:       /* Unexpected Bus Free */
+	case HA_BUS_PARITY:         /* Bus Parity Error */
+	case HA_SCSI_HUNG:          /* SCSI Hung */
+	case HA_UNX_MSGRJCT:        /* Unexpected Message Reject */
+	case HA_RESET_STUCK:        /* SCSI Bus Reset Stuck */
+	case HA_RSENSE_FAIL:        /* Auto Request-Sense Failed */
+	case HA_PARITY_ERR:         /* Controller Ram Parity */
 	default:
 	    result = DID_ERROR << 16;
 	    break;
 	}
 	cmd->result = result | (scsi_stat << 1); 
-
+	
 #if DBG_INTR2
-	if (scsi_stat || result || hba_stat || eata_stat != 0x50) 
-	    printk("eata_stat: %#x hba_stat: %#.2x,scsi_stat: %#.2x, "
-		   "sense_key: %#x, result: %#.8x\n", eata_stat, hba_stat, 
-		 scsi_stat,cmd->sense_buffer[2] & 0xf, cmd->result); 
+	if (scsi_stat || result || hba_stat || eata_stat != 0x50 
+	    || cmd->scsi_done == NULL || cmd->device->id == 7) 
+	    printk("HBA: %d, channel %d, id: %d, lun %d, pid %ld:\n" 
+		   "eata_stat %#x, hba_stat %#.2x, scsi_stat %#.2x, "
+		   "sense_key: %#x, result: %#.8x\n", 
+		   x, cmd->device->channel, cmd->device->id, cmd->device->lun,
+		   cmd->pid, eata_stat, hba_stat, scsi_stat, 
+		   cmd->sense_buffer[2] & 0xf, cmd->result); 
 	DBG(DBG_INTR&&DBG_DELAY,DEL2(800));
 #endif
-
-	cp->status = FREE;   /* now we can release the slot  */
- 
+	
+	cp->status = FREE;          /* now we can release the slot  */
+	
 	restore_flags(flags);
 	if(cmd->scsi_done != eata_scsi_done) cmd->scsi_done(cmd);
 	else {
@@ -269,31 +279,50 @@
 	cli();
     }
     restore_flags(flags);
-
+    
     return;
 }
 
-inline uint eata_send_command(ulong addr, uint base, unchar command)
+inline int eata_send_command(u32 addr, u32 base, u8 command)
 {
-    uint loop = R_LIMIT;
-
+    long loop = R_LIMIT;
+    
     while (inb(base + HA_RAUXSTAT) & HA_ABUSY)
-        if (--loop == 0)
-            return(FALSE);
-
-    outb(addr & 0x000000ff, base + HA_WDMAADDR);
-    outb((addr & 0x0000ff00) >> 8, base + HA_WDMAADDR + 1);
+	if (--loop == 0)
+	    return(FALSE);
+    
+    outb( addr & 0x000000ff,        base + HA_WDMAADDR);
+    outb((addr & 0x0000ff00) >> 8,  base + HA_WDMAADDR + 1);
     outb((addr & 0x00ff0000) >> 16, base + HA_WDMAADDR + 2);
     outb((addr & 0xff000000) >> 24, base + HA_WDMAADDR + 3);
     outb(command, base + HA_WCOMMAND);
     return(TRUE);
 }
 
-int eata_queue(Scsi_Cmnd * cmd, void *(done) (Scsi_Cmnd *))
+#if 0
+inline int eata_send_immediate(u32 addr, u32 base, u8 cmnd, u8 cmnd2, u8 id, 
+			       u8 lun)
 {
-    uint i, x, y;
-    long flags;
+    if(addr){
+	outb( addr & 0x000000ff,        base + HA_WDMAADDR);
+	outb((addr & 0x0000ff00) >> 8,  base + HA_WDMAADDR + 1);
+	outb((addr & 0x00ff0000) >> 16, base + HA_WDMAADDR + 2);
+	outb((addr & 0xff000000) >> 24, base + HA_WDMAADDR + 3);
+    } else {
+	outb(id,  base + HA_WSUBCODE);
+	outb(lun, base + HA_WSUBLUN);
+    }
+    
+    outb(cmnd2, base + HA_WCOMMAND2);
+    outb(cmnd,  base + HA_WCOMMAND);
+    return(TRUE);
+}
+#endif
 
+int eata_queue(Scsi_Cmnd * cmd, void (* done) (Scsi_Cmnd *))
+{
+    unsigned int i, x, y;
+    u32 flags;
     hostdata *hd;
     struct Scsi_Host *sh;
     struct eata_ccb *cp;
@@ -303,50 +332,50 @@
     cli();
 
     queue_counter++;
-
+    
     if (done == (void *)eata_scsi_done) { 
-        if (internal_command_finished == TRUE)
+	if (internal_command_finished == TRUE)
 	    internal_command_finished = FALSE;
-        else 
+	else 
 	    cmd->result = (DID_ERROR << 16) + QUEUE_FULL;
     }
     
     hd = HD(cmd);
     sh = cmd->host;
- 
+    
     /* check for free slot */
-     for (y = hd->last_ccb + 1, x = 0; x < sh->can_queue; x++, y++) { 
+    for (y = hd->last_ccb + 1, x = 0; x < sh->can_queue; x++, y++) { 
 	if (y >= sh->can_queue)
 	    y = 0;
 	if (hd->ccb[y].status == FREE)
 	    break;
     }
-
+    
     hd->last_ccb = y;
-
+    
     if (x == sh->can_queue) { 
-
-        DBG(DBG_QUEUE, printk("can_queue %d, x %d, y %d\n",sh->can_queue,x,y));
+	
+	DBG(DBG_QUEUE, printk("can_queue %d, x %d, y %d\n", 
+			      sh->can_queue, x, y));
 #if DEBUG_EATA
-        panic("eata_dma: run out of queue slots cmdno:%ld intrno: %ld\n", 
+	panic("eata_dma: run out of queue slots cmdno:%ld intrno: %ld\n", 
 	      queue_counter, int_counter);
 #else
-        panic("eata_dma: run out of queue slots....\n");
+	panic("eata_dma: run out of queue slots....\n");
 #endif
     }
-
+    
     cp = &hd->ccb[y];
-
-    memset(cp, 0, sizeof(struct eata_ccb));
-
-    cp->status = USED;		/* claim free slot */
+    
+    memset(cp, 0, sizeof(struct eata_ccb) - sizeof(struct eata_sg_list *));
+    
+    cp->status = USED;      /* claim free slot */
     
     DBG(DBG_QUEUE, printk("eata_queue pid %ld, target: %x, lun: %x, y %d\n",
 			  cmd->pid, cmd->target, cmd->lun, y));
     DBG(DBG_QUEUE && DBG_DELAY, DEL2(250));
- 
     cmd->scsi_done = (void *)done;
-
+    
     switch (cmd->cmnd[0]) {
     case CHANGE_DEFINITION: case COMPARE:         case COPY:
     case COPY_VERIFY:       case LOG_SELECT:      case MODE_SELECT:
@@ -358,366 +387,366 @@
     case SEARCH_HIGH_12:    case SEARCH_EQUAL_12: case SEARCH_LOW_12:
     case WRITE_12:          case WRITE_VERIFY_12: case SET_WINDOW: 
     case MEDIUM_SCAN:       case SEND_VOLUME_TAG:            
-    case 0xea:		/* alternate number for WRITE LONG */
-	cp->DataOut = TRUE;	/* Output mode */
-        break;
-    case 0x00:
+    case 0xea:      /* alternate number for WRITE LONG */
+	cp->DataOut = TRUE;     /* Output mode */
+	break;
+    case TEST_UNIT_READY:
     default:
-	cp->DataIn = TRUE;	/* Input mode  */
+	cp->DataIn = TRUE;      /* Input mode  */
     }
-
-    if (done == (void *) eata_scsi_done && HBA_interpret == TRUE) 
-        cp->Interpret = TRUE;   /* Interpret command */
-   
+    
+    if ((done == (void *) eata_scsi_done && HBA_interpret == TRUE) 
+	|| cmd->target == sh->this_id) 
+	cp->Interpret = TRUE;   /* Interpret command */
+    
     if (cmd->use_sg) {
-	cp->scatter = TRUE;	/* SG mode     */
-	cp->cp_dataDMA = htonl((long)&cp->sg_list);
-        cp->cp_datalen = htonl(cmd->use_sg*8);
+	cp->scatter = TRUE;     /* SG mode     */
+	if (cp->sg_list == NULL) {
+	    cp->sg_list = kmalloc(SG_SIZE_BIG*sizeof(struct eata_sg_list),
+				     GFP_ATOMIC | GFP_DMA);
+	}
+	cp->cp_dataDMA = htonl((ulong)cp->sg_list); 
+	if (cp->cp_dataDMA == 0)
+	    panic("eata_dma: Run out of DMA memory for SG lists !\n");
+
+	cp->cp_datalen = htonl(cmd->use_sg * sizeof(struct eata_sg_list));
 	sl=(struct scatterlist *)cmd->request_buffer;
- 
 	for(i = 0; i < cmd->use_sg; i++, sl++){
-	    cp->sg_list[i].data = htonl((ulong) sl->address);
-	    cp->sg_list[i].len = htonl((ulong) sl->length);
-  	}
+	    cp->sg_list[i].data = htonl((u32) sl->address);
+	    cp->sg_list[i].len = htonl((u32) sl->length);
+	}
     } else {
-        cp->scatter = FALSE;
+	cp->scatter = FALSE;
 	cp->cp_datalen = htonl(cmd->request_bufflen);
-	cp->cp_dataDMA = htonl((ulong)cmd->request_buffer);
+	cp->cp_dataDMA = htonl((u32)cmd->request_buffer);
     }
-
+    
     cp->Auto_Req_Sen = TRUE;
-    cp->cp_reqDMA = htonl((ulong) cmd->sense_buffer);
+    cp->cp_reqDMA = htonl((u32) cmd->sense_buffer);
     cp->reqlen = sizeof(cmd->sense_buffer);
-
+    
     cp->cp_id = cmd->target;
+    cp->cp_channel = cmd->channel;
     cp->cp_lun = cmd->lun;
     cp->cp_dispri = TRUE;
     cp->cp_identify = TRUE;
     memcpy(cp->cp_cdb, cmd->cmnd, cmd->cmd_len);
-
-    cp->cp_statDMA = htonl((ulong) &(hd->sp));
-
+    
+    cp->cp_statDMA = htonl((u32) &(hd->sp));
+    
     cp->cp_viraddr = cp;
     cp->cmd = cmd;
-    cmd->host_scribble = (char *)&hd->ccb[y];	
-
-    if(eata_send_command((ulong) cp, (uint) sh->base, EATA_CMD_DMA_SEND_CP) == FALSE) {
-      cmd->result = DID_ERROR << 16;
-      printk("eata_queue target %d, pid %ld, HBA busy, returning DID_ERROR, done.\n",
-              cmd->target, cmd->pid);
-      restore_flags(flags);
-      if(done != (void *)eata_scsi_done) done(cmd);
-      return (0);
+    cmd->host_scribble = (char *)&hd->ccb[y];   
+    
+    if(eata_send_command((u32) cp, (u32) sh->base, EATA_CMD_DMA_SEND_CP) == FALSE) {
+	cmd->result = DID_ERROR << 16;
+	printk("eata_queue target %d, pid %ld, HBA busy, returning DID_ERROR,"
+	       " done.\n", cmd->target, cmd->pid);
+	restore_flags(flags);
+	if(done != (void *)eata_scsi_done) done(cmd);
+	return (0);
     }
-    DBG(DBG_QUEUE,printk("Queued base %#.4lx pid: %ld target: %x lun: %x slot %d irq %d\n",
-	   (long)sh->base, cmd->pid, cmd->target, cmd->lun, y, sh->irq));
+    DBG(DBG_QUEUE,printk("Queued base %#.4x pid: %ld target: %x lun: %x "
+			 "slot %d irq %d\n", (s32)sh->base, cmd->pid, 
+			 cmd->target, cmd->lun, y, sh->irq));
     DBG(DBG_QUEUE && DBG_DELAY, DEL2(200));
     restore_flags(flags);
     return (0);
 }
 
-static volatile int internal_done_flag = 0;
-static volatile int internal_done_errcode = 0;
-
-static void internal_done(Scsi_Cmnd * cmd)
-{
-    internal_done_errcode = cmd->result;
-    ++internal_done_flag;
-}
-
-int eata_command(Scsi_Cmnd * cmd)
-{
-
-    DBG(DBG_COM, printk("eata_command: calling eata_queue\n"));
-
-    eata_queue(cmd, (void *)internal_done);
-
-    while (!internal_done_flag);
-    internal_done_flag = 0;
-    return (internal_done_errcode);
-}
 
 int eata_abort(Scsi_Cmnd * cmd)
 {
     ulong flags;
-    uint loop = R_LIMIT;
+    ulong loop = R_LIMIT;
 
     save_flags(flags);
     cli();
 
-    DBG(DBG_ABNORM, printk("eata_abort called pid: %ld target: %x lun: %x reason %x\n",
-			   cmd->pid, cmd->target, cmd->lun, cmd->abort_reason));
+    DBG(DBG_ABNORM, printk("eata_abort called pid: %ld target: %x lun: %x"
+			   " reason %x\n", cmd->pid, cmd->target, cmd->lun, 
+			   cmd->abort_reason));
     DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 
-
-    while (inb((uint)(cmd->host->base) + HA_RAUXSTAT) & HA_ABUSY)
-        if (--loop == 0) {
+    
+    
+    while (inb((u32)(cmd->host->base) + HA_RAUXSTAT) & HA_ABUSY)
+	if (--loop == 0) {
 	    printk("eata_dma: abort, timeout error.\n");
 	    restore_flags(flags);
 	    DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
 	    return (SCSI_ABORT_ERROR);
 	}
+    if (CD(cmd)->status == USED) {
+	DBG(DBG_ABNORM, printk("Returning: SCSI_ABORT_BUSY\n"));
+	restore_flags(flags);
+	return (SCSI_ABORT_BUSY);  /* SNOOZE */ 
+    }
     if (CD(cmd)->status == FREE) {
-        DBG(DBG_ABNORM, printk("Returning: SCSI_ABORT_NOT_RUNNING\n")); 
+	DBG(DBG_ABNORM, printk("Returning: SCSI_ABORT_NOT_RUNNING\n")); 
 	restore_flags(flags);
 	return (SCSI_ABORT_NOT_RUNNING);
     }
-    if (CD(cmd)->status == USED) {
-        DBG(DBG_ABNORM, printk("Returning: SCSI_ABORT_BUSY\n"));
- 	restore_flags(flags);
-	return (SCSI_ABORT_BUSY);  /* SNOOZE */ 
-    }
     if (CD(cmd)->status == RESET) {
 	restore_flags(flags);
-        printk("eata_dma: abort, command reset error.\n");
+	printk("eata_dma: abort, command reset error.\n");
 	DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 	return (SCSI_ABORT_ERROR);
+	return (SCSI_ABORT_ERROR);
     }
     if (CD(cmd)->status == LOCKED) {
 	restore_flags(flags);
-        DBG(DBG_ABNORM, printk("eata_dma: abort, queue slot locked.\n"));
-        DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 	return (SCSI_ABORT_NOT_RUNNING);
+	DBG(DBG_ABNORM, printk("eata_dma: abort, queue slot locked.\n"));
+	DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
+	return (SCSI_ABORT_NOT_RUNNING);
     } else
 	panic("eata_dma: abort: invalid slot status\n");
 }
 
 int eata_reset(Scsi_Cmnd * cmd)
 {
-    uint x, z, time, limit = 0;
-    uint loop = R_LIMIT;
+    ushort x, z; 
+    ulong time, limit = 0;
+    ulong loop = R_LIMIT;
     ulong flags;
     unchar success = FALSE;
     Scsi_Cmnd *sp; 
-
+    
     save_flags(flags);
     cli();
-
-    DBG(DBG_ABNORM, printk("eata_reset called pid:%ld target: %x lun: %x reason %x\n",
-			   cmd->pid, cmd->target, cmd->lun, cmd->abort_reason));
-
-
+    
+    DBG(DBG_ABNORM, printk("eata_reset called pid:%ld target: %x lun: %x"
+			   " reason %x\n", cmd->pid, cmd->target, cmd->lun, 
+			   cmd->abort_reason));
+	
     if (HD(cmd)->state == RESET) {
 	printk("eata_reset: exit, already in reset.\n");
 	restore_flags(flags);
-        DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 	return (SCSI_RESET_ERROR);
+	DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
+	return (SCSI_RESET_ERROR);
     }
-
-    while (inb((uint)(cmd->host->base) + HA_RAUXSTAT) & HA_ABUSY)
-        if (--loop == 0) {
- 	    printk("eata_reset: exit, timeout error.\n");
+    
+    while (inb((u32)(cmd->host->base) + HA_RAUXSTAT) & HA_ABUSY)
+	if (--loop == 0) {
+	    printk("eata_reset: exit, timeout error.\n");
 	    restore_flags(flags);
 	    DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
 	    return (SCSI_RESET_ERROR);
 	}
-    for (z = 0; z < MAXTARGET; z++) {
-	HD(cmd)->t_state[z] = RESET;
-	HD(cmd)->t_timeout[z] = FALSE;
+ 
+    for (x = 0; x < MAXCHANNEL; x++) {
+	for (z = 0; z < MAXTARGET; z++) {
+	    HD(cmd)->t_state[x][z] = RESET;
+	    HD(cmd)->t_timeout[x][z] = NO_TIMEOUT;
+	}
     }
 
     for (x = 0; x < cmd->host->can_queue; x++) {
-
 	if (HD(cmd)->ccb[x].status == FREE)
 	    continue;
-
+	
 	if (HD(cmd)->ccb[x].status == LOCKED) {
 	    HD(cmd)->ccb[x].status = FREE;
 	    printk("eata_reset: locked slot %d forced free.\n", x);
 	    DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 	    continue;
+	    continue;
 	}
 	sp = HD(cmd)->ccb[x].cmd;
 	HD(cmd)->ccb[x].status = RESET;
 	printk("eata_reset: slot %d in reset, pid %ld.\n", x, sp->pid);
-        DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 
+	DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
+	
 	if (sp == NULL)
 	    panic("eata_reset: slot %d, sp==NULL.\n", x);
-            DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 
+	DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
+	
 	if (sp == cmd)
 	    success = TRUE;
     }
-
+    
     /* hard reset the HBA  */
-    inb((uint) (cmd->host->base) + HA_RSTATUS);  /* This might cause trouble */
-    eata_send_command(0, (uint) cmd->host->base, EATA_CMD_RESET);
-
+    inb((u32) (cmd->host->base) + HA_RSTATUS);  /* This might cause trouble */
+    eata_send_command(0, (u32) cmd->host->base, EATA_CMD_RESET);
+    
     DBG(DBG_ABNORM, printk("eata_reset: board reset done, enabling interrupts.\n"));
     HD(cmd)->state = RESET;
-
+    
     restore_flags(flags);
-
+    
     time = jiffies;
-    while (jiffies < (time + 300) && limit++ < 10000000);
-
+    while (jiffies < (time + 300) && limit++ < 10000000)
+	/* nothing */;
+    
     save_flags(flags);
     cli();
-
-    DBG(DBG_ABNORM, printk("eata_reset: interrupts disabled, loops %d.\n", limit));
+    
+    DBG(DBG_ABNORM, printk("eata_reset: interrupts disabled, loops %ld.\n", 
+			   limit));
     DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 
+    
     for (x = 0; x < cmd->host->can_queue; x++) {
-
+	
 	/* Skip slots already set free by interrupt */
 	if (HD(cmd)->ccb[x].status != RESET)
 	    continue;
-
+	
 	sp = HD(cmd)->ccb[x].cmd;
 	sp->result = DID_RESET << 16;
-
+	
 	/* This mailbox is still waiting for its interrupt */
 	HD(cmd)->ccb[x].status = LOCKED;
-
+	
 	printk("eata_reset: slot %d locked, DID_RESET, pid %ld done.\n",
-	    x, sp->pid);
-        DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
+	       x, sp->pid);
+	DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
 	restore_flags(flags);
 	sp->scsi_done(sp);
 	cli();
     }
-
+    
     HD(cmd)->state = FALSE;
     restore_flags(flags);
-
+    
     if (success) {
 	DBG(DBG_ABNORM, printk("eata_reset: exit, success.\n"));
-        DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 	return (SCSI_RESET_SUCCESS);
+	DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
+	return (SCSI_RESET_SUCCESS);
     } else {
 	DBG(DBG_ABNORM, printk("eata_reset: exit, wakeup.\n"));
-        DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
- 	return (SCSI_RESET_PUNT);
+	DBG(DBG_ABNORM && DBG_DELAY, DEL2(500));
+	return (SCSI_RESET_PUNT);
     }
 }
 
-char * get_board_data(ulong base, uint irq, uint id)
+char * get_board_data(u32 base, u32 irq, u32 id)
 {
-    struct eata_ccb cp;
-    struct eata_sp  sp;
+    struct eata_ccb *cp;
+    struct eata_sp  *sp;
     static char *buff;
-    u32 i;
+    ulong i;
+    ulong limit = 0;
 
-    buff = dma_scratch;
+    cp = (struct eata_ccb *) scsi_init_malloc(sizeof(struct eata_ccb),
+					      GFP_ATOMIC | GFP_DMA);
+    sp = (struct eata_sp *) scsi_init_malloc(sizeof(struct eata_sp), 
+					     GFP_ATOMIC | GFP_DMA);
 
-    memset(&cp, 0, sizeof(struct eata_ccb));
-    memset(&sp, 0, sizeof(struct eata_sp));
+    buff = dma_scratch;
+ 
+    memset(cp, 0, sizeof(struct eata_ccb));
+    memset(sp, 0, sizeof(struct eata_sp));
     memset(buff, 0, 256);
 
-    cp.DataIn = TRUE;     
-    cp.Interpret = TRUE;   /* Interpret command */
+    cp->DataIn = TRUE;     
+    cp->Interpret = TRUE;   /* Interpret command */
  
-    cp.cp_datalen = htonl(255);  
-    cp.cp_dataDMA = htonl((s32)buff);
-    cp.cp_viraddr = &cp;
-
-    cp.cp_id = id;
-    cp.cp_lun = 0;
-
-    cp.cp_cdb[0] = INQUIRY;
-    cp.cp_cdb[1] = 0;
-    cp.cp_cdb[2] = 0;
-    cp.cp_cdb[3] = 0;
-    cp.cp_cdb[4] = 255;
-    cp.cp_cdb[5] = 0;
+    cp->cp_datalen = htonl(255);  
+    cp->cp_dataDMA = htonl((s32)buff);
+    cp->cp_viraddr = cp;
+    
+    cp->cp_id = id;
+    cp->cp_lun = 0;
 
-    cp.cp_statDMA = htonl((ulong) &sp);
+    cp->cp_cdb[0] = INQUIRY;
+    cp->cp_cdb[1] = 0;
+    cp->cp_cdb[2] = 0;
+    cp->cp_cdb[3] = 0;
+    cp->cp_cdb[4] = 255;
+    cp->cp_cdb[5] = 0;
+
+    cp->cp_statDMA = htonl((ulong) sp);
 
     fake_int_base = base;
     fake_int_result = 0;
 
-    eata_send_command((u32) &cp, (u32) base, EATA_CMD_DMA_SEND_CP);
+    eata_send_command((u32) cp, (u32) base, EATA_CMD_DMA_SEND_CP);
     
     i = jiffies + 300;
-    while (!fake_int_result && jiffies <= i) 
-        /* nothing */;
+    while (fake_int_result == FALSE && jiffies <= i) 
+	barrier();
     
-    DBG(DBG_INTR3, printk("fake_int_result: %#lx hbastat %#lx scsistat %#lx,"
+    DBG(DBG_INTR3, printk("fake_int_result: %#x hbastat %#x scsistat %#x,"
 			  " buff %p sp %p\n",
-                          fake_int_result, (u32) (sp.hba_stat & 0x7f), 
-			  (u32) sp.scsi_stat, buff, &sp));
+			  fake_int_result, (u32) (sp->hba_stat & 0x7f), 
+			  (u32) sp->scsi_stat, buff, sp));
+
+    scsi_init_free((void *)cp, sizeof(struct eata_ccb));
+    scsi_init_free((void *)sp, sizeof(struct eata_sp));
     
-    if (jiffies > i || (fake_int_result & 1))
-        return (NULL);
-    else
-        return (buff);
+    if ((fake_int_result & HA_SERROR) || jiffies > i){
+	/* hard reset the HBA  */
+	inb((u32) (base) + HA_RSTATUS);
+	eata_send_command(0, base, EATA_CMD_RESET);
+	i = jiffies;
+	while (jiffies < (i + 300) && limit++ < 10000000)
+	    barrier();
+	return (NULL);
+    } else
+	return (buff);
 }
     
 int check_blink_state(long base)
 {
-    uint loops = 10;
-    ulong blinkindicator = 0x42445054;
-    ulong state = 0x12345678;
-    ulong oldstate = 0;
+    ushort loops = 10;
+    u32 blinkindicator;
+    u32 state = 0x12345678;
+    u32 oldstate = 0;
 
+    blinkindicator = htonl(0x54504442);
     while ((loops--) && (state != oldstate)) {
 	oldstate = state;
 	state = inl((uint) base + 1);
     }
 
     DBG(DBG_BLINK, printk("Did Blink check. Status: %d\n",
-			  (state == oldstate) && (state == blinkindicator)));
+	      (state == oldstate) && (state == blinkindicator)));
 
     if ((state == oldstate) && (state == blinkindicator))
-        return(TRUE);
+	return(TRUE);
     else
-        return (FALSE);
+	return (FALSE);
 }
 
-int get_conf_PIO(struct eata_register *base, struct get_conf *buf)
+int get_conf_PIO(u32 base, struct get_conf *buf)
 {
     ulong loop = R_LIMIT;
-    ushort *p;
+    u16 *p;
 
-    u8  warning = FALSE;
-    
-    if(check_region((int) base, 9)) {
-        if ((int)base == 0x1f0 || (int)base == 0x170) {
-            warning = 1;
-        } else
-        return (FALSE);
-    }
- 
+    if(check_region(base, 9)) 
+	return (FALSE);
+     
     memset(buf, 0, sizeof(struct get_conf));
 
-    while (inb((uint) base + HA_RSTATUS) & HA_SBUSY)
+    while (inb(base + HA_RSTATUS) & HA_SBUSY)
 	if (--loop == 0) 
 	    return (FALSE);
        
-    DBG(DBG_PIO && DBG_PROBE,printk("Issuing PIO READ CONFIG to HBA at %lx\n", 
-				   (long)base));
-    eata_send_command(0, (uint) base, EATA_CMD_PIO_READ_CONFIG);
+    DBG(DBG_PIO && DBG_PROBE,
+	printk("Issuing PIO READ CONFIG to HBA at %#x\n", base));
+    eata_send_command(0, base, EATA_CMD_PIO_READ_CONFIG);
+
     loop = R_LIMIT;
-    for (p = (ushort *) buf; 
-         (long)p <= ((long)buf + (sizeof(struct get_conf)/ 2)); p++) {
-        while (!(inb((uint) base + HA_RSTATUS) & HA_SDRQ))
+    for (p = (u16 *) buf; 
+	 (long)p <= ((long)buf + (sizeof(struct get_conf) / 2)); p++) {
+	while (!(inb(base + HA_RSTATUS) & HA_SDRQ))
 	    if (--loop == 0)
- 		return (FALSE);
+		return (FALSE);
+
 	loop = R_LIMIT;
-	*p = inw((uint) base + HA_RDATA);
+	*p = inw(base + HA_RDATA);
     }
-    if (!(inb((uint) base + HA_RSTATUS) & HA_SERROR)) {	        /* Error ? */
-        DBG(DBG_PIO&&DBG_PROBE, printk("\nSignature: %c%c%c%c\n", 
-			      (char)buf->sig[0], (char)buf->sig[1], 
-			      (char)buf->sig[2], (char)buf->sig[3]));
 
-	if ((buf->sig[0] == 'E') && (buf->sig[1] == 'A')
-	    && (buf->sig[2] == 'T') && (buf->sig[3] == 'A')) {
+    if (!(inb(base + HA_RSTATUS) & HA_SERROR)) {            /* Error ? */
+	if (htonl(EATA_SIGNATURE) == buf->signature) {
 	    DBG(DBG_PIO&&DBG_PROBE, printk("EATA Controller found at %x "
-		      "EATA Level: %x\n", (uint) base, (uint) (buf->version)));
-	
-	    while (inb((uint) base + HA_RSTATUS) & HA_SDRQ) 
-	        inw((uint) base + HA_RDATA);
-            if (warning == TRUE)
-                printk("Warning: HBA with IO on 0x%p detected,\n"
-                       "         this IO space is already allocated, probably by the IDE driver.\n"
-                       "         This might lead to problems.", base);
- 	    return (TRUE);
+					   "EATA Level: %x\n", (uint) base, 
+					   (uint) (buf->version)));
+	    
+	    while (inb(base + HA_RSTATUS) & HA_SDRQ) 
+		inw(base + HA_RDATA);
+	    return (TRUE);
 	} 
     } else {
-        DBG(DBG_PROBE, printk("eata_dma: get_conf_PIO, error during transfer "
-			      "for HBA at %lx\n", (long)base));
+	DBG(DBG_PROBE, printk("eata_dma: get_conf_PIO, error during transfer "
+		  "for HBA at %lx\n", (long)base));
     }
     return (FALSE);
 }
@@ -726,127 +755,146 @@
 {
     printk("Please check values: (read config data)\n");
     printk("LEN: %d ver:%d OCS:%d TAR:%d TRNXFR:%d MORES:%d DMAS:%d\n",
-	(uint) ntohl(gc->len), gc->version,
-	gc->OCS_enabled, gc->TAR_support, gc->TRNXFR, gc->MORE_support,
-	gc->DMA_support);
+	   (u32) ntohl(gc->len), gc->version,
+	   gc->OCS_enabled, gc->TAR_support, gc->TRNXFR, gc->MORE_support,
+	   gc->DMA_support);
     printk("DMAV:%d HAAV:%d SCSIID0:%d ID1:%d ID2:%d QUEUE:%d SG:%d SEC:%d\n",
-	gc->DMA_valid, gc->HAA_valid, gc->scsi_id[3], gc->scsi_id[2],
-	gc->scsi_id[1], ntohs(gc->queuesiz), ntohs(gc->SGsiz), gc->SECOND);
-    printk("IRQ:%d IRQT:%d DMAC:%d FORCADR:%d MCH:%d RIDQ:%d PCI:%d EISA:%d\n",
-	gc->IRQ, gc->IRQ_TR, (8 - gc->DMA_channel) & 7, gc->FORCADR, 
-	gc->MAX_CHAN, gc->ID_qest, gc->is_PCI, gc->is_EISA);
+	   gc->DMA_valid, gc->HAA_valid, gc->scsi_id[3], gc->scsi_id[2],
+	   gc->scsi_id[1], ntohs(gc->queuesiz), ntohs(gc->SGsiz), gc->SECOND);
+    printk("IRQ:%d IRQT:%d DMAC:%d FORCADR:%d SG_64K:%d SG_UAE:%d MID:%d "
+	   "MCH:%d MLUN:%d\n",
+	   gc->IRQ, gc->IRQ_TR, (8 - gc->DMA_channel) & 7, gc->FORCADR, 
+	   gc->SG_64K, gc->SG_UAE, gc->MAX_ID, gc->MAX_CHAN, gc->MAX_LUN); 
+    printk("RIDQ:%d PCI:%d EISA:%d\n",
+	   gc->ID_qest, gc->is_PCI, gc->is_EISA);
     DBG(DPT_DEBUG, DELAY(1400));
 }
 
-int register_HBA(long base, struct get_conf *gc, Scsi_Host_Template * tpnt)
+short register_HBA(u32 base, struct get_conf *gc, Scsi_Host_Template * tpnt, 
+		   u8 bustype)
 {
     ulong size = 0;
     unchar dma_channel = 0;
-    char *buff;
-    uint i;
+    char *buff = 0;
+    unchar bugs = 0;
     struct Scsi_Host *sh;
     hostdata *hd;
     
+    
     DBG(DBG_REGISTER, print_config(gc));
 
-    if(gc->HAA_valid == FALSE || ntohl(gc->len) < 0x22) 
-        gc->MAX_CHAN = 0;
+    if (gc->DMA_support == FALSE) {
+	printk("The EATA HBA at %#.4x does not support DMA.\n" 
+	       "Please use the EATA-PIO driver.\n", base);
+	return (FALSE);
+    }
 
-    if (!reg_IRQ[gc->IRQ]) {	/* Interrupt already registered ? */
-        if (!request_irq(gc->IRQ, (void *) eata_fake_int_handler, SA_INTERRUPT, "eata_dma")){
-	    reg_IRQ[gc->IRQ] += (gc->MAX_CHAN+1);
+    if(gc->HAA_valid == FALSE || ntohl(gc->len) < 0x22) 
+	gc->MAX_CHAN = 0;
+    
+    if (reg_IRQ[gc->IRQ] == FALSE) {    /* Interrupt already registered ? */
+	if (!request_irq(gc->IRQ, (void *) eata_fake_int_handler, SA_INTERRUPT,
+			 "eata_dma")){
+	    reg_IRQ[gc->IRQ]++;
 	    if (!gc->IRQ_TR)
-		reg_IRQL[gc->IRQ] = TRUE;	/* IRQ is edge triggered */
+		reg_IRQL[gc->IRQ] = TRUE;   /* IRQ is edge triggered */
 	} else {
 	    printk("Couldn't allocate IRQ %d, Sorry.", gc->IRQ);
 	    return (FALSE);
 	}
-    } else {			/* More than one HBA on this IRQ */
+    } else {            /* More than one HBA on this IRQ */
 	if (reg_IRQL[gc->IRQ] == TRUE) {
 	    printk("Can't support more than one HBA on this IRQ,\n"
 		   "  if the IRQ is edge triggered. Sorry.\n");
 	    return (FALSE);
 	} else
-	    reg_IRQ[gc->IRQ] += (gc->MAX_CHAN+1);
+	    reg_IRQ[gc->IRQ]++;
     }
-
+    
     /* if gc->DMA_valid it must be an ISA HBA and we have to register it */
     dma_channel = 0xff;
     if (gc->DMA_valid) {
-        if (request_dma(dma_channel = (8 - gc->DMA_channel) & 7, "eata_dma")) {
-            printk("Unable to allocate DMA channel %d for ISA HBA at %#.4lx.\n",
-                   dma_channel, base);
-            reg_IRQ[gc->IRQ] -= (gc->MAX_CHAN+1);
-            if (reg_IRQ[gc->IRQ] == 0)
-                free_irq(gc->IRQ);
-            if (!gc->IRQ_TR)
-                reg_IRQL[gc->IRQ] = FALSE; 
-            return (FALSE);
-        }
-    } 
-    
-    buff = get_board_data(base, gc->IRQ, gc->scsi_id[3]);
+	if (request_dma(dma_channel = (8 - gc->DMA_channel) & 7, "eata_dma")) {
+	    printk("Unable to allocate DMA channel %d for ISA HBA at %#.4x.\n",
+		   dma_channel, base);
+	    reg_IRQ[gc->IRQ]--;
+	    if (reg_IRQ[gc->IRQ] == 0)
+		free_irq(gc->IRQ);
+	    if (gc->IRQ_TR == FALSE)
+		reg_IRQL[gc->IRQ] = FALSE; 
+	    return (FALSE);
+	}
+    }
+ 
+    if (bustype != IS_EISA)
+	buff = get_board_data(base, gc->IRQ, gc->scsi_id[3]);
 
     if (buff == NULL) {
-        if (gc->DMA_support == FALSE)
-            printk("HBA at %#.4lx doesn't support DMA. Sorry\n", base);
-        else
-            printk("HBA at %#.4lx didn't react on INQUIRY. Sorry.\n", base);
-        if (gc->DMA_valid) 
-            free_dma(dma_channel);
-        reg_IRQ[gc->IRQ] -= (gc->MAX_CHAN+1);
-        if (reg_IRQ[gc->IRQ] == 0)
-            free_irq(gc->IRQ);
-        if (!gc->IRQ_TR)
-            reg_IRQL[gc->IRQ] = FALSE; 
-        return (FALSE);
+	if (bustype == IS_EISA) {
+	    bugs = bugs || BROKEN_INQUIRY;
+	} else {
+	    if (gc->DMA_support == FALSE)
+		printk("HBA at %#.4x doesn't support DMA. Sorry\n", base);
+	    else
+		printk("HBA at %#.4x does not react on INQUIRY. Sorry.\n", 
+		       base);
+	    if (gc->DMA_valid) 
+		free_dma(dma_channel);
+	    reg_IRQ[gc->IRQ]--;
+	    if (reg_IRQ[gc->IRQ] == 0)
+		free_irq(gc->IRQ);
+	    if (gc->IRQ_TR == FALSE)
+		reg_IRQL[gc->IRQ] = FALSE; 
+	    return (FALSE);
+	}
     }
     
     if (gc->DMA_support == FALSE && buff != NULL)  
-        printk("HBA %.12sat %#.4lx doesn't set the DMA_support flag correctly.\n",
-               &buff[16], base);
+	printk("HBA %.12sat %#.4x doesn't set the DMA_support flag correctly.\n",
+	       &buff[16], base);
     
     request_region(base, 9, "eata_dma"); /* We already checked the 
-                                          * availability, so this could 
-                                          * only fail if we're on 
-					  * 0x1f0 or 0x170.
-                                          */
-
+					  * availability, so this
+					  * should not fail.
+					  */
+    
     if(ntohs(gc->queuesiz) == 0) {
-        gc->queuesiz = ntohs(64);
-	    printk("Warning: Queue size had to be corrected.\n"
-		   "This might be a PM2012 with a defective Firmware\n");
+	gc->queuesiz = ntohs(64);
+	printk("Warning: Queue size has to be corrected. Assuming 64 queueslots\n"
+	       "         This might be a PM2012B with a defective Firmware\n");
     }
 
-    size = sizeof(hostdata) + ((sizeof(struct eata_ccb) * ntohs(gc->queuesiz))/
-			       (gc->MAX_CHAN + 1));
+    size = sizeof(hostdata) + ((sizeof(struct eata_ccb) + sizeof(long)) 
+			       * ntohs(gc->queuesiz));
 
-    if (gc->MAX_CHAN) {
-	printk("This is a multichannel HBA. Linux doesn't support them,\n");
-	printk("so we'll try to register every channel as a virtual HBA.\n");
+    DBG(DBG_REGISTER, printk("scsi_register size: %ld\n", size));
+    
+    sh = scsi_register(tpnt, size);
+    
+    if(sh == NULL) {
+	if (gc->DMA_valid) 
+	    free_dma(dma_channel);
+	
+	reg_IRQ[gc->IRQ]--;
+	if (reg_IRQ[gc->IRQ] == 0)
+	    free_irq(gc->IRQ);
+	if (gc->IRQ_TR == FALSE)
+	    reg_IRQL[gc->IRQ] = FALSE; 
+	return (FALSE);
     }
     
-    for (i = 0; i <= gc->MAX_CHAN; i++) {
-
-	sh = scsi_register(tpnt, size);
-
-	if(sh == NULL) {
-	    if (gc->DMA_valid) 
-	        free_dma(dma_channel);
-	    reg_IRQ[gc->IRQ] -= 1;
-	    if (reg_IRQ[gc->IRQ] == 0)
-	        free_irq(gc->IRQ);
-	    if (!gc->IRQ_TR)
-	        reg_IRQL[gc->IRQ] = FALSE; 
-	    return (FALSE);
-	}
+    hd = SD(sh);                   
+    
+    memset(hd->ccb, 0, sizeof(struct eata_ccb) * ntohs(gc->queuesiz));
+    memset(hd->reads, 0, sizeof(u32) * 26); 
 
-	hd = SD(sh);                   
+    hd->broken_INQUIRY = (bugs & BROKEN_INQUIRY);
 
-	memset(hd->ccb, 0, (sizeof(struct eata_ccb) * ntohs(gc->queuesiz)) / 
-	       (gc->MAX_CHAN + 1));
-        memset(hd->reads, 0, sizeof(ulong) * 26); 
- 
+    if(hd->broken_INQUIRY == TRUE) {
+	strcpy(SD(sh)->vendor, "DPT");
+	strcpy(SD(sh)->name, "??????????");
+	strcpy(SD(sh)->revision, "???.?");
+    } else {    
 	strncpy(SD(sh)->vendor, &buff[8], 8);
 	SD(sh)->vendor[8] = 0;
 	strncpy(SD(sh)->name, &buff[16], 17);
@@ -857,130 +905,153 @@
 	SD(sh)->revision[3] = '.';
 	SD(sh)->revision[4] = buff[35];
 	SD(sh)->revision[5] = 0;
-	switch (ntohl(gc->len)) {
-	case 0x1c:
-	    SD(sh)->EATA_revision = 'a';
-	    break;
-	case 0x1e:
-	    SD(sh)->EATA_revision = 'b';
-	    break;
-	case 0x22:
-	    SD(sh)->EATA_revision = 'c';
-	    break;
-	default:
-	    SD(sh)->EATA_revision = '?';
- 	}
-	sh->base = (char *) base;
-	sh->io_port = (ushort) base;
-	sh->n_io_port = 9;
- 	sh->irq = gc->IRQ;
-	sh->dma_channel = dma_channel;
-	sh->this_id = gc->scsi_id[3 - i];
-	sh->can_queue = ntohs(gc->queuesiz) / (gc->MAX_CHAN + 1);
-
-	if (gc->OCS_enabled == TRUE) {
-	    sh->cmd_per_lun = sh->can_queue/C_P_L_DIV; 
-#if 0   /* The memory management seems to be more stable now */
-	    if (sh->cmd_per_lun > C_P_L_CURRENT_MAX)
-	        sh->cmd_per_lun = C_P_L_CURRENT_MAX;
-#endif
-	} else {
-	    sh->cmd_per_lun = 1;
-	}
-	sh->sg_tablesize = ntohs(gc->SGsiz);
-	if (sh->sg_tablesize > SG_SIZE || sh->sg_tablesize == 0) {
-	    sh->sg_tablesize = SG_SIZE;
-	    if (ntohs(gc->SGsiz) == 0)
-	        printk("Warning: SG size had to be corrected.\n"
-		       "This might be a PM2012 with a defective Firmware\n");
-	}
+    }
 
-	hd->channel = i;
+    switch (ntohl(gc->len)) {
+    case 0x1c:
+	SD(sh)->EATA_revision = 'a';
+	break;
+    case 0x1e:
+	SD(sh)->EATA_revision = 'b';
+	break;
+    case 0x22:
+	SD(sh)->EATA_revision = 'c';
+	break;
+    case 0x24:
+	SD(sh)->EATA_revision = 'z';            
+    default:
+	SD(sh)->EATA_revision = '?';
+    }
 
+    if(ntohl(gc->len) >= 0x22) {
+	if (gc->is_PCI == TRUE)
+	    hd->bustype = IS_PCI;
+	else if (gc->is_EISA == TRUE)
+	    hd->bustype = IS_EISA;
+	else
+	    hd->bustype = IS_ISA;
+    } else if(hd->broken_INQUIRY == FALSE) {
 	if (buff[21] == '4')
-	    hd->bustype = 'P';
+	    hd->bustype = IS_PCI;
 	else if (buff[21] == '2')
-	    hd->bustype = 'E';
+	    hd->bustype = IS_EISA;
 	else
-	    hd->bustype = 'I';
+	    hd->bustype = IS_ISA;
+    } else 
+	hd->bustype = bustype;
+    
+    if(ntohl(gc->len) >= 0x22) {
+	sh->max_id = gc->MAX_ID;
+	sh->max_lun = gc->MAX_LUN;
+    } else {
+	sh->max_id = 8;
+	sh->max_lun = 8;
+    }
 
-	if (gc->SECOND)
-	    hd->primary = FALSE;
+    hd->channel = gc->MAX_CHAN;     
+    sh->max_channel = gc->MAX_CHAN; 
+    sh->base = (char *) base;
+    sh->io_port = (u16) base;
+    sh->n_io_port = 9;
+    sh->irq = gc->IRQ;
+    sh->dma_channel = dma_channel;
+    
+    /* FIXME:
+     * SCSI midlevel code should support different HBA ids on every channel
+     */
+    sh->this_id = gc->scsi_id[3];
+    sh->can_queue = ntohs(gc->queuesiz);
+    
+    if (gc->OCS_enabled == TRUE) 
+	if(hd->bustype != IS_ISA)
+	    sh->cmd_per_lun = sh->can_queue/C_P_L_DIV; 
 	else
-	    hd->primary = TRUE;
-
-	if (hd->bustype != 'I') {
-	    sh->unchecked_isa_dma = FALSE;
-	    sh->wish_block = FALSE;        
-	}
-	else {
-	    sh->unchecked_isa_dma = TRUE;   /* We're doing ISA DMA */
-	    sh->wish_block = TRUE;          /* This will reduce performance */
-	}
-	if((hd->primary == TRUE) && (i == 0) && HARDCODED){                  
-	  geometry.drv[0].heads = HEADS0;          
-	  geometry.drv[0].sectors = SECTORS0;      
-	  geometry.drv[0].cylinder = CYLINDER0;
-	  geometry.drv[0].id = ID0;
-	  geometry.drv[0].trans = TRUE;
-	  geometry.drv[1].heads = HEADS1;
-	  geometry.drv[1].sectors = SECTORS1;
-	  geometry.drv[1].cylinder = CYLINDER1;
-	  geometry.drv[1].id = ID1;
-	  geometry.drv[1].trans = TRUE;
-	} else {
-	  geometry.drv[0].id=-1;
-	  geometry.drv[1].id=-1;
+	    sh->cmd_per_lun = 8;
+    else 
+	sh->cmd_per_lun = 1;
+    
+    /* FIXME:
+     * SG should be allocated more dynamically 
+     */
+    /*
+     * If we are using a ISA board, we can't use extended SG,
+     * because we would need exessive amounts of memory for
+     * bounce buffers.
+     */
+    if (gc->SG_64K == TRUE && ntohs(gc->SGsiz) == 64 && hd->bustype != IS_ISA){
+	sh->sg_tablesize = SG_SIZE_BIG;
+	sh->use_clustering = FALSE;
+    } else {
+	sh->sg_tablesize = ntohs(gc->SGsiz);
+	sh->use_clustering = TRUE;
+	if (sh->sg_tablesize > SG_SIZE || sh->sg_tablesize == 0) {
+	    sh->sg_tablesize = SG_SIZE;
+	    if (ntohs(gc->SGsiz) == 0)
+		printk("Warning: SG size had to be corrected.\n"
+		       "This might be a PM2012 with a defective Firmware\n");
 	}
-
-	hd->next = NULL;	/* build a linked list of all HBAs */
-	hd->prev = last_HBA;
-	if(hd->prev != NULL)
-	    SD(hd->prev)->next = sh;
-	last_HBA = sh;
-	if (first_HBA == NULL)
-	    first_HBA = sh;
-	registered_HBAs++;
     }
-    return (1);
+    
+    if (gc->SECOND)
+	hd->primary = FALSE;
+    else
+	hd->primary = TRUE;
+    
+    sh->wish_block = FALSE;        
+    
+    if (hd->bustype != IS_ISA) {
+	sh->unchecked_isa_dma = FALSE;
+    } else {
+	sh->unchecked_isa_dma = TRUE;   /* We're doing ISA DMA */
+    }
+    
+    hd->next = NULL;    /* build a linked list of all HBAs */
+    hd->prev = last_HBA;
+    if(hd->prev != NULL)
+	SD(hd->prev)->next = sh;
+    last_HBA = sh;
+    if (first_HBA == NULL)
+	first_HBA = sh;
+    registered_HBAs++;
+    
+    return (TRUE);
 }
 
 
-long find_EISA(struct get_conf *buf)
+void find_EISA(struct get_conf *buf, Scsi_Host_Template * tpnt)
 {
-    struct eata_register *base;
+    u32 base;
     int i;
-
+    
 #if CHECKPAL
-    unsigned char pal1, pal2, pal3, *p;
+    u8 pal1, pal2, pal3;
 #endif
-
+    
     for (i = 0; i < MAXEISA; i++) {
-	if (EISAbases[i] == TRUE) {	/* Still a possibility ?          */
-
-	    base = (void *)0x1c88 + (i * 0x1000);
+	if (EISAbases[i] == TRUE) { /* Still a possibility ?          */
+	    
+	    base = 0x1c88 + (i * 0x1000);
 #if CHECKPAL
-	    p = (char *)base;
-	    pal1 = *(p - 8);
-	    pal2 = *(p - 7);
-	    pal3 = *(p - 6);
-
+	    pal1 = inb((u16)base - 8);
+	    pal2 = inb((u16)base - 7);
+	    pal3 = inb((u16)base - 6);
+	    
 	    if (((pal1 == 0x12) && (pal2 == 0x14)) ||
 		((pal1 == 0x38) && (pal2 == 0xa3) && (pal3 == 0x82)) ||
 		((pal1 == 0x06) && (pal2 == 0x94) && (pal3 == 0x24))) {
 		DBG(DBG_PROBE, printk("EISA EATA id tags found: %x %x %x \n",
-			(int)pal1, (int)pal2, (int)pal3));
+				      (int)pal1, (int)pal2, (int)pal3));
 #endif
 		if (get_conf_PIO(base, buf) == TRUE) {
-		    DBG(DBG_PROBE&&DBG_EISA,print_config(buf));
-		    if (buf->IRQ) {          /* We'll check the 
-					      * primary/secondary stuff
-					      * later
-					      */
-			EISAbases[i] = 0;
-			return ((ulong)base);
-		    } 
-		    printk("No valid IRQ. HBA removed from list\n");
+		    DBG(DBG_PROBE && DBG_EISA, print_config(buf));
+		    if (buf->IRQ) {  
+			register_HBA(base, buf, tpnt, IS_EISA);
+		    } else
+			printk("eata_dma: No valid IRQ. HBA removed from list\n");
+		} else {
+		    if (check_blink_state(base)) 
+			printk("HBA is in BLINK state. Consult your HBAs "
+			       " Manual to correct this.\n");
 		} 
 		/* Nothing found here so we take it from the list */
 		EISAbases[i] = 0;  
@@ -989,25 +1060,26 @@
 #endif
 	}
     }
-    return (0l);		/* Nothing found  :-(             */
+    return; 
 }
 
-long find_ISA(struct get_conf *buf)
+void find_ISA(struct get_conf *buf, Scsi_Host_Template * tpnt)
 {
-    int l;
-    long ret;
-
-    for (l = 0; l < MAXISA; l++) {	
-        if (ISAbases[l]) {	
-	    if (get_conf_PIO((struct eata_register *)ISAbases[l],buf) == TRUE){
-	        ret = ISAbases[l];
-		ISAbases[l] = 0;
-		return (ret);
-	    } else
-	        ISAbases[l] = 0;
-        }
+    int i;
+    
+    for (i = 0; i < MAXISA; i++) {  
+	if (ISAbases[i]) {  
+	    if (get_conf_PIO(ISAbases[i],buf) == TRUE){
+		register_HBA(ISAbases[i], buf, tpnt, IS_ISA);
+	    } else {
+		if (check_blink_state(ISAbases[i])) 
+		    printk("HBA is in BLINK state. Consult your HBAs "
+			   "Manual to correct this.\n");
+	    }
+	    ISAbases[i] = 0;
+	}
     }
-    return ((long)NULL);
+    return;
 }
 
 void find_PCI(struct get_conf *buf, Scsi_Host_Template * tpnt)
@@ -1016,92 +1088,95 @@
 #ifndef CONFIG_PCI
     printk("Kernel PCI support not enabled. Skipping scan for PCI HBAs.\n");
 #else
-
-    unchar pci_bus, pci_device_fn;
-    static short pci_index = 0;	/* Device index to PCI BIOS calls */
-    ulong base = 0;
-    ushort com_adr;
-    ushort rev_device;
-    uint error, i, x;
+    
+    u8 pci_bus, pci_device_fn;
+    static s16 pci_index = 0;   /* Device index to PCI BIOS calls */
+    u32 base = 0;
+    u16 com_adr;
+    u16 rev_device;
+    u32 error, i, x;
 
     if (pcibios_present()) {
 	for (i = 0; i <= MAXPCI; ++i, ++pci_index) {
-
 	    if (pcibios_find_device(PCI_VENDOR_ID_DPT, PCI_DEVICE_ID_DPT, 
 				    pci_index, &pci_bus, &pci_device_fn))
 		break;
-	    DBG(DBG_PROBE && DBG_PCI, printk("eata_dma: HBA at bus %d, device %d,"
-				" function %d, index %d\n", (int)pci_bus, 
-				(int)((pci_device_fn & 0xf8) >> 3),
-				(int)(pci_device_fn & 7), pci_index));
-
+	    DBG(DBG_PROBE && DBG_PCI, 
+		printk("eata_dma: HBA at bus %d, device %d,"
+		       " function %d, index %d\n", (s32)pci_bus, 
+		       (s32)((pci_device_fn & 0xf8) >> 3),
+		       (s32)(pci_device_fn & 7), pci_index));
+	    
 	    if (!(error = pcibios_read_config_word(pci_bus, pci_device_fn, 
-					         PCI_CLASS_DEVICE, &rev_device))) {
-	        if (rev_device == PCI_CLASS_STORAGE_SCSI) {
+				       PCI_CLASS_DEVICE, &rev_device))) {
+		if (rev_device == PCI_CLASS_STORAGE_SCSI) {
 		    if (!(error = pcibios_read_config_word(pci_bus, 
-							   pci_device_fn, PCI_COMMAND, 
-							   (ushort *) & com_adr))) {
-		        if (!((com_adr & PCI_COMMAND_IO) && 
+					       pci_device_fn, PCI_COMMAND, 
+					       (u16 *) & com_adr))) {
+			if (!((com_adr & PCI_COMMAND_IO) && 
 			      (com_adr & PCI_COMMAND_MASTER))) {
 			    printk("HBA has IO or BUSMASTER mode disabled\n");
 			    continue;
 			}
 		    } else
-		        printk("error %x while reading PCI_COMMAND\n", error);
-	        } else
-		  printk("DEVICECLASSID %x didn't match\n", rev_device);
+			printk("eata_dma: error %x while reading "
+			       "PCI_COMMAND\n", error);
+		} else
+		    printk("DEVICECLASSID %x didn't match\n", rev_device);
 	    } else {
-	      printk("error %x while reading PCI_CLASS_BASE\n", error);
-	      continue;
+		printk("eata_dma: error %x while reading PCI_CLASS_BASE\n", 
+		       error);
+		continue;
 	    }
-
+	    
 	    if (!(error = pcibios_read_config_dword(pci_bus, pci_device_fn,
-						  PCI_BASE_ADDRESS_0, &base))){
-
-	        /* Check if the address is valid */
-	        if (base & 0x01) {
+				       PCI_BASE_ADDRESS_0, (int *) &base))){
+		
+		/* Check if the address is valid */
+		if (base & 0x01) {
 		    base &= 0xfffffffe;
-		                        /* EISA tag there ? */
+		    /* EISA tag there ? */
 		    if ((inb(base) == 0x12) && (inb(base + 1) == 0x14))
-		        continue;	/* Jep, it's forced, so move on  */
-		    base += 0x10;	/* Now, THIS is the real address */
+			continue;   /* Jep, it's forced, so move on  */
+		    base += 0x10;   /* Now, THIS is the real address */
 		    if (base != 0x1f8) {
-		        /* We didn't find it in the primary search */
-		        if (get_conf_PIO((struct eata_register *)base, buf)) {
-			    if (buf->FORCADR)	/* If the address is forced */
-			        continue;       /* we'll find it later      */
-
+			/* We didn't find it in the primary search */
+			if (get_conf_PIO(base, buf) == TRUE) {
+			    if (buf->FORCADR)   /* If the address is forced */
+				continue;       /* we'll find it later      */
+			    
 			    /* OK. We made it till here, so we can go now  
 			     * and register it. We  only have to check and 
 			     * eventually remove it from the EISA and ISA list 
 			     */
-
-			    register_HBA(base, buf, tpnt);
-
+			    
+			    register_HBA(base, buf, tpnt, IS_PCI);
+			    
 			    if (base < 0x1000) {
-			        for (x = 0; x < MAXISA; ++x) {
+				for (x = 0; x < MAXISA; ++x) {
 				    if (ISAbases[x] == base) {
-				        ISAbases[x] = 0;
+					ISAbases[x] = 0;
 					break;
 				    }
-			        }
+				}
 			    } else if ((base & 0x0fff) == 0x0c88) {
-			        x = (base >> 12) & 0x0f;
+				x = (base >> 12) & 0x0f;
 				EISAbases[x] = 0;
 			    }
-			    continue;  /*break;*/
-			} else if (check_blink_state(base)) {
-			    printk("HBA is in BLINK state. Consult your HBAs "
-				   " Manual to correct this.\n");
+			    continue;  /* break; */
+			} else if (check_blink_state(base) == TRUE) {
+			    printk("eata_dma: HBA is in BLINK state.\n"
+				   "Consult your HBAs Manual to correct this.\n");
 			}
 		    }
 		}
 	    } else
-	      printk("error %x while reading PCI_BASE_ADDRESS_0\n", error);
+		printk("eata_dma: error %x while reading "
+		       "PCI_BASE_ADDRESS_0\n", error);
 	}
     } else
-    printk("No BIOS32 extensions present. This release still depends on it."
-	     " Sorry.\n");
+	printk("No BIOS32 extensions present. This eata_dma release "
+	       "still depends on it.\nSkipping scan for PCI HBAs. Sorry.\n");
 #endif /* #ifndef CONFIG_PCI */
     return;
 }
@@ -1110,76 +1185,83 @@
 {
     struct Scsi_Host *HBA_ptr;
     struct get_conf gc;
-    ulong base = 0;
     int i;
- 
-    geometry.drv[0].trans = geometry.drv[1].trans = 0;
-
-    DBG((DBG_PROBE && DBG_DELAY)|| DPT_DEBUG,
+    
+    DBG((DBG_PROBE && DBG_DELAY) || DPT_DEBUG,
 	printk("Using lots of delays to let you read the debugging output\n"));
 
     status = scsi_init_malloc(512, GFP_ATOMIC | GFP_DMA);
     dma_scratch = scsi_init_malloc(512, GFP_ATOMIC | GFP_DMA);
 
     find_PCI(&gc, tpnt);
-
-    for (i = 0; i < MAXEISA; i++) {
-  	base = find_EISA(&gc);
-	if (base)
-	    register_HBA(base, &gc, tpnt);
-    }
-
-    for (i = 0; i <= MAXISA; i++) {
-	base = find_ISA(&gc);
-	if (base)
-	    register_HBA(base, &gc, tpnt);
-    }
-
+    
+    find_EISA(&gc, tpnt);
+    
+    find_ISA(&gc, tpnt);
+    
     for (i = 0; i <= MAXIRQ; i++)
 	if (reg_IRQ[i]){
 	    free_irq(i);
-	    request_irq(i, eata_int_handler, SA_INTERRUPT, "EATA-DMA");
+	    request_irq(i, (void *)(eata_int_handler), SA_INTERRUPT, "eata_dma");
 	}
-
+    
     HBA_ptr = first_HBA;
-
+    
     if (registered_HBAs != 0) {
-        printk("EATA (Extended Attachment) driver version: %d.%d%s\n"
+	printk("EATA (Extended Attachment) driver version: %d.%d%s\n"
 	       "developed in co-operation with DPT\n"             
-	       "(c) 1993-95 Michael Neuffer  neuffer@goofy.zdv.uni-mainz.de\n",
+	       "(c) 1993-95 Michael Neuffer, neuffer@goofy.zdv.uni-mainz.de\n",
 	       VER_MAJOR, VER_MINOR, VER_SUB);
-    printk("Registered HBAs:\n");
-    printk("HBA no. Boardtype: Revis: EATA: Bus: BaseIO: IRQ: DMA: Ch: ID: Pr: QS: SG: CPL:\n");
-    for (i = 1; i <= registered_HBAs; i++) {
-	    printk("scsi%-2d: %.10s v%s 2.0%c  %s %#.4lx   %2d",
-	       HBA_ptr->host_no, SD(HBA_ptr)->name, SD(HBA_ptr)->revision,
-	       SD(HBA_ptr)->EATA_revision, (SD(HBA_ptr)->bustype == 'P')? 
-	       "PCI ":(SD(HBA_ptr)->bustype == 'E')?"EISA":"ISA ",
-                   (u32) HBA_ptr->base, HBA_ptr->irq);
-            if(HBA_ptr->dma_channel != 0xff)
-	        printk("   %2x ", HBA_ptr->dma_channel);
-            else
-                printk("  %s", "BMST");
-            printk("  %d   %d   %c  %2d  %2d   %2d\n", SD(HBA_ptr)->channel, 
-                   HBA_ptr->this_id, (SD(HBA_ptr)->primary == TRUE)?'Y':'N', 
-	       HBA_ptr->can_queue, HBA_ptr->sg_tablesize, HBA_ptr->cmd_per_lun);
-        HBA_ptr = SD(HBA_ptr)->next;
+	printk("Registered HBAs:");
+	printk("\nHBA no. Boardtype: Revis: EATA: Bus: BaseIO: IRQ: DMA: Ch: "
+	       "ID: Pr: QS: SG: CPL:\n");
+	for (i = 1; i <= registered_HBAs; i++) {
+	    printk("scsi%-2d: %.10s v%s 2.0%c  %s %#.4x   %2d",
+		   HBA_ptr->host_no, SD(HBA_ptr)->name, SD(HBA_ptr)->revision,
+		   SD(HBA_ptr)->EATA_revision, (SD(HBA_ptr)->bustype == 'P')? 
+		   "PCI ":(SD(HBA_ptr)->bustype == 'E')?"EISA":"ISA ",
+		   (u32) HBA_ptr->base, HBA_ptr->irq);
+	    if(HBA_ptr->dma_channel != 0xff)
+		printk("   %2x ", HBA_ptr->dma_channel);
+	    else
+		printk("  %s", "BMST");
+	    printk("  %d   %d   %c  %2d  %2d   %2d\n", SD(HBA_ptr)->channel, 
+		   HBA_ptr->this_id, (SD(HBA_ptr)->primary == TRUE)?'Y':'N', 
+		   HBA_ptr->can_queue, HBA_ptr->sg_tablesize, HBA_ptr->cmd_per_lun);
+	    HBA_ptr = SD(HBA_ptr)->next;
+	}
+    } else {
+	scsi_init_free((void *)status, 512);
     }
-    } else 
-        scsi_init_free((void *)status, 512);
-    
+
     scsi_init_free((void *)dma_scratch, 512);
 
-    DBG(DPT_DEBUG,DELAY(1200));
+    DBG(DPT_DEBUG, DELAY(1200));
 
-    return (registered_HBAs);
+    return(registered_HBAs);
 }
 
 #ifdef MODULE
 /* Eventually this will go into an include file, but this will be later */
 Scsi_Host_Template driver_template = EATA_DMA;
-
 #include "scsi_module.c"
 #endif
- 
 
+/*
+ * Overrides for Emacs so that we almost follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-indent-level: 4
+ * c-brace-imaginary-offset: 0
+ * c-brace-offset: -4
+ * c-argdecl-indent: 4
+ * c-label-offset: -4
+ * c-continued-statement-offset: 4
+ * c-continued-brace-offset: 0
+ * indent-tabs-mode: nil
+ * tab-width: 8
+ * End:
+ */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this