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

Reorganize the way powerpc port install machine specific headers. 

Use <powerpc/oea/bat.h> exclusively and remove <machine/bat.h> and
<powerpc/bat.h>.  Remove unneeded <machine/cpufunc.h>.  To insure
1:1 correspondence of <powerpc/FOO.h> to <machine/FOO.h> include
"../../powerpc/include/Makefile" in "arch/FOO/include/Makefile".
Incororpate <byte_swap.h> into <bswap.h> and then byte_swap.h
This commit is contained in:
matt 2003-10-20 00:12:09 +00:00
parent 4bdc6bf1cb
commit 421dd6cc28
43 changed files with 166 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/bebox/bebox/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.82 2003/07/15 01:26:30 lukem Exp $ */
/* $NetBSD: machdep.c,v 1.83 2003/10/20 00:12:09 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2003/07/15 01:26:30 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.83 2003/10/20 00:12:09 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -67,7 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2003/07/15 01:26:30 lukem Exp $");
#include <net/netisr.h>
#include <powerpc/bat.h>
#include <machine/bootinfo.h>
#include <machine/autoconf.h>
#define _POWERPC_BUS_DMA_PRIVATE
@ -77,6 +76,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2003/07/15 01:26:30 lukem Exp $");
#include <machine/powerpc.h>
#include <machine/trap.h>
#include <powerpc/oea/bat.h>
#include <dev/cons.h>
#include "pfb.h"

27
sys/arch/bebox/include/Makefile
View File

@ -1,24 +1,11 @@
# $NetBSD: Makefile,v 1.19 2003/01/17 22:36:32 thorpej Exp $
# $NetBSD: Makefile,v 1.20 2003/10/20 00:12:09 matt Exp $
INCSDIR= /usr/include/bebox
INCS= ansi.h aout_machdep.h asm.h \
bootinfo.h bswap.h bus.h \
cdefs.h cpu.h cpufunc.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
intr.h ipkdb.h \
kcore.h kgdb.h \
limits.h lock.h \
math.h mcontext.h mouse.h \
param.h pcb.h pccons.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h \
psl.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h spkr.h stdarg.h \
trap.h types.h \
varargs.h vmparam.h
INCS= bootinfo.h
disklabel.h \
intr.h \
pccons.h \
vmparam.h
.include <bsd.kinc.mk>
.include "../../powerpc/include/Makefile"

3
sys/arch/bebox/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

2
sys/arch/bebox/include/cpufunc.h
View File

@ -1,2 +0,0 @@
/* $NetBSD: cpufunc.h,v 1.2 1998/01/05 07:02:53 perry Exp $ */

25
sys/arch/evbppc/include/Makefile
View File

@ -1,24 +1,9 @@
# $NetBSD: Makefile,v 1.3 2003/01/17 22:48:43 thorpej Exp $
# $NetBSD: Makefile,v 1.4 2003/10/20 00:12:10 matt Exp $
KDIR= /sys/arch/evbppc/include
INCSDIR= /usr/include/evbppc
INCS= ansi.h aout_machdep.h asm.h \
bswap.h bus.h \
cdefs.h cpu.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h \
int_types.h intr.h ipkdb.h \
kcore.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h \
psl.h pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
tlb.h trap.h types.h \
varargs.h vmparam.h
INCS= disklabel.h \
intr.h \
vmparam.h
.include <bsd.kinc.mk>
.include "../../powerpc/include/Makefile"

3
sys/arch/evbppc/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

5
sys/arch/ibmnws/ibmnws/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.1 2003/10/19 03:33:50 matt Exp $ */
/* $NetBSD: machdep.c,v 1.2 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -60,13 +60,14 @@
#include <net/netisr.h>
#include <machine/autoconf.h>
#include <machine/bat.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/pmap.h>
#include <machine/powerpc.h>
#include <machine/trap.h>
#include <powerpc/oea/bat.h>
#include <dev/cons.h>
#include "com.h"

24
sys/arch/ibmnws/include/Makefile
View File

@ -1,24 +1,10 @@
# $NetBSD: Makefile,v 1.1 2003/10/19 03:33:50 matt Exp $
# $NetBSD: Makefile,v 1.2 2003/10/20 00:12:10 matt Exp $
INCSDIR= /usr/include/ibmnws
INCS= ansi.h aout_machdep.h asm.h \
bat.h bswap.h bus.h \
cdefs.h cpu.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
INCS= bus.h \
disklabel.h \
intr.h \
kcore.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pmap.h pmc.h powerpc.h proc.h profile.h \
psl.h pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
trap.h types.h \
varargs.h vmparam.h
vmparam.h
.include <bsd.kinc.mk>
.include "../../powerpc/include/Makefile"

3
sys/arch/ibmnws/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

3
sys/arch/ibmnws/include/bat.h
View File

@ -1,3 +0,0 @@
/* $NetBSD: bat.h,v 1.1 2003/10/19 03:33:50 matt Exp $ */
#include <powerpc/bat.h>

1
sys/arch/ibmnws/include/cpufunc.h
View File

@ -1 +0,0 @@
/* $NetBSD: cpufunc.h,v 1.1 2003/10/19 03:33:50 matt Exp $ */

7
sys/arch/macppc/dev/ofb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofb.c,v 1.36 2003/07/15 02:43:30 lukem Exp $ */
/* $NetBSD: ofb.c,v 1.37 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.36 2003/07/15 02:43:30 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.37 2003/10/20 00:12:10 matt Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -53,11 +53,12 @@ __KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.36 2003/07/15 02:43:30 lukem Exp $");
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_pci.h>
#include <machine/bat.h>
#include <machine/bus.h>
#include <machine/autoconf.h>
#include <machine/grfioctl.h>
#include <powerpc/oea/bat.h>
#include <macppc/dev/ofbvar.h>
#if OFB_ENABLE_CACHE

32
sys/arch/macppc/include/Makefile
View File

@ -1,26 +1,14 @@
# $NetBSD: Makefile,v 1.17 2003/01/17 23:23:08 thorpej Exp $
# $NetBSD: Makefile,v 1.18 2003/10/20 00:12:10 matt Exp $
INCSDIR= /usr/include/macppc
INCS= adbsys.h ansi.h aout_machdep.h apmvar.h asm.h autoconf.h \
bat.h bswap.h bus.h \
cdefs.h cpu.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
grfioctl.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
intr.h ipkdb.h \
kcore.h keyboard.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h psl.h \
pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
trap.h types.h \
varargs.h vmparam.h \
z8530var.h
# Add the macppc specific includes.
.include <bsd.kinc.mk>
INCS= adbsys.h apmvar.h autoconf.h \
disklabel.h \
grfioctl.h \
intr.h \
keyboard.h \
vmparam.h
.include "../../powerpc/include/Makefile"

3
sys/arch/macppc/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

6
sys/arch/macppc/macppc/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.36 2003/08/17 18:12:34 chs Exp $ */
/* $NetBSD: cpu.c,v 1.37 2003/10/20 00:12:10 matt Exp $ */
/*-
* Copyright (c) 2001 Tsubai Masanari.
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.36 2003/08/17 18:12:34 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.37 2003/10/20 00:12:10 matt Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@ -46,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.36 2003/08/17 18:12:34 chs Exp $");
#include <uvm/uvm_extern.h>
#include <dev/ofw/openfirm.h>
#include <powerpc/oea/hid.h>
#include <powerpc/oea/bat.h>
#include <powerpc/openpic.h>
#include <powerpc/atomic.h>
#include <powerpc/spr.h>
@ -54,7 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.36 2003/08/17 18:12:34 chs Exp $");
#endif
#include <machine/autoconf.h>
#include <machine/bat.h>
#include <machine/fpu.h>
#include <machine/pcb.h>
#include <machine/pio.h>

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

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.128 2003/07/15 02:43:32 lukem Exp $ */
/* $NetBSD: machdep.c,v 1.129 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.128 2003/07/15 02:43:32 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.129 2003/10/20 00:12:10 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -79,11 +79,11 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.128 2003/07/15 02:43:32 lukem Exp $");
#endif
#include <machine/autoconf.h>
#include <machine/bat.h>
#include <machine/powerpc.h>
#include <machine/trap.h>
#include <machine/bus.h>
#include <machine/fpu.h>
#include <powerpc/oea/bat.h>
#ifdef ALTIVEC
#include <powerpc/altivec.h>
#endif

6
sys/arch/macppc/macppc/rbus_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rbus_machdep.c,v 1.11 2003/07/15 02:43:33 lukem Exp $ */
/* $NetBSD: rbus_machdep.c,v 1.12 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (c) 1999
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.11 2003/07/15 02:43:33 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.12 2003/10/20 00:12:10 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.11 2003/07/15 02:43:33 lukem Exp
#include <uvm/uvm_extern.h>
#include <machine/bat.h>
#include <powerpc/oea/bat.h>
#include <machine/bus.h>
#include <dev/pci/pcivar.h>

4
sys/arch/macppc/stand/bootxx/bootxx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootxx.c,v 1.11 2003/02/28 05:24:56 matt Exp $ */
/* $NetBSD: bootxx.c,v 1.12 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/types.h>
#include <machine/bat.h>
#include <powerpc/oea/bat.h>
#include <sys/bootblock.h>

26
sys/arch/mvmeppc/include/Makefile
View File

@ -1,24 +1,10 @@
# $NetBSD: Makefile,v 1.5 2003/01/17 23:46:29 thorpej Exp $
# $NetBSD: Makefile,v 1.6 2003/10/20 00:12:10 matt Exp $
INCSDIR= /usr/include/mvmeppc
INCS= ansi.h aout_machdep.h asm.h \
bat.h bootinfo.h bswap.h bus.h \
cdefs.h cpu.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
intr.h ipkdb.h \
kcore.h kgdb.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pio.h pmap.h pmc.h powerpc.h \
proc.h profile.h psl.h pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
trap.h types.h \
varargs.h vmparam.h
INCS= bootinfo.h \
disklabel.h \
intr.h \
vmparam.h
.include <bsd.kinc.mk>
.include "../../powerpc/include/Makefile"

3
sys/arch/mvmeppc/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

3
sys/arch/mvmeppc/include/bat.h
View File

@ -1,3 +0,0 @@
/* $NetBSD: bat.h,v 1.1 2002/02/27 21:02:14 scw Exp $ */
#include <powerpc/bat.h>

7
sys/arch/mvmeppc/mvmeppc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.18 2003/09/06 21:07:00 kleink Exp $ */
/* $NetBSD: machdep.c,v 1.19 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2003/09/06 21:07:00 kleink Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.19 2003/10/20 00:12:10 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_mvmetype.h"
@ -65,7 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2003/09/06 21:07:00 kleink Exp $");
#include <net/netisr.h>
#include <machine/autoconf.h>
#include <machine/bat.h>
#include <machine/bootinfo.h>
#include <machine/bus.h>
#include <machine/intr.h>
@ -74,6 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2003/09/06 21:07:00 kleink Exp $");
#include <machine/powerpc.h>
#include <machine/trap.h>
#include <powerpc/oea/bat.h>
#include <dev/cons.h>
#if 0

6
sys/arch/ofppc/firepower/firepower.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: firepower.c,v 1.10 2003/07/15 02:46:30 lukem Exp $ */
/* $NetBSD: firepower.c,v 1.11 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: firepower.c,v 1.10 2003/07/15 02:46:30 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: firepower.c,v 1.11 2003/10/20 00:12:10 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -60,10 +60,10 @@ __KERNEL_RCSID(0, "$NetBSD: firepower.c,v 1.10 2003/07/15 02:46:30 lukem Exp $")
#include <dev/ic/wdcvar.h>
#include <machine/autoconf.h>
#include <machine/bat.h>
#include <machine/intr.h>
#include <machine/platform.h>
#include <powerpc/oea/bat.h>
#include <powerpc/pio.h>
#include <ofppc/firepower/firepowerreg.h>

25
sys/arch/ofppc/include/Makefile
View File

@ -1,24 +1,9 @@
# $NetBSD: Makefile,v 1.17 2003/01/18 06:11:50 thorpej Exp $
# $NetBSD: Makefile,v 1.18 2003/10/20 00:12:10 matt Exp $
INCSDIR= /usr/include/ofppc
INCS= ansi.h aout_machdep.h asm.h \
bat.h bswap.h \
cdefs.h cpu.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
intr.h ipkdb.h \
kcore.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pmap.h pmc.h \
proc.h profile.h psl.h pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
trap.h types.h \
varargs.h vmparam.h
INCS= disklabel.h \
intr.h \
vmparam.h
.include <bsd.kinc.mk>
.include "../../powerpc/include/Makefile"

3
sys/arch/ofppc/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

3
sys/arch/ofppc/include/bat.h
View File

@ -1,3 +0,0 @@
/* $NetBSD: bat.h,v 1.1 1998/05/28 08:12:14 sakamoto Exp $ */
#include <powerpc/bat.h>

8
sys/arch/ofppc/ofppc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.86 2003/07/15 02:46:32 lukem Exp $ */
/* $NetBSD: machdep.c,v 1.87 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.86 2003/07/15 02:46:32 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.87 2003/10/20 00:12:10 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -65,13 +65,13 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.86 2003/07/15 02:46:32 lukem Exp $");
#include <dev/ofw/openfirm.h>
#include <machine/autoconf.h>
#include <machine/bat.h>
#include <machine/pmap.h>
#include <machine/powerpc.h>
#include <machine/trap.h>
#include <machine/platform.h>
#include <powerpc/oea/bat.h>
#include <dev/cons.h>
#include "ksyms.h"

25
sys/arch/pmppc/include/Makefile
View File

@ -1,24 +1,9 @@
# $NetBSD: Makefile,v 1.5 2003/01/18 18:17:23 augustss Exp $
# $NetBSD: Makefile,v 1.6 2003/10/20 00:12:10 matt Exp $
INCSDIR= /usr/include/pmppc
INCS= ansi.h aout_machdep.h asm.h \
bswap.h bus.h \
cdefs.h cpu.h cpufunc.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
intr.h ipkdb.h \
kcore.h kgdb.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h psl.h \
ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
trap.h types.h \
varargs.h vmparam.h
INCS= disklabel.h \
intr.h \
vmparam.h
.include <bsd.kinc.mk>
.include "../../powerpc/include/Makefile"

3
sys/arch/pmppc/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

2
sys/arch/pmppc/include/cpufunc.h
View File

@ -1,2 +0,0 @@
/* $NetBSD: cpufunc.h,v 1.1 2002/05/30 08:51:16 augustss Exp $ */

7
sys/arch/pmppc/pmppc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.16 2003/07/15 02:54:42 lukem Exp $ */
/* $NetBSD: machdep.c,v 1.17 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2003/07/15 02:54:42 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2003/10/20 00:12:10 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -105,7 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2003/07/15 02:54:42 lukem Exp $");
#include <net/netisr.h>
#include <powerpc/bat.h>
#include <machine/bus.h>
#include <machine/db_machdep.h>
#include <machine/intr.h>
@ -115,6 +114,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2003/07/15 02:54:42 lukem Exp $");
#include <machine/trap.h>
#include <machine/pmppc.h>
#include <powerpc/oea/bat.h>
#include <ddb/db_extern.h>
#include <dev/cons.h>

12
sys/arch/powerpc/include/Makefile
View File

@ -1,20 +1,18 @@
# $NetBSD: Makefile,v 1.29 2003/01/18 06:23:29 thorpej Exp $
# $NetBSD: Makefile,v 1.30 2003/10/20 00:12:10 matt Exp $
INCSDIR= /usr/include/powerpc
INCSDIR?= /usr/include/powerpc
INCS= ansi.h aout_machdep.h asm.h atomic.h \
bat.h bswap.h byte_swap.h \
INCS+= ansi.h aout_machdep.h asm.h atomic.h \
bswap.h \
cdefs.h cpu.h \
db_machdep.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
ipkdb.h \
kcore.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pio.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
trap.h types.h \

36
sys/arch/powerpc/include/bswap.h
View File

@ -1,4 +1,30 @@
/* $NetBSD: bswap.h,v 1.3 2001/05/30 13:08:34 tsubai Exp $ */
/* $NetBSD: bswap.h,v 1.4 2003/10/20 00:12:10 matt Exp $ */
/*-
* Copyright (c) 2001 Tsubai Masanari. All rights reserved.
*
* 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. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
*/
#ifndef _POWERPC_BSWAP_H_
#define _POWERPC_BSWAP_H_
@ -6,8 +32,14 @@
#include <sys/bswap.h>
#ifdef __GNUC__
#include <powerpc/byte_swap.h>
#define __bswap16_const(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
#define __bswap16(x) (__builtin_constant_p(x) ? __bswap16_const(x) : bswap16(x))
#define bswap16(x) __bswap16(x)
#define __bswap32_const(x) \
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
#define __bswap32(x) (__builtin_constant_p(x) ? __bswap32_const(x) : bswap32(x))
#define bswap32(x) __bswap32(x)
#endif

35
sys/arch/powerpc/include/byte_swap.h
View File

@ -1,35 +0,0 @@
/* $NetBSD: byte_swap.h,v 1.1 2001/05/30 13:08:34 tsubai Exp $ */
/*-
* Copyright (c) 2001 Tsubai Masanari. All rights reserved.
*
* 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. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
*/
#define __bswap16_const(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
#define __bswap16(x) (__builtin_constant_p(x) ? __bswap16_const(x) : bswap16(x))
#define __bswap32_const(x) \
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
#define __bswap32(x) (__builtin_constant_p(x) ? __bswap32_const(x) : bswap32(x))

6
sys/arch/powerpc/powerpc/kgdb_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kgdb_machdep.c,v 1.8 2003/09/27 04:44:42 matt Exp $ */
/* $NetBSD: kgdb_machdep.c,v 1.9 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.8 2003/09/27 04:44:42 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.9 2003/10/20 00:12:10 matt Exp $");
#include "opt_ddb.h"
@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.8 2003/09/27 04:44:42 matt Exp $"
#include <machine/trap.h>
#include <machine/pmap.h>
#include <powerpc/bat.h>
#include <powerpc/oea/bat.h>
/*
* Determine if the memory at va..(va+len) is valid.

26
sys/arch/prep/include/Makefile
View File

@ -1,24 +1,10 @@
# $NetBSD: Makefile,v 1.15 2003/05/15 18:51:18 wiz Exp $
# $NetBSD: Makefile,v 1.16 2003/10/20 00:12:10 matt Exp $
INCSDIR= /usr/include/prep
INCS= ansi.h aout_machdep.h asm.h \
bat.h bootinfo.h bswap.h bus.h \
cdefs.h cpu.h cpufunc.h \
db_machdep.h disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
intr.h ipkdb.h \
kcore.h kgdb.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pio.h pmap.h pmc.h powerpc.h proc.h profile.h \
psl.h pte.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h spkr.h stdarg.h \
trap.h types.h \
varargs.h vmparam.h
INCS= bootinfo.h \
disklabel.h \
intr.h \
vmparam.h
.include <bsd.kinc.mk>
.include "../../powerpc/include/Makefile"

3
sys/arch/prep/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

3
sys/arch/prep/include/bat.h
View File

@ -1,3 +0,0 @@
/* $NetBSD: bat.h,v 1.1 2000/02/29 15:21:26 nonaka Exp $ */
#include <powerpc/bat.h>

1
sys/arch/prep/include/cpufunc.h
View File

@ -1 +0,0 @@
/* $NetBSD: cpufunc.h,v 1.1 2000/02/29 15:21:27 nonaka Exp $ */

7
sys/arch/prep/prep/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.50 2003/08/10 11:41:36 tsutsui Exp $ */
/* $NetBSD: machdep.c,v 1.51 2003/10/20 00:12:10 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2003/08/10 11:41:36 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2003/10/20 00:12:10 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2003/08/10 11:41:36 tsutsui Exp $")
#include <net/netisr.h>
#include <machine/autoconf.h>
#include <machine/bat.h>
#include <machine/bootinfo.h>
#include <machine/bus.h>
#include <machine/intr.h>
@ -74,6 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2003/08/10 11:41:36 tsutsui Exp $")
#include <machine/residual.h>
#include <machine/trap.h>
#include <powerpc/oea/bat.h>
#include <dev/cons.h>
#include "com.h"

21
sys/arch/sandpoint/include/Makefile
View File

@ -1,23 +1,10 @@
# $NetBSD: Makefile,v 1.15 2003/10/19 18:56:39 matt Exp $
# $NetBSD: Makefile,v 1.16 2003/10/20 00:12:10 matt Exp $
INCSDIR= /usr/include/sandpoint
INCS= ansi.h aout_machdep.h asm.h \
bootinfo.h bswap.h bus.h \
cdefs.h cpu.h \
INCS= bootinfo.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
float.h fpu.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
intr.h \
kcore.h \
limits.h lock.h \
math.h mcontext.h \
param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h ptrace.h \
reg.h reloc.h \
setjmp.h signal.h stdarg.h \
trap.h types.h \
varargs.h vmparam.h
vmparam.h
.include <bsd.kinc.mk>
.include "../../powerpc/include/Makefile"

3
sys/arch/sandpoint/include/atomic.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: atomic.h,v 1.1 2003/10/20 00:12:10 matt Exp $ */
#include <powerpc/atomic.h>

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

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.28 2003/07/15 03:35:50 lukem Exp $ */
/* $NetBSD: machdep.c,v 1.29 2003/10/20 00:12:11 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2003/07/15 03:35:50 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2003/10/20 00:12:11 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -68,7 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2003/07/15 03:35:50 lukem Exp $");
#include <net/netisr.h>
#include <powerpc/bat.h>
#include <machine/bus.h>
#include <machine/db_machdep.h>
#include <machine/intr.h>
@ -76,6 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2003/07/15 03:35:50 lukem Exp $");
#include <machine/powerpc.h>
#include <machine/trap.h>
#include <powerpc/oea/bat.h>
#include <powerpc/openpic.h>
#include <ddb/db_extern.h>