diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2000-02-07 01:07:25 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2000-02-07 01:07:25 +0000 |
| commit | d5155573c9af6af1083d24f9f12c50165a351dc6 (patch) | |
| tree | 999cbcb5333fb12d4bee276afe5ed268cbc612b9 /sys | |
| parent | c126799c0149dda9a5c9ab9ea3c1b9cff49e8611 (diff) | |
sync with netbsd. ok @deraadt
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/adwlib.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/adw_pci.c | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c index f7654463205..ce38578070f 100644 --- a/sys/dev/ic/adwlib.c +++ b/sys/dev/ic/adwlib.c @@ -2382,6 +2382,7 @@ AdvInquiryHandling(sc, scsiq) ADW_SOFTC *sc; ADW_SCSI_REQ_Q *scsiq; { +#ifndef FAILSAFE bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; u_int8_t tid; @@ -2433,9 +2434,8 @@ ADW_SCSI_REQ_Q *scsiq; * device's 'wdtr_able' bit and write the new value to the * microcode. */ -#ifndef FAILSAFE #ifdef SCSI_ADW_WDTR_DISABLE - if(!(tid & SCSI_ADW_WDTR_DISABLE) + if(!(tid & SCSI_ADW_WDTR_DISABLE)) #endif /* SCSI_ADW_WDTR_DISABLE */ if ((sc->wdtr_able & tidmask) && inq->WBus16) { ADW_READ_WORD_LRAM(iot, ioh, ASC_MC_WDTR_ABLE, @@ -2473,7 +2473,7 @@ ADW_SCSI_REQ_Q *scsiq; * 'sdtr_able' bit. Write the new value to the microcode. */ #ifdef SCSI_ADW_SDTR_DISABLE - if(!(tid & SCSI_ADW_SDTR_DISABLE) + if(!(tid & SCSI_ADW_SDTR_DISABLE)) #endif /* SCSI_ADW_SDTR_DISABLE */ if ((sc->sdtr_able & tidmask) && inq->Sync) { ADW_READ_WORD_LRAM(iot, ioh, ASC_MC_SDTR_ABLE, cfg_word); @@ -2508,7 +2508,7 @@ ADW_SCSI_REQ_Q *scsiq; * bugs will at least work with the BIOS. */ #ifdef SCSI_ADW_TAGQ_DISABLE - if(!(tid & SCSI_ADW_TAGQ_DISABLE) + if(!(tid & SCSI_ADW_TAGQ_DISABLE)) #endif /* SCSI_ADW_TAGQ_DISABLE */ if ((sc->tagqng_able & tidmask) && inq->CmdQue) { ADW_READ_WORD_LRAM(iot, ioh, ASC_MC_TAGQNG_ABLE, @@ -2521,8 +2521,8 @@ ADW_SCSI_REQ_Q *scsiq; ASC_MC_NUMBER_OF_MAX_CMD + tid, sc->max_dvc_qng); } -#endif /* FAILSAFE */ } +#endif /* FAILSAFE */ } diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c index 938b1a3dd6b..a520ebe01b6 100644 --- a/sys/dev/pci/adw_pci.c +++ b/sys/dev/pci/adw_pci.c @@ -38,8 +38,12 @@ * Device probe and attach routines for the following * Advanced Systems Inc. SCSI controllers: * - * Single Channel Products: - * ABP940UW - Bus-Master PCI Ultra-Wide (240 CDB) + * ABP-940UW - Bus-Master PCI Ultra-Wide (240 CDB) + * ABP-940UW (68) - Bus-Master PCI Ultra-Wide (240 CDB) + * ABP-940UWD - Bus-Master PCI Ultra-Wide (240 CDB) + * ABP-970UW - Bus-Master PCI Ultra-Wide (240 CDB) + * ASB-3940UW - Bus-Master PCI Ultra-Wide (240 CDB) + * ASB-3940U2W-00 - Bus-Master PCI Ultra2-Wide (240 CDB) */ #include <sys/types.h> |