diff options
| author | barthess <barthess@yandex.ru> | 2015-06-28 17:18:39 +0300 |
|---|---|---|
| committer | barthess <barthess@yandex.ru> | 2015-06-28 17:18:39 +0300 |
| commit | 1181dc9c2e8df44055bf080731f8abdd6207bc56 (patch) | |
| tree | 61394b9fca94433dffaffc7d422c19e937dc2b59 | |
| parent | fce100680ecae2d19d1c7fb05a769a1968ade733 (diff) | |
| download | ChibiOS-Contrib-1181dc9c2e8df44055bf080731f8abdd6207bc56.tar.gz ChibiOS-Contrib-1181dc9c2e8df44055bf080731f8abdd6207bc56.tar.bz2 ChibiOS-Contrib-1181dc9c2e8df44055bf080731f8abdd6207bc56.zip | |
Memtest code moved to 'various' directory
| -rw-r--r-- | os/various/memtest.cpp (renamed from testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.cpp) | 2 | ||||
| -rw-r--r-- | os/various/memtest.hpp (renamed from testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.hpp) | 0 | ||||
| -rw-r--r-- | testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.cpp b/os/various/memtest.cpp index 6a0630a..49828ec 100644 --- a/testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.cpp +++ b/os/various/memtest.cpp @@ -220,7 +220,7 @@ static void memtest_wrapper(memtest_t *testp, void (*p_u8)(memtest_t *testp), void (*p_u16)(memtest_t *testp), void (*p_u32)(memtest_t *testp)) { - switch(testp->width){ + switch(testp->width) { case MEMTEST_WIDTH_32: p_u8(testp); p_u16(testp); diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.hpp b/os/various/memtest.hpp index 200db1f..200db1f 100644 --- a/testhal/STM32/STM32F4xx/FSMC_SRAM/memtest.hpp +++ b/os/various/memtest.hpp diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile index c85f1e9..e3d83c4 100644 --- a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile +++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile @@ -114,7 +114,7 @@ CSRC = $(STARTUPSRC) \ # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. CPPSRC = $(CHCPPSRC) \ - memtest.cpp + $(CHIBIOS)/community/os/various/memtest.cpp # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -142,7 +142,8 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ $(CHIBIOS)/os/various/cpp_wrappers \ - $(CHIBIOS)/os/various + $(CHIBIOS)/os/various \ + $(CHIBIOS)/community/os/various # # Project, sources and paths |