patch-2.1.32 linux/drivers/scsi/g_NCR5380.c

• Lines: 52
• Date: Fri Apr 4 14:03:29 1997
• Orig file: v2.1.31/linux/drivers/scsi/g_NCR5380.c
• Orig date: Fri Apr 4 08:52:23 1997

diff -u --recursive --new-file v2.1.31/linux/drivers/scsi/g_NCR5380.c linux/drivers/scsi/g_NCR5380.c
@@ -331,6 +331,10 @@
     int blocks = len / 128;
     int start = 0;
     int bl;
+#ifdef CONFIG_SCSI_G_NCR5380_PORT
+    int i;
+#endif 
+
     NCR5380_local_declare();
 
     NCR5380_setup(instance);
@@ -605,21 +609,6 @@
     return len-start;
 }
 
-const char *const private_scsi_device_types[] =
-{
-    "Direct-Access    ",
-    "Sequential-Access",
-    "Printer          ",
-    "Processor        ",
-    "WORM             ",
-    "CD-ROM           ",
-    "Scanner          ",
-    "Optical Device   ",
-    "Medium Changer   ",
-    "Communications   "
-};
-#define MAX_SCSI_DEVICE_CODE sizeof(private_scsi_device_types)/sizeof(char*)
-
 int generic_NCR5380_proc_info(char* buffer, char** start, off_t offset, int length, int hostno, int inout)
 {
     int len = 0;
@@ -630,7 +619,8 @@
 	Scsi_Device *dev;
     Scsi_Cmnd *ptr;
     struct NCR5380_hostdata *hostdata;
-
+    extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
+    
     cli();
 
     for (scsi_ptr = first_instance; scsi_ptr; scsi_ptr=scsi_ptr->next)
@@ -673,7 +663,7 @@
 	    long tr = hostdata->time_read[dev->id] / HZ;
 	    long tw = hostdata->time_write[dev->id] / HZ;
 
-	    PRINTP("  T:%d %s " ANDP dev->id ANDP (dev->type < MAX_SCSI_DEVICE_CODE) ? private_scsi_device_types[(int)dev->type] : "Unknown");
+	    PRINTP("  T:%d %s " ANDP dev->id ANDP (dev->type < MAX_SCSI_DEVICE_CODE) ? scsi_device_types[(int)dev->type] : "Unknown");
 	    for (i=0; i<8; i++)
 		if (dev->vendor[i] >= 0x20)
 		    *(buffer+(len++)) = dev->vendor[i];