Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use char* for pointer arithmetic.

Browse Source
This commit is contained in:
he 2007-03-05 21:31:30 +00:00
parent 0e9b57828a
commit 176f2ec48f
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/arch/mac68k/dev/if_sn.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sn.c,v 1.43 2007/03/04 06:00:07 christos Exp $ */
/* $NetBSD: if_sn.c,v 1.44 2007/03/05 21:31:30 he Exp $ */
/*
* National Semiconductor DP8393X SONIC Driver
@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.43 2007/03/04 06:00:07 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.44 2007/03/05 21:31:30 he Exp $");
#include "opt_inet.h"
@ -595,7 +595,7 @@ sonicput(struct sn_softc *sc, struct mbuf *m0, int mtd_next)
if (totlen < ETHERMIN + ETHER_HDR_LEN) {
int pad = ETHERMIN + ETHER_HDR_LEN - totlen;
memset(mtdp->mtd_buf + totlen, 0, pad);
memset((char*)mtdp->mtd_buf + totlen, 0, pad);
totlen = ETHERMIN + ETHER_HDR_LEN;
}
@ -793,12 +793,12 @@ initialise_rda(struct sn_softc *sc)
/* link the RDA's together into a circular list */
for (i = 0; i < (sc->sc_nrda - 1); i++) {
p_rda = sc->p_rda + (i * RXPKT_SIZE(sc));
p_rda = (char*)sc->p_rda + (i * RXPKT_SIZE(sc));
v_rda = sc->v_rda + ((i+1) * RXPKT_SIZE(sc));
SWO(bitmode, p_rda, RXPKT_RLINK, LOWER(v_rda));
SWO(bitmode, p_rda, RXPKT_INUSE, 1);
}
p_rda = sc->p_rda + ((sc->sc_nrda - 1) * RXPKT_SIZE(sc));
p_rda = (char*)sc->p_rda + ((sc->sc_nrda - 1) * RXPKT_SIZE(sc));
SWO(bitmode, p_rda, RXPKT_RLINK, LOWER(sc->v_rda) | EOL);
SWO(bitmode, p_rda, RXPKT_INUSE, 1);
@ -985,7 +985,7 @@ sonictxint(struct sn_softc *sc)
static void
sonicrxint(struct sn_softc *sc)
{
void * rda;
void *rda;
int orra;
int len;
int rramark;
@ -993,7 +993,7 @@ sonicrxint(struct sn_softc *sc)
int bitmode = sc->bitmode;
u_int16_t rxpkt_ptr;
rda = sc->p_rda + (sc->sc_rxmark * RXPKT_SIZE(sc));
rda = (char*)sc->p_rda + (sc->sc_rxmark * RXPKT_SIZE(sc));
while (SRO(bitmode, rda, RXPKT_INUSE) == 0) {
u_int status = SRO(bitmode, rda, RXPKT_STATUS);
@ -1002,7 +1002,7 @@ sonicrxint(struct sn_softc *sc)
rxpkt_ptr = SRO(bitmode, rda, RXPKT_PTRLO);
len = SRO(bitmode, rda, RXPKT_BYTEC) - FCSSIZE;
if (status & RCR_PRX) {
void *pkt = sc->rbuf[orra & RBAMASK] +
void *pkt = (char*)sc->rbuf[orra & RBAMASK] +
m68k_page_offset(rxpkt_ptr);
if (sonic_read(sc, pkt, len))
sc->sc_if.if_ipackets++;
@ -1056,14 +1056,16 @@ sonicrxint(struct sn_softc *sc)
SWO(bitmode, rda, RXPKT_INUSE, 1);
SWO(bitmode, rda, RXPKT_RLINK,
SRO(bitmode, rda, RXPKT_RLINK) | EOL);
SWO(bitmode, (sc->p_rda + (rdamark * RXPKT_SIZE(sc))), RXPKT_RLINK,
SRO(bitmode, (sc->p_rda + (rdamark * RXPKT_SIZE(sc))),
SWO(bitmode, ((char*)sc->p_rda + (rdamark * RXPKT_SIZE(sc))),
RXPKT_RLINK,
SRO(bitmode, ((char*)sc->p_rda +
(rdamark * RXPKT_SIZE(sc))),
RXPKT_RLINK) & ~EOL);
sc->sc_rdamark = sc->sc_rxmark;
if (++sc->sc_rxmark >= sc->sc_nrda)
sc->sc_rxmark = 0;
rda = sc->p_rda + (sc->sc_rxmark * RXPKT_SIZE(sc));
rda = (char*)sc->p_rda + (sc->sc_rxmark * RXPKT_SIZE(sc));
}
}
@ -1142,7 +1144,7 @@ sonic_get(struct sn_softc *sc, void *pkt, int datalen)
}
if (mp == &top) {
void *newdata = (void *)
char *newdata = (char *)
ALIGN(m->m_data + sizeof(struct ether_header)) -
sizeof(struct ether_header);
len -= newdata - m->m_data;
@ -1152,7 +1154,7 @@ sonic_get(struct sn_softc *sc, void *pkt, int datalen)
m->m_len = len = min(datalen, len);
memcpy(mtod(m, void *), pkt, len);
pkt += len;
pkt = (char*)pkt + len;
datalen -= len;
*mp = m;
mp = &m->m_next;