prerelease work

3 files changed, 14 insertions, 5 deletions

diff --git a/i386/i386at/gpl/linux/scsi/aha1740.c b/i386/i386at/gpl/linux/scsi/aha1740.c
index e3b8f1d..250aa1b 100644
--- a/i386/i386at/gpl/linux/scsi/aha1740.c
+++ b/i386/i386at/gpl/linux/scsi/aha1740.c
@@ -1,4 +1,4 @@
-/*  $Id: aha1740.c,v 1.1.1.1 1997/02/25 21:27:46 thomas Exp $
+/*  $Id: aha1740.c,v 1.2 1997/03/24 21:51:17 thomas Exp $
  *  1993/03/31
  *  linux/kernel/aha1740.c
  *
@@ -56,7 +56,7 @@ struct proc_dir_entry proc_scsi_aha1740 = {
 #endif
 
 /*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/aha1740.c,v 1.1.1.1 1997/02/25 21:27:46 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/aha1740.c,v 1.2 1997/03/24 21:51:17 thomas Exp $";
 */
 
 static unsigned int slot, base;
@@ -166,6 +166,9 @@ int aha1740_test_port(void)
 	return 0;
     }
 
+    /* Try and turn on enhanced mode */
+    tmp = inb (PORTADR);
+    outb (PORTADR, tmp | PORTADDR_ENH);
     if ( inb(PORTADR) & PORTADDR_ENH )
 	return 1;   /* Okay, we're all set */
 	
diff --git a/i386/i386at/gpl/linux/scsi/hosts.c b/i386/i386at/gpl/linux/scsi/hosts.c
index cb0163b..72ae0cb 100644
--- a/i386/i386at/gpl/linux/scsi/hosts.c
+++ b/i386/i386at/gpl/linux/scsi/hosts.c
@@ -134,7 +134,7 @@
 #endif
 
 /*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/hosts.c,v 1.1.1.1 1997/02/25 21:27:49 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/hosts.c,v 1.2 1997/03/24 21:51:24 thomas Exp $";
 */
 
 /*
@@ -387,12 +387,16 @@ unsigned int scsi_init()
 	    name = shpnt->hostt->info(shpnt);
 	else
 	    name = shpnt->hostt->name;
+#if 0
 	printk ("scsi%d : %s\n", /* And print a little message */
 		shpnt->host_no, name);
+#endif
     }
-    
+
+#if 0    
     printk ("scsi : %d host%s.\n", next_scsi_host,
 	    (next_scsi_host == 1) ? "" : "s");
+#endif
     
     scsi_make_blocked_list();
     
diff --git a/i386/i386at/gpl/linux/scsi/scsi.c b/i386/i386at/gpl/linux/scsi/scsi.c
index 85d234e..7b29168 100644
--- a/i386/i386at/gpl/linux/scsi/scsi.c
+++ b/i386/i386at/gpl/linux/scsi/scsi.c
@@ -49,7 +49,7 @@
 #undef USE_STATIC_SCSI_MEMORY
 
 /*
-static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/scsi.c,v 1.1.1.1 1997/02/25 21:27:50 thomas Exp $";
+static const char RCSid[] = "$Header: cvs/gnumach/i386/i386at/gpl/linux/scsi/Attic/scsi.c,v 1.2 1997/03/24 21:51:33 thomas Exp $";
 */
 
 
@@ -2352,12 +2352,14 @@ int scsi_dev_init(void)
     for (shpnt = scsi_hostlist; shpnt; shpnt = shpnt->next)
 	scan_scsis(shpnt,0,0,0,0);           /* scan for scsi devices */
 
+#if 0
     printk("scsi : detected ");
     for (sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next)
 	if (sdtpnt->dev_noticed && sdtpnt->name)
 	    printk("%d SCSI %s%s ", sdtpnt->dev_noticed, sdtpnt->name,
 		   (sdtpnt->dev_noticed != 1) ? "s" : "");
     printk("total.\n");
+#endif
     
     for(sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next)
 	if(sdtpnt->init && sdtpnt->dev_noticed) (*sdtpnt->init)();