xnu-1228.5.20.tar.gz

[apple/xnu.git] / bsd / dev / memdev.c

diff --git a/bsd/dev/memdev.c b/bsd/dev/memdev.c
index 7e7ab586f696bb9c08bb0c1abf3e11791ffba9ed..f957be33c52a71e9f8109403b51827479d6fb488 100644 (file)
--- a/bsd/dev/memdev.c
+++ b/bsd/dev/memdev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -94,6 +94,7 @@
 #include <vm/pmap.h>
 #include <vm/vm_pager.h>
 #include <mach/memory_object_types.h>
+#include <kern/debug.h>
 
 #include <miscfs/devfs/devfs.h>
 
@@ -140,7 +141,7 @@ static struct cdevsw mdevcdevsw = {
        /* ioctl */     mdevcioctl,
        /* stop */      eno_stop,
        /* reset */     eno_reset,
-       /* ttys */      0,
+       /* ttys */      NULL,
        /* select */    eno_select,
        /* mmap */      eno_mmap,
        /* strategy */  eno_strat,
@@ -171,6 +172,7 @@ int mdevCMajor = -1;
 static int mdevioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p, int is_char);
 dev_t mdevadd(int devid, ppnum_t base, unsigned int size, int phys);
 dev_t mdevlookup(int devid);
+void mdevremoveall(void);
 
 static int mdevclose(__unused dev_t dev, __unused int flags, 
                                          __unused int devtype, __unused struct proc *p) {
@@ -550,10 +552,10 @@ dev_t mdevadd(int devid, ppnum_t base, unsigned int size, int phys) {
        }
        else {
                if(devid >= 16) {                                                               /* Giving us something bogus? */
-                       panic("mdevadd: attempt to explicitly add a bogus memory device: &08X\n", devid);
+                       panic("mdevadd: attempt to explicitly add a bogus memory device: %08X\n", devid);
                }
                if(mdev[devid].mdFlags &mdInited) {                             /* Already there? */
-                       panic("mdevadd: attempt to explicitly add a previously defined memory device: &08X\n", devid);
+                       panic("mdevadd: attempt to explicitly add a previously defined memory device: %08X\n", devid);
                }
        }
        
@@ -608,3 +610,24 @@ dev_t mdevlookup(int devid) {
        if(!(mdev[devid].mdFlags & mdInited)) return -1;        /* This one hasn't been defined */
        return mdev[devid].mdBDev;                                                      /* Return the device number */
 }
+
+void mdevremoveall(void) {
+
+       int i;
+
+       for(i = 0; i < 16; i++) {
+               if(!(mdev[i].mdFlags & mdInited)) continue;     /* Ignore unused mdevs */
+
+               devfs_remove(mdev[i].mdbdevb);                  /* Remove the block device */
+               devfs_remove(mdev[i].mdcdevb);                  /* Remove the character device */
+
+               mdev[i].mdBase = 0;                             /* Clear the mdev's storage */
+               mdev[i].mdSize = 0;
+               mdev[i].mdSecsize = 0;
+               mdev[i].mdFlags = 0;
+               mdev[i].mdBDev = 0;
+               mdev[i].mdCDev = 0;
+               mdev[i].mdbdevb = 0;
+               mdev[i].mdcdevb = 0;
+       }
+}