diff --git a/platform/x86/console.c b/platform/pc/console.c similarity index 99% rename from platform/x86/console.c rename to platform/pc/console.c index 0ce55276..35375394 100644 --- a/platform/x86/console.c +++ b/platform/pc/console.c @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include -#include +#include #include #include #include diff --git a/platform/x86/debug.c b/platform/pc/debug.c similarity index 98% rename from platform/x86/debug.c rename to platform/pc/debug.c index 0bc49990..e87bc56b 100644 --- a/platform/x86/debug.c +++ b/platform/pc/debug.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/platform/x86/include/platform/console.h b/platform/pc/include/platform/console.h similarity index 100% rename from platform/x86/include/platform/console.h rename to platform/pc/include/platform/console.h diff --git a/platform/x86/include/platform/keyboard.h b/platform/pc/include/platform/keyboard.h similarity index 100% rename from platform/x86/include/platform/keyboard.h rename to platform/pc/include/platform/keyboard.h diff --git a/platform/x86/include/platform/multiboot.h b/platform/pc/include/platform/multiboot.h similarity index 100% rename from platform/x86/include/platform/multiboot.h rename to platform/pc/include/platform/multiboot.h diff --git a/platform/x86/include/platform/x86.h b/platform/pc/include/platform/pc.h similarity index 94% rename from platform/x86/include/platform/x86.h rename to platform/pc/include/platform/pc.h index e4a1db10..a8a7251c 100644 --- a/platform/x86/include/platform/x86.h +++ b/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 -#include +#include +#include /* NOTE: keep arch/x86/crt0.S in sync with these definitions */ diff --git a/platform/x86/include/platform/x86/iomap.h b/platform/pc/include/platform/pc/iomap.h similarity index 100% rename from platform/x86/include/platform/x86/iomap.h rename to platform/pc/include/platform/pc/iomap.h diff --git a/platform/x86/include/platform/x86/memmap.h b/platform/pc/include/platform/pc/memmap.h similarity index 100% rename from platform/x86/include/platform/x86/memmap.h rename to platform/pc/include/platform/pc/memmap.h diff --git a/platform/x86/interrupts.c b/platform/pc/interrupts.c similarity index 99% rename from platform/x86/interrupts.c rename to platform/pc/interrupts.c index fa598d02..c507c19a 100644 --- a/platform/x86/interrupts.c +++ b/platform/pc/interrupts.c @@ -29,7 +29,7 @@ #include #include #include "platform_p.h" -#include +#include void x86_gpf_handler(struct x86_iframe *frame); void x86_invop_handler(struct x86_iframe *frame); diff --git a/platform/x86/keyboard.c b/platform/pc/keyboard.c similarity index 99% rename from platform/x86/keyboard.c rename to platform/pc/keyboard.c index bb057b62..8b4d623d 100644 --- a/platform/x86/keyboard.c +++ b/platform/pc/keyboard.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "platform_p.h" #include diff --git a/platform/x86/platform.c b/platform/pc/platform.c similarity index 99% rename from platform/x86/platform.c rename to platform/pc/platform.c index 5d762373..df0189f4 100644 --- a/platform/x86/platform.c +++ b/platform/pc/platform.c @@ -25,7 +25,7 @@ #include #include #include "platform_p.h" -#include +#include #include #include #include diff --git a/platform/x86/platform_p.h b/platform/pc/platform_p.h similarity index 100% rename from platform/x86/platform_p.h rename to platform/pc/platform_p.h diff --git a/platform/x86/rules.mk b/platform/pc/rules.mk similarity index 100% rename from platform/x86/rules.mk rename to platform/pc/rules.mk diff --git a/platform/x86/timer.c b/platform/pc/timer.c similarity index 99% rename from platform/x86/timer.c rename to platform/pc/timer.c index 2684ab54..2211511b 100644 --- a/platform/x86/timer.c +++ b/platform/pc/timer.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "platform_p.h" #include diff --git a/project/pc-x86-test.mk b/project/pc-x86-test.mk new file mode 100644 index 00000000..c5ff4918 --- /dev/null +++ b/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 diff --git a/project/x86-test.mk b/project/x86-test.mk deleted file mode 100644 index 49522605..00000000 --- a/project/x86-test.mk +++ /dev/null @@ -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 diff --git a/target/pc-x86/rules.mk b/target/pc-x86/rules.mk new file mode 100644 index 00000000..ed7bbfb4 --- /dev/null +++ b/target/pc-x86/rules.mk @@ -0,0 +1,5 @@ +# mostly null target configuration for pc-x86 +LOCAL_DIR := $(GET_LOCAL_DIR) + +PLATFORM := pc + diff --git a/target/x86/rules.mk b/target/x86/rules.mk deleted file mode 100644 index 3f9b0729..00000000 --- a/target/x86/rules.mk +++ /dev/null @@ -1,6 +0,0 @@ -# mostly null target configuration for x86, since there's only one real -# implementation. -LOCAL_DIR := $(GET_LOCAL_DIR) - -PLATFORM := x86 -