diff --git a/drivers/at_wini/Makefile b/drivers/at_wini/Makefile index d1390d978..98cac29a9 100644 --- a/drivers/at_wini/Makefile +++ b/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 diff --git a/drivers/at_wini/at_wini.c b/drivers/at_wini/at_wini.c index 78d077229..0af648bad 100644 --- a/drivers/at_wini/at_wini.c +++ b/drivers/at_wini/at_wini.c @@ -14,7 +14,7 @@ */ #include "at_wini.h" -#include +#include #include #include diff --git a/drivers/dpeth/Makefile b/drivers/dpeth/Makefile index 09053aa2a..8bc1107c7 100644 --- a/drivers/dpeth/Makefile +++ b/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) diff --git a/drivers/drivers.h b/drivers/drivers.h index 69eb79b95..a5812b12c 100644 --- a/drivers/drivers.h +++ b/drivers/drivers.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include /* IRQ vectors and miscellaneous ports */ diff --git a/drivers/floppy/Makefile b/drivers/floppy/Makefile index 5110219db..55f0fdcc5 100644 --- a/drivers/floppy/Makefile +++ b/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 diff --git a/drivers/floppy/floppy.c b/drivers/floppy/floppy.c index 8801881cd..8bf01098c 100644 --- a/drivers/floppy/floppy.c +++ b/drivers/floppy/floppy.c @@ -24,7 +24,7 @@ #include "floppy.h" #include #include -#include +#include #include /* I/O Ports used by floppy disk task. */ diff --git a/drivers/fxp/Makefile b/drivers/fxp/Makefile index d53aa934b..317e62481 100644 --- a/drivers/fxp/Makefile +++ b/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 diff --git a/drivers/libdriver/Makefile b/drivers/libdriver/Makefile index eda7c7434..c17be2d65 100644 --- a/drivers/libdriver/Makefile +++ b/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 diff --git a/drivers/libdriver/driver.h b/drivers/libdriver/driver.h index 777581663..9bb1ff816 100644 --- a/drivers/libdriver/driver.h +++ b/drivers/libdriver/driver.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/libpci/Makefile b/drivers/libpci/Makefile index d8f262830..96acf0bb1 100644 --- a/drivers/libpci/Makefile +++ b/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 diff --git a/drivers/libpci/pci.c b/drivers/libpci/pci.c index 8b57c3fe6..ba04f257b 100644 --- a/drivers/libpci/pci.c +++ b/drivers/libpci/pci.c @@ -32,7 +32,7 @@ Created: Jan 2000 by Philip Homburg #include #include #include -#include +#include #define NR_PCIBUS 2 #define NR_PCIDEV 40 diff --git a/drivers/log/Makefile b/drivers/log/Makefile index 0f4855784..d62267d9c 100644 --- a/drivers/log/Makefile +++ b/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 diff --git a/drivers/log/log.c b/drivers/log/log.c index 3277bf29b..54cf75c43 100644 --- a/drivers/log/log.c +++ b/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 = { diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index b696edba7..c9576a127 100644 --- a/drivers/memory/Makefile +++ b/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 diff --git a/drivers/printer/Makefile b/drivers/printer/Makefile index 09f475770..14e88093e 100644 --- a/drivers/printer/Makefile +++ b/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 diff --git a/drivers/rtl8139/Makefile b/drivers/rtl8139/Makefile index 24b6c4ec0..83be7bd15 100644 --- a/drivers/rtl8139/Makefile +++ b/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 diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c index b075b68fe..9e86b7104 100755 --- a/drivers/rtl8139/rtl8139.c +++ b/drivers/rtl8139/rtl8139.c @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile index 0229b2191..06790e6ed 100644 --- a/drivers/tty/Makefile +++ b/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 diff --git a/include/minix/utils.h b/include/minix/sysutil.h similarity index 100% rename from include/minix/utils.h rename to include/minix/sysutil.h diff --git a/lib/Makefile b/lib/Makefile index 25eb72dac..55fd6812a 100755 --- a/lib/Makefile +++ b/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 diff --git a/lib/utils/Makefile b/lib/sysutil/Makefile similarity index 97% rename from lib/utils/Makefile rename to lib/sysutil/Makefile index 46e702e5b..61189679a 100644 --- a/lib/utils/Makefile +++ b/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 = \ diff --git a/lib/utils/env_panic.c b/lib/sysutil/env_panic.c similarity index 96% rename from lib/utils/env_panic.c rename to lib/sysutil/env_panic.c index f458860e4..76d503714 100644 --- a/lib/utils/env_panic.c +++ b/lib/sysutil/env_panic.c @@ -1,4 +1,4 @@ -#include "utils.h" +#include "sysutil.h" #include /*=========================================================================* diff --git a/lib/utils/env_parse.c b/lib/sysutil/env_parse.c similarity index 99% rename from lib/utils/env_parse.c rename to lib/sysutil/env_parse.c index a29ecd3ee..8979957a5 100644 --- a/lib/utils/env_parse.c +++ b/lib/sysutil/env_parse.c @@ -1,4 +1,4 @@ -#include "utils.h" +#include "sysutil.h" #include #include diff --git a/lib/utils/env_prefix.c b/lib/sysutil/env_prefix.c similarity index 97% rename from lib/utils/env_prefix.c rename to lib/sysutil/env_prefix.c index 6adfe8b18..791854ff2 100644 --- a/lib/utils/env_prefix.c +++ b/lib/sysutil/env_prefix.c @@ -1,4 +1,4 @@ -#include "utils.h" +#include "sysutil.h" #include #include diff --git a/lib/utils/fkey_ctl.c b/lib/sysutil/fkey_ctl.c similarity index 97% rename from lib/utils/fkey_ctl.c rename to lib/sysutil/fkey_ctl.c index 79207fd68..0de98f90f 100644 --- a/lib/utils/fkey_ctl.c +++ b/lib/sysutil/fkey_ctl.c @@ -1,4 +1,4 @@ -#include "utils.h" +#include "sysutil.h" /*===========================================================================* * fkey_ctl * diff --git a/lib/utils/get_mon_prm.c b/lib/sysutil/get_mon_prm.c similarity index 98% rename from lib/utils/get_mon_prm.c rename to lib/sysutil/get_mon_prm.c index 93c49ba15..4f0489cc6 100644 --- a/lib/utils/get_mon_prm.c +++ b/lib/sysutil/get_mon_prm.c @@ -1,4 +1,4 @@ -#include "utils.h" +#include "sysutil.h" #include #include diff --git a/lib/utils/getuptime.c b/lib/sysutil/getuptime.c similarity index 96% rename from lib/utils/getuptime.c rename to lib/sysutil/getuptime.c index 06f94179a..c304b93d3 100644 --- a/lib/utils/getuptime.c +++ b/lib/sysutil/getuptime.c @@ -1,4 +1,4 @@ -#include "utils.h" +#include "sysutil.h" /*===========================================================================* * getuptime * diff --git a/lib/utils/kmalloc.c b/lib/sysutil/kmalloc.c similarity index 100% rename from lib/utils/kmalloc.c rename to lib/sysutil/kmalloc.c diff --git a/lib/utils/kprintf.c b/lib/sysutil/kprintf.c similarity index 100% rename from lib/utils/kprintf.c rename to lib/sysutil/kprintf.c diff --git a/lib/utils/kputc.c b/lib/sysutil/kputc.c similarity index 98% rename from lib/utils/kputc.c rename to lib/sysutil/kputc.c index 76827f4d2..242a4b22b 100644 --- a/lib/utils/kputc.c +++ b/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 * diff --git a/lib/utils/panic.c b/lib/sysutil/panic.c similarity index 97% rename from lib/utils/panic.c rename to lib/sysutil/panic.c index 00cc89186..6fa0bcf63 100644 --- a/lib/utils/panic.c +++ b/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); diff --git a/lib/utils/report.c b/lib/sysutil/report.c similarity index 95% rename from lib/utils/report.c rename to lib/sysutil/report.c index 541cdca69..e4f9d5ef1 100644 --- a/lib/utils/report.c +++ b/lib/sysutil/report.c @@ -1,4 +1,4 @@ -#include "utils.h" +#include "sysutil.h" /*===========================================================================* * report * diff --git a/lib/utils/utils.h b/lib/sysutil/sysutil.h similarity index 64% rename from lib/utils/utils.h rename to lib/sysutil/sysutil.h index 14578d3bf..306abfe4f 100644 --- a/lib/utils/utils.h +++ b/lib/sysutil/sysutil.h @@ -1,8 +1,8 @@ -/* utils.h - System library utilities. */ +/* sysutil.h - System library utilities. */ #define _SYSTEM #include /* common to all libraries */ #include /* need task numbers + message types */ #include /* need sendrec, _taskcall, etc */ -#include /* prototypes in this library */ +#include /* prototypes in this library */ diff --git a/lib/utils/taskcall.c b/lib/sysutil/taskcall.c similarity index 100% rename from lib/utils/taskcall.c rename to lib/sysutil/taskcall.c diff --git a/lib/utils/tickdelay.c b/lib/sysutil/tickdelay.c similarity index 98% rename from lib/utils/tickdelay.c rename to lib/sysutil/tickdelay.c index f407fea9b..6ec28bdf7 100644 --- a/lib/utils/tickdelay.c +++ b/lib/sysutil/tickdelay.c @@ -1,4 +1,4 @@ -#include "utils.h" +#include "sysutil.h" /*===========================================================================* * tickdelay * diff --git a/servers/fs/Makefile b/servers/fs/Makefile index 6a914f4f0..9b94b1c84 100644 --- a/servers/fs/Makefile +++ b/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 \ diff --git a/servers/fs/cmostime.c b/servers/fs/cmostime.c index cce3cb587..06e5e9012 100644 --- a/servers/fs/cmostime.c +++ b/servers/fs/cmostime.c @@ -1,7 +1,6 @@ #include "fs.h" #include #include -#include #include #include #include diff --git a/servers/fs/dmap.c b/servers/fs/dmap.c index 542ff3a0c..5fa611088 100644 --- a/servers/fs/dmap.c +++ b/servers/fs/dmap.c @@ -9,7 +9,6 @@ #include #include #include -#include /* Some devices may or may not be there in the next table. */ #define DT(enable, opcl, io, driver, flags) \ diff --git a/servers/fs/fs.h b/servers/fs/fs.h index 3ebc92ed7..a47663f35 100644 --- a/servers/fs/fs.h +++ b/servers/fs/fs.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include "const.h" #include "type.h" diff --git a/servers/fs/main.c b/servers/fs/main.c index 97f34c013..c10692238 100644 --- a/servers/fs/main.c +++ b/servers/fs/main.c @@ -18,7 +18,6 @@ struct super_block; /* proto.h needs to know this */ #include #include #include -#include #include #include #include diff --git a/servers/inet/Makefile b/servers/inet/Makefile index 8038feb24..a2cc1d5ee 100644 --- a/servers/inet/Makefile +++ b/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 $< diff --git a/servers/inet/inet.h b/servers/inet/inet.h index 3d99d7c08..61a8f6c39 100644 --- a/servers/inet/inet.h +++ b/servers/inet/inet.h @@ -30,7 +30,6 @@ Copyright 1995 Philip Homburg #include #include #include -#include #define _NORETURN /* Should be non empty for GCC */ @@ -41,6 +40,7 @@ typedef int ioreq_t; #include #include #include +#include #include #include #include diff --git a/servers/inet/inet_config.c b/servers/inet/inet_config.c index a8f873732..9937dc8b5 100644 --- a/servers/inet/inet_config.c +++ b/servers/inet/inet_config.c @@ -20,7 +20,7 @@ Copyright 1995 Philip Homburg #include #include #include -#include +#include #include #include "inet_config.h" diff --git a/servers/init/Makefile b/servers/init/Makefile index 4070c12de..ce4593ef2 100644 --- a/servers/init/Makefile +++ b/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 diff --git a/servers/is/Makefile b/servers/is/Makefile index 57031af65..ce485bfa5 100644 --- a/servers/is/Makefile +++ b/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 diff --git a/servers/is/is.h b/servers/is/is.h index 311520043..88db7e9ec 100644 --- a/servers/is/is.h +++ b/servers/is/is.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/servers/pm/Makefile b/servers/pm/Makefile index af0a03974..f671ff4fc 100644 --- a/servers/pm/Makefile +++ b/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 diff --git a/servers/pm/forkexit.c b/servers/pm/forkexit.c index 0a66b737e..43976542e 100644 --- a/servers/pm/forkexit.c +++ b/servers/pm/forkexit.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include "mproc.h" #include "param.h" diff --git a/servers/pm/main.c b/servers/pm/main.c index 5200ff65d..17696a668 100644 --- a/servers/pm/main.c +++ b/servers/pm/main.c @@ -10,7 +10,6 @@ */ #include "pm.h" -#include #include #include #include diff --git a/servers/pm/misc.c b/servers/pm/misc.c index 49d3469e6..636bd8150 100644 --- a/servers/pm/misc.c +++ b/servers/pm/misc.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include "mproc.h" #include "param.h" diff --git a/servers/pm/pm.h b/servers/pm/pm.h index b582c5a16..0d610454e 100644 --- a/servers/pm/pm.h +++ b/servers/pm/pm.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/servers/pm/signal.c b/servers/pm/signal.c index 1cc1e8f69..e1b874c70 100644 --- a/servers/pm/signal.c +++ b/servers/pm/signal.c @@ -21,7 +21,6 @@ */ #include "pm.h" -#include #include #include #include