diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ed/if_ed.c | 4 | ||||
| -rw-r--r-- | sys/dev/fdc/fdc.c | 14 | ||||
| -rw-r--r-- | sys/dev/mcd/mcd.c | 21 |
3 files changed, 23 insertions, 16 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 30d37e6..5ab5507 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -20,7 +20,7 @@ */ /* - * $Id: if_ed.c,v 2.16 1993/11/29 16:55:56 davidg Exp davidg $ + * $Id: if_ed.c,v 1.25 1993/11/29 17:07:26 davidg Exp $ */ /* @@ -1596,7 +1596,7 @@ outloop: /* copy trailer_header into a data structure */ m_copydata(m0, off, sizeof(struct trailer_header), - &trailer_header.ether_type); + (caddr_t)&trailer_header.ether_type); /* copy residual data */ m_copydata(m0, off+sizeof(struct trailer_header), diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 9dcc2cb..ef24eb0 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.14 1993/12/16 19:47:42 ache Exp $ + * $Id: fd.c,v 1.16 1993/12/19 00:40:49 ache Exp $ * */ @@ -165,6 +165,8 @@ typedef int fdsu_t; typedef struct fd_data *fd_p; typedef struct fdc_data *fdc_p; +static int retrier(fdcu_t); + #define DEVIDLE 0 #define FINDWORK 1 #define DOSEEK 2 @@ -391,7 +393,7 @@ void fdstrategy(struct buf *bp) dp = &(fdc->head); s = splbio(); disksort(dp, bp); - untimeout(fd_turnoff,fdu); /* a good idea */ + untimeout(fd_turnoff, (caddr_t)fdu); /* a good idea */ fdstart(fdcu); splx(s); return; @@ -762,7 +764,7 @@ fdstate(fdcu, fdc) TRACE1("fd%d",fdu); TRACE1("[%s]",fdstates[fdc->state]); TRACE1("(0x%x)",fd->flags); - untimeout(fd_turnoff, fdu); + untimeout(fd_turnoff, (caddr_t)fdu); timeout(fd_turnoff, (caddr_t)fdu, 4 * hz); switch (fdc->state) { @@ -810,7 +812,7 @@ fdstate(fdcu, fdc) timeout(fd_timeout, (caddr_t)fdcu, 2 * hz); return(0); /* will return later */ case SEEKWAIT: - untimeout(fd_timeout,fdcu); + untimeout(fd_timeout, (caddr_t)fdcu); /* allow heads to settle */ timeout(fd_pseudointr, (caddr_t)fdcu, hz / 50); fdc->state = SEEKCOMPLETE; @@ -883,7 +885,7 @@ fdstate(fdcu, fdc) timeout(fd_timeout, (caddr_t)fdcu, 2 * hz); return(0); /* will return later */ case IOCOMPLETE: /* IO DONE, post-analyze */ - untimeout(fd_timeout,fdcu); + untimeout(fd_timeout, (caddr_t)fdcu); for(i=0;i<7;i++) { fdc->status[i] = in_fdc(fdcu); @@ -994,7 +996,7 @@ fdstate(fdcu, fdc) return(1); /* Come back immediatly to new state */ } -int +static int retrier(fdcu) fdcu_t fdcu; { diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 97b3f51..f4802bc 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -34,7 +34,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.2 1993/10/16 13:46:13 rgrimes Exp $ + * $Id: mcd.c,v 1.3 1993/11/25 01:31:43 wollman Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -68,7 +68,7 @@ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #undef MCD_TO_WARNING_ON #endif #else -#define MCD_TRACE(fmt,a,b,c,d) {if (mcd_data[unit].debug) {printf("mcd%d st=%02x: ",unit,mcd_data[unit].status); printf(fmt,a,b,c,d);}} +#define MCD_TRACE(fmt,a,b,c,xd) {if (mcd_data[unit].debug) {printf("mcd%d st=%02x: ",unit,mcd_data[unit].status); printf(fmt,a,b,c,xd);}} #endif #define mcd_part(dev) ((minor(dev)) & 7) @@ -158,7 +158,7 @@ static void hsg2msf(int hsg, bcd_t *msf); static int msf2hsg(bcd_t *msf); static int mcd_volinfo(int unit); static int mcd_waitrdy(int port,int dly); -static void mcd_doread(int state, struct mcd_mbx *mbxin); +static void mcd_doread(caddr_t, int); #ifndef MCDMINI static int mcd_setmode(int unit, int mode); static int mcd_getqchan(int unit, struct mcd_qchninfo *q); @@ -397,7 +397,7 @@ static void mcd_start(int unit) cd->mbx.p_offset = p->p_offset; /* calling the read routine */ - mcd_doread(MCD_S_BEGIN,&(cd->mbx)); + mcd_doread((caddr_t)MCD_S_BEGIN, (int)&(cd->mbx)); /* triggers mcd_start, when successful finished */ return; } @@ -811,8 +811,13 @@ mcdintr(unit) */ static struct mcd_mbx *mbxsave; -static void mcd_doread(int state, struct mcd_mbx *mbxin) +/* + * Good thing Alphas come with real CD players... + */ +static void mcd_doread(caddr_t xstate, int xmbxin) { + int state = (int)xstate; + struct mcd_mbx *mbxin = (struct mcd_mbx *)xmbxin; struct mcd_mbx *mbx = (state!=MCD_S_BEGIN) ? mbxsave : mbxin; int unit = mbx->unit; int port = mbx->port; @@ -836,7 +841,7 @@ loop: timeout((timeout_func_t)mcd_doread,(caddr_t)MCD_S_WAITSTAT,hz/100); /* XXX */ return; case MCD_S_WAITSTAT: - untimeout(mcd_doread,MCD_S_WAITSTAT); + untimeout(mcd_doread, (caddr_t)MCD_S_WAITSTAT); if (mbx->count-- >= 0) { if (inb(port+mcd_xfer) & MCD_ST_BUSY) { timeout((timeout_func_t)mcd_doread,(caddr_t)MCD_S_WAITSTAT,hz/100); /* XXX */ @@ -873,7 +878,7 @@ loop: } case MCD_S_WAITMODE: - untimeout(mcd_doread,MCD_S_WAITMODE); + untimeout(mcd_doread, (caddr_t)MCD_S_WAITMODE); if (mbx->count-- < 0) { #ifdef MCD_TO_WARNING_ON printf("mcd%d: timeout set mode\n",unit); @@ -911,7 +916,7 @@ nextblock: timeout((timeout_func_t)mcd_doread,(caddr_t)MCD_S_WAITREAD,hz/100); /* XXX */ return; case MCD_S_WAITREAD: - untimeout(mcd_doread,MCD_S_WAITREAD); + untimeout(mcd_doread,(caddr_t)MCD_S_WAITREAD); if (mbx->count-- > 0) { k = inb(port+mcd_xfer); if ((k & 2)==0) { |
