Move archtypes.h, fpu.h, and stackframe.h

Move archtypes.h to include/ dir, since several servers require it. Move
fpu.h and stackframe.h to arch-specific header directory. Make source
files and makefiles aware of the new header locations.

diff --git a/commands/ibm/postmort.c b/commands/ibm/postmort.c
index 1060d779780f10164b7c4cb6fd2b8fbbc57c9592..4164307b18973847d0e828718163cd5dba8cead0 100644 (file)
--- a/commands/ibm/postmort.c
+++ b/commands/ibm/postmort.c
@@ -33,7 +33,7 @@
 
 #undef EXTERN                  /* <minix/const.h> defined this */
 #define EXTERN                 /* so we get proc & mproc */
-#include "../../kernel/arch/i386/include/archtypes.h"
+#include <machine/archtypes.h>
 #include "../../kernel/const.h"
 #include "../../kernel/type.h"
 #include "../../kernel/proc.h"

diff --git a/commands/ibm/sdump.c b/commands/ibm/sdump.c
index eb3ac6dfeb0bbbe6c17047735e8974aa8c09b120..9f9abc2dd0927909ac19f1a1d6dc9653631e025c 100644 (file)
--- a/commands/ibm/sdump.c
+++ b/commands/ibm/sdump.c
@@ -10,7 +10,7 @@
 
 #undef EXTERN
 #define EXTERN
-#include "../../kernel/arch/i386/include/archtypes.h"
+#include <machine/archtypes.h>
 #include "../../servers/pm/const.h"
 #include "../../servers/pm/type.h"
 #include "../../servers/pm/mproc.h"

diff --git a/commands/mdb/core.c b/commands/mdb/core.c
index 96f91f1a3a1b3680bb3f5eed605806e53766704a..78448615c6dafefca1c565395564ebe603ebcaef 100644 (file)
--- a/commands/mdb/core.c
+++ b/commands/mdb/core.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <sys/ptrace.h>
 
-#include <kernel/arch/i386/include/archtypes.h>
+#include <machine/archtypes.h>
 #include <kernel/const.h>
 #include <kernel/type.h>
 #include <kernel/proc.h>

diff --git a/commands/mdb/kernel.c b/commands/mdb/kernel.c
index 2afdf276b9af4bd03c9d2123bf287a7a4749c34a..ccc50d176d1eadf2ac3626f871b15298aa934c7c 100644 (file)
--- a/commands/mdb/kernel.c
+++ b/commands/mdb/kernel.c
@@ -11,7 +11,7 @@
 #include <sys/ptrace.h>
 #include "proto.h"
 
-#include <kernel/arch/i386/include/archtypes.h>
+#include <machine/archtypes.h>
 #include <kernel/const.h>
 #include <kernel/type.h>
 #include <kernel/proc.h>

diff --git a/commands/mdb/mdb.c b/commands/mdb/mdb.c
index c931b949c8b5a1ba6c87daf9eee916c0f8b311f9..47006109a7f629e745b99c28479a9be70023b560 100644 (file)
--- a/commands/mdb/mdb.c
+++ b/commands/mdb/mdb.c
@@ -45,7 +45,7 @@
 #include <setjmp.h>
 #include "proto.h"
 
-#include "../../kernel/arch/i386/include/archtypes.h"
+#include <machine/archtypes.h>
 #include <kernel/const.h>
 #include <kernel/type.h>
 #include <kernel/proc.h>

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index 08efe8a5077d01526a89b3865f6419047713d91b..676e10d2d6fcb7d3e550a2d9e40e4de12dd853cd 100644 (file)
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -78,7 +78,7 @@
 #include <stdio.h>
 #include <ttyent.h>
 
-#include "../../kernel/arch/i386/include/archtypes.h"
+#include <machine/archtypes.h>
 #include "../../kernel/const.h"
 #include "../../kernel/type.h"
 #include "../../kernel/proc.h"

diff --git a/commands/simple/dumpcore.c b/commands/simple/dumpcore.c
index f032141225dcfd9d4280403a0c604013e98587b8..62e03170d3bc4d7db1e11e0189bb5f41ad6b2316 100644 (file)
--- a/commands/simple/dumpcore.c
+++ b/commands/simple/dumpcore.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../../kernel/arch/i386/include/archtypes.h"
+#include <machine/archtypes.h>
 #include "../../kernel/proc.h"
 
 #define CLICK_WORDS (CLICK_SIZE / sizeof(unsigned long))

diff --git a/commands/simple/top.c b/commands/simple/top.c
index 55d6e7d3577c8fea725e0b7b495cde76ef2dd734..9fa434b1daecdcef696bc0bba0d0beb8cd2d9e1e 100644 (file)
--- a/commands/simple/top.c
+++ b/commands/simple/top.c
@@ -34,7 +34,7 @@
 
 #include <minix/u64.h>
 
-#include "../../kernel/arch/i386/include/archtypes.h"
+#include <machine/archtypes.h>
 #include "../../servers/pm/mproc.h"
 #include "../../kernel/const.h"
 #include "../../kernel/proc.h"

diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 9e819ca28ad21f0b0d5a435e1c3f507b38dd2f6a..ab77633714b267e9befa5c64c080ee5350b58613 100644 (file)
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -14,7 +14,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =   exec cc
-CPPFLAGS = -I.. -I../.. -I../../kernel/arch/$(ARCH)/include -I$i 
+CPPFLAGS = -I.. -I../.. -I$i
 CFLAGS = $(CPPFLAGS)
 LDFLAGS = -i
 LIBS =  -lsys -ltimers

diff --git a/drivers/tty/keyboard.c b/drivers/tty/keyboard.c
index 9a3be7b6f38581756875af555d0759018e2fb872..9fe9dd5bec9115a46fb6f89caf915799ff57f94f 100644 (file)
--- a/drivers/tty/keyboard.c
+++ b/drivers/tty/keyboard.c
@@ -14,7 +14,7 @@
 #include <termios.h>
 #include <signal.h>
 #include <unistd.h>
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include <minix/callnr.h>
 #include <minix/com.h>
 #include <minix/keymap.h>

diff --git a/include/arch/i386/Makefile b/include/arch/i386/Makefile
index 5e3b1bbae8c139507b16cda0a5cbcebd8b91fbb4..b3887ea76dde7e86ee406621570f52279634a5c8 100644 (file)
--- a/include/arch/i386/Makefile
+++ b/include/arch/i386/Makefile
@@ -1,6 +1,7 @@
 INCSDIR= /usr/include/i386
 
-INCS=  bios.h cmos.h cpu.h diskparm.h int86.h interrupt.h memory.h \
-       partition.h pci.h ports.h vm.h
+INCS=  archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \
+       interrupt.h memory.h partition.h pci.h ports.h stackframe.h \
+       vm.h
 
 .include <minix.kinc.mk>

diff --git a/kernel/arch/i386/include/archtypes.h b/include/arch/i386/archtypes.h
similarity index 95%
rename from kernel/arch/i386/include/archtypes.h
rename to include/arch/i386/archtypes.h
index 942363bc6207f96676022414bb5c4e15dcb670ce..82c573b44cf7dca962ecc6f5933ed2e18818ceaf 100644 (file)
--- a/kernel/arch/i386/include/archtypes.h
+++ b/include/arch/i386/archtypes.h
@@ -3,9 +3,8 @@
 #define _I386_TYPES_H
 
 #include <minix/sys_config.h>
-#include "archconst.h"
-#include <sys/stackframe.h>
-#include <sys/fpu.h>
+#include <machine/stackframe.h>
+#include <machine/fpu.h>
 
 struct segdesc_s {             /* segment descriptor for protected mode */
   u16_t limit_low;

diff --git a/include/sys/fpu.h b/include/arch/i386/fpu.h
similarity index 100%
rename from include/sys/fpu.h
rename to include/arch/i386/fpu.h

diff --git a/include/sys/stackframe.h b/include/arch/i386/stackframe.h
similarity index 100%
rename from include/sys/stackframe.h
rename to include/arch/i386/stackframe.h

diff --git a/include/minix/const.h b/include/minix/const.h
index ea3aa37bcc036e046ea468dacb4a96784c433b56..9ba211b199d8e5ff4d5654eff3cd5c8abd42a8b1 100644 (file)
--- a/include/minix/const.h
+++ b/include/minix/const.h
@@ -1,3 +1,5 @@
+#ifndef _MINIX_CONST_H
+#define _MINIX_CONST_H
 
 #ifndef CHIP
 #error CHIP is not defined
@@ -151,3 +153,5 @@
 #define VERBOSEBOOT_BASIC 1
 #define VERBOSEBOOT_MAX   2
 #define VERBOSEBOOTVARNAME "verbose"
+
+#endif /* _MINIX_CONST_H */

diff --git a/include/sys/Makefile b/include/sys/Makefile
index 08e8f0ad7aa629b6b81043706778c4b45a35ceb1..caf81424ea9086aa7402603953441044196d41d5 100644 (file)
--- a/include/sys/Makefile
+++ b/include/sys/Makefile
@@ -2,12 +2,12 @@
 
 INCSDIR=        /usr/include/sys
 
-INCS=  asynchio.h dir.h file.h fpu.h ioc_cmos.h ioc_disk.h \
+INCS=  asynchio.h dir.h file.h ioc_cmos.h ioc_disk.h \
        ioc_file.h ioc_memory.h ioc_scsi.h ioc_sound.h ioc_tape.h \
        ioctl.h ioc_tty.h ipc.h jmp_buf.h kbdio.h mman.h \
        mount.h mtio.h param.h ptrace.h queue.h resource.h \
        select.h sem.h shm.h sigcontext.h signal.h socket.h \
-       soundcard.h stackframe.h statfs.h stat.h svrctl.h timeb.h \
+       soundcard.h statfs.h stat.h svrctl.h timeb.h \
        time.h times.h types.h uio.h un.h utsname.h video.h vm.h \
        wait.h
 

diff --git a/include/sys/sigcontext.h b/include/sys/sigcontext.h
index def987187a0fdf9ab511bc7248720a46b883f40a..abac04aec21e83996046fae5e3f13d4d93997988 100644 (file)
--- a/include/sys/sigcontext.h
+++ b/include/sys/sigcontext.h
@@ -23,8 +23,8 @@
  * be added in a different struct.
  */
 #if (_MINIX_CHIP == _CHIP_INTEL)
-#include <sys/stackframe.h>
-#include <sys/fpu.h>
+#include <machine/stackframe.h>
+#include <machine/fpu.h>
 
 typedef struct stackframe_s sigregs;
 struct sigframe {              /* stack frame created for signalled process */

diff --git a/kernel/arch/i386/apic_asm.S b/kernel/arch/i386/apic_asm.S
index 3d0a138cfe0cdb3c5682a542c0321ac022f56059..815ce2825ca3503f730ee874a60abb4c359afda3 100644 (file)
--- a/kernel/arch/i386/apic_asm.S
+++ b/kernel/arch/i386/apic_asm.S
@@ -1,4 +1,4 @@
-#include <archconst.h>
+#include "archconst.h"
 #include "apic.h"
 #include "sconst.h"
 #include "apic_asm.h"

diff --git a/kernel/arch/i386/klib386.S b/kernel/arch/i386/klib386.S
index dd94d6a5871d622626617132e00db0679c62fe8a..cbfb932b4db9c14f4c8f7caf104a8f17a423b340 100644 (file)
--- a/kernel/arch/i386/klib386.S
+++ b/kernel/arch/i386/klib386.S
@@ -4,7 +4,7 @@
 #include <minix/config.h>
 #include <minix/const.h>
 #include <machine/interrupt.h>
-#include <archconst.h>
+#include "archconst.h"
 #include "../../const.h"
 #include "sconst.h"
 

diff --git a/kernel/arch/i386/mpx386.S b/kernel/arch/i386/mpx386.S
index d58c5d8e0b4d0d101a571d289b7c8b4ea6701dd1..1729fa8cc4844d891eed6942b294b3e066717332 100644 (file)
--- a/kernel/arch/i386/mpx386.S
+++ b/kernel/arch/i386/mpx386.S
@@ -68,7 +68,7 @@ begbss:
 #include <minix/const.h>
 #include <minix/com.h>
 #include <machine/interrupt.h>
-#include <archconst.h>
+#include "archconst.h"
 #include "../../const.h"
 #include "../../proc.h"
 #include "sconst.h"

diff --git a/kernel/arch/i386/protect.c b/kernel/arch/i386/protect.c
index bbef77763c3a79823fc159085bf684f7d76e7f22..a77dcbe25bb8ea83315f46ca75d7a03701f47443 100644 (file)
--- a/kernel/arch/i386/protect.c
+++ b/kernel/arch/i386/protect.c
@@ -5,7 +5,7 @@
 
 #include "../../kernel.h"
 #include "../../proc.h"
-#include <archconst.h>
+#include "archconst.h"
 
 #include "proto.h"
 

diff --git a/kernel/arch/i386/system.c b/kernel/arch/i386/system.c
index 0b57abd70a6a2883f8c631277af222c9af570d0e..665d85c876bdd6014e104961dddd0c1f43e6e6ce 100644 (file)
--- a/kernel/arch/i386/system.c
+++ b/kernel/arch/i386/system.c
@@ -10,8 +10,8 @@
 #include <minix/portio.h>
 #include <minix/cpufeature.h>
 #include <a.out.h>
-#include <archconst.h>
 
+#include "archconst.h"
 #include "proto.h"
 #include "../../proc.h"
 #include "../../debug.h"

diff --git a/kernel/glo.h b/kernel/glo.h
index 03180577697f36a5d0a8ebf6e25499ee72d5f178..d3042d3dd359b09f384f7791e4637cf9a7193326 100644 (file)
--- a/kernel/glo.h
+++ b/kernel/glo.h
@@ -12,7 +12,8 @@
 #endif
 
 #include <minix/config.h>
-#include <archtypes.h>
+#include <machine/archtypes.h>
+#include "archconst.h"
 #include "config.h"
 #include "debug.h"
 

diff --git a/kernel/interrupt.c b/kernel/interrupt.c
index d1168113d9aaaf1defe43a12d641919e064f87db..a61331a52e8b6a9846518efa8f44b6cf0418768a 100644 (file)
--- a/kernel/interrupt.c
+++ b/kernel/interrupt.c
@@ -15,7 +15,7 @@
 
 #include "kernel.h"
 #include "proc.h"
-#include <archconst.h>
+#include "archconst.h"
 
 #include "arch/i386/hw_intr.h"
 

diff --git a/kernel/priv.h b/kernel/priv.h
index d05a22683ed86b32dc7ba5eea9d8f9198642e9da..b4bd9c886f82da86db18a7a25ef0be97ca45d7d1 100644 (file)
--- a/kernel/priv.h
+++ b/kernel/priv.h
@@ -13,6 +13,7 @@
  *   Jul 01, 2005  Created.  (Jorrit N. Herder)        
  */
 #include <minix/com.h>
+#include <minix/const.h>
 #include "const.h"
 #include "type.h"
 

diff --git a/kernel/proto.h b/kernel/proto.h
index eb9141876c7cbf504a66268d0b36617f96c7e380..fdcd6980f93a9168b961facc91ed8e01ed0fbdf3 100644 (file)
--- a/kernel/proto.h
+++ b/kernel/proto.h
@@ -4,7 +4,7 @@
 #define PROTO_H
 
 #include <minix/safecopies.h>
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include <a.out.h>
 
 /* Struct declarations. */

diff --git a/servers/is/Makefile b/servers/is/Makefile
index a6af2bbd61befc4da3d87a6b7a75359e624d2132..fb8de4aaa029887834dcc28cae9b523c80bd4492 100644 (file)
--- a/servers/is/Makefile
+++ b/servers/is/Makefile
@@ -15,7 +15,7 @@ f = $u/src/servers/fs
 
 # programs, flags, etc.
 CC =   exec cc
-CPPFLAGS=-I../../kernel/arch/$(ARCH)/include -I$i 
+CPPFLAGS=-I$i
 CFLAGS = $(CPROFILE) $(CPPFLAGS)
 LDFLAGS = -i
 LIBS = -lsys 

diff --git a/servers/is/inc.h b/servers/is/inc.h
index 6c17ee9a1157aeceb571d99f4731597716e8faed..08174df46a2d657c0c88f126a06ca8207c8b84c7 100644 (file)
--- a/servers/is/inc.h
+++ b/servers/is/inc.h
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include "proto.h"
 #include "glo.h"
 

diff --git a/servers/pm/Makefile b/servers/pm/Makefile
index f76be6867906de960967676c1f0a02b46438edfb..dbb2891ec7c74385adee551bf76b0cd307c47afa 100644 (file)
--- a/servers/pm/Makefile
+++ b/servers/pm/Makefile
@@ -12,7 +12,7 @@ k = $u/src/kernel
 
 # programs, flags, etc.
 CC =   exec cc
-CPPFLAGS=-I../../kernel/arch/$(ARCH)/include -I$i 
+CPPFLAGS=-I$i
 CFLAGS = $(CPROFILE) $(CPPFLAGS)
 LDFLAGS = -i
 

diff --git a/servers/pm/dma.c b/servers/pm/dma.c
index 11afac7ef7e7e3a84d5e57ba8af1e59b05c6734e..476006431da694cf1df569c0665e1b61b6193c6a 100644 (file)
--- a/servers/pm/dma.c
+++ b/servers/pm/dma.c
@@ -9,7 +9,6 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <archconst.h>
 
 #include "mproc.h"
 

diff --git a/servers/pm/main.c b/servers/pm/main.c
index a4fb748e6b86392f0b96cd5762040d6661cd5dfe..e5cef3ad7096af706b8199ed63729f6db3905a4f 100644 (file)
--- a/servers/pm/main.c
+++ b/servers/pm/main.c
@@ -26,8 +26,7 @@
 #include <sys/resource.h>
 #include <sys/utsname.h>
 #include <string.h>
-#include <archconst.h>
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include <env.h>
 #include "mproc.h"
 #include "param.h"

diff --git a/servers/pm/misc.c b/servers/pm/misc.c
index e5330ac89791cf3ea88ae6a7eb93bb1eb7a39f32..e4c023f251e006e4a551c1c9e91bba9be602537e 100644 (file)
--- a/servers/pm/misc.c
+++ b/servers/pm/misc.c
@@ -24,8 +24,7 @@
 #include <minix/type.h>
 #include <minix/vm.h>
 #include <string.h>
-#include <archconst.h>
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include <lib.h>
 #include <assert.h>
 #include "mproc.h"

diff --git a/servers/pm/utility.c b/servers/pm/utility.c
index f3058b3f62e3d01b6c551028f1ed78b709782297..0825d4b086be11050c2af80a97df9ebbcb3e01a1 100644 (file)
--- a/servers/pm/utility.c
+++ b/servers/pm/utility.c
@@ -22,8 +22,7 @@
 #include <minix/config.h>
 #include <timers.h>
 #include <string.h>
-#include <archconst.h>
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include "../../kernel/const.h"
 #include "../../kernel/config.h"
 #include "../../kernel/type.h"

diff --git a/servers/rs/Makefile b/servers/rs/Makefile
index 1e35b7c28ed7941c15aeca660c8d87bb711cd4ab..1bd073636ed6cf8214fd7d5032b70bf66c85c552 100644 (file)
--- a/servers/rs/Makefile
+++ b/servers/rs/Makefile
@@ -13,7 +13,7 @@ b = $i/ibm
 
 # programs, flags, etc.
 CC =   exec cc
-CPPFLAGS = -I../../kernel/arch/$(ARCH)/include
+CPPFLAGS =
 CFLAGS = -I$i $(CPROFILE) $(CPPFLAGS)
 LDFLAGS = -i
 LIBS = -lsys 

diff --git a/servers/rs/inc.h b/servers/rs/inc.h
index 892aa76fb8f9d308bf1c6ff85d223c7ac8976d04..70ff1b8c396696f435a4fc1abc9416f4cc3f9c3e 100644 (file)
--- a/servers/rs/inc.h
+++ b/servers/rs/inc.h
@@ -27,7 +27,7 @@
 #include <minix/dmap.h>
 #include <minix/endpoint.h>
 
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include <timers.h>                            /* For priv.h */
 #include "../../kernel/priv.h"
 #include "../../kernel/ipc.h"

diff --git a/servers/vm/Makefile b/servers/vm/Makefile
index 8d844d84e062ead84363ed51a2cf59c41835fa75..defbdd8bb7315aff05fe5538b96a9dc88ac255c2 100644 (file)
--- a/servers/vm/Makefile
+++ b/servers/vm/Makefile
@@ -8,7 +8,7 @@ OBJ = main.o alloc.o utility.o exec.o exit.o fork.o break.o \
        physravl.o rs.o queryexit.o map_mem.o
 ARCHOBJ =  $(ARCH)/vm.o $(ARCH)/pagetable.o $(ARCH)/arch_pagefaults.o $(ARCH)/util.o 
 
-CPPFLAGS=-I../../kernel/arch/$(ARCH)/include -I$(ARCH)
+CPPFLAGS=-I$(ARCH)
 CFLAGS = $(CPROFILE) $(CPPFLAGS)
 
 # build local binary

diff --git a/servers/vm/i386/Makefile b/servers/vm/i386/Makefile
index 77eb97c1698daf343a55044ee00fdf8d1428553b..7f97f13411424e38c1ba1a969b776e5c3d03d384 100644 (file)
--- a/servers/vm/i386/Makefile
+++ b/servers/vm/i386/Makefile
@@ -3,7 +3,7 @@ include /etc/make.conf
 
 OBJ = vm.o pagetable.o arch_pagefaults.o util.o
 
-CPPFLAGS=-I../../../kernel/arch/$(ARCH)/include -I.
+CPPFLAGS=-I.
 CFLAGS = $(CPROFILE) $(CPPFLAGS)
 
 all:   $(OBJ)

diff --git a/servers/vm/i386/arch_vmproc.h b/servers/vm/i386/arch_vmproc.h
index e6ea34bae5d33d692b58f289d31a3ded3216cf65..455e167e9ea51ff7226fd7d0bc086b7537870805 100644 (file)
--- a/servers/vm/i386/arch_vmproc.h
+++ b/servers/vm/i386/arch_vmproc.h
@@ -1,5 +1,4 @@
 
-#include <archtypes.h>
 #include <minix/config.h>
 #include <minix/const.h>
 #include <minix/type.h>

diff --git a/servers/vm/main.c b/servers/vm/main.c
index d0a7f8a5fbd08471a994304552d2ada14bce513d..34184e27c7bec105467ec76703907fc9b4f4bd44 100644 (file)
--- a/servers/vm/main.c
+++ b/servers/vm/main.c
@@ -34,7 +34,7 @@
 
 extern int missing_spares;
 
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include "../../kernel/const.h"
 #include "../../kernel/config.h" 
 #include "../../kernel/proc.h"

diff --git a/servers/vm/utility.c b/servers/vm/utility.c
index 844aae7203ab3bb0ac39cf69fb2c83a1fd9ea44f..a4bbb8d0f1aa92640aaa0562b6ee5f132c48aaa0 100644 (file)
--- a/servers/vm/utility.c
+++ b/servers/vm/utility.c
@@ -29,8 +29,7 @@
 #include "glo.h"
 #include "util.h"
 
-#include <archconst.h>
-#include <archtypes.h>
+#include <machine/archtypes.h>
 #include "../../kernel/const.h"
 #include "../../kernel/config.h"
 #include "../../kernel/type.h"