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

Replace {disable,enable}_intr() with critical_{enter,exit}().

Browse Source
This commit is contained in:
Matthew N. Dodd 2002-11-10 03:45:49 +00:00
parent e7bc2035e9
commit f5464126bb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/mcd/mcd.c
View File

@ -909,7 +909,7 @@ mcd_doread(struct mcd_softc *sc, int state, struct mcd_mbx *mbxin)
hsg2msf(blknum,rbuf.start_msf);
retry_read:
/* send the read command */
disable_intr();
critical_enter();
MCD_WRITE(sc, MCD_REG_COMMAND, sc->data.read_command);
MCD_WRITE(sc, MCD_REG_COMMAND, rbuf.start_msf[0]);
MCD_WRITE(sc, MCD_REG_COMMAND, rbuf.start_msf[1]);
@ -917,7 +917,7 @@ mcd_doread(struct mcd_softc *sc, int state, struct mcd_mbx *mbxin)
MCD_WRITE(sc, MCD_REG_COMMAND, 0);
MCD_WRITE(sc, MCD_REG_COMMAND, 0);
MCD_WRITE(sc, MCD_REG_COMMAND, 1);
enable_intr();
critical_exit();
/* Spin briefly (<= 2ms) to avoid missing next block */
for (i = 0; i < 20; i++) {
@ -1547,7 +1547,7 @@ mcd_play(struct mcd_softc *sc, struct mcd_read2 *pb)
sc->data.lastpb = *pb;
for(retry=0; retry<MCD_RETRYS; retry++) {
disable_intr();
critical_enter();
MCD_WRITE(sc, MCD_REG_COMMAND, MCD_CMDSINGLESPEEDREAD);
MCD_WRITE(sc, MCD_REG_COMMAND, pb->start_msf[0]);
MCD_WRITE(sc, MCD_REG_COMMAND, pb->start_msf[1]);
@ -1555,7 +1555,7 @@ mcd_play(struct mcd_softc *sc, struct mcd_read2 *pb)
MCD_WRITE(sc, MCD_REG_COMMAND, pb->end_msf[0]);
MCD_WRITE(sc, MCD_REG_COMMAND, pb->end_msf[1]);
MCD_WRITE(sc, MCD_REG_COMMAND, pb->end_msf[2]);
enable_intr();
critical_exit();
status=mcd_getstat(sc, 0);
if (status == -1)

4
sys/dev/scd/scd.c
View File

@ -827,7 +827,7 @@ scd_doread(struct scd_softc *sc, int state, struct scd_mbx *mbxin)
}
/* send the read command */
disable_intr();
critical_enter();
SCD_WRITE(sc, OREG_WPARAMS, sdata[0]);
SCD_WRITE(sc, OREG_WPARAMS, sdata[1]);
SCD_WRITE(sc, OREG_WPARAMS, sdata[2]);
@ -835,7 +835,7 @@ scd_doread(struct scd_softc *sc, int state, struct scd_mbx *mbxin)
SCD_WRITE(sc, OREG_WPARAMS, 0);
SCD_WRITE(sc, OREG_WPARAMS, 1);
SCD_WRITE(sc, OREG_COMMAND, CMD_READ);
enable_intr();
critical_exit();
mbx->count = RDELAY_WAITREAD;
for (i = 0; i < 50; i++) {