Reorganization to better fit platform/target conventions.

platform/pc/console.c

@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <arch/x86.h>
-#include <platform/x86.h>
+#include <platform/pc.h>
 #include <platform/console.h>
 #include <string.h>
 #include <stdlib.h>

platform/pc/debug.c

@@ -25,7 +25,7 @@
 #include <printf.h>
 #include <kernel/thread.h>
 #include <arch/x86.h>
-#include <platform/x86/memmap.h>
+#include <platform/pc/memmap.h>
 #include <platform/console.h>
 #include <platform/keyboard.h>
 #include <platform/debug.h>

platform/pc/include/platform/pc.h

@@ -20,11 +20,11 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef __PLATFORM_X86_H
-#define __PLATFORM_X86_H
+#ifndef __PLATFORM_PC_H
+#define __PLATFORM_PC_H
 
-#include <platform/x86/memmap.h>
-#include <platform/x86/iomap.h>
+#include <platform/pc/memmap.h>
+#include <platform/pc/iomap.h>
 
 /* NOTE: keep arch/x86/crt0.S in sync with these definitions */
 

platform/pc/interrupts.c

@@ -29,7 +29,7 @@
 #include <arch/ops.h>
 #include <arch/x86.h>
 #include "platform_p.h"
-#include <platform/x86.h>
+#include <platform/pc.h>
 
 void x86_gpf_handler(struct x86_iframe *frame);
 void x86_invop_handler(struct x86_iframe *frame);

platform/pc/keyboard.c

@@ -29,7 +29,7 @@
 #include <platform/interrupts.h>
 #include <platform/console.h>
 #include <platform/timer.h>
-#include <platform/x86.h>
+#include <platform/pc.h>
 #include "platform_p.h"
 #include <arch/x86.h>
 

platform/pc/platform.c

@@ -25,7 +25,7 @@
 #include <arch/x86/mmu.h>
 #include <platform.h>
 #include "platform_p.h"
-#include <platform/x86.h>
+#include <platform/pc.h>
 #include <platform/multiboot.h>
 #include <platform/console.h>
 #include <platform/keyboard.h>

platform/pc/timer.c

@@ -29,7 +29,7 @@
 #include <platform/interrupts.h>
 #include <platform/console.h>
 #include <platform/timer.h>
-#include <platform/x86.h>
+#include <platform/pc.h>
 #include "platform_p.h"
 #include <arch/x86.h>
 

project/pc-x86-test.mk

@@ -0,0 +1,16 @@
+# top level project rules for the pc-x86-test project
+#
+LOCAL_DIR := $(GET_LOCAL_DIR)
+
+TARGET := pc-x86
+MODULES += \
+	app/tests \
+	app/shell
+
+# extra rules to copy the pc-x86.conf file to the build dir
+#$(BUILDDIR)/pc-x86.conf: $(LOCAL_DIR)/pc-x86.conf
+#	@echo copy $< to $@
+#	$(NOECHO)cp $< $@
+
+#EXTRA_BUILDDEPS += $(BUILDDIR)/pc-x86.conf
+#GENERATED += $(BUILDDIR)/pc-x86.conf

project/x86-test.mk

@@ -1,18 +0,0 @@
-# top level project rules for the x86-test project
-#
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-TARGET := x86
-#DEFINES += \
-#	USE_UNDERSCORE=1
-MODULES += \
-	app/tests \
-	app/shell
-
-# extra rules to copy the x86.conf file to the build dir
-#$(BUILDDIR)/x86.conf: $(LOCAL_DIR)/x86.conf
-#	@echo copy $< to $@
-#	$(NOECHO)cp $< $@
-
-#EXTRA_BUILDDEPS += $(BUILDDIR)/x86.conf
-#GENERATED += $(BUILDDIR)/x86.conf

target/pc-x86/rules.mk

@@ -0,0 +1,5 @@
+# mostly null target configuration for pc-x86
+LOCAL_DIR := $(GET_LOCAL_DIR)
+
+PLATFORM := pc
+

target/x86/rules.mk

@@ -1,6 +0,0 @@
-# mostly null target configuration for x86, since there's only one real
-# implementation.
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-PLATFORM := x86
-