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

Fix some caddr_t rototill fallout.

This commit is contained in:
simonb 2007-03-06 00:43:50 +00:00
parent 25e99827c3
commit 80c8d64aa9
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/mips/alchemy/dev/if_aumac.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_aumac.c,v 1.19 2007/03/04 06:00:11 christos Exp $ */
/* $NetBSD: if_aumac.c,v 1.20 2007/03/06 00:43:50 simonb Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.19 2007/03/04 06:00:11 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.20 2007/03/06 00:43:50 simonb Exp $");
#include "bpfilter.h"
#include "rnd.h"
@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.19 2007/03/04 06:00:11 christos Exp $
#define AUMAC_BUFSIZE (MAC_BUFLEN * (AUMAC_NTXDESC + AUMAC_NRXDESC))
struct aumac_buf {
void *buf_vaddr; /* virtual address of buffer */
vaddr_t buf_vaddr; /* virtual address of buffer */
bus_addr_t buf_paddr; /* DMA address of buffer */
};
@ -234,7 +234,7 @@ aumac_attach(struct device *parent, struct device *self, void *aux)
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct pglist pglist;
paddr_t bufaddr;
void *vbufaddr;
vaddr_t vbufaddr;
int i;
callout_init(&sc->sc_tick_ch);
@ -297,7 +297,7 @@ aumac_attach(struct device *parent, struct device *self, void *aux)
return;
bufaddr = VM_PAGE_TO_PHYS(TAILQ_FIRST(&pglist));
vbufaddr = (void *)MIPS_PHYS_TO_KSEG0(bufaddr);
vbufaddr = MIPS_PHYS_TO_KSEG0(bufaddr);
for (i = 0; i < AUMAC_NTXDESC; i++) {
int offset = AUMAC_TXBUF_OFFSET + (i * MAC_BUFLEN);
@ -437,11 +437,11 @@ aumac_start(struct ifnet *ifp)
*/
m_copydata(m, 0, m->m_pkthdr.len,
sc->sc_txbufs[nexttx].buf_vaddr);
(void *)sc->sc_txbufs[nexttx].buf_vaddr);
/* Zero out the remainder of any short packets. */
if (m->m_pkthdr.len < (ETHER_MIN_LEN - ETHER_CRC_LEN))
memset(sc->sc_txbufs[nexttx].buf_vaddr +
memset((char *)sc->sc_txbufs[nexttx].buf_vaddr +
m->m_pkthdr.len, 0,
ETHER_MIN_LEN - ETHER_CRC_LEN - m->m_pkthdr.len);
@ -738,7 +738,7 @@ aumac_rxintr(struct aumac_softc *sc)
m->m_data += 2; /* align payload */
memcpy(mtod(m, void *),
sc->sc_rxbufs[i].buf_vaddr, len);
(void *)sc->sc_rxbufs[i].buf_vaddr, len);
AUMAC_INIT_RXDESC(sc, i);
m->m_pkthdr.rcvif = ifp;

8
sys/arch/mips/sibyte/dev/sbmac.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbmac.c,v 1.22 2007/03/04 06:00:13 christos Exp $ */
/* $NetBSD: sbmac.c,v 1.23 2007/03/06 00:43:50 simonb Exp $ */
/*
* Copyright 2000, 2001, 2004
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.22 2007/03/04 06:00:13 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.23 2007/03/06 00:43:50 simonb Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@ -660,7 +660,7 @@ sbdma_add_txbuffer(sbmacdma_t *d, struct mbuf *m)
len -= next_len;
if (addr + len ==
KVTOPHYS(mtod(m_temp, void *) + len)) {
KVTOPHYS(mtod(m_temp, char *) + len)) {
SBMAC_EVCNT_INCR(sc->sbm_ev_txkeep);
len += next_len;
next_len = 0;
@ -702,7 +702,7 @@ again:
num_mbufs++;
if (next_len != 0) {
addr = KVTOPHYS(mtod(m_temp, void *) + len);
addr = KVTOPHYS(mtod(m_temp, char *) + len);
len = next_len;
next_len = 0;

12
sys/arch/sbmips/sbmips/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.12 2006/11/25 11:59:57 scw Exp $ */
/* $NetBSD: disksubr.c,v 1.13 2007/03/06 00:45:06 simonb Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.12 2006/11/25 11:59:57 scw Exp $");
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.13 2007/03/06 00:45:06 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -60,12 +60,12 @@ mbr_findslice(dp, bp)
int i;
/* Note: Magic number is little-endian. */
mbrmagicp = (uint16_t *)(bp->b_data + MBR_MAGIC_OFFSET);
mbrmagicp = (uint16_t *)((char *)bp->b_data + MBR_MAGIC_OFFSET);
if (*mbrmagicp != MBR_MAGIC)
return (NO_MBR_SIGNATURE);
/* XXX how do we check veracity/bounds of this? */
memcpy(dp, bp->b_data + MBR_PART_OFFSET, MBR_PART_COUNT * sizeof(*dp));
memcpy(dp, (char *)bp->b_data + MBR_PART_OFFSET, MBR_PART_COUNT * sizeof(*dp));
/* look for NetBSD partition */
for (i = 0; i < MBR_PART_COUNT; i++) {
@ -204,7 +204,7 @@ nombrpart:
}
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)
(bp->b_data + lp->d_secsize - sizeof(*dlp));
((char *)bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)
@ -382,7 +382,7 @@ nombrpart:
goto done;
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)
(bp->b_data + lp->d_secsize - sizeof(*dlp));
((char *)bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {

6
sys/arch/sbmips/sbmips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.34 2007/03/05 21:05:02 dogcow Exp $ */
/* $NetBSD: machdep.c,v 1.35 2007/03/06 00:45:06 simonb Exp $ */
/*
* Copyright 2000, 2001
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2007/03/05 21:05:02 dogcow Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35 2007/03/06 00:45:06 simonb Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@ -322,7 +322,7 @@ mach_init(long fwhandle, long magic, long bootdata, long reserved)
*/
p0 = (void *)pmap_steal_memory(USPACE, NULL, NULL);
lwp0.l_addr = proc0paddr = (struct user *)p0;
lwp0.l_md.md_regs = (struct frame *)(p0 + USPACE) - 1;
lwp0.l_md.md_regs = (struct frame *)((char *)p0 + USPACE) - 1;
curpcb = &lwp0.l_addr->u_pcb;
curpcb->pcb_context[11] = MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */