Move viengoos header files to libviengoos.

/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* libviengoos: New directory.
	* Makefile.am (SUBDIRS): Add libviengoos.
	* configure.ac: Include libviengoos/headers.m4.  Generate
	libviengoos/Makefile.

hurd/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* activity.h: Move to ../libviengoos/viengoos.  Update references.
	* addr-trans.h: Likewise.
	* addr.h: Likewise.
	* cap.h: Likewise.
	* folio.h: Likewise.
	* futex.h: Likewise.
	* ipc.h: Likewise.
	* message.h: Likewise.
	* messenger.h: Likewise.
	* rpc.h: Likewise.
	* thread.h: Move viengoos specific bits...
	* ../libviengoos/viengoos/thread.h: ... to this new file.
	* thread.h (struct hurd_utcb): New structure.
	* exceptions.h (hurd_utcb): Use a struct hurd_utcb *, not a
	struct vg_utcb *.  Update users.
	(hurd_activation_state_alloc): Likewise.
	(hurd_activation_state_free): Likewise.
	(hurd_activation_handler_activated): Likewise.
	(hurd_activation_handler_normal): Likewise.
	* t-addr-trans.c: Move to ../libviengoos.
	* t-addr.c: Likewise.
	* t-rpc.c: Likewise.
	* Makefile.am (TESTS, check_PROGRAMS, t_addr_CPPFLAGS)
	(t_addr_SOURCES, t_addr_trans_CPPFLAGS, t_addr_trans_SOURCES)
	(t_rpc_CPPFLAGS, t_rpc_SOURCES): Move from this file...
	* ../libviengoos/Makefile.am.
	* Makefile.am (includehurd_HEADERS): Don't mention activity.h,
	addr-trans.h, addr.h, cap.h, folio.h, futex.h, ipc.h, message.h or
	messenger.h.
	* headers.m4: Don't create a link to hurd/addr.h,
	hurd/addr-trans.h, hurd/cap.h, hurd/folio.h, hurd/rpc.h,
	hurd/activity.h, hurd/futex.h, hurd/message.h, hurd/messenger.h or
	hurd/ipc.h.
	
libviengoos/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* Makefile.am: New file.
	* headers.m4: Likewise.
	* t-addr-trans.c: Move from ../hurd.
	* t-addr.c: Likewise.
	* t-rpc.c: Likewise.
	* viengoos.h: Likewise.
	* viengoos/activity.h: Likewise.
	* viengoos/addr-trans.h: Likewise.
	* viengoos/addr.h: Likewise.
	* viengoos/cap.h: Likewise.
	* viengoos/folio.h: Likewise.
	* viengoos/futex.h: Likewise.
	* viengoos/ipc.h: Likewise.
	* viengoos/message.h: Likewise.
	* viengoos/messenger.h: Likewise.
	* viengoos/rpc.h: Likewise.
	* viengoos/misc.h: Moved from ../viengoos/rm.h.
	* viengoos/thread.h: New file split from ../hurd/thread.h.

libpthread/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* Makefile.am: New file.
	* headers.m4: Likewise.
	* t-addr-trans.c: Move from ../hurd.
	* t-addr.c: Likewise.
	* t-rpc.c: Likewise.
	* viengoos.h: Likewise.
	* viengoos/activity.h: Likewise.
	* viengoos/addr-trans.h: Likewise.
	* viengoos/addr.h: Likewise.
	* viengoos/cap.h: Likewise.
	* viengoos/folio.h: Likewise.
	* viengoos/futex.h: Likewise.
	* viengoos/ipc.h: Likewise.
	* viengoos/message.h: Likewise.
	* viengoos/messenger.h: Likewise.
	* viengoos/rpc.h: Likewise.
	* viengoos/misc.h: Moved from ../viengoos/rm.h.
	* viengoos/thread.h: New file split from ../hurd/thread.h.

viengoos/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* rm.h: Move from here...
	* ../libviengoos/viengoos/misc.h: ... to here.  Update users.
	* headers.m4: Don't link rm.h to hurd/rm.h.
	* Makefile.am (viengoos_SOURCES): Remove rm.h.

16 files changed, 32 insertions, 154 deletions

diff --git a/viengoos/ChangeLog b/viengoos/ChangeLog
index a2e5496..ea0d57a 100644
--- a/viengoos/ChangeLog
+++ b/viengoos/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-17  Neal H. Walfield  <neal@gnu.org>
+
+	* rm.h: Move from here...
+	* ../libviengoos/viengoos/misc.h: ... to here.  Update users.
+	* headers.m4: Don't link rm.h to hurd/rm.h.
+	* Makefile.am (viengoos_SOURCES): Remove rm.h.
+
 2008-12-16  Neal H. Walfield  <neal@gnu.org>
 
 	* thread.c (thread_activate): Don't update
diff --git a/viengoos/Makefile.am b/viengoos/Makefile.am
index c3d37df..d132605 100644
--- a/viengoos/Makefile.am
+++ b/viengoos/Makefile.am
@@ -41,7 +41,6 @@ viengoos_SOURCES = $(ARCH_SOURCES)		\
 	panic.c					\
 	sigma0.h sigma0.c			\
 	zalloc.h zalloc.c			\
-	rm.h					\
 	viengoos.h viengoos.c			\
 	boot-modules.h boot-modules.c		\
 	memory.h memory.c			\
diff --git a/viengoos/activity.c b/viengoos/activity.c
index acd8645..220b362 100644
--- a/viengoos/activity.c
+++ b/viengoos/activity.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 #include <assert.h>
-#include <hurd/cap.h>
+#include <viengoos/cap.h>
 
 #include "activity.h"
 #include "thread.h"
diff --git a/viengoos/activity.h b/viengoos/activity.h
index 983395a..745486f 100644
--- a/viengoos/activity.h
+++ b/viengoos/activity.h
@@ -21,7 +21,7 @@
 #ifndef RM_ACTIVITY_H
 #define RM_ACTIVITY_H
 
-#include <hurd/activity.h>
+#include <viengoos/activity.h>
 
 #include "cap.h"
 #include "object.h"
diff --git a/viengoos/cap.c b/viengoos/cap.c
index 2a9ae66..b765ae3 100644
--- a/viengoos/cap.c
+++ b/viengoos/cap.c
@@ -20,7 +20,7 @@
 
 #include <assert.h>
 #include <hurd/stddef.h>
-#include <hurd/messenger.h>
+#include <viengoos/messenger.h>
 
 #include "cap.h"
 #include "object.h"
diff --git a/viengoos/cap.h b/viengoos/cap.h
index deb8c59..609e4a1 100644
--- a/viengoos/cap.h
+++ b/viengoos/cap.h
@@ -22,7 +22,7 @@
 #define RM_CAP_H
 
 #include <l4.h>
-#include <hurd/cap.h>
+#include <viengoos/cap.h>
 
 /* The number of slots in a capability object of the given type.  */
 extern const int cap_type_num_slots[];
diff --git a/viengoos/headers.m4 b/viengoos/headers.m4
index 091ed24..ba32755 100644
--- a/viengoos/headers.m4
+++ b/viengoos/headers.m4
@@ -1,5 +1,5 @@
 # headers.m4 - Autoconf snippets to install links for header files.
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007, 2008 Free Software Foundation, Inc.
 # Written by Neal H. Walfield <neal@gnu.org>.
 #
 # This file is free software; as a special exception the author gives
@@ -10,7 +10,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_CONFIG_LINKS([sysroot/include/hurd/rm.h:viengoos/rm.h])
+# AC_CONFIG_LINKS([])
 
 AC_CONFIG_COMMANDS_POST([
   mkdir -p sysroot/lib viengoos &&
diff --git a/viengoos/messenger.c b/viengoos/messenger.c
index fbcd58f..4e109a2 100644
--- a/viengoos/messenger.c
+++ b/viengoos/messenger.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <assert.h>
-#include <hurd/cap.h>
+#include <viengoos/cap.h>
 #include <hurd/as.h>
 
 #include "messenger.h"
diff --git a/viengoos/messenger.h b/viengoos/messenger.h
index abbf8ff..2ab669c 100644
--- a/viengoos/messenger.h
+++ b/viengoos/messenger.h
@@ -24,9 +24,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
-#include <hurd/cap.h>
-#include <hurd/messenger.h>
-#include <hurd/message.h>
+#include <viengoos/cap.h>
+#include <viengoos/messenger.h>
+#include <viengoos/message.h>
 
 #ifndef NDEBUG
 #include "../viengoos/list.h"
diff --git a/viengoos/object.c b/viengoos/object.c
index c91ff45..5d11edd 100644
--- a/viengoos/object.c
+++ b/viengoos/object.c
@@ -22,9 +22,9 @@
 #include <string.h>
 #include <hurd/stddef.h>
 #include <hurd/ihash.h>
-#include <hurd/folio.h>
-#include <hurd/thread.h>
-#include <hurd/messenger.h>
+#include <viengoos/folio.h>
+#include <viengoos/thread.h>
+#include <viengoos/messenger.h>
 #include <bit-array.h>
 #include <assert.h>
 
diff --git a/viengoos/object.h b/viengoos/object.h
index 47f36b2..e8855f0 100644
--- a/viengoos/object.h
+++ b/viengoos/object.h
@@ -25,8 +25,8 @@
 #include <hurd/error.h>
 #include <string.h>
 #include <assert.h>
-#include <hurd/cap.h>
-#include <hurd/folio.h>
+#include <viengoos/cap.h>
+#include <viengoos/folio.h>
 #include <hurd/btree.h>
 #include <stdint.h>
 
diff --git a/viengoos/rm.h b/viengoos/rm.h
deleted file mode 100644
index bef530e..0000000
--- a/viengoos/rm.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* rm.h - Resource manager interface.
-   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
-   Written by Neal H. Walfield <neal@gnu.org>.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3 of the
-   License, or (at your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef RM_RM_H
-#define RM_RM_H
-
-#include <hurd/startup.h>
-#include <hurd/folio.h>
-#include <hurd/exceptions.h>
-#include <hurd/thread.h>
-#include <hurd/activity.h>
-#include <hurd/futex.h>
-#include <l4/message.h>
-
-enum rm_method_id
-  {
-    RM_write = 100,
-    RM_read,
-    RM_as_dump,
-    RM_fault,
-  };
-
-static inline const char *
-rm_method_id_string (int id)
-{
-  switch (id)
-    {
-    case RM_write:
-      return "write";
-    case RM_read:
-      return "read";
-    case RM_as_dump:
-      return "as_dump";
-    case RM_fault:
-      return "fault";
-    case RM_folio_alloc:
-      return "folio_alloc";
-    case RM_folio_free:
-      return "folio_free";
-    case RM_folio_object_alloc:
-      return "folio_object_alloc";
-    case RM_folio_policy:
-      return "folio_policy";
-    case RM_cap_copy:
-      return "cap_copy";
-    case RM_cap_rubout:
-      return "cap_rubout";
-    case RM_cap_read:
-      return "cap_read";
-    case RM_object_discarded_clear:
-      return "object_discarded_clear";
-    case RM_object_discard:
-      return "object_discard";
-    case RM_object_status:
-      return "object_status";
-    case RM_object_reply_on_destruction:
-      return "object_reply_on_destruction";
-    case RM_object_name:
-      return "object_name";
-    case RM_thread_exregs:
-      return "thread_exregs";
-    case RM_thread_id:
-      return "thread_id";
-    case RM_thread_activation_collect:
-      return "thread_activation_collect";
-    case RM_activity_policy:
-      return "activity_policy";
-    case RM_activity_info:
-      return "activity_info";
-    case RM_futex:
-      return "futex";
-    default:
-      return "unknown method id";
-    }
-}
-
-#define RPC_STUB_PREFIX rm
-#define RPC_ID_PREFIX RM
-
-#include <hurd/rpc.h>
-
-struct io_buffer
-{
-  /* The length.  */
-  unsigned char len;
-  char data[(L4_NUM_BRS - 2) * sizeof (uintptr_t)];
-};
-
-/* Echo the character CHR on the manager console.  */
-RPC(write, 1, 0, 0, struct io_buffer, io)
-
-/* Read up to MAX characters from the console's input device.  */
-RPC(read, 1, 1, 0,
-    int, max, struct io_buffer, io)
-
-/* Dump the address space rooted at ROOT.  */
-RPC(as_dump, 0, 0, 0,
-    /* cap_t, principal, cap_t, object */)
-
-/* Fault up to COUNT pages starting at START.  Returns the number
-   actually faulted in OCOUNT.  */
-RPC(fault, 2, 1, 0,
-    /* cap_t, principal, cap_t thread, */
-    uintptr_t, start, int, count,
-    /* Out: */
-    int, ocount)
-
-#undef RPC_STUB_PREFIX
-#undef RPC_ID_PREFIX
-
-#endif
diff --git a/viengoos/server.c b/viengoos/server.c
index 9a46efa..764ba25 100644
--- a/viengoos/server.c
+++ b/viengoos/server.c
@@ -20,15 +20,15 @@
 
 #include <l4.h>
 #include <l4/pagefault.h>
-#include <hurd/cap.h>
+#include <viengoos/cap.h>
 #include <hurd/stddef.h>
 #include <hurd/exceptions.h>
-#include <hurd/thread.h>
-#include <hurd/activity.h>
-#include <hurd/futex.h>
+#include <viengoos/thread.h>
+#include <viengoos/activity.h>
+#include <viengoos/futex.h>
 #include <hurd/trace.h>
 #include <hurd/as.h>
-#include <hurd/ipc.h>
+#include <viengoos/ipc.h>
 
 #include "server.h"
 
diff --git a/viengoos/thread.c b/viengoos/thread.c
index 19fca5b..ec8080f 100644
--- a/viengoos/thread.c
+++ b/viengoos/thread.c
@@ -21,10 +21,10 @@
 #include <l4.h>
 #include <l4/thread-start.h>
 #include <hurd/ihash.h>
-#include <hurd/cap.h>
+#include <viengoos/cap.h>
 #include <hurd/stddef.h>
 #include <hurd/exceptions.h>
-#include <hurd/thread.h>
+#include <viengoos/thread.h>
 #include <bit-array.h>
 #include <backtrace.h>
 
diff --git a/viengoos/thread.h b/viengoos/thread.h
index 3bcb91d..f869d0b 100644
--- a/viengoos/thread.h
+++ b/viengoos/thread.h
@@ -23,8 +23,8 @@
 
 #include <l4.h>
 #include <errno.h>
-#include <hurd/cap.h>
-#include <hurd/thread.h>
+#include <viengoos/cap.h>
+#include <viengoos/thread.h>
 
 /* Forward.  */
 struct activity;
diff --git a/viengoos/viengoos.c b/viengoos/viengoos.c
index 8730f64..ccab7a5 100644
--- a/viengoos/viengoos.c
+++ b/viengoos/viengoos.c
@@ -39,7 +39,7 @@ int ss_lock_trace_count;
 
 #include <hurd/startup.h>
 #include <hurd/stddef.h>
-#include <hurd/thread.h>
+#include <viengoos/thread.h>
 #include <hurd/as.h>
 
 #include <process-spawn.h>