patch-2.1.6 linux/drivers/scsi/aic7xxx.c

• Lines: 33
• Date: Tue Oct 29 00:21:09 1996
• Orig file: v2.1.5/linux/drivers/scsi/aic7xxx.c
• Orig date: Wed Oct 16 10:48:19 1996

diff -u --recursive --new-file v2.1.5/linux/drivers/scsi/aic7xxx.c linux/drivers/scsi/aic7xxx.c
@@ -1,3 +1,5 @@
+#define EXPERIMENTAL_FLAGS 0
+
 /*+M*************************************************************************
  * Adaptec AIC7xxx device driver for Linux.
  *
@@ -4314,7 +4316,7 @@
   p->flags = config->flags;
   p->chan_num = config->chan_num;
   p->scb_link = &(p->scb_usage);
-#ifdef AIC7XXX_SHARE_SCBS
+#if defined(CONFIG_PCI) && defined(AIC7XXX_SHARE_SCBS)
   if ((p->chan_num == 0) && ((p->type == AIC_7873) | (p->type == AIC_7883)))
   {
     shared_3985_scbs = &(p->scb_usage);
@@ -4410,7 +4412,7 @@
     outb(config->scsi_id_b, SCSIID + base);
     scsi_conf = inb(SCSICONF + base + 1) & (ENSPCHK | STIMESEL);
     outb(scsi_conf | ENSTIMER | ACTNEGEN | STPWEN, SXFRCTL1 + base);
-#if 1
+#if EXPERIMENTAL_FLAGS
     outb(ENSELTIMO | ENSCSIRST | ENSCSIPERR, SIMODE1 + base);
 #else
     outb(ENSELTIMO, SIMODE1 + base);
@@ -4432,7 +4434,7 @@
   outb(config->scsi_id, SCSIID + base);
   scsi_conf = inb(SCSICONF + base) & (ENSPCHK | STIMESEL);
   outb(scsi_conf | ENSTIMER | ACTNEGEN | STPWEN, SXFRCTL1 + base);
-#if 1
+#if EXPERIMENTAL_FLAGS
   outb(ENSELTIMO | ENSCSIRST | ENSCSIPERR, SIMODE1 + base);
 #else
   outb(ENSELTIMO, SIMODE1 + base);