From c2f69d249e114881ea5a1ef60aba4dbffc4d1105 Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Fri, 24 Jan 1997 21:59:32 +0000 Subject: 93cx6.c: Style nit. Backslashes in macro weren't aligned. aic7xxx.c: Preserve the value of STPWEN in SXFRCTL1 during initialization. STPWEN controls low byte termination and is setup by the PCI probe front end. --- sys/i386/scsi/93cx6.c | 2 +- sys/i386/scsi/aic7xxx.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/i386/scsi/93cx6.c b/sys/i386/scsi/93cx6.c index 7086209f3791..1215a7d76c30 100644 --- a/sys/i386/scsi/93cx6.c +++ b/sys/i386/scsi/93cx6.c @@ -78,7 +78,7 @@ static struct seeprom_cmd { * Wait for the SEERDY to go high; about 800 ns. */ #define CLOCK_PULSE(sd, rdy) \ - while ((SEEPROM_INB(sd) & rdy) == 0) { \ + while ((SEEPROM_INB(sd) & rdy) == 0) { \ ; /* Do nothing */ \ } diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c index d1f129460dbf..e638d26bd024 100644 --- a/sys/i386/scsi/aic7xxx.c +++ b/sys/i386/scsi/aic7xxx.c @@ -1746,7 +1746,7 @@ int ahc_init(ahc) struct ahc_softc *ahc; { - u_int8_t scsi_conf, sblkctl, i; + u_int8_t scsi_conf, sblkctl, sxfrctl1, i; u_int16_t ultraenable = 0; int max_targ = 15; /* @@ -1876,8 +1876,10 @@ ahc_init(ahc) */ ahc_outb(ahc, SCSIID, ahc->our_id_b); scsi_conf = ahc_inb(ahc, SCSICONF + 1); + sxfrctl1 = ahc_inb(ahc, SXFRCTL1); ahc_outb(ahc, SXFRCTL1, (scsi_conf & (ENSPCHK|STIMESEL)) - | ENSTIMER|ACTNEGEN); + |(sxfrctl1 & STPWEN) + |ENSTIMER|ACTNEGEN); ahc_outb(ahc, SIMODE1, ENSELTIMO|ENSCSIRST|ENSCSIPERR); if (ahc->type & AHC_ULTRA) ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN|ULTRAEN); @@ -1903,8 +1905,10 @@ ahc_init(ahc) } ahc_outb(ahc, SCSIID, ahc->our_id); scsi_conf = ahc_inb(ahc, SCSICONF); + sxfrctl1 = ahc_inb(ahc, SXFRCTL1); ahc_outb(ahc, SXFRCTL1, (scsi_conf & (ENSPCHK|STIMESEL)) - | ENSTIMER|ACTNEGEN); + |(sxfrctl1 & STPWEN) + |ENSTIMER|ACTNEGEN); ahc_outb(ahc, SIMODE1, ENSELTIMO|ENSCSIRST|ENSCSIPERR); if (ahc->type & AHC_ULTRA) ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN|ULTRAEN); -- cgit v1.3