d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

93cx6.c:

Browse Source 
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.
This commit is contained in:
Justin T. Gibbs 1997-01-24 21:59:32 +00:00
parent ed69a71305
commit c2f69d249e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/i386/scsi/93cx6.c
View File

@ -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 */ \
}

10
sys/i386/scsi/aic7xxx.c
View File

@ -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);