summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2010-03-14 16:50:19 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2010-03-14 16:53:41 +0100
commitcab7658d901a4a211734a62e642c59993da68301 (patch)
treed8c9d879e2dd2378960cd992ad948b5e125c741f /i386
parentdada0bebb8554305b805c721e278a16bde79944f (diff)
Add mem device
* i386/Makefrag.am (libkernel_a_SOURCES): Add i386/i386at/iopl.c. * i386/i386at/conf.c [!MACH_HYP] (memmmap): Declare function. (memname): Add macro. (dev_name_list): Add mem device. * i386/i386at/mem.c: New file.
Diffstat (limited to 'i386')
-rw-r--r--i386/Makefrag.am1
-rw-r--r--i386/i386at/conf.c10
-rw-r--r--i386/i386at/mem.c47
3 files changed, 58 insertions, 0 deletions
diff --git a/i386/Makefrag.am b/i386/Makefrag.am
index 876761c..b2bad86 100644
--- a/i386/Makefrag.am
+++ b/i386/Makefrag.am
@@ -46,6 +46,7 @@ libkernel_a_SOURCES += \
i386/i386at/kd_mouse.h \
i386/i386at/kdasm.S \
i386/i386at/kdsoft.h \
+ i386/i386at/mem.c \
i386/i386at/pic_isa.c \
i386/i386at/rtc.c \
i386/i386at/rtc.h
diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c
index f5ab36c..d51b5ee 100644
--- a/i386/i386at/conf.c
+++ b/i386/i386at/conf.c
@@ -60,6 +60,9 @@ extern int kbdgetstat(), kbdsetstat();
#ifndef MACH_HYP
extern int mouseopen(), mouseclose(), mouseread(), mousegetstat();
#define mousename "mouse"
+
+extern vm_offset_t memmmap();
+#define memname "mem"
#endif /* MACH_HYP */
extern int kmsgopen(), kmsgclose(), kmsgread(), kmsggetstat();
@@ -127,6 +130,13 @@ struct dev_ops dev_name_list[] =
nodev, nulldev, nulldev, 0,
nodev },
+#ifndef MACH_HYP
+ { memname, nulldev, nulldev, nodev,
+ nodev, nodev, nodev, memmmap,
+ nodev, nulldev, nulldev, 0,
+ nodev },
+#endif /* MACH_HYP */
+
#ifdef MACH_KMSG
{ kmsgname, kmsgopen, kmsgclose, kmsgread,
nodev, kmsggetstat, nodev, nomap,
diff --git a/i386/i386at/mem.c b/i386/i386at/mem.c
new file mode 100644
index 0000000..5e51676
--- /dev/null
+++ b/i386/i386at/mem.c
@@ -0,0 +1,47 @@
+/*
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
+ * School of Computer Science
+ * Carnegie Mellon University
+ * Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
+#include <device/io_req.h>
+#include <i386/model_dep.h>
+
+/* This provides access to any memory that is not main RAM */
+
+/*ARGSUSED*/
+int
+memmmap(dev, off, prot)
+int dev;
+vm_offset_t off;
+vm_prot_t prot;
+{
+ if (off == 0)
+ return 0;
+ else if (off < 0xa0000)
+ return -1;
+ else if (off >= 0x100000 && off < phys_last_addr)
+ return -1;
+ else
+ return i386_btop(off);
+}