Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/dnard/include More merging.
details: https://anonhg.NetBSD.org/src/rev/eeb15f130868
branches: trunk
changeset: 504501:eeb15f130868
user: matt <matt%NetBSD.org@localhost>
date: Sun Mar 04 05:55:43 2001 +0000
description:
More merging.
diffstat:
sys/arch/dnard/include/db_machdep.h | 12 ++++-
sys/arch/dnard/include/frame.h | 3 +
sys/arch/dnard/include/intr.h | 71 ++++++++++++++++++++++++++++++
sys/arch/dnard/include/ofisa_machdep.h | 3 +
sys/arch/dnard/include/pcb.h | 79 ++++++++++++++++++++++++++++++++++
5 files changed, 166 insertions(+), 2 deletions(-)
diffs (190 lines):
diff -r 1b2e18d5d573 -r eeb15f130868 sys/arch/dnard/include/db_machdep.h
--- a/sys/arch/dnard/include/db_machdep.h Sun Mar 04 05:52:58 2001 +0000
+++ b/sys/arch/dnard/include/db_machdep.h Sun Mar 04 05:55:43 2001 +0000
@@ -1,4 +1,12 @@
-/* $NetBSD: db_machdep.h,v 1.1 2001/02/26 03:09:23 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.2 2001/03/04 05:55:43 matt Exp $ */
+
+void db_of_boot_cmd (db_expr_t addr, int have_addr, db_expr_t count, char *modif);
+void db_of_enter_cmd (db_expr_t addr, int have_addr, db_expr_t count, char *modif);
+void db_of_exit_cmd (db_expr_t addr, int have_addr, db_expr_t count, char *modif);
+
+#define ARM32_DB_COMMANDS \
+ { "ofboot", db_of_boot_cmd, 0, NULL }, \
+ { "ofenter", db_of_enter_cmd, 0, NULL }, \
+ { "ofexit", db_of_exit_cmd, 0, NULL }
#include <arm/db_machdep.h>
-
diff -r 1b2e18d5d573 -r eeb15f130868 sys/arch/dnard/include/frame.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/dnard/include/frame.h Sun Mar 04 05:55:43 2001 +0000
@@ -0,0 +1,3 @@
+/* $NetBSD: frame.h,v 1.1 2001/03/04 05:55:43 matt Exp $ */
+
+#include <arm/arm32/frame.h>
diff -r 1b2e18d5d573 -r eeb15f130868 sys/arch/dnard/include/intr.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/dnard/include/intr.h Sun Mar 04 05:55:43 2001 +0000
@@ -0,0 +1,71 @@
+/* $NetBSD: intr.h,v 1.1 2001/03/04 05:55:43 matt Exp $ */
+
+/*
+ * Copyright (c) 1997 Mark Brinicombe.
+ * 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. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Mark Brinicombe
+ * for the NetBSD Project.
+ * 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 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 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.
+ */
+
+#ifndef _ARM32_INTR_H_
+#define _ARM32_INTR_H_
+
+/* Define the various Interrupt Priority Levels */
+
+/* Hardware Interrupt Priority Levels are not mutually exclusive. */
+
+#define IPL_BIO 0 /* block I/O */
+#define IPL_NET 1 /* network */
+#define IPL_TTY 2 /* terminal */
+#define IPL_IMP 3 /* memory allocation */
+#define IPL_AUDIO 4 /* audio */
+#define IPL_CLOCK 5 /* clock */
+#define IPL_HIGH 6 /* */
+#define IPL_SERIAL 7 /* serial */
+#define IPL_NONE 8
+
+#define IPL_LEVELS 8
+
+#define IST_UNUSABLE -1 /* interrupt cannot be used */
+#define IST_NONE 0 /* none (dummy) */
+#define IST_PULSE 1 /* pulsed */
+#define IST_EDGE 2 /* edge-triggered */
+#define IST_LEVEL 3 /* level-triggered */
+
+/* Software interrupt priority levels */
+
+#define SOFTIRQ_CLOCK 0
+#define SOFTIRQ_NET 1
+#define SOFTIRQ_SERIAL 2
+
+#define SOFTIRQ_BIT(x) (1 << x)
+
+#include <machine/irqhandler.h>
+
+#endif /* _ARM32_INTR_H */
diff -r 1b2e18d5d573 -r eeb15f130868 sys/arch/dnard/include/ofisa_machdep.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/dnard/include/ofisa_machdep.h Sun Mar 04 05:55:43 2001 +0000
@@ -0,0 +1,3 @@
+/* $NetBSD: ofisa_machdep.h,v 1.1 2001/03/04 05:55:43 matt Exp $ */
+
+#include <arm/ofisa_machdep.h>
diff -r 1b2e18d5d573 -r eeb15f130868 sys/arch/dnard/include/pcb.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/dnard/include/pcb.h Sun Mar 04 05:55:43 2001 +0000
@@ -0,0 +1,79 @@
+/* $NetBSD: pcb.h,v 1.1 2001/03/04 05:55:43 matt Exp $ */
+
+/*
+ * Copyright (c) 1994 Mark Brinicombe.
+ * 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. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the RiscBSD team.
+ * 4. The name "RiscBSD" 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 RISCBSD ``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 RISCBSD 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.
+ */
+
+#ifndef _ARM32_PCB_H_
+#define _ARM32_PCB_H_
+
+#include <machine/pte.h>
+#include <machine/fp.h>
+
+struct pcb {
+ pd_entry_t *pcb_pagedir; /* PT hooks */
+ u_int pcb_flags; /* Flags */
+ u_int pcb_spsr;
+ u_int pcb_r0; /* Space for register dump */
+ u_int pcb_r1;
+ u_int pcb_r2;
+ u_int pcb_r3;
+ u_int pcb_r4;
+ u_int pcb_r5;
+ u_int pcb_r6;
+ u_int pcb_r7;
+ u_int pcb_r8; /* used */
+ u_int pcb_r9; /* used */
+ u_int pcb_r10; /* used */
+ u_int pcb_r11; /* used */
+ u_int pcb_r12; /* used */
+ u_int pcb_sp; /* used */
+ u_int pcb_lr;
+ u_int pcb_pc;
+ u_int pcb_und_sp;
+ caddr_t pcb_onfault; /* On fault handler */
+ struct fpe_sp_state pcb_fpstate; /* Floating Point state */
+};
+
+/*
+ * No additional data for core dumps.
+ */
+struct md_coredump {
+ int md_empty;
+};
+
+#ifdef _KERNEL
+extern struct pcb *curpcb;
+#endif /* _KERNEL */
+
+#endif /* _ARM32_PCB_H_ */
+
+/* End of pcb.h */
Home |
Main Index |
Thread Index |
Old Index