Undo the use of #include <...> because it caused some errors.

diff --git a/drivers/at_wini/Makefile b/drivers/at_wini/Makefile
index fdc7afcff5388516ebdfdedfa0009b772721367d..333a9459e6c5eedd6dfd77cfbab228b92505a040 100644 (file)
--- a/drivers/at_wini/Makefile
+++ b/drivers/at_wini/Makefile
@@ -13,7 +13,7 @@ p = ../libpci
 # programs, flags, etc.
 MAKE = exec make
 CC =   exec cc
-CFLAGS = -I$i -I.. $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i -L../libdriver
 LIBS = -ldriver -lsys -ltimers 
 

diff --git a/drivers/at_wini/at_wini.h b/drivers/at_wini/at_wini.h
index df0aa771de4b0800b7000579e6bfbf717d0c5edc..4f7fbd8eaf27348fc7a59e75566297f4992f2919 100644 (file)
--- a/drivers/at_wini/at_wini.h
+++ b/drivers/at_wini/at_wini.h
@@ -1,6 +1,6 @@
-#include <drivers.h>
-#include <libdriver/driver.h>
-#include <libdriver/drvlib.h>
+#include "../drivers.h"
+#include "../libdriver/driver.h"
+#include "../libdriver/drvlib.h"
 
 #define VERBOSE                   0    /* display identify messages during boot */
 #define ENABLE_ATAPI      1    /* add ATAPI cd-rom support to driver */

diff --git a/drivers/bios_wini/Makefile b/drivers/bios_wini/Makefile
index f6a154404fa8f35cfbe5ec7eec8e0e79b446a635..f0ff487e898834649e4afee812a33ae143a61d3b 100644 (file)
--- a/drivers/bios_wini/Makefile
+++ b/drivers/bios_wini/Makefile
@@ -12,7 +12,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =   exec cc
-CFLAGS = -I$i -I.. $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i -L../libdriver 
 LIBS = -ldriver    -lsys  -lsys -ltimers 
 

diff --git a/drivers/bios_wini/bios_wini.c b/drivers/bios_wini/bios_wini.c
index b142ce261fbab35b4acdbbeedb43a77d1e523591..e4ffddb4fd73dbe797ce20e72ab2431b8b43d69c 100644 (file)
--- a/drivers/bios_wini/bios_wini.c
+++ b/drivers/bios_wini/bios_wini.c
@@ -20,9 +20,9 @@
  *     14 May 2000 by Kees J. Bot: d-d/i rewrite.
  */
 
-#include <drivers.h>
-#include <libdriver/driver.h>
-#include <libdriver/drvlib.h>
+#include "../drivers.h"
+#include "../libdriver/driver.h"
+#include "../libdriver/drvlib.h"
 #include <minix/sysutil.h>
 #include <minix/safecopies.h>
 #include <sys/ioc_disk.h>

diff --git a/drivers/floppy/Makefile b/drivers/floppy/Makefile
index d32359c5f7a5714835248f6ddc99c20a68d3e698..e690291fdb09ff19618fbbd1ac251cf46732dda9 100644 (file)
--- a/drivers/floppy/Makefile
+++ b/drivers/floppy/Makefile
@@ -12,7 +12,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =   exec cc
-CFLAGS = -I.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i -L../libdriver
 LIBS = -ldriver -lsys  -ltimers
 

diff --git a/drivers/floppy/floppy.c b/drivers/floppy/floppy.c
index 9d313984fd317eb1384be3b0155090d62261571f..26f86b1243b8201bc453f25c930c28af82519d47 100644 (file)
--- a/drivers/floppy/floppy.c
+++ b/drivers/floppy/floppy.c
@@ -300,7 +300,7 @@ PUBLIC int last_transfer_opcode;
 /*===========================================================================*
  *                             floppy_task                                  *
  *===========================================================================*/
-PUBLIC int main()
+PUBLIC int main(void)
 {
   /* SEF local startup. */
   sef_local_startup();

diff --git a/drivers/floppy/floppy.h b/drivers/floppy/floppy.h
index 415a425198881dfef5d49aa63150d4a66aefff1c..2bc0334b739044ad96abcbe728d978cf7e316c6f 100644 (file)
--- a/drivers/floppy/floppy.h
+++ b/drivers/floppy/floppy.h
@@ -1,4 +1,4 @@
-#include <drivers.h>
-#include <libdriver/driver.h>
-#include <libdriver/drvlib.h>
+#include "../drivers.h"
+#include "../libdriver/driver.h"
+#include "../libdriver/drvlib.h"
 

diff --git a/drivers/log/Makefile b/drivers/log/Makefile
index 2834aaf743bc32c0095662c0ae057aa3195ec74b..eecdc5e69ea2c2cbf0522f1254840d8cb4561a2c 100644 (file)
--- a/drivers/log/Makefile
+++ b/drivers/log/Makefile
@@ -11,7 +11,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =   exec cc
-CFLAGS = -I.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i -L../libdriver
 LIBS = -ldriver  -lsys 
 LIB_DEP = ../libdriver/libdriver.a

diff --git a/drivers/log/log.h b/drivers/log/log.h
index 3d8c4c362385154c8b79e493a6425bb1a88784ec..d180305073f0282725c0697b465f66323d8c300e 100644 (file)
--- a/drivers/log/log.h
+++ b/drivers/log/log.h
@@ -1,6 +1,6 @@
 /* Includes. */
-#include <drivers.h>
-#include <libdriver/driver.h>
+#include "../drivers.h"
+#include "../libdriver/driver.h"
 #include <minix/type.h>
 #include <minix/const.h>
 #include <minix/com.h>

diff --git a/drivers/orinoco/Makefile b/drivers/orinoco/Makefile
index f9bce9eb0dfcb457c801cc029627b46b69957f4d..9a1d8900b02f5048aaaed06fe71d299e5c667d22 100644 (file)
--- a/drivers/orinoco/Makefile
+++ b/drivers/orinoco/Makefile
@@ -11,7 +11,7 @@ d = ..
 
 # programs, flags, etc.
 CC =   exec cc
-CFLAGS = -I.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i
 LIBS = -lsys -ltimers
 

diff --git a/drivers/orinoco/hermes.h b/drivers/orinoco/hermes.h
index 7c0b0be34defcc0432b017ff917ff0a9aa8b62cf..9f43dd833cd4edf7edbf3d48bdc924f52637dd2f 100644 (file)
--- a/drivers/orinoco/hermes.h
+++ b/drivers/orinoco/hermes.h
@@ -19,7 +19,7 @@
 #ifndef _HERMES_H
 #define _HERMES_H
 
-#include <drivers.h>
+#include "../drivers.h"
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 #include <net/hton.h>

diff --git a/drivers/rtl8139/Makefile b/drivers/rtl8139/Makefile
index 86a45aadacfe09fa1bb411c62e75315f75d1ef3d..49d2df8024304a6b0f8e36b6305e98764ae09277 100644 (file)
--- a/drivers/rtl8139/Makefile
+++ b/drivers/rtl8139/Makefile
@@ -12,7 +12,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =   exec cc
-CFLAGS = -I.. -I../.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i
 LIBS = -lsys -ltimers 
 

diff --git a/drivers/rtl8139/rtl8139.h b/drivers/rtl8139/rtl8139.h
index 0adb74e530130640fac0196f0c9ac724c63b1416..218be4b5cb36383ba696fc9ff1b1f7039f23abc3 100644 (file)
--- a/drivers/rtl8139/rtl8139.h
+++ b/drivers/rtl8139/rtl8139.h
@@ -4,7 +4,7 @@ ibm/rtl8139.h
 Created:       Aug 2003 by Philip Homburg <philip@cs.vu.nl>
 */
 
-#include <drivers.h>
+#include "../drivers.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -28,9 +28,9 @@ Created:      Aug 2003 by Philip Homburg <philip@cs.vu.nl>
 #include <assert.h>
 #include <unistd.h>
 #include <sys/ioc_memory.h>
-#include <kernel/const.h>
-#include <kernel/config.h>
-#include <kernel/type.h>
+#include "../../kernel/const.h"
+#include "../../kernel/config.h"
+#include "../../kernel/type.h"
 
 #define        RL_IDR          0x00    /* Ethernet address
                                 * Note: RL_9346CR_EEM_CONFIG mode is

diff --git a/drivers/rtl8169/Makefile b/drivers/rtl8169/Makefile
index 09410ad5140327dbf66b23aa81cbe55e47e19413..0d9403a60ab1f56532b452a5702bbde71c51e1ee 100644 (file)
--- a/drivers/rtl8169/Makefile
+++ b/drivers/rtl8169/Makefile
@@ -12,7 +12,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =   exec cc
-CFLAGS = -I.. -I../.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i
 LIBS = -lsys -ltimers
 

diff --git a/drivers/rtl8169/rtl8169.c b/drivers/rtl8169/rtl8169.c
index a08661e823106f67180a5f4a453f0a920b2a8128..84792b177b7680ccb7ae10322adccf0f20eebadd 100644 (file)
--- a/drivers/rtl8169/rtl8169.c
+++ b/drivers/rtl8169/rtl8169.c
@@ -6,7 +6,7 @@
  *
  */
 
-#include <drivers.h>
+#include "../drivers.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -26,9 +26,9 @@
 #include <sys/types.h>
 #include <assert.h>
 #include <unistd.h>
-#include <kernel/const.h>
-#include <kernel/config.h>
-#include <kernel/type.h>
+#include "../../kernel/const.h"
+#include "../../kernel/config.h"
+#include "../../kernel/type.h"
 
 #define debug                  1
 #define printW()               ((void)0)

diff --git a/drivers/ti1225/Makefile b/drivers/ti1225/Makefile
index d26cdf55e62e9de450904386b352b2075a329c99..b197db5dd1cfae90c2485281997767538fc4712e 100644 (file)
--- a/drivers/ti1225/Makefile
+++ b/drivers/ti1225/Makefile
@@ -11,7 +11,7 @@ d = ..
 
 # programs, flags, etc.
 CC =   exec cc
-CFLAGS = -I.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i 
 LIBS = -lsys -ltimers
 

diff --git a/drivers/ti1225/ti1225.c b/drivers/ti1225/ti1225.c
index 1254dc29a494f7d020bbce416db8eb0e500951d2..bff640de2791373a2f333dfaabb301ae4941deb7 100644 (file)
--- a/drivers/ti1225/ti1225.c
+++ b/drivers/ti1225/ti1225.c
@@ -4,7 +4,7 @@ ti1225.c
 Created:       Dec 2005 by Philip Homburg
 */
 
-#include <drivers.h>
+#include "../drivers.h"
 #include <ibm/pci.h>
 #include <sys/vm_i386.h>
 

diff --git a/drivers/tty/tty.c b/drivers/tty/tty.c
index dc403adb8c63cb15f20deb8431688c83e4efcd3a..9f737eb1b9975d958469bfd3e96e243149539792 100644 (file)
--- a/drivers/tty/tty.c
+++ b/drivers/tty/tty.c
@@ -71,8 +71,6 @@
 #include <sys/time.h>
 #include <sys/select.h>
 
-extern int irq_hook_id;
-
 unsigned long kbd_irq_set = 0;
 unsigned long rs_irq_set = 0;
 

diff --git a/drivers/tty/tty.h b/drivers/tty/tty.h
index 79cfed7d4abf59d40b15f9cc5767988c37d8baa7..82da3a7001d6e90b511f0d4f2d1147f7e8a4b705 100644 (file)
--- a/drivers/tty/tty.h
+++ b/drivers/tty/tty.h
@@ -106,7 +106,6 @@ typedef struct tty {
 /* Memory allocated in tty.c, so extern here. */
 extern tty_t tty_table[NR_CONS+NR_RS_LINES+NR_PTYS];
 extern int ccurrent;           /* currently visible console */
-extern int irq_hook_id;                /* hook id for keyboard irq */
 extern u32_t system_hz;                /* system clock frequency */
 
 extern unsigned long kbd_irq_set;

diff --git a/kernel/arch/i386/memory.c b/kernel/arch/i386/memory.c
index 159ba42e6b816d545d92d1b8cfbed793e6e51ec0..27b211e4482907a34539125c8b53254be1c08735 100644 (file)
--- a/kernel/arch/i386/memory.c
+++ b/kernel/arch/i386/memory.c
@@ -43,7 +43,6 @@ PRIVATE int nfreepdes = 0, freepdes[WANT_FREEPDES], inusepde = NOPDE;
 
 FORWARD _PROTOTYPE( u32_t phys_get32, (phys_bytes v)                   );
 FORWARD _PROTOTYPE( void vm_enable_paging, (void)                      );
-FORWARD _PROTOTYPE( void set_cr3, (void)                       );
 
        
 /* *** Internal VM Functions *** */