Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nathanw_sa]: src/sys/arch Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/305f498407bc
branches: nathanw_sa
changeset: 506549:305f498407bc
user: thorpej <thorpej%NetBSD.org@localhost>
date: Wed Dec 11 06:10:50 2002 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/macppc/include/Makefile | 3 +-
sys/arch/macppc/include/darwin_machdep.h | 3 +
sys/arch/macppc/include/vmparam.h | 3 +-
sys/arch/macppc/macppc/autoconf.c | 4 +-
sys/arch/macppc/macppc/bus_dma.c | 4 +-
sys/arch/macppc/stand/ofwboot/Makefile | 7 +-
sys/arch/mips/alchemy/au_icu.c | 4 +-
sys/arch/mips/alchemy/include/aureg.h | 544 +++++++++++++
sys/arch/mips/conf/Makefile.mips | 30 +-
sys/arch/mips/conf/files.mips | 8 +-
sys/arch/mips/conf/files.sibyte | 11 +-
sys/arch/mips/include/Makefile | 3 +-
sys/arch/mips/include/aout_machdep.h | 4 +-
sys/arch/mips/include/bsd-aout.h | 8 +-
sys/arch/mips/include/bswap.h | 8 +-
sys/arch/mips/include/cache_mipsNN.h | 16 +-
sys/arch/mips/include/cache_r4k.h | 40 +-
sys/arch/mips/include/cpu.h | 14 +-
sys/arch/mips/include/cpuregs.h | 13 +-
sys/arch/mips/include/limits.h | 8 +-
sys/arch/mips/include/lock.h | 7 +-
sys/arch/mips/include/mipsNN.h | 7 +-
sys/arch/mips/include/pcb.h | 9 +-
sys/arch/mips/include/pmap.h | 8 +-
sys/arch/mips/include/r5900regs.h | 14 +-
sys/arch/mips/include/reg.h | 8 +-
sys/arch/mips/include/sb1regs.h | 60 +
sys/arch/mips/include/vmparam.h | 6 +-
sys/arch/mips/mips/cache.c | 60 +-
sys/arch/mips/mips/cache_mipsNN.c | 509 +++---------
sys/arch/mips/mips/locore_mips1.S | 3 +-
sys/arch/mips/mips/mipsX_subr.S | 3 +-
sys/arch/mips/mips/mips_machdep.c | 8 +-
sys/arch/mips/mips/pmap.c | 8 +-
sys/arch/mips/mips/syscall.c | 8 +-
sys/arch/mips/mips/vm_machdep.c | 7 +-
sys/arch/mips/sibyte/dev/sbmac.c | 260 ++++-
sys/arch/mips/sibyte/dev/sbsmbus.c | 8 +-
sys/arch/mipsco/conf/GENERIC | 4 +-
sys/arch/mipsco/conf/Makefile.mipsco.inc | 9 +-
sys/arch/mipsco/conf/kern.ldscript | 65 -
sys/arch/mipsco/conf/std.mipsco | 3 +-
sys/arch/mipsco/include/Makefile | 3 +-
sys/arch/mipsco/stand/Makefile.booters | 136 +++
sys/arch/mipsco/stand/common/devopen.c | 3 +-
sys/arch/mipsco/stand/common/saio.c | 233 +++++
sys/arch/mipsco/stand/common/start.S | 9 +-
sys/arch/mmeye/include/Makefile | 3 +-
sys/arch/mvme68k/conf/GENERIC | 6 +-
sys/arch/mvme68k/conf/Makefile.mvme68k | 6 +-
sys/arch/mvme68k/include/Makefile | 3 +-
sys/arch/mvme68k/include/vmparam.h | 10 +-
sys/arch/mvmeppc/include/Makefile | 3 +-
sys/arch/mvmeppc/include/darwin_machdep.h | 3 +
sys/arch/mvmeppc/mvmeppc/bus_space.c | 4 +-
sys/arch/netwinder/conf/GENERIC | 4 +-
sys/arch/netwinder/include/Makefile | 3 +-
sys/arch/news68k/conf/GENERIC | 6 +-
sys/arch/news68k/conf/Makefile.news68k | 6 +-
sys/arch/news68k/include/Makefile | 3 +-
sys/arch/news68k/include/vmparam.h | 10 +-
sys/arch/newsmips/conf/GENERIC | 6 +-
sys/arch/newsmips/conf/std.newsmips | 3 +-
sys/arch/newsmips/include/Makefile | 3 +-
sys/arch/newsmips/stand/boot/Makefile | 7 +-
sys/arch/newsmips/stand/boot/boot.c | 10 +-
sys/arch/newsmips/stand/boot/devopen.c | 5 +-
sys/arch/newsmips/stand/bootxx/Makefile | 7 +-
sys/arch/newsmips/stand/bootxx/bootxx.c | 6 +-
sys/arch/newsmips/stand/common/Makefile | 7 +-
sys/arch/next68k/conf/GENERIC | 6 +-
sys/arch/next68k/conf/Makefile.next68k | 6 +-
sys/arch/next68k/include/Makefile | 3 +-
sys/arch/next68k/include/vmparam.h | 10 +-
sys/arch/ofppc/include/Makefile | 3 +-
sys/arch/ofppc/include/darwin_machdep.h | 3 +
sys/arch/ofppc/include/vmparam.h | 3 +-
sys/arch/playstation2/conf/std.playstation2 | 3 +-
sys/arch/playstation2/include/Makefile | 3 +-
sys/arch/pmax/conf/GENERIC | 6 +-
sys/arch/pmax/conf/std.pmax | 10 +
sys/arch/pmax/dev/fb_usrreq.c | 6 +-
sys/arch/pmax/dev/px.c | 8 +-
sys/arch/pmax/include/Makefile | 3 +-
sys/arch/pmax/stand/Makefile.booters | 6 +-
sys/arch/pmax/stand/common/bootxx.c | 212 +++++
sys/arch/pmax/stand/common/devopen.c | 3 +-
sys/arch/pmax/stand/common/rz.c | 199 ++++
sys/arch/powerpc/conf/files.ibm4xx | 8 +-
sys/arch/powerpc/conf/files.powerpc | 7 +-
sys/arch/powerpc/fpu/fpu_emu.c | 783 +++++++++++++++++++
sys/arch/powerpc/ibm4xx/dev/ibm405gp.c | 139 +++
sys/arch/powerpc/ibm4xx/pmap.c | 12 +-
sys/arch/powerpc/ibm4xx/trap.c | 3 +-
sys/arch/powerpc/include/Makefile | 3 +-
sys/arch/powerpc/include/ansi.h | 10 +-
sys/arch/powerpc/include/aout_machdep.h | 4 +-
sys/arch/powerpc/include/atomic.h | 80 +-
sys/arch/powerpc/include/cpu.h | 14 +-
sys/arch/powerpc/include/darwin_machdep.h | 101 ++
sys/arch/powerpc/include/ibm4xx/Makefile | 3 +-
sys/arch/powerpc/include/ibm4xx/bus.h | 1038 +++++++++++++++++++++++++
sys/arch/powerpc/include/mpc6xx/Makefile | 3 +-
sys/arch/powerpc/include/mpc6xx/vmparam.h | 4 -
sys/arch/powerpc/include/pte.h | 11 +
sys/arch/powerpc/include/stdarg.h | 10 +-
sys/arch/powerpc/include/varargs.h | 4 +-
sys/arch/powerpc/mpc6xx/cpu_subr.c | 4 +-
sys/arch/powerpc/powerpc/bus_dma.c | 4 +-
sys/arch/powerpc/powerpc/darwin_machdep.c | 271 ++++++
sys/arch/powerpc/powerpc/db_disasm.c | 3 +-
sys/arch/powerpc/powerpc/db_interface.c | 6 +-
sys/arch/powerpc/powerpc/db_trace.c | 4 +-
sys/arch/powerpc/powerpc/mach_machdep.c | 20 +-
sys/arch/powerpc/powerpc/mach_syscall.c | 38 +-
sys/arch/powerpc/powerpc/pmap_subr.c | 7 +-
sys/arch/powerpc/powerpc/syscall.c | 37 +-
sys/arch/powerpc/powerpc/trap.c | 60 +-
sys/arch/prep/conf/GENERIC | 6 +-
sys/arch/prep/include/Makefile | 3 +-
sys/arch/prep/include/darwin_machdep.h | 3 +
sys/arch/prep/include/vmparam.h | 3 +-
sys/arch/sandpoint/include/Makefile | 3 +-
sys/arch/sandpoint/include/darwin_machdep.h | 3 +
sys/arch/sandpoint/include/vmparam.h | 3 +-
sys/arch/sbmips/conf/GENERIC | 19 +-
sys/arch/sbmips/conf/std.sbmips | 13 +
sys/arch/sbmips/include/Makefile | 3 +-
sys/arch/sbmips/include/swarm.h | 79 +
sys/arch/sbmips/sbmips/machdep.c | 18 +-
sys/arch/sbmips/sbmips/rtc.c | 369 ++++++--
sys/arch/sbmips/stand/Makefile.bootprogs | 6 +-
sys/arch/sgimips/conf/GENERIC | 6 +-
sys/arch/sgimips/conf/std.sgimips | 3 +-
sys/arch/sgimips/include/Makefile | 3 +-
sys/arch/sh3/include/Makefile | 3 +-
sys/arch/sh3/include/aout_machdep.h | 35 +
sys/arch/sh3/include/cpu.h | 9 +-
sys/arch/sh3/include/vmparam.h | 113 ++
sys/arch/sh3/sh3/exception.c | 4 +-
sys/arch/shark/conf/Makefile.shark.inc | 17 +-
sys/arch/shark/conf/kern.ldscript | 50 +
sys/arch/shark/include/Makefile | 3 +-
sys/arch/shark/shark/opms.c | 6 +-
sys/arch/sparc/conf/GENERIC | 6 +-
sys/arch/sparc/conf/KRUPS | 6 +-
sys/arch/sparc/conf/Makefile.sparc | 6 +-
sys/arch/sparc/conf/files.sparc | 3 +-
sys/arch/sparc/conf/majors.sparc | 3 +-
sys/arch/sparc/dev/audioamd.c | 74 +-
sys/arch/sparc/dev/cgtwo.c | 5 +-
sys/arch/sparc/dev/com_ebus.c | 4 +-
sys/arch/sparc/dev/com_obio.c | 4 +-
sys/arch/sparc/dev/ebus.c | 12 +-
sys/arch/sparc/dev/esp_obio.c | 4 +-
sys/arch/sparc/dev/fd.c | 78 +-
sys/arch/sparc/dev/if_ie_obio.c | 4 +-
sys/arch/sparc/dev/if_le_obio.c | 4 +-
sys/arch/sparc/dev/pckbc_js.c | 4 +-
sys/arch/sparc/dev/rtc.c | 9 +-
sys/arch/sparc/dev/sbus.c | 19 +-
sys/arch/sparc/dev/sw.c | 4 +-
sys/arch/sparc/dev/tctrl.c | 10 +-
sys/arch/sparc/dev/vme_machdep.c | 30 +-
sys/arch/sparc/dev/zs.c | 50 +-
sys/arch/sparc/include/Makefile | 3 +-
sys/arch/sparc/include/aout_machdep.h | 4 +-
sys/arch/sparc/include/bus.h | 36 +-
sys/arch/sparc/include/cpu.h | 115 +-
sys/arch/sparc/include/intr.h | 92 ++
sys/arch/sparc/include/loadfile_machdep.h | 4 +-
sys/arch/sparc/include/psl.h | 411 ++++++++++
sys/arch/sparc/include/types.h | 3 +-
sys/arch/sparc/include/vmparam.h | 6 +-
sys/arch/sparc/sparc/amd7930intr.s | 7 +-
sys/arch/sparc/sparc/autoconf.c | 47 +-
sys/arch/sparc/sparc/bsd_fdintr.s | 7 +-
sys/arch/sparc/sparc/cpu.c | 34 +-
sys/arch/sparc/sparc/intr.c | 296 +++++-
sys/arch/sparc/sparc/intreg.h | 13 +-
sys/arch/sparc/sparc/locore.s | 158 ++-
sys/arch/sparc/sparc/locore2.c | 101 --
sys/arch/sparc/sparc/machdep.c | 19 +-
sys/arch/sparc/sparc/msiiep.c | 14 +-
sys/arch/sparc/sparc/oclock.c | 4 +-
sys/arch/sparc/sparc/pci_machdep.c | 4 +-
sys/arch/sparc/sparc/pmap.c | 56 +-
sys/arch/sparc/sparc/timer.c | 47 +-
sys/arch/sparc/sparc/timer_msiiep.c | 6 +-
sys/arch/sparc/sparc/timer_sun4.c | 63 +-
sys/arch/sparc/sparc/timer_sun4m.c | 4 +-
sys/arch/sparc/sparc/timervar.h | 4 +-
sys/arch/sparc/sparc/trap.c | 4 +-
sys/arch/sparc64/conf/GENERIC32 | 6 +-
sys/arch/sparc64/conf/Makefile.sparc64 | 6 +-
sys/arch/sparc64/conf/files.sparc64 | 3 +-
sys/arch/sparc64/conf/majors.sparc64 | 3 +-
sys/arch/sparc64/dev/com_ebus.c | 4 +-
sys/arch/sparc64/dev/ebus.c | 12 +-
sys/arch/sparc64/dev/lpt_ebus.c | 4 +-
sys/arch/sparc64/dev/pci_machdep.c | 4 +-
sys/arch/sparc64/dev/psycho.c | 80 +-
sys/arch/sparc64/dev/sab.c | 4 +-
sys/arch/sparc64/dev/sbus.c | 14 +-
sys/arch/sparc64/dev/zs.c | 4 +-
sys/arch/sparc64/include/Makefile | 3 +-
sys/arch/sparc64/include/bus.h | 16 +-
sys/arch/sparc64/include/cpu.h | 10 +-
sys/arch/sparc64/include/vmparam.h | 6 +-
sys/arch/sparc64/sparc64/locore2.c | 101 --
sys/arch/sparc64/sparc64/machdep.c | 119 ++-
sys/arch/sparc64/sparc64/trap.c | 8 +-
sys/arch/sun2/conf/GENERIC | 6 +-
sys/arch/sun2/conf/Makefile.sun2 | 6 +-
sys/arch/sun2/include/Makefile | 3 +-
sys/arch/sun2/include/aout_machdep.h | 5 +
sys/arch/sun2/include/vmparam.h | 4 +-
sys/arch/sun3/conf/GENERIC | 6 +-
sys/arch/sun3/conf/GENERIC3X | 4 +-
sys/arch/sun3/conf/Makefile.sun3 | 6 +-
sys/arch/sun3/include/Makefile | 3 +-
sys/arch/sun3/include/bswap.h | 9 +-
sys/arch/sun3/include/vmparam3.h | 103 ++
sys/arch/sun3/include/vmparam3x.h | 89 ++
sys/arch/sun68k/include/Makefile | 14 +
sys/arch/vax/boot/common/srt0.S | 12 +-
sys/arch/vax/conf/GENERIC | 6 +-
sys/arch/vax/include/Makefile | 3 +-
sys/arch/vax/include/aout_machdep.h | 4 +-
sys/arch/vax/include/bus.h | 1092 +++++++++++++++++++++++++++
sys/arch/vax/include/ka410.h | 7 +-
sys/arch/vax/include/ka420.h | 6 +-
sys/arch/vax/include/ka43.h | 7 +-
sys/arch/vax/include/ka46.h | 7 +-
sys/arch/vax/include/ka48.h | 4 +
sys/arch/vax/include/ka650.h | 249 ++++++
sys/arch/vax/include/ka670.h | 5 +-
sys/arch/vax/include/ka680.h | 5 +-
sys/arch/vax/include/ka750.h | 7 +-
sys/arch/vax/include/ka820.h | 148 +++
sys/arch/vax/include/ka88.h | 6 +-
sys/arch/vax/include/reg.h | 7 +-
sys/arch/vax/include/rpb.h | 6 +-
sys/arch/vax/include/vmparam.h | 9 +-
sys/arch/vax/vax/bus_dma.c | 5 +-
sys/arch/vax/vax/locore.c | 4 +-
sys/arch/vax/vax/machdep.c | 60 +-
sys/arch/vax/vax/mem.c | 4 +-
sys/arch/vax/vax/pmap.c | 15 +-
sys/arch/vax/vax/trap.c | 4 +-
sys/arch/x68k/conf/GENERIC | 9 +-
sys/arch/x68k/conf/Makefile.x68k | 6 +-
sys/arch/x68k/conf/files.x68k | 7 +-
sys/arch/x68k/conf/majors.x68k | 3 +-
sys/arch/x68k/dev/bmd.c | 439 ++++++++++
sys/arch/x68k/dev/event.c | 6 +-
sys/arch/x68k/dev/vs.c | 4 +-
sys/arch/x68k/include/Makefile | 3 +-
sys/arch/x68k/include/vmparam.h | 6 +-
sys/arch/x68k/stand/common/exec_sub.c | 4 +-
260 files changed, 8886 insertions(+), 2133 deletions(-)
diffs (truncated from 16052 to 300 lines):
diff -r cdcbba453bb6 -r 305f498407bc sys/arch/macppc/include/Makefile
--- a/sys/arch/macppc/include/Makefile Wed Dec 11 06:00:49 2002 +0000
+++ b/sys/arch/macppc/include/Makefile Wed Dec 11 06:10:50 2002 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.13.8.4 2002/08/13 02:18:28 nathanw Exp $
+# $NetBSD: Makefile,v 1.13.8.5 2002/12/11 06:10:50 thorpej Exp $
-KDIR= /sys/arch/macppc/include
INCSDIR= /usr/include/macppc
INCS= adbsys.h ansi.h aout_machdep.h apmvar.h asm.h autoconf.h \
diff -r cdcbba453bb6 -r 305f498407bc sys/arch/macppc/include/darwin_machdep.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/macppc/include/darwin_machdep.h Wed Dec 11 06:10:50 2002 +0000
@@ -0,0 +1,3 @@
+/* $NetBSD: darwin_machdep.h,v 1.1.2.2 2002/12/11 06:10:51 thorpej Exp $ */
+
+#include <powerpc/darwin_machdep.h>
diff -r cdcbba453bb6 -r 305f498407bc sys/arch/macppc/include/vmparam.h
--- a/sys/arch/macppc/include/vmparam.h Wed Dec 11 06:00:49 2002 +0000
+++ b/sys/arch/macppc/include/vmparam.h Wed Dec 11 06:10:50 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.18.8.3 2002/04/01 07:40:54 nathanw Exp $ */
+/* $NetBSD: vmparam.h,v 1.18.8.4 2002/12/11 06:10:51 thorpej Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -39,7 +39,6 @@
#ifndef _MACHINE_VMPARAM_H_
#define _MACHINE_VMPARAM_H_
-#define USRTEXT NBPG
#define USRSTACK VM_MAXUSER_ADDRESS
#ifndef MAXTSIZ
diff -r cdcbba453bb6 -r 305f498407bc sys/arch/macppc/macppc/autoconf.c
--- a/sys/arch/macppc/macppc/autoconf.c Wed Dec 11 06:00:49 2002 +0000
+++ b/sys/arch/macppc/macppc/autoconf.c Wed Dec 11 06:10:50 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.26.6.4 2002/10/18 02:38:37 nathanw Exp $ */
+/* $NetBSD: autoconf.c,v 1.26.6.5 2002/12/11 06:10:52 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -82,7 +82,7 @@
* Now allow hardware interrupts.
*/
asm volatile ("mfmsr %0; ori %0,%0,%1; mtmsr %0"
- : "=r"(msr) : "K"((u_short)(PSL_EE|PSL_RI)));
+ : "=r"(msr) : "K"(PSL_EE|PSL_RI));
}
void
diff -r cdcbba453bb6 -r 305f498407bc sys/arch/macppc/macppc/bus_dma.c
--- a/sys/arch/macppc/macppc/bus_dma.c Wed Dec 11 06:00:49 2002 +0000
+++ b/sys/arch/macppc/macppc/bus_dma.c Wed Dec 11 06:10:50 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22.4.2 2002/06/20 03:39:36 nathanw Exp $ */
+/* $NetBSD: bus_dma.c,v 1.22.4.3 2002/12/11 06:10:53 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@
*/
if (p != NULL)
(void) pmap_extract(p->p_vmspace->vm_map.pmap,
- vaddr, (paddr_t *)&curaddr);
+ vaddr, (void *)&curaddr);
else
curaddr = vtophys(vaddr);
diff -r cdcbba453bb6 -r 305f498407bc sys/arch/macppc/stand/ofwboot/Makefile
--- a/sys/arch/macppc/stand/ofwboot/Makefile Wed Dec 11 06:00:49 2002 +0000
+++ b/sys/arch/macppc/stand/ofwboot/Makefile Wed Dec 11 06:10:50 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22.4.8 2002/10/18 02:38:41 nathanw Exp $
+# $NetBSD: Makefile,v 1.22.4.9 2002/12/11 06:10:54 thorpej Exp $
S= ${.CURDIR}/../../../..
@@ -14,6 +14,11 @@
CPPFLAGS+= -DLIBSA_USE_MEMCPY -DLIBSA_USE_MEMSET
DBG= -Os
+LIBCRT0= # nothing
+LIBCRTBEGIN= # nothing
+LIBCRTEND= # nothing
+LIBC= # nothing
+
.PATH: ${S}/arch/powerpc/powerpc
SRCS+= ofwmagic.S
diff -r cdcbba453bb6 -r 305f498407bc sys/arch/mips/alchemy/au_icu.c
--- a/sys/arch/mips/alchemy/au_icu.c Wed Dec 11 06:00:49 2002 +0000
+++ b/sys/arch/mips/alchemy/au_icu.c Wed Dec 11 06:10:50 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: au_icu.c,v 1.2.2.2 2002/10/18 02:38:42 nathanw Exp $ */
+/* $NetBSD: au_icu.c,v 1.2.2.3 2002/12/11 06:10:55 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -213,8 +213,6 @@
EVCNT_TYPE_INTR, NULL, "mips", au1000_cpuintrnames[i]);
}
- evcnt_attach_static(&mips_int5_evcnt);
-
for (i = 0; i < NIRQS; i++) {
/* XXX steering - use an irqmap array? */
diff -r cdcbba453bb6 -r 305f498407bc sys/arch/mips/alchemy/include/aureg.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mips/alchemy/include/aureg.h Wed Dec 11 06:10:50 2002 +0000
@@ -0,0 +1,544 @@
+/* $NetBSD: aureg.h,v 1.1.2.2 2002/12/11 06:10:56 thorpej Exp $ */
+
+/*
+ * Copyright 2002 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Simon Burge for Wasabi Systems, Inc.
+ *
+ * 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 for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
+ * 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.
+ */
+
+/* *********************************************************************
+ * Naming schemes for constants in these files:
+ *
+ * M_xxx MASK constant (identifies bits in a register).
+ * For multi-bit fields, all bits in the field will
+ * be set.
+ *
+ * K_xxx "Code" constant (value for data in a multi-bit
+ * field). The value is right justified.
+ *
+ * V_xxx "Value" constant. This is the same as the
+ * corresponding "K_xxx" constant, except it is
+ * shifted to the correct position in the register.
+ *
+ * S_xxx SHIFT constant. This is the number of bits that
+ * a field value (code) needs to be shifted
+ * (towards the left) to put the value in the right
+ * position for the register.
+ *
+ * A_xxx ADDRESS constant. This will be a physical
+ * address. Use the MIPS_PHYS_TO_KSEG1 macro to
+ * generate a K1SEG address.
+ *
+ * R_xxx RELATIVE offset constant. This is an offset from
+ * an A_xxx constant (usually the first register in
+ * a group).
+ *
+ * G_xxx(X) GET value. This macro obtains a multi-bit field
+ * from a register, masks it, and shifts it to
+ * the bottom of the register (retrieving a K_xxx
+ * value, for example).
+ *
+ * V_xxx(X) VALUE. This macro computes the value of a
+ * K_xxx constant shifted to the correct position
+ * in the register.
+ ********************************************************************* */
+
+#if !defined(__ASSEMBLER__)
+#define _MAKE64(x) ((uint64_t)(x))
+#define _MAKE32(x) ((uint32_t)(x))
+#else
+#define _MAKE64(x) (x)
+#define _MAKE32(x) (x)
+#endif
+
+/* Make a mask for 1 bit at position 'n' */
+#define _MAKEMASK1_64(n) (_MAKE64(1) << _MAKE64(n))
+#define _MAKEMASK1_32(n) (_MAKE32(1) << _MAKE32(n))
+
+/* Make a mask for 'v' bits at position 'n' */
+#define _MAKEMASK_64(v,n) (_MAKE64((_MAKE64(1)<<(v))-1) << _MAKE64(n))
+#define _MAKEMASK_32(v,n) (_MAKE32((_MAKE32(1)<<(v))-1) << _MAKE32(n))
+
+/* Make a value at 'v' at bit position 'n' */
+#define _MAKEVALUE_64(v,n) (_MAKE64(v) << _MAKE64(n))
+#define _MAKEVALUE_32(v,n) (_MAKE32(v) << _MAKE32(n))
+
+#define _GETVALUE_64(v,n,m) ((_MAKE64(v) & _MAKE64(m)) >> _MAKE64(n))
+#define _GETVALUE_32(v,n,m) ((_MAKE32(v) & _MAKE32(m)) >> _MAKE32(n))
+
+
+/************************************************************************/
+/******************** AC97 Controller registers *********************/
+/************************************************************************/
+#define AC97_BASE 0x10000000
+
+#define AC97_CONFIG 0x00
+
+#define M_AC97CFG_RS _MAKEMASK1_32(0)
+#define M_AC97CFG_SN _MAKEMASK1_32(1)
+#define M_AC97CFG_SG _MAKEMASK1_32(2)
+
+#define S_AC97CFG_XS _MAKE32(12)
+#define M_AC97CFG_XS _MAKEMASK_32(10)
+#define V_AC97CFG_XS(x) _MAKEVALUE_32(x, S_AC97CFG_XS)
+#define G_AC97CFG_XS(x) _GETVALUE_32(x, S_AC97CFG_XS, M_AC97CFG_XS)
+
+#define S_AC97CFG_RC _MAKE32(12)
+#define M_AC97CFG_RC _MAKEMASK_32(10)
+#define V_AC97CFG_RC(x) _MAKEVALUE_32(x, S_AC97CFG_RC)
+#define G_AC97CFG_RC(x) _GETVALUE_32(x, S_AC97CFG_RC, M_AC97CFG_RC)
+
+#define AC97_STATUS 0x04
+
+#define M_AC97STAT_RF _MAKEMASK1_32(0)
+#define M_AC97STAT_RE _MAKEMASK1_32(1)
+#define M_AC97STAT_TF _MAKEMASK1_32(3)
+#define M_AC97STAT_TE _MAKEMASK1_32(4)
+#define M_AC97STAT_CP _MAKEMASK1_32(6)
+#define M_AC97STAT_RD _MAKEMASK1_32(7)
+#define M_AC97STAT_RO _MAKEMASK1_32(8)
+#define M_AC97STAT_RU _MAKEMASK1_32(9)
+#define M_AC97STAT_XO _MAKEMASK1_32(10)
+#define M_AC97STAT_XU _MAKEMASK1_32(11)
+
+#define AC97_DATA 0x08
+
+#define S_AC97DATA_DATA _MAKE32(0)
+#define M_AC97DATA_DATA _MAKEMASK_32(16)
+#define V_AC97DATA_DATA(x) _MAKEVALUE_32(x, S_AC97DATA_DATA)
+#define G_AC97DATA_DATA(x) _GETVALUE_32(x, S_AC97DATA_DATA, M_AC97DATA_DATA)
+
+#define AC97_COMMAND 0x0c
+
+#define S_AC97CMD_INDEX _MAKE32(0)
+#define M_AC97CMD_INDEX _MAKEMASK_32(7)
+#define V_AC97CMD_INDEX(x) _MAKEVALUE_32(x, S_AC97CMD_INDEX)
+#define G_AC97CMD_INDEX(x) _GETVALUE_32(x, S_AC97CMD_INDEX, M_AC97CMD_INDEX)
+
+#define M_AC97CMD_RW _MAKEMASK1_32(7)
+
+#define S_AC97CMD_DATA _MAKE32(16)
+#define M_AC97CMD_DATA _MAKEMASK_32(16)
+#define V_AC97CMD_DATA(x) _MAKEVALUE_32(x, S_AC97CMD_DATA)
+#define G_AC97CMD_DATA(x) _GETVALUE_32(x, S_AC97CMD_DATA, M_AC97CMD_DATA)
+
+#define AC97_COMMAND_RESPONSE 0x0c
+
+#define S_AC97CMDRESP_DATA _MAKE32(0)
+#define M_AC97CMDRESP_DATA _MAKEMASK_32(16)
+#define V_AC97CMDRESP_DATA(x) _MAKEVALUE_32(x, S_AC97CMDRESP_DATA)
+#define G_AC97CMDRESP_DATA(x) _GETVALUE_32(x, S_AC97CMDRESP_DATA, M_AC97CMDRESP_DATA)
+
+#define AC97_ENABLE 0x10
+
+#define M_AC97EN_CE _MAKEMASK1_32(0)
+#define M_AC97EN_D _MAKEMASK1_32(1)
+
+#define AC97_SIZE 0x14 /* size of register set */
+
+/************************************************************************/
+/*********************** USB Host registers *************************/
+/************************************************************************/
+#define USBH_BASE 0x10100000
+
+#define USBH_ENABLE 0x7fffc
+#define UE_RD 0x00000010 /* reset done */
+#define UE_CE 0x00000008 /* clock enable */
+#define UE_E 0x00000004 /* enable */
+#define UE_C 0x00000002 /* coherent */
+#define UE_BE 0x00000001 /* big-endian */
+
+#define USBH_SIZE 0x80000 /* size of register set */
+
+/************************************************************************/
+/********************** USB Device registers ************************/
+/************************************************************************/
+#define USBD_BASE 0x10200000
+
Home |
Main Index |
Thread Index |
Old Index