Directory re-structuring. Doesn't compile yet, need to commit first.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@33 ebee16cc-31ac-478f-84a7-5cbb03baadba

flight/Makefile

@@ -53,10 +53,12 @@ BOARD    = STM3210E_OP
 OUTDIR = Build
 
 # Target file name (without extension).
-TARGET = openpilot
+TARGET = OpenPilot
 
 # Paths
-SYSDIR = sys
+PIOS = PiOS
+PIOSSTM32F10X = PiOS/STM32F10x
+PIOSCOMMON = PiOS/Common
 APPLIBDIR = libraries
 STMLIBDIR = $(APPLIBDIR)
 STMSPDDIR = $(STMLIBDIR)/STM32F10x_StdPeriph_Driver
@@ -77,16 +79,18 @@ RTOSINCDIR = $(RTOSSRCDIR)/include
 # use file-extension c for "c-only"-files
 
 ## PIOS:
-SRC = $(SYSDIR)/pios.c 
+SRC = $(PIOS)/pios.c 
 
-## PIOS Hardware
-SRC += $(SYSDIR)/pios_sys.c
-SRC += $(SYSDIR)/pios_settings.c
-SRC += $(SYSDIR)/pios_led.c
-SRC += $(SYSDIR)/pios_uart.c
-SRC += $(SYSDIR)/pios_irq.c
-SRC += $(SYSDIR)/pios_com.c
-SRC += $(SYSDIR)/printf-stdarg.c
+## PIOS Hardware (STM32F10x)
+SRC += $(PIOSSTM32F10X)/pios_sys.c
+SRC += $(PIOSSTM32F10X)/pios_settings.c
+SRC += $(PIOSSTM32F10X)/pios_led.c
+SRC += $(PIOSSTM32F10X)/pios_uart.c
+SRC += $(PIOSSTM32F10X)/pios_irq.c
+
+## PIOS Hardware (Common)
+SRC += $(PIOSCOMMON)/pios_com.c
+SRC += $(PIOSCOMMON)/printf-stdarg.c
 
 ## CMSIS for STM32
 SRC += $(CMSISDIR)/core_cm3.c
@@ -155,14 +159,15 @@ CPPSRCARM =
 # Even though the DOS/Win* filesystem matches both .s and .S the same,
 # it will preserve the spelling of the filenames, and gcc itself does
 # care about how the name is spelled on its command-line.
-ASRC = $(SYSDIR)/startup_stm32f10x_$(MODEL).S
+ASRC = $(PIOSSTM32F10X)/startup_stm32f10x_$(MODEL).S
 
 # List Assembler source files here which must be assembled in ARM-Mode..
 ASRCARM = 
 
 # List any extra directories to look for include files here.
 #    Each directory must be seperated by a space.
-EXTRAINCDIRS  = $(SYSDIR)
+EXTRAINCDIRS  =  $(PIOSSTM32F10X)
+EXTRAINCDIRS  += $(PIOSCOMMON)
 EXTRAINCDIRS  += $(STMSPDINCDIR)
 EXTRAINCDIRS  += $(CMSISDIR)
 EXTRAINCDIRS  += $(FATSDDIR)
@@ -187,7 +192,7 @@ EXTRA_LIBDIRS =
 EXTRA_LIBS =
 
 # Path to Linker-Scripts
-LINKERSCRIPTPATH = $(SYSDIR)
+LINKERSCRIPTPATH = $(PIOSSTM32F10X)
 
 # Optimization level, can be [0, 1, 2, 3, s]. 
 # 0 = turn off optimization. s = optimize for size.

flight/PiOS/pios.h

@@ -28,7 +28,6 @@
 #ifndef PIOS_H
 #define PIOS_H
 
-
 /* C Lib Includes */
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,7 +36,7 @@
 
 /* STM32 Std Perf Lib */
 #include <stm32f10x.h>
-#include <stm32f10x_conf.h>
+#include "STM32F10x/inc/stm32f10x_conf.h"
 
 /* FatFS Includes */
 #include <ff.h>
@@ -46,14 +45,16 @@
 /* minIni Includes */
 #include <minIni.h>
 
-/* PIOS Hardware Includes */
-#include "pios_board.h"
-#include "pios_sys.h"
-#include "pios_settings.h"
-#include "pios_led.h"
-#include "pios_uart.h"
-#include "pios_irq.h"
-#include "pios_com.h"
+/* PIOS Hardware Includes (STM32F10x) */
+#include "STM32F10x/inc/pios_board.h"
+#include "STM32F10x/inc/pios_sys.h"
+#include "STM32F10x/inc/pios_settings.h"
+#include "STM32F10x/inc/pios_led.h"
+#include "STM32F10x/inc/pios_uart.h"
+#include "STM32F10x/inc/pios_irq.h"
+
+/* PIOS Hardware Includes (Common) */
+#include "Common/inc/pios_com.h"
 
 /* More added here as they get written */