Some relatively minor tweaks to enable vinum to be built into a static

kernel as a pseudo-device.  The changes were:
- #ifdef DEBUG -> #ifdef VINUMDEBUG
- opt_vinum.h for holding above config variable
- Fixing up a few stray problems where DEBUG wasn't optional.
- config.c -> vinumconfig.c (there's already a config.o)
- Other *.c -> vinum*.c (wasn't strictly necessary, but done in case we end
  up with something else conflicting later on and we might have to have yet
  more repository copies of files).
- include file paths fixups..  (ie: get them all from the kernel tree
  instead of partly from the kernel and partly from /usr/include/machine)

I've spoken with Greg about this..  I hope this doesn't mess him around
too much..

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index a7e7e2f..bca7f77 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumvar.h,v 1.3 1998/11/02 04:11:16 grog Exp $
+ * $Id: vinumvar.h,v 1.5 1998/12/28 04:56:24 peter Exp $
  */
 
 /* XXX gdb can't find our global pointers, so use this kludge to
@@ -41,7 +41,7 @@
 #define BROKEN_GDB struct _vinum_conf *VC = &vinum_conf
 
 #include <sys/time.h>
-#include "vinumstate.h"
+#include <dev/vinum/vinumstate.h>
 /* Some configuration maxima.  They're an enum because
  * we can't define global constants.  Sorry about that.
  *
@@ -212,7 +212,7 @@ struct _vinum_conf {
 
     int flags;
     int opencount;					    /* number of times we've been opened */
-#if DEBUG
+#if VINUMDEBUG
     int lastrq;
     struct buf *lastbuf;
     struct rqinfo **rqipp;
@@ -506,7 +506,7 @@ enum setstateflags {
     setstate_noupdate = 16				    /* don't update config */
 };
 
-#ifdef DEBUG
+#ifdef VINUMDEBUG
 /* Debugging stuff */
 #define DEBUG_ADDRESSES 1
 #define DEBUG_NUMOUTPUT 2