diff options
Diffstat (limited to 'sys/dev/ppbus')
| -rw-r--r-- | sys/dev/ppbus/ppb_msq.h | 20 | ||||
| -rw-r--r-- | sys/dev/ppbus/ppi.c | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h index 4bba299..7de698b 100644 --- a/sys/dev/ppbus/ppb_msq.h +++ b/sys/dev/ppbus/ppb_msq.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ppb_msq.h,v 1.2 1998/09/13 18:26:26 nsouch Exp $ + * $Id: ppb_msq.h,v 1.3 1999/01/10 12:04:54 nsouch Exp $ * */ #ifndef __PPB_MSQ_H @@ -119,23 +119,23 @@ #define MS_RFETCH_P(n,reg,mask) { MS_OP_RFETCH_P, { n, reg, mask } } /* ptr manipulation */ -#define MS_PTR(ptr) { MS_OP_PTR, { ptr } } +#define MS_PTR(ptr) { MS_OP_PTR, { { ptr } } } #define MS_DASS(byte) MS_RASSERT(MS_REG_DTR,byte) #define MS_SASS(byte) MS_RASSERT(MS_REG_STR,byte) #define MS_CASS(byte) MS_RASSERT(MS_REG_CTR,byte) -#define MS_SET(accum) { MS_OP_SET, { accum } } +#define MS_SET(accum) { MS_OP_SET, { { accum } } } #define MS_BRSET(mask,offset) { MS_OP_BRSET, { mask, offset } } -#define MS_DBRA(offset) { MS_OP_DBRA, { offset } } -#define MS_BRCLEAR(mask,offset) { MS_OP_BRCLEAR, { mask, offset } } +#define MS_DBRA(offset) { MS_OP_DBRA, { { offset } } } +#define MS_BRCLEAR(mask,offset) { MS_OP_BRCLEAR, { { mask }, { offset } } } #define MS_BRSTAT(mask_set,mask_clr,offset) \ { MS_OP_BRSTAT, { mask_set, mask_clr, offset } } /* C function or submicrosequence call */ #define MS_C_CALL(function,parameter) \ { MS_OP_C_CALL, { function, parameter } } -#define MS_CALL(microseq) { MS_OP_CALL, { microseq } } +#define MS_CALL(microseq) { MS_OP_CALL, { { microseq } } } /* mode dependent read/write operations * ppb_MS_xxx_init() call required otherwise default is @@ -144,14 +144,14 @@ #define MS_GET(ptr,len) { MS_OP_GET, { ptr, len } } /* delay in microseconds */ -#define MS_DELAY(udelay) { MS_OP_DELAY, { udelay } } +#define MS_DELAY(udelay) { MS_OP_DELAY, { { udelay } } } /* asynchroneous delay in ms */ -#define MS_ADELAY(mdelay) { MS_OP_ADELAY, { mdelay } } +#define MS_ADELAY(mdelay) { MS_OP_ADELAY, { { mdelay } } } /* return from submicrosequence execution or microseqence execution */ -#define MS_SUBRET(code) { MS_OP_SUBRET, { code } } -#define MS_RET(code) { MS_OP_RET, { code } } +#define MS_SUBRET(code) { MS_OP_SUBRET, { { code } } } +#define MS_RET(code) { MS_OP_RET, { { code } } } /* * Function abstraction level diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c index e0072f3..95d7644 100644 --- a/sys/dev/ppbus/ppi.c +++ b/sys/dev/ppbus/ppi.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ppi.c,v 1.8 1998/12/07 21:58:16 archie Exp $ + * $Id: ppi.c,v 1.9 1999/01/10 12:04:55 nsouch Exp $ * */ #include "ppi.h" @@ -449,7 +449,7 @@ ppiwrite(dev_t dev, struct uio *uio, int ioflag) #endif /* negociation done, write bytes to master host */ - while (len = min(uio->uio_resid, BUFSIZE)) { + while ((len = min(uio->uio_resid, BUFSIZE)) != 0) { uiomove(ppi->ppi_buffer, len, uio); if ((error = byte_peripheral_write(&ppi->ppi_dev, ppi->ppi_buffer, len, &sent))) |
