monitor: capops: Remove no-longer-needed capops/magic.[ch]

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/usr/monitor/Hakefile b/usr/monitor/Hakefile
index 10889a8..9c6787f 100644 (file)
--- a/usr/monitor/Hakefile
+++ b/usr/monitor/Hakefile
@@ -25,8 +25,7 @@
                      "capops/capsend.c", "capops/capqueue.c", "capops/internal.c",
                      "capops/caplock.c", "capops/copy.c", "capops/move.c",
                      "capops/retrieve.c", "capops/delete.c", "capops/revoke.c",
-                     "capops/retype.c", "capops/init.c", "capops/magic.c",
-                     "capops/deletestep.c" ]
+                     "capops/retype.c", "capops/init.c", "capops/deletestep.c" ]
 
      arch_srcs "x86_32"  = [ "arch/x86/boot.c", "arch/x86/inter.c", "arch/x86/monitor_server.c", "arch/x86/notify_ipi.c" ]
      arch_srcs "x86_64"  = [ "arch/x86/boot.c", "arch/x86/inter.c", "arch/x86/monitor_server.c", "arch/x86/notify_ipi.c" ]

diff --git a/usr/monitor/capops/capsend.c b/usr/monitor/capops/capsend.c
index 4a3b2ff..fe365d6 100644 (file)
--- a/usr/monitor/capops/capsend.c
+++ b/usr/monitor/capops/capsend.c
@@ -10,7 +10,6 @@
 #include <barrelfish/barrelfish.h>
 #include "capsend.h"
 #include "monitor.h"
-#include "magic.h"
 #include "capops.h"
 #include "internal.h"
 

diff --git a/usr/monitor/capops/delete.c b/usr/monitor/capops/delete.c
index aa1495d..00b64cf 100644 (file)
--- a/usr/monitor/capops/delete.c
+++ b/usr/monitor/capops/delete.c
@@ -12,7 +12,6 @@
 #include "monitor.h"
 #include "capops.h"
 #include "capsend.h"
-#include "magic.h"
 #include "caplock.h"
 #include "capqueue.h"
 #include "dom_invocations.h"

diff --git a/usr/monitor/capops/magic.c b/usr/monitor/capops/magic.c
deleted file mode 100644 (file)
index fe3b555..0000000
--- a/usr/monitor/capops/magic.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2012 ETH Zurich.
- * All rights reserved.
- *
- * This file is distributed under the terms in the attached LICENSE file.
- * If you do not find this file, copies can be found by writing to:
- * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
- */
-
-#include "magic.h"
-#include <barrelfish/debug.h>
-
-// delete all local copies of capref
-errval_t monitor_delete_copies(struct capref cap)
-{
-    USER_PANIC("NYI");
-    return ERR_NOTIMP;
-}
-

diff --git a/usr/monitor/capops/magic.h b/usr/monitor/capops/magic.h
deleted file mode 100644 (file)
index 6e03fb7..0000000
--- a/usr/monitor/capops/magic.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2012 ETH Zurich.
- * All rights reserved.
- *
- * This file is distributed under the terms in the attached LICENSE file.
- * If you do not find this file, copies can be found by writing to:
- * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
- */
-
-// XXX: prototypes and other decls that need to be moved to suitable locations
-#ifndef CAPOPS_MAGIC_H
-#define CAPOPS_MAGIC_H
-
-#include <barrelfish_kpi/capabilities.h>
-#include <barrelfish_kpi/distcaps.h>
-#include <barrelfish/caddr.h>
-#include <errors/errno.h>
-
-/*
- * Magic NYI functions
- */
-
-// delete all local copies of capref
-errval_t monitor_delete_copies(struct capref);
-
-#endif

diff --git a/usr/monitor/capops/move.c b/usr/monitor/capops/move.c
index 103583e..5e03b75 100644 (file)
--- a/usr/monitor/capops/move.c
+++ b/usr/monitor/capops/move.c
@@ -12,7 +12,6 @@
 #include "monitor.h"
 #include "capops.h"
 #include "capsend.h"
-#include "magic.h"
 #include "caplock.h"
 #include "internal.h"
 #include "dom_invocations.h"

diff --git a/usr/monitor/capops/retrieve.c b/usr/monitor/capops/retrieve.c
index 8189295..82c10e9 100644 (file)
--- a/usr/monitor/capops/retrieve.c
+++ b/usr/monitor/capops/retrieve.c
@@ -12,7 +12,6 @@
 #include "monitor.h"
 #include "capops.h"
 #include "capsend.h"
-#include "magic.h"
 #include "caplock.h"
 #include "internal.h"
 #include "dom_invocations.h"

diff --git a/usr/monitor/capops/retype.c b/usr/monitor/capops/retype.c
index fbff529..f84bcd0 100644 (file)
--- a/usr/monitor/capops/retype.c
+++ b/usr/monitor/capops/retype.c
@@ -16,7 +16,6 @@
 #include "capops.h"
 #include "capsend.h"
 #include "caplock.h"
-#include "magic.h"
 #include "internal.h"
 
 /*