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

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

diff -u --recursive --new-file v1.3.4/linux/drivers/scsi/hosts.c linux/drivers/scsi/hosts.c
@@ -1,19 +1,19 @@
 /*
- *	hosts.c Copyright (C) 1992 Drew Eckhardt
- *	        Copyright (C) 1993, 1994, 1995 Eric Youngdale
+ *  hosts.c Copyright (C) 1992 Drew Eckhardt
+ *          Copyright (C) 1993, 1994, 1995 Eric Youngdale
  *
- *	mid to lowlevel SCSI driver interface
- *		Initial versions: Drew Eckhardt
- *		Subsequent revisions: Eric Youngdale
+ *  mid to lowlevel SCSI driver interface
+ *      Initial versions: Drew Eckhardt
+ *      Subsequent revisions: Eric Youngdale
  *
- *	<drew@colorado.edu>
+ *  <drew@colorado.edu>
  */
 
 
 /*
- *	This file contains the medium level SCSI
- *	host interface initialization, as well as the scsi_hosts array of SCSI
- *	hosts currently present in the system.
+ *  This file contains the medium level SCSI
+ *  host interface initialization, as well as the scsi_hosts array of SCSI
+ *  hosts currently present in the system.
  */
 
 #include <linux/config.h>
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/mm.h>
+#include <linux/proc_fs.h>
 
 #include "scsi.h"
 
@@ -56,6 +57,10 @@
 #include "eata_dma.h"
 #endif
 
+#ifdef CONFIG_SCSI_EATA_PIO
+#include "eata_pio.h"
+#endif
+
 #ifdef CONFIG_SCSI_U14_34F
 #include "u14-34f.h"
 #endif
@@ -113,257 +118,274 @@
 */
 
 /*
- *	The scsi host entries should be in the order you wish the
- *	cards to be detected.  A driver may appear more than once IFF
- *	it can deal with being detected (and therefore initialized)
- *	with more than one simultaneous host number, can handle being
- *	reentrant, etc.
+ *  The scsi host entries should be in the order you wish the
+ *  cards to be detected.  A driver may appear more than once IFF
+ *  it can deal with being detected (and therefore initialized)
+ *  with more than one simultaneous host number, can handle being
+ *  reentrant, etc.
  *
- *	They may appear in any order, as each SCSI host  is told which host number it is
- *	during detection.
+ *  They may appear in any order, as each SCSI host is told which host 
+ *  number it is during detection.
  */
 
 /* This is a placeholder for controllers that are not configured into
-   the system - we do this to ensure that the controller numbering is
-   always consistent, no matter how the kernel is configured. */
+ * the system - we do this to ensure that the controller numbering is
+ * always consistent, no matter how the kernel is configured. */
 
 #define NO_CONTROLLER {NULL, NULL, NULL, NULL, NULL, NULL, NULL, \
-	        NULL, NULL, 0, 0, 0, 0, 0, 0}
+			   NULL, NULL, 0, 0, 0, 0, 0, 0}
 
 /*
- *	When figure is run, we don't want to link to any object code.  Since
- *	the macro for each host will contain function pointers, we cannot
- *	use it and instead must use a "blank" that does no such
- *	idiocy.
+ *  When figure is run, we don't want to link to any object code.  Since
+ *  the macro for each host will contain function pointers, we cannot
+ *  use it and instead must use a "blank" that does no such
+ *  idiocy.
  */
 
 Scsi_Host_Template * scsi_hosts = NULL;
 
 static Scsi_Host_Template builtin_scsi_hosts[] =
-	{
+{
 #ifdef CONFIG_SCSI_U14_34F
-	ULTRASTOR_14_34F,
+    ULTRASTOR_14_34F,
 #endif
 #ifdef CONFIG_SCSI_ULTRASTOR
-	ULTRASTOR_14F,
+    ULTRASTOR_14F,
 #endif
 #ifdef CONFIG_SCSI_AHA152X
-	AHA152X,
+    AHA152X,
 #endif
 /* Buslogic must come before aha1542.c */
 #ifdef CONFIG_SCSI_BUSLOGIC
-	BUSLOGIC,
+    BUSLOGIC,
 #endif
 #ifdef CONFIG_SCSI_AHA1542
-	AHA1542,
+    AHA1542,
 #endif
 #ifdef CONFIG_SCSI_AHA1740
-	AHA1740,
+    AHA1740,
 #endif
 #ifdef CONFIG_SCSI_AIC7XXX
-	AIC7XXX,
+    AIC7XXX,
 #endif
 #ifdef CONFIG_SCSI_FUTURE_DOMAIN
-	FDOMAIN_16X0,
+    FDOMAIN_16X0,
 #endif
 #ifdef CONFIG_SCSI_IN2000
-	IN2000,
+    IN2000,
 #endif
 #ifdef CONFIG_SCSI_GENERIC_NCR5380
-	GENERIC_NCR5380,
+    GENERIC_NCR5380,
 #endif
 #ifdef CONFIG_SCSI_QLOGIC
-	QLOGIC,
+    QLOGIC,
 #endif
 #ifdef CONFIG_SCSI_PAS16
-	MV_PAS16,
+    MV_PAS16,
 #endif
 #ifdef CONFIG_SCSI_SEAGATE
-	SEAGATE_ST0X,
+    SEAGATE_ST0X,
 #endif
 #ifdef CONFIG_SCSI_T128
-	TRANTOR_T128,
+    TRANTOR_T128,
 #endif
 #ifdef CONFIG_SCSI_NCR53C7xx
-	NCR53c7xx,
+    NCR53c7xx,
 #endif
 #ifdef CONFIG_SCSI_EATA_DMA
-	EATA_DMA,
+    EATA_DMA,
+#endif
+#ifdef CONFIG_SCSI_EATA_PIO
+    EATA_PIO,
 #endif
 #ifdef CONFIG_SCSI_7000FASST
-	WD7000,
+    WD7000,
 #endif
 #ifdef CONFIG_SCSI_EATA
-	EATA,
+    EATA,
 #endif
 #ifdef CONFIG_SCSI_DEBUG
-	SCSI_DEBUG,
+    SCSI_DEBUG,
 #endif
-	};
+};
 
 #define MAX_SCSI_HOSTS (sizeof(builtin_scsi_hosts) / sizeof(Scsi_Host_Template))
 
+
 /*
- *	Our semaphores and timeout counters, where size depends on MAX_SCSI_HOSTS here.
+ *  Our semaphores and timeout counters, where size depends on 
+ *      MAX_SCSI_HOSTS here.
  */
 
 struct Scsi_Host * scsi_hostlist = NULL;
-struct Scsi_Device_Template * scsi_devicelist;
+struct Scsi_Device_Template * scsi_devicelist = NULL;
 
 int max_scsi_hosts = 0;
 int next_scsi_host = 0;
 
 void
 scsi_unregister(struct Scsi_Host * sh){
-	struct Scsi_Host * shpnt;
-
-	if(scsi_hostlist == sh)
-		scsi_hostlist = sh->next;
-	else {
-		shpnt = scsi_hostlist;
-		while(shpnt->next != sh) shpnt = shpnt->next;
-		shpnt->next = shpnt->next->next;
-	};
-
-        /* If we are removing the last host registered, it is safe to reuse
-           its host number (this avoids "holes" at boot time) (DB) */
-        if (max_scsi_hosts == next_scsi_host && !scsi_loadable_module_flag)
-           max_scsi_hosts--;
-
-	next_scsi_host--;
-	scsi_init_free((char *) sh, sizeof(struct Scsi_Host) + sh->extra_bytes);
+    struct Scsi_Host * shpnt;
+    
+    if(scsi_hostlist == sh)
+	scsi_hostlist = sh->next;
+    else {
+	shpnt = scsi_hostlist;
+	while(shpnt->next != sh) shpnt = shpnt->next;
+	shpnt->next = shpnt->next->next;
+    }
+    
+    /* If we are removing the last host registered, it is safe to reuse
+     * its host number (this avoids "holes" at boot time) (DB) 
+     */
+    if (max_scsi_hosts == next_scsi_host && !scsi_loadable_module_flag)
+	max_scsi_hosts--;
+    
+    next_scsi_host--;
+    scsi_init_free((char *) sh, sizeof(struct Scsi_Host) + sh->extra_bytes);
 }
 
 /* We call this when we come across a new host adapter. We only do this
-   once we are 100% sure that we want to use this host adapter -  it is a
-   pain to reverse this, so we try and avoid it */
+ * once we are 100% sure that we want to use this host adapter -  it is a
+ * pain to reverse this, so we try and avoid it 
+ */
 
 struct Scsi_Host * scsi_register(Scsi_Host_Template * tpnt, int j){
-	struct Scsi_Host * retval, *shpnt;
-	retval = (struct Scsi_Host *)scsi_init_malloc(sizeof(struct Scsi_Host) + j,
-						      (tpnt->unchecked_isa_dma && j ? GFP_DMA : 0) | GFP_ATOMIC);
-	retval->host_busy = 0;
-	retval->block = NULL;
-	retval->wish_block = 0;
-	if(j > 0xffff) panic("Too many extra bytes requested\n");
-	retval->extra_bytes = j;
-	retval->loaded_as_module = scsi_loadable_module_flag;
-	retval->host_no = max_scsi_hosts++; /* never reuse host_no (DB) */
-	next_scsi_host++;
-	retval->host_queue = NULL;
-	retval->host_wait = NULL;
-	retval->last_reset = 0;
-	retval->irq = 0;
-	retval->dma_channel = 0xff;
-	retval->io_port = 0;
-	retval->forbidden_addr = 0;
-	retval->forbidden_size = 0;
-	retval->hostt = tpnt;
-	retval->next = NULL;
+    struct Scsi_Host * retval, *shpnt;
+    retval = (struct Scsi_Host *)scsi_init_malloc(sizeof(struct Scsi_Host) + j,
+						  (tpnt->unchecked_isa_dma && j ? GFP_DMA : 0) | GFP_ATOMIC);
+    retval->host_busy = 0;
+    retval->block = NULL;
+    retval->wish_block = 0;
+    if(j > 0xffff) panic("Too many extra bytes requested\n");
+    retval->extra_bytes = j;
+    retval->loaded_as_module = scsi_loadable_module_flag;
+    retval->host_no = max_scsi_hosts++; /* never reuse host_no (DB) */
+    next_scsi_host++;
+    retval->host_queue = NULL;
+    retval->host_wait = NULL;
+    retval->last_reset = 0;
+    retval->irq = 0;
+    retval->dma_channel = 0xff;
+
+    /* These three are default values which can be overridden */
+    retval->max_channel = 0; 
+    retval->max_id = 8;      
+    retval->max_lun = 8;
+
+    retval->io_port = 0;
+    retval->forbidden_addr = 0;
+    retval->forbidden_size = 0;
+    retval->hostt = tpnt;
+    retval->next = NULL;
 #ifdef DEBUG
-	printk("Register %x %x: %d\n", (int)retval, (int)retval->hostt, j);
+    printk("Register %x %x: %d\n", (int)retval, (int)retval->hostt, j);
 #endif
 
-	/* The next four are the default values which can be overridden
-	   if need be */
-	retval->this_id = tpnt->this_id;
-	retval->can_queue = tpnt->can_queue;
-	retval->sg_tablesize = tpnt->sg_tablesize;
-	retval->cmd_per_lun = tpnt->cmd_per_lun;
-	retval->unchecked_isa_dma = tpnt->unchecked_isa_dma;
-
-	if(!scsi_hostlist)
-		scsi_hostlist = retval;
-	else
-	{
-		shpnt = scsi_hostlist;
-		while(shpnt->next) shpnt = shpnt->next;
-		shpnt->next = retval;
-	}
-
-	return retval;
+    /* The next six are the default values which can be overridden
+     * if need be */
+    retval->this_id = tpnt->this_id;
+    retval->can_queue = tpnt->can_queue;
+    retval->sg_tablesize = tpnt->sg_tablesize;
+    retval->cmd_per_lun = tpnt->cmd_per_lun;
+    retval->unchecked_isa_dma = tpnt->unchecked_isa_dma;
+    retval->use_clustering = tpnt->use_clustering;   
+    if(!scsi_hostlist)
+	scsi_hostlist = retval;
+    else
+    {
+	shpnt = scsi_hostlist;
+	while(shpnt->next) shpnt = shpnt->next;
+	shpnt->next = retval;
+    }
+    
+    return retval;
 }
 
 int
 scsi_register_device(struct Scsi_Device_Template * sdpnt)
 {
-  if(sdpnt->next) panic("Device already registered");
-  sdpnt->next = scsi_devicelist;
-  scsi_devicelist = sdpnt;
-  return 0;
+    if(sdpnt->next) panic("Device already registered");
+    sdpnt->next = scsi_devicelist;
+    scsi_devicelist = sdpnt;
+    return 0;
 }
 
 unsigned int scsi_init()
 {
-	static int called = 0;
-	int i, pcount;
-	Scsi_Host_Template * tpnt;
-	struct Scsi_Host * shpnt;
-	const char * name;
-
-	if(called) return 0;
-
-	called = 1;
-	for (tpnt = &builtin_scsi_hosts[0], i = 0; i < MAX_SCSI_HOSTS; ++i, tpnt++)
+    static int called = 0;
+    int i, pcount;
+    Scsi_Host_Template * tpnt;
+    struct Scsi_Host * shpnt;
+    const char * name;
+    
+    if(called) return 0;
+    
+    called = 1;
+    for (tpnt = &builtin_scsi_hosts[0], i = 0; i < MAX_SCSI_HOSTS; ++i, tpnt++)
+    {
+	/*
+	 * Initialize our semaphores.  -1 is interpreted to mean
+	 * "inactive" - where as 0 will indicate a time out condition.
+	 */
+	
+	pcount = next_scsi_host;
+	if ((tpnt->detect) &&
+	    (tpnt->present =
+	     tpnt->detect(tpnt)))
 	{
-		/*
-		 * Initialize our semaphores.  -1 is interpreted to mean
-		 * "inactive" - where as 0 will indicate a time out condition.
-		 */
-
-		pcount = next_scsi_host;
-		if ((tpnt->detect) &&
-		    (tpnt->present =
-		     tpnt->detect(tpnt)))
-		{
-			/* The only time this should come up is when people use
-			   some kind of patched driver of some kind or another. */
-			if(pcount == next_scsi_host) {
-				if(tpnt->present > 1)
-					panic("Failure to register low-level scsi driver");
-				/* The low-level driver failed to register a driver.  We
- 				   can do this now. */
-				scsi_register(tpnt,0);
-			};
-			tpnt->next = scsi_hosts;
-			scsi_hosts = tpnt;
-		}
-	}
-
-
-	for(shpnt=scsi_hostlist; shpnt; shpnt = shpnt->next)
-	    {
-	      if(shpnt->hostt->info)
-		name = shpnt->hostt->info(shpnt);
-	      else
-		name = shpnt->hostt->name;
-	      printk ("scsi%d : %s\n", /* And print a little message */
-		      shpnt->host_no, name);
+	    /* The only time this should come up is when people use
+	     * some kind of patched driver of some kind or another. */
+	    if(pcount == next_scsi_host) {
+		if(tpnt->present > 1)
+		    panic("Failure to register low-level scsi driver");
+		/* The low-level driver failed to register a driver.  We
+		 * can do this now. */
+		scsi_register(tpnt,0);
 	    }
-
-	printk ("scsi : %d host%s.\n", next_scsi_host,
-		(next_scsi_host == 1) ? "" : "s");
-
-	scsi_make_blocked_list();
-
-	/* Now attach the high level drivers */
+	    tpnt->next = scsi_hosts;
+	    scsi_hosts = tpnt;
+	}
+    }
+    
+    /* Add the drivers to /proc/scsi */
+#if CONFIG_PROC_FS 
+    build_proc_dir_entries();    
+#endif
+    
+    for(shpnt=scsi_hostlist; shpnt; shpnt = shpnt->next)
+    {
+	if(shpnt->hostt->info)
+	    name = shpnt->hostt->info(shpnt);
+	else
+	    name = shpnt->hostt->name;
+	printk ("scsi%d : %s\n", /* And print a little message */
+		shpnt->host_no, name);
+    }
+    
+    printk ("scsi : %d host%s.\n", next_scsi_host,
+	    (next_scsi_host == 1) ? "" : "s");
+    
+    scsi_make_blocked_list();
+    
+    /* Now attach the high level drivers */
 #ifdef CONFIG_BLK_DEV_SD
-	scsi_register_device(&sd_template);
+    scsi_register_device(&sd_template);
 #endif
 #ifdef CONFIG_BLK_DEV_SR
-	scsi_register_device(&sr_template);
+    scsi_register_device(&sr_template);
 #endif
 #ifdef CONFIG_CHR_DEV_ST
-	scsi_register_device(&st_template);
+    scsi_register_device(&st_template);
 #endif
 #ifdef CONFIG_CHR_DEV_SG
-	scsi_register_device(&sg_template);
+    scsi_register_device(&sg_template);
 #endif
-
+    
 #if 0      
-	max_scsi_hosts = next_scsi_host;
+    max_scsi_hosts = next_scsi_host;
 #endif
-	return 0;
+    return 0;
 }
 
 
@@ -383,7 +405,7 @@
 		}
 	    }
 	}
-      next_host:
+    next_host:
 	continue;
     }
 }
@@ -395,12 +417,14 @@
  * of the file.
  * ---------------------------------------------------------------------------
  * Local variables:
- * c-indent-level: 8
+ * c-indent-level: 4
  * c-brace-imaginary-offset: 0
- * c-brace-offset: -8
- * c-argdecl-indent: 8
- * c-label-offset: -8
- * c-continued-statement-offset: 8
+ * 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