Module Name: src
Committed By: uebayasi
Date: Sat Oct 30 08:51:10 UTC 2010
Modified Files:
src/sys/dev [uebayasi-xip]: xmd.c
Removed Files:
src/sys/dev [uebayasi-xip]: xmdvar.h
Log Message:
Adapt to thew new pmap(9) interfaces.
Don't conditionalize few lines of code for modularity. As suggested
by Chuck Silvers.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/dev/xmd.c
cvs rdiff -u -r1.1.2.1 -r0 src/sys/dev/xmdvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/xmd.c
diff -u src/sys/dev/xmd.c:1.1.2.4 src/sys/dev/xmd.c:1.1.2.5
--- src/sys/dev/xmd.c:1.1.2.4 Sat Aug 28 16:27:02 2010
+++ src/sys/dev/xmd.c Sat Oct 30 08:51:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xmd.c,v 1.1.2.4 2010/08/28 16:27:02 uebayasi Exp $ */
+/* $NetBSD: xmd.c,v 1.1.2.5 2010/10/30 08:51:10 uebayasi Exp $ */
/*-
* Copyright (c) 2010 Tsubai Masanari. All rights reserved.
@@ -28,15 +28,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmd.c,v 1.1.2.4 2010/08/28 16:27:02 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmd.c,v 1.1.2.5 2010/10/30 08:51:10 uebayasi Exp $");
#include "opt_xip.h"
#include "opt_xmd.h"
-#ifndef XIP
-#error xmd(4) needs options XIP
-#endif
-
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/conf.h>
@@ -53,7 +49,7 @@
#include <machine/vmparam.h>
-#include <dev/xmdvar.h>
+#include <uvm/uvm_extern.h>
struct xmd_softc {
vaddr_t sc_addr;
@@ -127,9 +123,7 @@
sc->sc_addr = (vaddr_t)md_root_image;
sc->sc_size = (size_t)md_root_size;
-#ifdef XIP
- sc->sc_phys = xmd_machdep_physload(sc->sc_addr, sc->sc_size);
-#endif
+ sc->sc_phys = pmap_physload_device(sc->sc_addr, sc->sc_size, PROT_READ, 0);
disk_init(&sc->sc_dkdev, device_xname(self), NULL);
disk_attach(&sc->sc_dkdev);
@@ -159,9 +153,7 @@
disk_detach(&sc->sc_dkdev);
disk_destroy(&sc->sc_dkdev);
-#ifdef XIP
- xmd_machdep_physunload(sc->sc_phys);
-#endif
+ pmap_physunload_device(sc->sc_phys);
return 0;
}
@@ -210,14 +202,12 @@
return -1;
switch (cmd) {
-#ifdef XIP
case DIOCGPHYSSEG:
if (sc->sc_phys == NULL)
error = EINVAL;
else
*(void **)data = sc->sc_phys;
break;
-#endif
case DIOCGDINFO:
*(struct disklabel *)data = *sc->sc_dkdev.dk_label;
@@ -261,7 +251,7 @@
if ((u_int64_t)off >= sc->sc_size)
return -1;
- return xmd_machdep_mmap(sc->sc_addr, off, prot);
+ return pmap_mmap(sc->sc_addr, off);
}
static void
