diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-01-03 16:17:42 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-01-03 16:17:42 +0000 |
| commit | b5da4b76b5810b41900432832f178280069d8d91 (patch) | |
| tree | a17b3f5413acc5e61ce4888f5bbe82cd939b7a88 /demos/ARMCM4-STM32F407-DISCOVERY-G++ | |
| parent | 05c30c4e651909ec86e43c16bccea85d180e39c0 (diff) | |
| download | ChibiOS-b5da4b76b5810b41900432832f178280069d8d91.tar.gz ChibiOS-b5da4b76b5810b41900432832f178280069d8d91.tar.bz2 ChibiOS-b5da4b76b5810b41900432832f178280069d8d91.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5027 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/ARMCM4-STM32F407-DISCOVERY-G++')
| -rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY-G++/.project | 5 | ||||
| -rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile | 3 | ||||
| -rw-r--r-- | demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
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 @@ -82,6 +82,11 @@ <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>
<locationURI>CHIBIOS/os</locationURI>
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");
|