Fix more `void *' arithmetic.
This commit is contained in:
augustss
parent
332d7c138f
commit
0d32a9a78b
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ibcs2_exec.c,v 1.20 1998/10/23 19:45:59 mjacob Exp $ */
|
||||
/* $NetBSD: ibcs2_exec.c,v 1.21 1999/01/08 19:22:34 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995, 1998 Scott Bartram
|
||||
|
|
@ -259,7 +259,7 @@ exec_ibcs2_coff_makecmds(p, epp)
|
|||
if (COFF_BADMAG(fp))
|
||||
return ENOEXEC;
|
||||
|
||||
ap = epp->ep_hdr + sizeof(struct coff_filehdr);
|
||||
ap = (void *)((char *)epp->ep_hdr + sizeof(struct coff_filehdr));
|
||||
switch (ap->a_magic) {
|
||||
case COFF_OMAGIC:
|
||||
error = exec_ibcs2_coff_prep_omagic(p, epp, fp, ap);
|
||||
|
|
@ -710,7 +710,7 @@ exec_ibcs2_xout_makecmds(p, epp)
|
|||
if ((xp->x_renv & (XE_ABS | XE_VMOD)) || !(xp->x_renv & XE_EXEC))
|
||||
return ENOEXEC;
|
||||
|
||||
xep = epp->ep_hdr + sizeof(struct xexec);
|
||||
xep = (void *)((char *)epp->ep_hdr + sizeof(struct xexec));
|
||||
#ifdef notyet
|
||||
if (xp->x_renv & XE_PURE)
|
||||
error = exec_ibcs2_xout_prep_zmagic(p, epp, xp, xep);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rrunner.c,v 1.7 1998/11/20 04:12:58 kml Exp $ */
|
||||
/* $NetBSD: rrunner.c,v 1.8 1999/01/08 19:22:35 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -3737,7 +3737,7 @@ esh_dma_sync(sc, mem, start, end, entries, size, do_equal, ops)
|
|||
int do_equal;
|
||||
int ops;
|
||||
{
|
||||
int offset = mem - (void *) sc->sc_dma_addr;
|
||||
int offset = (char *)mem - (char *)sc->sc_dma_addr;
|
||||
|
||||
if (start < end) {
|
||||
bus_dmamap_sync(sc->sc_dmat, sc->sc_dma,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ess.c,v 1.27 1998/11/25 13:39:37 mycroft Exp $ */
|
||||
/* $NetBSD: ess.c,v 1.28 1999/01/08 19:22:35 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997
|
||||
|
|
@ -1175,7 +1175,8 @@ ess_trigger_output(addr, start, end, blksize, intr, arg, param)
|
|||
ess_clear_mreg_bits(sc, ESS_MREG_AUDIO2_CTRL2,
|
||||
ESS_AUDIO2_CTRL2_FIFO_SIGNED);
|
||||
|
||||
isa_dmastart(sc->sc_ic, sc->sc_out.drq, start, end - start, NULL,
|
||||
isa_dmastart(sc->sc_ic, sc->sc_out.drq, start,
|
||||
(char *)end - (char *)start, NULL,
|
||||
DMAMODE_WRITE | DMAMODE_LOOP, BUS_DMA_NOWAIT);
|
||||
|
||||
if (IS16BITDRQ(sc->sc_out.drq))
|
||||
|
|
@ -1266,7 +1267,8 @@ ess_trigger_input(addr, start, end, blksize, intr, arg, param)
|
|||
ess_set_xreg_bits(sc, ESS_XCMD_AUDIO1_CTRL1,
|
||||
ESS_AUDIO1_CTRL1_FIFO_CONNECT);
|
||||
|
||||
isa_dmastart(sc->sc_ic, sc->sc_in.drq, start, end - start, NULL,
|
||||
isa_dmastart(sc->sc_ic, sc->sc_in.drq, start,
|
||||
(char *)end - (char *)start, NULL,
|
||||
DMAMODE_READ | DMAMODE_LOOP, BUS_DMA_NOWAIT);
|
||||
|
||||
if (IS16BITDRQ(sc->sc_in.drq))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_ai.c,v 1.6 1998/06/09 07:25:00 thorpej Exp $ */
|
||||
/* $NetBSD: if_ai.c,v 1.7 1999/01/08 19:22:35 augustss Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -366,8 +366,8 @@ ai_attach(parent, self, aux)
|
|||
|
||||
/* Map i/o space. */
|
||||
sc->sc_msize = ia->ia_msize;
|
||||
sc->sc_maddr = (void *) memh;
|
||||
sc->sc_iobase = sc->sc_maddr + sc->sc_msize - (1 << 24);
|
||||
sc->sc_maddr = (void *)memh;
|
||||
sc->sc_iobase = (char *)sc->sc_maddr + sc->sc_msize - (1 << 24);
|
||||
|
||||
/* set up pointers to important on-card control structures */
|
||||
sc->iscp = 0;
|
||||
|
|
@ -459,7 +459,7 @@ check_ie_present(sc, memt, memh, size)
|
|||
|
||||
sc->bt = memt;
|
||||
sc->bh = memh;
|
||||
sc->sc_iobase = (void *) memh + size - (1 << 24);
|
||||
sc->sc_iobase = (char *)memh + size - (1 << 24);
|
||||
|
||||
sc->scp = size + IE_SCP_ADDR - (1 << 24);
|
||||
bus_space_set_region_1(memt, memh, (u_long) sc->scp, 0, IE_SCP_SZ);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_ef.c,v 1.5 1998/06/09 07:25:01 thorpej Exp $ */
|
||||
/* $NetBSD: if_ef.c,v 1.6 1999/01/08 19:22:36 augustss Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -578,8 +578,8 @@ ef_attach(parent, self, aux)
|
|||
sc->bh = memh;
|
||||
|
||||
sc->sc_msize = ia->ia_msize;
|
||||
sc->sc_maddr = (void *) memh;
|
||||
sc->sc_iobase = sc->sc_maddr + sc->sc_msize - (1 << 24);
|
||||
sc->sc_maddr = (void *)memh;
|
||||
sc->sc_iobase = (char *)sc->sc_maddr + sc->sc_msize - (1 << 24);
|
||||
|
||||
/* set up pointers to important on-card control structures */
|
||||
sc->iscp = 0;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_ix.c,v 1.5 1998/06/09 07:25:02 thorpej Exp $ */
|
||||
/* $NetBSD: if_ix.c,v 1.6 1999/01/08 19:22:36 augustss Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -623,8 +623,8 @@ ix_attach(parent, self, aux)
|
|||
|
||||
/* Map i/o space. */
|
||||
sc->sc_msize = ia->ia_msize;
|
||||
sc->sc_maddr = (void* ) memh;
|
||||
sc->sc_iobase = sc->sc_maddr + sc->sc_msize - (1 << 24);
|
||||
sc->sc_maddr = (void *)memh;
|
||||
sc->sc_iobase = (char *)sc->sc_maddr + sc->sc_msize - (1 << 24);
|
||||
|
||||
/* set up pointers to important on-card control structures */
|
||||
sc->iscp = 0;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: eap.c,v 1.19 1998/11/25 22:17:07 augustss Exp $ */
|
||||
/* $NetBSD: eap.c,v 1.20 1999/01/08 19:22:36 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -803,10 +803,12 @@ eap_trigger_output(addr, start, end, blksize, intr, arg, param)
|
|||
}
|
||||
|
||||
DPRINTF(("eap_trigger_output: DAC2_ADDR=0x%x, DAC2_SIZE=0x%x\n",
|
||||
(int)DMAADDR(p), EAP_SET_SIZE(0, ((end - start) >> 2) - 1)));
|
||||
(int)DMAADDR(p),
|
||||
EAP_SET_SIZE(0, (((char *)end - (char *)start) >> 2) - 1)));
|
||||
EWRITE4(sc, EAP_MEMPAGE, EAP_DAC_PAGE);
|
||||
EWRITE4(sc, EAP_DAC2_ADDR, DMAADDR(p));
|
||||
EWRITE4(sc, EAP_DAC2_SIZE, EAP_SET_SIZE(0, ((end - start) >> 2) - 1));
|
||||
EWRITE4(sc, EAP_DAC2_SIZE,
|
||||
EAP_SET_SIZE(0, (((char *)end - (char *)start) >> 2) - 1));
|
||||
|
||||
EWRITE2(sc, EAP_DAC2_CSR, (blksize >> sampshift) - 1);
|
||||
mode = EREAD4(sc, EAP_ICSC) & ~EAP_DAC2_EN;
|
||||
|
|
@ -863,10 +865,12 @@ eap_trigger_input(addr, start, end, blksize, intr, arg, param)
|
|||
}
|
||||
|
||||
DPRINTF(("eap_trigger_input: ADC_ADDR=0x%x, ADC_SIZE=0x%x\n",
|
||||
(int)DMAADDR(p), EAP_SET_SIZE(0, ((end - start) >> 2) - 1)));
|
||||
(int)DMAADDR(p),
|
||||
EAP_SET_SIZE(0, (((char *)end - (char *)start) >> 2) - 1)));
|
||||
EWRITE4(sc, EAP_MEMPAGE, EAP_ADC_PAGE);
|
||||
EWRITE4(sc, EAP_ADC_ADDR, DMAADDR(p));
|
||||
EWRITE4(sc, EAP_ADC_SIZE, EAP_SET_SIZE(0, ((end - start) >> 2) - 1));
|
||||
EWRITE4(sc, EAP_ADC_SIZE,
|
||||
EAP_SET_SIZE(0, (((char *)end - (char *)start) >> 2) - 1));
|
||||
|
||||
EWRITE2(sc, EAP_ADC_CSR, (blksize >> sampshift) - 1);
|
||||
mode = EREAD4(sc, EAP_ICSC) & ~EAP_ADC_EN;
|
||||
|
|
|
|||
Loading…
Reference in New Issue