diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-05 09:01:21 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-05 09:01:21 +0000 |
| commit | 867c7c95aa67ea1f19286c3593500214101bacd9 (patch) | |
| tree | 1b094e37b25017a849a5eb5383bc141622654c81 /testhal/STM32F4xx/ADC | |
| parent | e5e278c89f2edd0750749dfca551fc531cf317f2 (diff) | |
| download | ChibiOS-867c7c95aa67ea1f19286c3593500214101bacd9.tar.gz ChibiOS-867c7c95aa67ea1f19286c3593500214101bacd9.tar.bz2 ChibiOS-867c7c95aa67ea1f19286c3593500214101bacd9.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6262 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32F4xx/ADC')
| -rw-r--r-- | testhal/STM32F4xx/ADC/.cproject | 1 | ||||
| -rw-r--r-- | testhal/STM32F4xx/ADC/Makefile | 8 | ||||
| -rw-r--r-- | testhal/STM32F4xx/ADC/main.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/testhal/STM32F4xx/ADC/.cproject b/testhal/STM32F4xx/ADC/.cproject index b279459f3..fe8f3f8c5 100644 --- a/testhal/STM32F4xx/ADC/.cproject +++ b/testhal/STM32F4xx/ADC/.cproject @@ -48,4 +48,5 @@ </scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
</cproject>
diff --git a/testhal/STM32F4xx/ADC/Makefile b/testhal/STM32F4xx/ADC/Makefile index 814be9864..29f0682fa 100644 --- a/testhal/STM32F4xx/ADC/Makefile +++ b/testhal/STM32F4xx/ADC/Makefile @@ -66,11 +66,11 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk
+include $(CHIBIOS)/os/hal/ports/STM32F4xx/platform.mk
include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk
+include $(CHIBIOS)/os/rt/osal/osal.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
#include $(CHIBIOS)/test/test.mk
# Define linker script file here
@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes) USE_OPT += -DUSE_STDPERIPH_DRIVER
endif
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk
diff --git a/testhal/STM32F4xx/ADC/main.c b/testhal/STM32F4xx/ADC/main.c index 650347f76..f4b65170f 100644 --- a/testhal/STM32F4xx/ADC/main.c +++ b/testhal/STM32F4xx/ADC/main.c @@ -91,7 +91,7 @@ static const ADCConversionGroup adcgrpcfg2 = { /*
* Red LEDs blinker thread, times are in milliseconds.
*/
-static WORKING_AREA(waThread1, 128);
+static THD_WORKING_AREA(waThread1, 128);
static msg_t Thread1(void *arg) {
(void)arg;
|