From b5da4b76b5810b41900432832f178280069d8d91 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 3 Jan 2013 16:17:42 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5027
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARMCM4-STM32F407-DISCOVERY-G++/.project | 5 +++++
 demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile | 3 ++-
 demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'demos/ARMCM4-STM32F407-DISCOVERY-G++')

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/.project b/demos/ARMCM4-STM32F407-DISCOVERY-G++/.project
index e5df63390..2e1e063fe 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/.project
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/.project
@@ -81,6 +81,11 @@
 			<type>2</type>
 			<locationURI>CHIBIOS/boards/ST_STM32F4_DISCOVERY</locationURI>
 		</link>
+		<link>
+			<name>fatfs</name>
+			<type>2</type>
+			<locationURI>CHIBIOS/ext/fatfs</locationURI>
+		</link>
 		<link>
 			<name>os</name>
 			<type>2</type>
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile b/demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile
index 55f9bb261..cd5388514 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile
@@ -89,6 +89,7 @@ CSRC = $(PORTSRC) \
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CPPSRC = $(CHCPPSRC) \
+         $(CHIBIOS)/os/fs/fatfs/fatfs_fsimpl.cpp \
          main.cpp
 
 # C sources to be compiled in ARM mode regardless of the global setting.
@@ -117,7 +118,7 @@ ASMSRC = $(PORTASM)
 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) \
          $(CHCPPINC) \
-         $(CHIBIOS)/os/various $(CHIBIOS)/os/fs
+         $(CHIBIOS)/os/various $(CHIBIOS)/os/fs $(CHIBIOS)/os/fs/fatfs
 
 #
 # Project, sources and paths
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp b/demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp
index 3834a1046..d56a3f4c3 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp
@@ -92,7 +92,7 @@ private:
   const seqop_t *base, *curr;                   // Thread local variables.
 
 protected:
-  virtual msg_t Main(void) {
+  virtual msg_t main(void) {
 
     setName("sequencer");
 
-- 
cgit v1.2.3