src/sys/dev/ic/wdc.c - diff

Return to wdc.c CVS log

Up to [cvs.NetBSD.org] / src / sys / dev / ic

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

version 1.63, 1999/03/25 16:17:36

version 1.64, 1999/03/29 08:32:02

Line 358 wdcattach(chp)

chp->ch_drive[i].drive_flags &=

~(DRIVE_ATA | DRIVE_ATAPI);

}

* XXX some drives (e.g. some revisions of ZIP) are both ATA

* and ATAPI

if (chp->ch_drive[i].drive_flags & DRIVE_ATA) {

if ((params.atap_config & WDC_CFG_ATAPI_MASK) ==

WDC_CFG_ATAPI) {

chp->ch_drive[i].drive_flags &= ~DRIVE_ATA;

chp->ch_drive[i].drive_flags |= DRIVE_ATAPI;

}

ctrl_flags = chp->wdc->sc_dev.dv_cfdata->cf_flags;

channel_flags = (ctrl_flags >> (NBBY * chp->channel)) & 0xff;

Line 1101 __wdccommand_intr(chp, xfer)

Line 1090 __wdccommand_intr(chp, xfer)

chp->wdc->sc_dev.dv_xname, chp->channel, xfer->drive), DEBUG_INTR);

if (wdcwait(chp, wdc_c->r_st_pmask, wdc_c->r_st_pmask,

(wdc_c->flags & AT_POLL) ? wdc_c->timeout : 0)) {

if ((xfer->c_flags & C_TIMEOU) == 0)

if ((xfer->c_flags & C_TIMEOU) == 0 &&

(wdc_c->flags & AT_POLL) == 0)

return 0; /* IRQ was not for us */

wdc_c->flags |= AT_TIMEOU;

__wdccommand_done(chp, xfer);