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

Replace badbaddr() with hp300_bus_space_probe() to avoid -Wcast-qual warning.

This commit is contained in:
tsutsui 2005-06-03 11:51:16 +00:00
parent fbc313cb9d
commit 072babb902
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/hp300/dev/dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dma.c,v 1.31 2004/08/28 17:37:00 thorpej Exp $ */
/* $NetBSD: dma.c,v 1.32 2005/06/03 11:51:16 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.31 2004/08/28 17:37:00 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.32 2005/06/03 11:51:16 tsutsui Exp $");
#include <machine/hp300spu.h> /* XXX param.h includes cpu.h */
@ -211,7 +211,7 @@ dmaattach(struct device *parent, struct device *self, void *aux)
* so we just hope nobody has an A card (A cards will work if
* splbio works out to ipl 3).
*/
if (badbaddr((char *)&dma->dma_id[2])) {
if (hp300_bus_space_probe(sc->sc_bst, sc->sc_bsh, DMA_ID2, 1) == 0) {
rev = 'B';
#if !defined(HP320)
panic("dmainit: DMA card requires hp320 support");

4
sys/arch/hp300/dev/dmareg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: dmareg.h,v 1.13 2003/08/07 16:27:28 agc Exp $ */
/* $NetBSD: dmareg.h,v 1.14 2005/06/03 11:51:16 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@ -73,6 +73,8 @@ struct dmareg {
/* addresses */
#define DMA_BASE IIOV(0x500000)
#define DMA_ID2 offsetof(struct dmareg, dma_id[2])
/* command bits */
#define DMA_ENAB 0x0001
#define DMA_WORD 0x0002