From 7f8ea5e55a87ddc64c18b48b65fe1f702d873f58 Mon Sep 17 00:00:00 2001
From: cwabbott <cwabbott>
Date: Mon, 17 Jan 2011 00:00:41 +0000
Subject: [PATCH] PiOS.win32: updates to get it compiling again.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2462 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 flight/Modules/System/systemmod.c     |  4 ----
 flight/OpenPilot/Makefile.win32       | 16 ++++++++++------
 flight/PiOS.win32/inc/pios_sdcard.h   |  2 +-
 flight/PiOS.win32/win32/pios_sdcard.c |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/flight/Modules/System/systemmod.c b/flight/Modules/System/systemmod.c
index 6dcf874e4..5cab88a73 100644
--- a/flight/Modules/System/systemmod.c
+++ b/flight/Modules/System/systemmod.c
@@ -239,9 +239,6 @@ static void updateI2Cstats()
 }
 #endif
 
-#if defined(ARCH_POSIX) || defined(ARCH_WIN32)
-static void updateWDGstats() {} //Posix and win32 don't have a watchdog
-#else
 static void updateWDGstats() 
 {
 	WatchdogStatusData watchdogStatus;
@@ -249,7 +246,6 @@ static void updateWDGstats()
 	watchdogStatus.ActiveFlags = PIOS_WDG_GetActiveFlags();
 	WatchdogStatusSet(&watchdogStatus);
 }
-#endif
 
 /**
  * Called periodically to update the system stats
diff --git a/flight/OpenPilot/Makefile.win32 b/flight/OpenPilot/Makefile.win32
index 3b13a4080..68d882a60 100644
--- a/flight/OpenPilot/Makefile.win32
+++ b/flight/OpenPilot/Makefile.win32
@@ -84,12 +84,12 @@ TARGET = OpenPilot
 # Paths
 OPSYSTEM = ./System
 OPSYSTEMINC = $(OPSYSTEM)/inc
-OPUAVTALK = ./UAVTalk
+OPUAVTALK = ../UAVTalk
 OPUAVTALKINC = $(OPUAVTALK)/inc
-OPUAVOBJ = ./UAVObjects
+OPUAVOBJ = ../UAVObjects
 OPUAVOBJINC = $(OPUAVOBJ)/inc
 OPTESTS  = ./Tests
-OPMODULEDIR = ./Modules
+OPMODULEDIR = ../Modules
 FLIGHTLIB = ../Libraries
 FLIGHTLIBINC = ../Libraries/inc
 PIOS = ../PiOS.win32
@@ -130,6 +130,7 @@ SRC += $(OPUAVTALK)/uavtalk.c
 SRC += $(OPUAVOBJ)/uavobjectmanager.c
 SRC += $(OPUAVOBJ)/uavobjectsinit.c
 SRC += $(OPUAVOBJ)/eventdispatcher.c
+SRC += $(FLIGHTLIB)/CoordinateConversions.c
 else
 ## TESTCODE
 SRC += $(OPTESTS)/test_common.c
@@ -182,6 +183,7 @@ SRC += $(OPUAVOBJ)/flightplanstatus.c
 SRC += $(OPUAVOBJ)/flightplansettings.c
 SRC += $(OPUAVOBJ)/taskinfo.c
 SRC += $(OPUAVOBJ)/watchdogstatus.c
+SRC += $(OPUAVOBJ)/nedaccel.c
 endif
 
 ## PIOS Hardware (win32)
@@ -230,22 +232,24 @@ CPPSRCARM =
 
 # List any extra directories to look for include files here.
 #    Each directory must be seperated by a space.
-EXTRAINCDIRS  =  $(OPSYSTEM)
+EXTRAINCDIRS  = $(PIOSINC)
+EXTRAINCDIRS  +=  $(OPSYSTEM)
 EXTRAINCDIRS  += $(OPSYSTEMINC)
 EXTRAINCDIRS  += $(OPUAVTALK)
 EXTRAINCDIRS  += $(OPUAVTALKINC)
 EXTRAINCDIRS  += $(OPUAVOBJ)
 EXTRAINCDIRS  += $(OPUAVOBJINC)
 EXTRAINCDIRS  += $(PIOS)
-EXTRAINCDIRS  += $(PIOSINC)
 EXTRAINCDIRS  += $(PIOSWIN32)
 EXTRAINCDIRS  += $(MININIDIR)
 EXTRAINCDIRS  += $(RTOSINCDIR)
 EXTRAINCDIRS  += $(APPLIBDIR)
 EXTRAINCDIRS  += $(RTOSSRCDIR)/portable/GCC/Win32
+EXTRAINCDIRS  += $(FLIGHTLIB)
+EXTRAINCDIRS  += $(FLIGHTLIBINC)
 EXTRAINCDIRS  += $(PYMITEINC)
 
-EXTRAINCDIRS += ${foreach MOD, ${MODULES}, Modules/${MOD}/inc} ${OPMODULEDIR}/System/inc
+EXTRAINCDIRS += ${foreach MOD, ${MODULES}, ${OPMODULEDIR}/${MOD}/inc} ${OPMODULEDIR}/System/inc
 
 
 # List any extra directories to look for library files here.
diff --git a/flight/PiOS.win32/inc/pios_sdcard.h b/flight/PiOS.win32/inc/pios_sdcard.h
index 83915d21f..225d9de80 100644
--- a/flight/PiOS.win32/inc/pios_sdcard.h
+++ b/flight/PiOS.win32/inc/pios_sdcard.h
@@ -99,7 +99,7 @@ extern int32_t PIOS_SDCARD_CIDRead(SDCARDCidTypeDef *cid);
 extern int32_t PIOS_SDCARD_CSDRead(SDCARDCsdTypeDef *csd);
 
 extern int32_t PIOS_SDCARD_StartupLog(void);
-extern int32_t POIS_SDCARD_IsMounted();
+extern int32_t PIOS_SDCARD_IsMounted();
 extern int32_t PIOS_SDCARD_MountFS(uint32_t StartupLog);
 extern int32_t PIOS_SDCARD_GetFree(void);
 
diff --git a/flight/PiOS.win32/win32/pios_sdcard.c b/flight/PiOS.win32/win32/pios_sdcard.c
index f588399f0..1e43c8086 100644
--- a/flight/PiOS.win32/win32/pios_sdcard.c
+++ b/flight/PiOS.win32/win32/pios_sdcard.c
@@ -221,7 +221,7 @@ int32_t PIOS_SDCARD_StartupLog(void)
  * @return 0 if no
  * @return 1 if yes
  */
-int32_t POIS_SDCARD_IsMounted()
+int32_t PIOS_SDCARD_IsMounted()
 {
 	return 1;
 }