Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/sommerfeld_i386mp_1]: src/sys/arch/i386 here we go again
details: https://anonhg.NetBSD.org/src/rev/44f1f053ac9b
branches: sommerfeld_i386mp_1
changeset: 482429:44f1f053ac9b
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Thu Sep 06 03:41:44 2001 +0000
description:
here we go again
diffstat:
sys/arch/i386/conf/files.i386 | 3 ++-
sys/arch/i386/i386/bus_machdep.c | 25 ++++++++++++++++++++++++-
sys/arch/i386/i386/conf.c | 6 +++++-
sys/arch/i386/i386/db_trace.c | 7 ++++++-
sys/arch/i386/include/bus.h | 15 ++++++++++++++-
5 files changed, 51 insertions(+), 5 deletions(-)
diffs (133 lines):
diff -r e8bd747ac7e7 -r 44f1f053ac9b sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386 Mon Sep 03 19:48:06 2001 +0000
+++ b/sys/arch/i386/conf/files.i386 Thu Sep 06 03:41:44 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.147.2.16 2001/09/03 19:48:07 sommerfeld Exp $
+# $NetBSD: files.i386,v 1.147.2.17 2001/09/06 03:41:44 sommerfeld Exp $
#
# new style config file for i386 architecture
#
@@ -253,6 +253,7 @@
file arch/i386/isa/pms.c opms | opms_hack | opms_pckbc needs-flag
include "dev/wscons/files.wscons"
+include "dev/wsfont/files.wsfont"
include "dev/pckbc/files.pckbc"
diff -r e8bd747ac7e7 -r 44f1f053ac9b sys/arch/i386/i386/bus_machdep.c
--- a/sys/arch/i386/i386/bus_machdep.c Mon Sep 03 19:48:06 2001 +0000
+++ b/sys/arch/i386/i386/bus_machdep.c Thu Sep 06 03:41:44 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_machdep.c,v 1.1.2.7 2001/05/27 14:19:11 sommerfeld Exp $ */
+/* $NetBSD: bus_machdep.c,v 1.1.2.8 2001/09/06 03:41:45 sommerfeld Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -464,6 +464,29 @@
return (0);
}
+paddr_t
+i386_memio_mmap(t, addr, off, prot, flags)
+ bus_space_tag_t t;
+ bus_addr_t addr;
+ off_t off;
+ int prot;
+ int flags;
+{
+
+ /* Can't mmap I/O space. */
+ if (t == I386_BUS_SPACE_IO)
+ return (EOPNOTSUPP);
+
+ /*
+ * "addr" is the base address of the device we're mapping.
+ * "off" is the offset into that device.
+ *
+ * Note we are called for each "page" in the device that
+ * the upper layers want to map.
+ */
+ return (i386_btop(addr + off));
+}
+
/*
* Common function for DMA map creation. May be called by bus-specific
* DMA map creation functions.
diff -r e8bd747ac7e7 -r 44f1f053ac9b sys/arch/i386/i386/conf.c
--- a/sys/arch/i386/i386/conf.c Mon Sep 03 19:48:06 2001 +0000
+++ b/sys/arch/i386/i386/conf.c Thu Sep 06 03:41:44 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.135.2.4 2001/09/03 19:48:09 sommerfeld Exp $ */
+/* $NetBSD: conf.c,v 1.135.2.5 2001/09/06 03:41:45 sommerfeld Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -237,6 +237,9 @@
#include <altq/altqconf.h>
+#include "wsfont.h"
+cdev_decl(wsfont);
+
struct cdevsw cdevsw[] =
{
cdev_cn_init(1,cn), /* 0: virtual console */
@@ -327,6 +330,7 @@
cdev__oci_init(NMLX,mlx), /* 78: Mylex DAC960 control interface */
cdev_disk_init(NED_MCA,edmca), /* 79: PS/2 ESDI disk */
cdev__oci_init(NMLY,mly), /* 80: Newer Mylex control interface */
+ cdev__oci_init(NWSFONT,wsfont), /* 81: wsfont pseudo-device */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
diff -r e8bd747ac7e7 -r 44f1f053ac9b sys/arch/i386/i386/db_trace.c
--- a/sys/arch/i386/i386/db_trace.c Mon Sep 03 19:48:06 2001 +0000
+++ b/sys/arch/i386/i386/db_trace.c Thu Sep 06 03:41:44 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.28.4.5 2001/06/18 03:33:28 sommerfeld Exp $ */
+/* $NetBSD: db_trace.c,v 1.28.4.6 2001/09/06 03:41:45 sommerfeld Exp $ */
/*
* Mach Operating System
@@ -288,6 +288,11 @@
}
}
if (INKERNEL((int)frame) && name) {
+ /*
+ * XXX traps should be based off of the Xtrap*
+ * locations rather than on trap, since some traps
+ * (e.g., npxdna) don't go through trap()
+ */
#ifdef __ELF__
if (!strcmp(name, "trap")) {
is_trap = TRAP;
diff -r e8bd747ac7e7 -r 44f1f053ac9b sys/arch/i386/include/bus.h
--- a/sys/arch/i386/include/bus.h Mon Sep 03 19:48:06 2001 +0000
+++ b/sys/arch/i386/include/bus.h Thu Sep 06 03:41:44 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.30.2.5 2001/07/20 00:38:22 sommerfeld Exp $ */
+/* $NetBSD: bus.h,v 1.30.2.6 2001/09/06 03:41:45 sommerfeld Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -209,6 +209,19 @@
((t) == I386_BUS_SPACE_MEM ? (void *)(h) : (void *)0)
/*
+ * paddr_t bus_space_mmap __P((bus_space_tag_t t, bus_addr_t base,
+ * off_t offset, int prot, int flags));
+ *
+ * Mmap an area of bus space.
+ */
+
+paddr_t i386_memio_mmap __P((bus_space_tag_t, bus_addr_t, off_t,
+ int, int));
+
+#define bus_space_mmap(t, b, o, p, f) \
+ i386_memio_mmap((t), (b), (o), (p), (f))
+
+/*
* u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset));
*
Home |
Main Index |
Thread Index |
Old Index