Renamed src/lib/utils to src/lib/sysutil --- because of new src/lib/util

drivers/at_wini/Makefile

@@ -14,7 +14,7 @@ MAKE = exec make
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = at_wini.o 
 LIBDRIVER = $d/libdriver/driver.o $d/libdriver/drvlib.o

drivers/at_wini/at_wini.c

@@ -14,7 +14,7 @@
  */
 
 #include "at_wini.h"
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/keymap.h>
 #include <sys/ioc_disk.h>
 

drivers/dpeth/Makefile

@@ -2,6 +2,9 @@
 ##  Makefile for ISA ethernet drivers	May  02, 2000
 ##
 ##  $Log$
+##  Revision 1.3  2005/07/19 13:21:48  jnherder
+##  Renamed src/lib/utils to src/lib/sysutil --- because of new src/lib/util
+##
 ##  Revision 1.2  2005/07/19 12:12:47  jnherder
 ##  Changed Makefiles: drivers are now installed in /usr/sbin.
 ##  TTY now gets SYS_EVENT message with sigset (e.g., SIGKMESS, SIGKSTOP).
@@ -28,7 +31,7 @@ LDFLAGS	= -i -o $@
 
 SRCS	= 3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c
 OBJS	= 3c501.o 3c509.o 3c503.o ne.o wd.o 8390.o devio.o netbuff.o dp.o
-LIBS	= -lutils -lsys # -ltimers
+LIBS	= -lsysutil -lsys # -ltimers
 
 ##  Build rules
 all build:	$(DRIVER)

drivers/drivers.h

@@ -15,7 +15,7 @@
 #include <minix/const.h>
 #include <minix/devio.h>
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/bitmap.h>
 
 #include <ibm/interrupt.h>	/* IRQ vectors and miscellaneous ports */

drivers/floppy/Makefile

@@ -14,7 +14,7 @@ MAKE = exec make
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = floppy.o 
 LIBDRIVER = $d/libdriver/driver.o $d/libdriver/drvlib.o

drivers/floppy/floppy.c

@@ -24,7 +24,7 @@
 #include "floppy.h"
 #include <timers.h>
 #include <ibm/diskparm.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/syslib.h>
 
 /* I/O Ports used by floppy disk task. */

drivers/fxp/Makefile

@@ -13,7 +13,7 @@ d = ..
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i 
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = fxp.o mii.o
 LIBPCI = $d/libpci/pci.o $d/libpci/pci_table.o

drivers/libdriver/Makefile

@@ -11,7 +11,7 @@ m = $i/minix
 CC = exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJECTS = driver.o drvlib.o
 

drivers/libdriver/driver.h

@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 
 #include <string.h>
 #include <limits.h>

drivers/libpci/Makefile

@@ -11,7 +11,7 @@ m = $i/minix
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJECTS = pci.o pci_table.o 
 

drivers/libpci/pci.c

@@ -32,7 +32,7 @@ Created:	Jan 2000 by Philip Homburg <philip@cs.vu.nl>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 
 #define NR_PCIBUS	 2
 #define NR_PCIDEV	40

drivers/log/Makefile

@@ -13,7 +13,7 @@ MAKE = exec make
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJ = log.o 
 LIBDRIVER = $d/libdriver/driver.o

drivers/log/log.c

@@ -53,6 +53,7 @@ FORWARD _PROTOTYPE( int log_other, (struct driver *dp, message *m_ptr) );
 FORWARD _PROTOTYPE( void log_geometry, (struct partition *entry) );
 FORWARD _PROTOTYPE( void log_reply, (int code, int replyee, int proc, int status) );
 FORWARD _PROTOTYPE( void log_notify, (int code, int replyee, int line, int ops) );
+FORWARD _PROTOTYPE( int subread, (struct logdevice *log, int count, int proc_nr, vir_bytes user_vir) );
 
 /* Entry points to this driver. */
 PRIVATE struct driver log_dtab = {

drivers/memory/Makefile

@@ -14,7 +14,7 @@ MAKE = exec make
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJ = memory.o random.o sha2.o aes/rijndael_api.o aes/rijndael_alg.o
 LIBDRIVER = $d/libdriver/driver.o

drivers/printer/Makefile

@@ -13,7 +13,7 @@ d = ..
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJ = printer.o
 

drivers/rtl8139/Makefile

@@ -14,7 +14,7 @@ MAKE = exec make
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = rtl8139.o 
 LIBPCI = $d/libpci/pci.o $d/libpci/pci_table.o

drivers/rtl8139/rtl8139.c

@@ -56,7 +56,7 @@
 #include <minix/keymap.h>
 #include <minix/syslib.h>
 #include <minix/type.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <timers.h>
 #include <ibm/portio.h>
 #include <net/hton.h>

drivers/tty/Makefile

@@ -14,7 +14,7 @@ MAKE = exec make
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = tty.o console.o vidcopy.o keyboard.o pty.o rs232.o 
 

lib/Makefile

@@ -33,7 +33,7 @@ all:
 	cd socket && $(MAKE)
 	cd syscall && $(MAKE)
 	cd syslib && $(MAKE)
-	cd utils && $(MAKE)
+	cd sysutil && $(MAKE)
 	cd timers && $(MAKE)
 	cd $(ZLIB) && $(MAKE)
 	cd `arch` && $(MAKE)
@@ -59,7 +59,7 @@ install_i86:	\
 	$(LIB)/end.a \
 	$(LIB)/libsys.a \
 	$(LIB)/libtimers.a \
-	$(LIB)/utils.a \
+	$(LIB)/sysutil.a \
 	$(LIB)/libcurses.a \
 	$(LIB)/libedit.a \
 	$(LIB)/liby.a \
@@ -103,7 +103,7 @@ $(LIB)/libsys.a:	libsys.a
 $(LIB)/libtimers.a:	libtimers.a
 	install -c -o bin $? $@
 
-$(LIB)/libutils.a:	libutils.a
+$(LIB)/libsysutil.a:	libsysutil.a
 	install -c -o bin $? $@
 
 $(LIB)/libcurses.a:	libcurses.a
@@ -134,7 +134,7 @@ install_i386:	\
 	$(LIB386)/end.a \
 	$(LIB386)/libsys.a \
 	$(LIB386)/libtimers.a \
-	$(LIB386)/libutils.a \
+	$(LIB386)/libsysutil.a \
 	$(LIB386)/libcurses.a \
 	$(LIB386)/libedit.a \
 	$(LIB386)/liby.a \
@@ -181,7 +181,7 @@ $(LIB386)/libsys.a:	libsys.a
 $(LIB386)/libtimers.a:	libtimers.a
 	install -c -o bin $? $@
 
-$(LIB386)/libutils.a:	libutils.a
+$(LIB386)/libsysutil.a:	libsysutil.a
 	install -c -o bin $? $@
 
 $(LIB386)/libcurses.a:	libcurses.a

lib/sysutil/Makefile

@@ -3,7 +3,7 @@
 CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
 CC1	= $(CC) $(CFLAGS) -c
 
-LIBUTILS	= ../libutils.a
+LIBUTILS	= ../libsysutil.a
 all:	$(LIBUTILS)
 
 OBJECTS	= \

lib/sysutil/env_panic.c

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 #include <string.h>
 
 /*=========================================================================*

lib/sysutil/env_parse.c

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 #include <stdlib.h>
 #include <string.h>
 

lib/sysutil/env_prefix.c

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 #include <stdlib.h>
 #include <string.h>
 

lib/sysutil/fkey_ctl.c

@@ -1,4 +1,4 @@
-#include "utils.h" 
+#include "sysutil.h" 
 
 /*===========================================================================*
  *				fkey_ctl				     *

lib/sysutil/get_mon_prm.c

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 #include <minix/config.h>
 #include <string.h>
 

lib/sysutil/getuptime.c

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 
 /*===========================================================================*
  *                               getuptime			    	     *

lib/sysutil/kputc.c

@@ -10,7 +10,7 @@
  * to pollute the kernel message buffer with its debug dumps. 
  */
 
-#include "utils.h"
+#include "sysutil.h"
 
 /*===========================================================================*
  *				kputc					     *

lib/sysutil/panic.c

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 
 /*===========================================================================*
  *				panic					     *
@@ -13,7 +13,6 @@ int num;			/* number to go with format string */
  * value of a defined constant.
  */
   message m;
-
   if (NULL != who && NULL != mess) {
       if (num != NO_NUM) {
           printf("Panic in %s: %s: %d\n", who, mess, num); 

lib/sysutil/report.c

@@ -1,4 +1,4 @@
-#include "utils.h" 
+#include "sysutil.h" 
 
 /*===========================================================================*
  *				    report					     *

lib/sysutil/sysutil.h

@@ -1,8 +1,8 @@
-/*	utils.h - System library utilities.	*/
+/*	sysutil.h - System library utilities.	*/
 
 #define _SYSTEM
 
 #include <lib.h>		/* common to all libraries */
 #include <minix/com.h>		/* need task numbers + message types */
 #include <minix/syslib.h>	/* need sendrec, _taskcall, etc */
-#include <minix/utils.h>	/* prototypes in this library */
+#include <minix/sysutil.h>	/* prototypes in this library */

lib/sysutil/tickdelay.c

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 
 /*===========================================================================*
  *                               tickdelay			    	     *

servers/fs/Makefile

@@ -11,7 +11,7 @@ h = $i/minix
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ =	main.o open.o read.o write.o pipe.o dmap.o \
 	device.o path.o mount.o link.o super.o inode.o \

servers/fs/cmostime.c

@@ -1,7 +1,6 @@
 #include "fs.h"
 #include <minix/com.h>
 #include <minix/callnr.h>
-#include <minix/utils.h>
 #include <time.h>
 #include <ibm/cmos.h>
 #include <ibm/bios.h>

servers/fs/dmap.c

@@ -9,7 +9,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <minix/com.h>
-#include <minix/utils.h>
 
 /* Some devices may or may not be there in the next table. */
 #define DT(enable, opcl, io, driver, flags) \

servers/fs/fs.h

@@ -16,7 +16,7 @@
 #include <errno.h>
 
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 
 #include "const.h"
 #include "type.h"

servers/fs/main.c

@@ -18,7 +18,6 @@ struct super_block;		/* proto.h needs to know this */
 #include <stdlib.h>
 #include <sys/ioc_memory.h>
 #include <sys/svrctl.h>
-#include <minix/utils.h>
 #include <minix/callnr.h>
 #include <minix/com.h>
 #include <minix/keymap.h>

servers/inet/Makefile

@@ -8,7 +8,7 @@ CC =		cc
 CPPFLAGS =	-I. -D_MINIX
 CFLAGS =	$(OPT) $(CPPFLAGS)
 LDFLAGS =
-LIBS =		-lsys -lutils
+LIBS =		-lsys -lsysutil
 
 .c.o:
 	$(CC) $(CFLAGS) -o $@ -c $<

servers/inet/inet.h

@@ -30,7 +30,6 @@ Copyright 1995 Philip Homburg
 #include <sys/time.h>
 #include <minix/config.h>
 #include <minix/type.h>
-#include <minix/utils.h>
 
 #define _NORETURN	/* Should be non empty for GCC */
 
@@ -41,6 +40,7 @@ typedef int ioreq_t;
 #include <minix/const.h>
 #include <minix/com.h>
 #include <minix/syslib.h>
+#include <minix/sysutil.h>
 #include <net/hton.h>
 #include <net/gen/ether.h>
 #include <net/gen/eth_hdr.h>

servers/inet/inet_config.c

@@ -20,7 +20,7 @@ Copyright 1995 Philip Homburg
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <minix/type.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/syslib.h>
 #include "inet_config.h"
 

servers/init/Makefile

@@ -18,7 +18,7 @@ OBJ = 	init.o
 # build local binary
 all build:	$(SERVER)
 $(SERVER):	$(OBJ)
-	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJ) -lutils
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJ) -lsysutil
 	install -S 192w $@
 
 # install with other servers

servers/is/Makefile

@@ -15,7 +15,7 @@ f = $u/src/servers/fs
 CC =	exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils 
+LIBS = -lsys -lsysutil 
 
 OBJ = main.o dmp.o dmp_kernel.o dmp_pm.o dmp_fs.o diag.o kputc.o
 

servers/is/is.h

@@ -18,7 +18,7 @@
 #include <minix/const.h>
 #include <minix/com.h>
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/keymap.h>
 #include <minix/bitmap.h>
 

servers/pm/Makefile

@@ -19,7 +19,7 @@ OBJ = 	main.o forkexit.o break.o exec.o time.o timers.o \
 # build local binary
 all build:	$(SERVER)
 $(SERVER):	$(OBJ)
-	$(CC) -o $@ $(LDFLAGS) $(OBJ) -lsys -lutils -ltimers
+	$(CC) -o $@ $(LDFLAGS) $(OBJ) -lsys -lsysutil -ltimers
 	install -S 256w $@
 
 # install with other servers

servers/pm/forkexit.c

@@ -18,7 +18,6 @@
 #include <sys/wait.h>
 #include <minix/callnr.h>
 #include <minix/com.h>
-#include <minix/utils.h>
 #include <signal.h>
 #include "mproc.h"
 #include "param.h"

servers/pm/main.c

@@ -10,7 +10,6 @@
  */
 
 #include "pm.h"
-#include <minix/utils.h>
 #include <minix/keymap.h>
 #include <minix/callnr.h>
 #include <minix/com.h>

servers/pm/misc.c

@@ -16,7 +16,6 @@
 #include <sys/svrctl.h>
 #include <sys/resource.h>
 #include <minix/com.h>
-#include <minix/utils.h>
 #include <string.h>
 #include "mproc.h"
 #include "param.h"

servers/pm/pm.h

@@ -15,7 +15,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 
 #include <limits.h>
 #include <errno.h>

servers/pm/signal.c

@@ -21,7 +21,6 @@
  */
 
 #include "pm.h"
-#include <minix/utils.h>
 #include <sys/stat.h>
 #include <minix/callnr.h>
 #include <minix/com.h>