Add parentheses because == has higher precedence than &.
PR: i386/4225 Submitted by: Frank MacLachlan <fpm@n2.net>
This commit is contained in:
parent
d57f88658b
commit
1393383a2e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=28138
@ -34,7 +34,7 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
|
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
|
||||||
* $Id: isa.c,v 1.98 1997/07/28 09:13:11 msmith Exp $
|
* $Id: isa.c,v 1.99 1997/07/29 05:24:36 msmith Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -648,7 +648,7 @@ isa_dma_release(chan)
|
|||||||
if (chan & ~VALID_DMA_MASK)
|
if (chan & ~VALID_DMA_MASK)
|
||||||
panic("isa_dma_release: channel out of range");
|
panic("isa_dma_release: channel out of range");
|
||||||
|
|
||||||
if (dma_inuse & (1 << chan) == 0)
|
if ((dma_inuse & (1 << chan)) == 0)
|
||||||
printf("isa_dma_release: channel %d not in use\n", chan);
|
printf("isa_dma_release: channel %d not in use\n", chan);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -705,7 +705,7 @@ void isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan)
|
|||||||
|| (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1)))
|
|| (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1)))
|
||||||
panic("isa_dmastart: impossible request");
|
panic("isa_dmastart: impossible request");
|
||||||
|
|
||||||
if (dma_inuse & (1 << chan) == 0)
|
if ((dma_inuse & (1 << chan)) == 0)
|
||||||
printf("isa_dmastart: channel %d not acquired\n", chan);
|
printf("isa_dmastart: channel %d not acquired\n", chan);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -813,7 +813,7 @@ void isa_dmadone(int flags, caddr_t addr, int nbytes, int chan)
|
|||||||
if (chan & ~VALID_DMA_MASK)
|
if (chan & ~VALID_DMA_MASK)
|
||||||
panic("isa_dmadone: channel out of range");
|
panic("isa_dmadone: channel out of range");
|
||||||
|
|
||||||
if (dma_inuse & (1 << chan) == 0)
|
if ((dma_inuse & (1 << chan)) == 0)
|
||||||
printf("isa_dmadone: channel %d not acquired\n", chan);
|
printf("isa_dmadone: channel %d not acquired\n", chan);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -823,7 +823,7 @@ void isa_dmadone(int flags, caddr_t addr, int nbytes, int chan)
|
|||||||
* isa_dmastart() once because they use Auto DMA mode. If we
|
* isa_dmastart() once because they use Auto DMA mode. If we
|
||||||
* leave this in, drivers that do this will print this continuously.
|
* leave this in, drivers that do this will print this continuously.
|
||||||
*/
|
*/
|
||||||
if (dma_busy & (1 << chan) == 0)
|
if ((dma_busy & (1 << chan)) == 0)
|
||||||
printf("isa_dmadone: channel %d not busy\n", chan);
|
printf("isa_dmadone: channel %d not busy\n", chan);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -910,13 +910,13 @@ isa_dmastatus(int chan)
|
|||||||
u_long ef;
|
u_long ef;
|
||||||
|
|
||||||
/* channel active? */
|
/* channel active? */
|
||||||
if (dma_inuse & (1 << chan) == 0) {
|
if ((dma_inuse & (1 << chan)) == 0) {
|
||||||
printf("isa_dmastatus: channel %d not active\n", chan);
|
printf("isa_dmastatus: channel %d not active\n", chan);
|
||||||
return(-1);
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* still busy? */
|
/* still busy? */
|
||||||
if (dma_busy & (1 << chan) == 0) {
|
if ((dma_busy & (1 << chan)) == 0) {
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
|
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
|
||||||
* $Id: isa.c,v 1.98 1997/07/28 09:13:11 msmith Exp $
|
* $Id: isa.c,v 1.99 1997/07/29 05:24:36 msmith Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -648,7 +648,7 @@ isa_dma_release(chan)
|
|||||||
if (chan & ~VALID_DMA_MASK)
|
if (chan & ~VALID_DMA_MASK)
|
||||||
panic("isa_dma_release: channel out of range");
|
panic("isa_dma_release: channel out of range");
|
||||||
|
|
||||||
if (dma_inuse & (1 << chan) == 0)
|
if ((dma_inuse & (1 << chan)) == 0)
|
||||||
printf("isa_dma_release: channel %d not in use\n", chan);
|
printf("isa_dma_release: channel %d not in use\n", chan);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -705,7 +705,7 @@ void isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan)
|
|||||||
|| (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1)))
|
|| (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1)))
|
||||||
panic("isa_dmastart: impossible request");
|
panic("isa_dmastart: impossible request");
|
||||||
|
|
||||||
if (dma_inuse & (1 << chan) == 0)
|
if ((dma_inuse & (1 << chan)) == 0)
|
||||||
printf("isa_dmastart: channel %d not acquired\n", chan);
|
printf("isa_dmastart: channel %d not acquired\n", chan);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -813,7 +813,7 @@ void isa_dmadone(int flags, caddr_t addr, int nbytes, int chan)
|
|||||||
if (chan & ~VALID_DMA_MASK)
|
if (chan & ~VALID_DMA_MASK)
|
||||||
panic("isa_dmadone: channel out of range");
|
panic("isa_dmadone: channel out of range");
|
||||||
|
|
||||||
if (dma_inuse & (1 << chan) == 0)
|
if ((dma_inuse & (1 << chan)) == 0)
|
||||||
printf("isa_dmadone: channel %d not acquired\n", chan);
|
printf("isa_dmadone: channel %d not acquired\n", chan);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -823,7 +823,7 @@ void isa_dmadone(int flags, caddr_t addr, int nbytes, int chan)
|
|||||||
* isa_dmastart() once because they use Auto DMA mode. If we
|
* isa_dmastart() once because they use Auto DMA mode. If we
|
||||||
* leave this in, drivers that do this will print this continuously.
|
* leave this in, drivers that do this will print this continuously.
|
||||||
*/
|
*/
|
||||||
if (dma_busy & (1 << chan) == 0)
|
if ((dma_busy & (1 << chan)) == 0)
|
||||||
printf("isa_dmadone: channel %d not busy\n", chan);
|
printf("isa_dmadone: channel %d not busy\n", chan);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -910,13 +910,13 @@ isa_dmastatus(int chan)
|
|||||||
u_long ef;
|
u_long ef;
|
||||||
|
|
||||||
/* channel active? */
|
/* channel active? */
|
||||||
if (dma_inuse & (1 << chan) == 0) {
|
if ((dma_inuse & (1 << chan)) == 0) {
|
||||||
printf("isa_dmastatus: channel %d not active\n", chan);
|
printf("isa_dmastatus: channel %d not active\n", chan);
|
||||||
return(-1);
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* still busy? */
|
/* still busy? */
|
||||||
if (dma_busy & (1 << chan) == 0) {
|
if ((dma_busy & (1 << chan)) == 0) {
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user