From 16676bcded7bb328c0ddfb958850dd8a23866163 Mon Sep 17 00:00:00 2001 From: Andrew Gallatin Date: Mon, 5 Nov 2001 12:57:46 +0000 Subject: [PATCH] Force the RxBuf and TxBuf arrays to be aligned on 16-bit boundaries to make the driver work on alpha approved by: tanimura --- sys/dev/rp/rp.c | 2 +- sys/dev/rp/rpvar.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 9c49f208fc2..b1a488e5457 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -1632,7 +1632,7 @@ rpstart(tp) qp = &tp->t_outq; if(xmit_fifo_room > 0 && qp->c_cc > 0) { tp->t_state |= TS_BUSY; - count = q_to_b( qp, rp->TxBuf, xmit_fifo_room ); + count = q_to_b( qp, (char *)rp->TxBuf, xmit_fifo_room ); wcount = count >> 1; if ( wcount ) { rp_writemultich2(cp, sGetTxRxDataIO(cp), (u_int16_t *)rp->TxBuf, wcount); diff --git a/sys/dev/rp/rpvar.h b/sys/dev/rp/rpvar.h index ae22a4e3877..41aee029b19 100644 --- a/sys/dev/rp/rpvar.h +++ b/sys/dev/rp/rpvar.h @@ -77,8 +77,8 @@ struct rp_port { int rp_xmit_stopped:1; CONTROLLER_t * rp_ctlp; CHANNEL_t rp_channel; - unsigned char TxBuf[TXFIFO_SIZE]; - unsigned char RxBuf[RXFIFO_SIZE]; + unsigned short TxBuf[TXFIFO_SIZE/2 +1]; + unsigned short RxBuf[RXFIFO_SIZE/2 +1]; }; /* Actually not used */