Merge with latest version of the Mylex 6+ driver.

 - All sources are built in a single object, reducing namespace pollution.
 - Kill the ready queue, and handle a busy response to mly_start in callers
   rather than deferring the command.
 - Improve our interaction with CAM:
   - Don't advertise physical channels as SCSI busses by default.
   - use the SIM queue freeze capability rather than queueing CDBs internally.
   - force bus reprobe at module load time.
 - Clean up more resources in mly_free.
 - Tidy up debugging levels.
 - Tidy up handling of events (mostly just code cleanliness).
 - Use explanatory macros for operations on bus/target/channel numbers.

1 files changed, 12 insertions, 28 deletions

diff --git a/sys/dev/mly/mly_tables.h b/sys/dev/mly/mly_tables.h
index 5a83f17..16c0b75 100644
--- a/sys/dev/mly/mly_tables.h
+++ b/sys/dev/mly/mly_tables.h
@@ -35,26 +35,12 @@ struct mly_code_lookup {
     u_int32_t	code;
 };
 
-extern char	*mly_describe_code(struct mly_code_lookup *table, u_int32_t code);
-
-#ifndef MLY_DEFINE_TABLES
-extern struct mly_code_lookup mly_table_bustype[];
-extern struct mly_code_lookup mly_table_controllertype[];
-extern struct mly_code_lookup mly_table_oemname[];
-extern struct mly_code_lookup mly_table_memorytype[];
-extern struct mly_code_lookup mly_table_cputype[];
-extern struct mly_code_lookup mly_table_event[];
-extern struct mly_code_lookup mly_table_device_state[];
-extern struct mly_code_lookup mly_table_device_type[];
-extern struct mly_code_lookup mly_table_stripe_size[];
-extern struct mly_code_lookup mly_table_cacheline_size[];
-
-#else /* MLY_DEFINE_TABLES */
+static char	*mly_describe_code(struct mly_code_lookup *table, u_int32_t code);
 
 /********************************************************************************
  * Look up a text description of a numeric code and return a pointer to same.
  */
-char *
+static char *
 mly_describe_code(struct mly_code_lookup *table, u_int32_t code)
 {
     int		i;
@@ -65,7 +51,7 @@ mly_describe_code(struct mly_code_lookup *table, u_int32_t code)
     return(table[i+1].string);
 }
 
-struct mly_code_lookup mly_table_bustype[] = {
+static struct mly_code_lookup mly_table_bustype[] = {
     {"SCSI",		0x00},
     {"FC-AL",		0x01},
     {"PCI",		0x03},
@@ -73,7 +59,7 @@ struct mly_code_lookup mly_table_bustype[] = {
     {"unknown bus",	0}
 };
 
-struct mly_code_lookup mly_table_controllertype[] = {
+static struct mly_code_lookup mly_table_controllertype[] = {
 #if 0	/* not supported by this driver */
     {"DAC960E",		0x01},	/* EISA */
     {"DAC960M",		0x08},	/* MCA */
@@ -99,7 +85,7 @@ struct mly_code_lookup mly_table_controllertype[] = {
     {"unknown adapter",	0}
 };    
 
-struct mly_code_lookup mly_table_oemname[] = {
+static struct mly_code_lookup mly_table_oemname[] = {
     {"Mylex",		MLY_OEM_MYLEX},
     {"IBM",		MLY_OEM_IBM},
     {"Hewlett-Packard",	MLY_OEM_HP},
@@ -110,7 +96,7 @@ struct mly_code_lookup mly_table_oemname[] = {
     {"unknown OEM",	0}
 };
 
-struct mly_code_lookup mly_table_memorytype[] = {
+static struct mly_code_lookup mly_table_memorytype[] = {
     {"DRAM",		0x01},
     {"EDRAM",		0x02},
     {"EDO RAM",		0x03},
@@ -119,7 +105,7 @@ struct mly_code_lookup mly_table_memorytype[] = {
     {"unknown memory",	0}
 };
 
-struct mly_code_lookup mly_table_cputype[] = {
+static struct mly_code_lookup mly_table_cputype[] = {
     {"i960CA",		0x01},
     {"i960RD",		0x02},
     {"i960RN",		0x03},
@@ -153,7 +139,7 @@ struct mly_code_lookup mly_table_cputype[] = {
  * r	rescan the device for possible state change
  *
  */
-struct mly_code_lookup mly_table_event[] = {
+static struct mly_code_lookup mly_table_event[] = {
     /* physical device events (0x0000 - 0x007f) */
     {"pr online",							0x0001},
     {"pr standby",							0x0002},
@@ -266,7 +252,7 @@ struct mly_code_lookup mly_table_event[] = {
  * Values here must be 16 characters or less, as they are packed into
  * the 'product' field in the SCSI inquiry data.
  */
-struct mly_code_lookup mly_table_device_state[] = {
+static struct mly_code_lookup mly_table_device_state[] = {
     {"offline",		MLY_DEVICE_STATE_OFFLINE},
     {"unconfigured",	MLY_DEVICE_STATE_UNCONFIGURED},
     {"online",		MLY_DEVICE_STATE_ONLINE},
@@ -282,7 +268,7 @@ struct mly_code_lookup mly_table_device_state[] = {
  * Values here must be 8 characters or less, as they are packed into
  * the 'vendor' field in the SCSI inquiry data.
  */
-struct mly_code_lookup mly_table_device_type[] = {
+static struct mly_code_lookup mly_table_device_type[] = {
     {"RAID 0",		MLY_DEVICE_TYPE_RAID0},
     {"RAID 1",		MLY_DEVICE_TYPE_RAID1},
     {"RAID 3",		MLY_DEVICE_TYPE_RAID3},		/* right asymmetric parity */
@@ -300,7 +286,7 @@ struct mly_code_lookup mly_table_device_type[] = {
     {"UNKNOWN",		0}
 };
 
-struct mly_code_lookup mly_table_stripe_size[] = {
+static struct mly_code_lookup mly_table_stripe_size[] = {
     {"NONE",		MLY_STRIPE_ZERO},
     {"512B",		MLY_STRIPE_512b},
     {"1k",		MLY_STRIPE_1k},
@@ -318,7 +304,7 @@ struct mly_code_lookup mly_table_stripe_size[] = {
     {"unknown",		0}
 };
 
-struct mly_code_lookup mly_table_cacheline_size[] = {
+static struct mly_code_lookup mly_table_cacheline_size[] = {
     {"NONE",		MLY_CACHELINE_ZERO},
     {"512B",		MLY_CACHELINE_512b},
     {"1k",		MLY_CACHELINE_1k},
@@ -331,5 +317,3 @@ struct mly_code_lookup mly_table_cacheline_size[] = {
     {NULL, 0},
     {"unknown",		0}
 };
-
-#endif /* MLY_DEFINE_TABLES */