Remove katelib.h and references to it.

{Read,Write}{Word,Byte} macros are provided in the files that still use
them. Someone(tm) should convert them to bus_space(9)
This commit is contained in:
skrll 2014-10-25 10:58:12 +00:00
parent bc885fd55c
commit 01e4054922
22 changed files with 64 additions and 160 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: ad.aarch64,v 1.6 2014/10/22 16:51:31 christos Exp $
# $NetBSD: ad.aarch64,v 1.7 2014/10/25 10:58:12 skrll Exp $
./usr/include/aarch64 comp-c-include
./usr/include/aarch64/ansi.h comp-c-include
./usr/include/aarch64/aout_machdep.h comp-c-include
@ -56,7 +56,7 @@
./usr/include/arm/arm26/types.h comp-c-include
./usr/include/arm/arm32 comp-c-include
./usr/include/arm/arm32/frame.h comp-c-include
./usr/include/arm/arm32/katelib.h comp-c-include
./usr/include/arm/arm32/katelib.h comp-c-include obsolete
./usr/include/arm/arm32/param.h comp-c-include
./usr/include/arm/arm32/pmap.h comp-c-include
./usr/include/arm/arm32/psl.h comp-c-include

View File

@ -1,4 +1,4 @@
# $NetBSD: ad.arm,v 1.62 2014/10/22 16:51:31 christos Exp $
# $NetBSD: ad.arm,v 1.63 2014/10/25 10:58:12 skrll Exp $
./usr/include/acorn26 comp-c-include
./usr/include/acorn26/ansi.h comp-obsolete obsolete
./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete
@ -115,7 +115,7 @@
./usr/include/arm/arm32 comp-c-include
./usr/include/arm/arm32/bus.h comp-obsolete obsolete
./usr/include/arm/arm32/frame.h comp-c-include
./usr/include/arm/arm32/katelib.h comp-c-include
./usr/include/arm/arm32/katelib.h comp-c-include obsolete
./usr/include/arm/arm32/param.h comp-c-include
./usr/include/arm/arm32/pmap.h comp-c-include
./usr/include/arm/arm32/psl.h comp-c-include

View File

@ -1,4 +1,4 @@
/* $NetBSD: rpc_machdep.c,v 1.89 2014/09/13 17:36:41 matt Exp $ */
/* $NetBSD: rpc_machdep.c,v 1.90 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@ -55,7 +55,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.89 2014/09/13 17:36:41 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.90 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -85,7 +85,6 @@ __KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.89 2014/09/13 17:36:41 matt Exp $"
#include <arm/locore.h>
#include <arm/undefined.h>
#include <arm/arm32/katelib.h>
#include <arm/arm32/machdep.h>
#include <arm/arm32/pmap.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: eb7500atx_machdep.c,v 1.27 2014/09/13 17:36:42 matt Exp $ */
/* $NetBSD: eb7500atx_machdep.c,v 1.28 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@ -55,7 +55,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.27 2014/09/13 17:36:42 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.28 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -89,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.27 2014/09/13 17:36:42 matt
#include <machine/signal.h>
#include <machine/bootconfig.h>
#include <machine/io.h>
#include <arm/arm32/katelib.h>
#include <arm/arm32/machdep.h>
#include <machine/rtc.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.55 2014/07/25 08:10:31 dholland Exp $ */
/* $NetBSD: fd.c,v 1.56 2014/10/25 10:58:12 skrll Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.55 2014/07/25 08:10:31 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.56 2014/10/25 10:58:12 skrll Exp $");
#include "opt_ddb.h"
@ -113,7 +113,6 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.55 2014/07/25 08:10:31 dholland Exp $");
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/io.h>
#include <arm/arm32/katelib.h>
#include <arm/iomd/iomdreg.h>
#include <arm/iomd/iomdvar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.19 2012/10/27 17:17:23 chs Exp $ */
/* $NetBSD: asc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@ -98,7 +98,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.19 2012/10/27 17:17:23 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -115,8 +115,6 @@ __KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.19 2012/10/27 17:17:23 chs Exp $");
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
#include <arm/arm32/katelib.h>
#include <dev/podulebus/podules.h>
#include <dev/podulebus/powerromreg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: cosc.c,v 1.19 2014/01/21 19:46:45 christos Exp $ */
/* $NetBSD: cosc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.19 2014/01/21 19:46:45 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.20 2014/10/25 10:58:12 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.19 2014/01/21 19:46:45 christos Exp $");
#include <machine/bootconfig.h>
#include <machine/io.h>
#include <machine/intr.h>
#include <arm/arm32/katelib.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/escreg.h>
#include <acorn32/podulebus/escvar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
/* $NetBSD: esc.c,v 1.29 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.29 2014/10/25 10:58:12 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -103,7 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
#include <machine/cpu.h>
#include <machine/io.h>
#include <machine/intr.h>
#include <arm/arm32/katelib.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/escreg.h>
#include <acorn32/podulebus/escvar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie.c,v 1.33 2014/10/18 08:33:24 snj Exp $ */
/* $NetBSD: if_ie.c,v 1.34 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.33 2014/10/18 08:33:24 snj Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.34 2014/10/25 10:58:12 skrll Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@ -71,7 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.33 2014/10/18 08:33:24 snj Exp $");
#include <sys/device.h>
#include <machine/io.h>
#include <machine/intr.h>
#include <arm/arm32/katelib.h>
#include <acorn32/podulebus/podulebus.h>
#include <dev/podulebus/podules.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: netslot.c,v 1.10 2012/05/10 10:27:10 skrll Exp $ */
/* $NetBSD: netslot.c,v 1.11 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -35,7 +35,7 @@
#include <sys/param.h>
__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.10 2012/05/10 10:27:10 skrll Exp $");
__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.11 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -44,7 +44,6 @@ __KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.10 2012/05/10 10:27:10 skrll Exp $");
#include <sys/device.h>
#include <uvm/uvm_extern.h>
#include <machine/io.h>
#include <arm/arm32/katelib.h>
#include <machine/intr.h>
#include <machine/bootconfig.h>
#include <arm/iomd/iomdreg.h>
@ -52,6 +51,11 @@ __KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.10 2012/05/10 10:27:10 skrll Exp $");
#include <dev/podulebus/podulebus.h>
#include <dev/podulebus/podules.h>
#define WriteByte(a, b) \
*((volatile unsigned char *)(a)) = (b)
#define ReadByte(a) \
(*((volatile unsigned char *)(a)))
u_int netslotread(u_int, int);
u_int

View File

@ -1,4 +1,4 @@
/* $NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
/* $NetBSD: podulebus.c,v 1.29 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,7 +43,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.29 2014/10/25 10:58:12 skrll Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
#include <sys/device.h>
#include <uvm/uvm_extern.h>
#include <machine/io.h>
#include <arm/arm32/katelib.h>
#include <machine/intr.h>
#include <machine/bootconfig.h>
#include <machine/pmap.h>
@ -64,6 +63,11 @@ __KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
#include "locators.h"
#define WriteByte(a, b) \
*((volatile unsigned char *)(a)) = (b)
#define ReadByte(a) \
(*((volatile unsigned char *)(a)))
/* Array of podule structures, one per possible podule */
podule_t podules[MAX_PODULES + MAX_NETSLOTS];

View File

@ -1,4 +1,4 @@
/* $NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $ */
/* $NetBSD: sfas.c,v 1.26 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.26 2014/10/25 10:58:12 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -100,7 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $");
#include <machine/cpu.h>
#include <machine/io.h>
#include <machine/intr.h>
#include <arm/arm32/katelib.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/sfasreg.h>
#include <acorn32/podulebus/sfasvar.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: arm32_machdep.c,v 1.105 2014/05/19 22:47:53 rmind Exp $ */
/* $NetBSD: arm32_machdep.c,v 1.106 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.105 2014/05/19 22:47:53 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.106 2014/10/25 10:58:12 skrll Exp $");
#include "opt_modular.h"
#include "opt_md.h"
@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.105 2014/05/19 22:47:53 rmind Ex
#include <arm/locore.h>
#include <arm/arm32/katelib.h>
#include <arm/arm32/machdep.h>
#include <machine/bootconfig.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.52 2014/03/30 08:00:34 skrll Exp $ */
/* $NetBSD: db_interface.c,v 1.53 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.52 2014/03/30 08:00:34 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.53 2014/10/25 10:58:12 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.52 2014/03/30 08:00:34 skrll Exp
#include <uvm/uvm_extern.h>
#include <arm/arm32/db_machdep.h>
#include <arm/arm32/katelib.h>
#include <arm/undefined.h>
#include <ddb/db_access.h>
#include <ddb/db_command.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: fault.c,v 1.101 2014/08/13 21:41:32 matt Exp $ */
/* $NetBSD: fault.c,v 1.102 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@ -81,7 +81,7 @@
#include "opt_kgdb.h"
#include <sys/types.h>
__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.101 2014/08/13 21:41:32 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.102 2014/10/25 10:58:12 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -99,8 +99,6 @@ __KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.101 2014/08/13 21:41:32 matt Exp $");
#include <arm/locore.h>
#include <arm/arm32/katelib.h>
#include <machine/pcb.h>
#if defined(DDB) || defined(KGDB)
#include <machine/db_machdep.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.304 2014/10/20 07:13:27 skrll Exp $ */
/* $NetBSD: pmap.c,v 1.305 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@ -214,9 +214,8 @@
#include <uvm/uvm.h>
#include <arm/locore.h>
//#include <arm/arm32/katelib.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.304 2014/10/20 07:13:27 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.305 2014/10/25 10:58:12 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG

View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.9 2002/11/26 23:30:12 lukem Exp $
# $NetBSD: Makefile,v 1.10 2014/10/25 10:58:12 skrll Exp $
INCSDIR= /usr/include/arm/arm32
INCS= frame.h katelib.h param.h pmap.h psl.h pte.h rtc.h types.h vmparam.h
INCS= frame.h param.h pmap.h psl.h pte.h rtc.h types.h vmparam.h
.include <bsd.kinc.mk>

View File

@ -1,98 +0,0 @@
/* $NetBSD: katelib.h,v 1.3 2001/11/23 19:21:48 thorpej Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
* Copyright (c) 1994 Brini.
* All rights reserved.
*
* This code is derived from software written for Brini by Mark Brinicombe
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Brini.
* 4. The name of the company nor the name of the author may be used to
* endorse or promote products derived from this software without specific
* prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* RiscBSD kernel project
*
* katelib.h
*
* Prototypes for machine specific functions. Most of these
* could be inlined.
*
* This should not really be a separate header file. Eventually I will merge
* this into other header files once I have decided where the declarations
* should go.
*
* Created : 18/09/94
*
* Based on kate/katelib/prototypes.h
*/
/*
* USE OF THIS FILE IS DEPRECATED
*/
#include <sys/types.h>
#include <arm/cpufunc.h>
#ifdef _KERNEL
/* Assembly modules */
/* In blockio.S */
#include <arm/blockio.h>
/* Macros for reading and writing words, shorts, bytes */
#define WriteWord(a, b) \
*((volatile unsigned int *)(a)) = (b)
#define ReadWord(a) \
(*((volatile unsigned int *)(a)))
#define WriteShort(a, b) \
*((volatile unsigned int *)(a)) = ((b) | ((b) << 16))
#define ReadShort(a) \
((*((volatile unsigned int *)(a))) & 0xffff)
#define WriteByte(a, b) \
*((volatile unsigned char *)(a)) = (b)
#define ReadByte(a) \
(*((volatile unsigned char *)(a)))
/* Define in/out macros */
#define inb(port) ReadByte((port))
#define outb(port, byte) WriteByte((port), (byte))
#define inw(port) ReadShort((port))
#define outw(port, word) WriteShort((port), (word))
#define inl(port) ReadWord((port))
#define outl(port, lword) WriteWord((port), (lword))
#endif
/* End of katelib.h */

View File

@ -1,4 +1,4 @@
/* $NetBSD: iomd_irqhandler.c,v 1.21 2014/09/21 15:46:44 christos Exp $ */
/* $NetBSD: iomd_irqhandler.c,v 1.22 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.21 2014/09/21 15:46:44 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.22 2014/10/25 10:58:12 skrll Exp $");
#include "opt_irqstats.h"
@ -49,12 +49,12 @@ __KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.21 2014/09/21 15:46:44 christo
#include <sys/syslog.h>
#include <sys/malloc.h>
#include <arm/cpufunc.h>
#include <arm/iomd/iomdreg.h>
#include <arm/iomd/iomdvar.h>
#include <machine/intr.h>
#include <machine/cpu.h>
#include <arm/arm32/katelib.h>
irqhandler_t *irqhandlers[NIRQS];

View File

@ -1,4 +1,4 @@
/* $NetBSD: vidc20config.c,v 1.33 2014/10/18 08:33:24 snj Exp $ */
/* $NetBSD: vidc20config.c,v 1.34 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2001 Reinoud Zandijk
@ -48,12 +48,11 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vidc20config.c,v 1.33 2014/10/18 08:33:24 snj Exp $");
__KERNEL_RCSID(0, "$NetBSD: vidc20config.c,v 1.34 2014/10/25 10:58:12 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <arm/iomd/vidc.h>
#include <arm/arm32/katelib.h>
#include <machine/bootconfig.h>
#include <machine/intr.h>
@ -65,6 +64,11 @@ __KERNEL_RCSID(0, "$NetBSD: vidc20config.c,v 1.33 2014/10/18 08:33:24 snj Exp $"
#include <arm/iomd/iomdvar.h>
#include <arm/iomd/vidc20config.h>
#define WriteWord(a, b) \
*((volatile unsigned int *)(a)) = (b)
#define ReadWord(a) \
(*((volatile unsigned int *)(a)))
/*
* A structure containing ALL the information required to restore

View File

@ -1,4 +1,4 @@
/* $NetBSD: vidcaudio.c,v 1.52 2014/09/13 18:08:38 matt Exp $ */
/* $NetBSD: vidcaudio.c,v 1.53 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson
@ -65,7 +65,7 @@
#include <sys/param.h> /* proc.h */
__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.52 2014/09/13 18:08:38 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.53 2014/10/25 10:58:12 skrll Exp $");
#include <sys/audioio.h>
#include <sys/conf.h> /* autoconfig functions */
@ -84,7 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.52 2014/09/13 18:08:38 matt Exp $");
#include <machine/intr.h>
#include <machine/machdep.h>
#include <arm/arm32/katelib.h>
#include <arm/iomd/vidcaudiovar.h>
#include <arm/iomd/iomdreg.h>
@ -105,6 +104,12 @@ extern int *vidc_base;
#define DPRINTF(x)
#endif
#define WriteWord(a, b) \
*((volatile unsigned int *)(a)) = (b)
#define ReadWord(a) \
(*((volatile unsigned int *)(a)))
struct vidcaudio_softc {
device_t sc_dev;

View File

@ -1,4 +1,4 @@
/* $NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $ */
/* $NetBSD: ipaq_lcd.c,v 1.20 2014/10/25 10:58:12 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.20 2014/10/25 10:58:12 skrll Exp $");
#define IPAQ_LCD_DEBUG
@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipaq_lcd.c,v 1.19 2011/07/19 15:37:38 dyoung Exp $")
#include <machine/bootinfo.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
#include <arm/arm32/katelib.h>
#include <arm/sa11x0/sa11x0_reg.h>
#include <arm/sa11x0/sa11x0_gpioreg.h>