From 6620e65927443454f881d706a69ea8c9af71e296 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 2 Nov 2018 21:14:35 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12403 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- testhal/STM32/multi/WSPI-MFS/main.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'testhal/STM32/multi/WSPI-MFS/main.c') diff --git a/testhal/STM32/multi/WSPI-MFS/main.c b/testhal/STM32/multi/WSPI-MFS/main.c index 0bce0c7f3..18d4a22e2 100644 --- a/testhal/STM32/multi/WSPI-MFS/main.c +++ b/testhal/STM32/multi/WSPI-MFS/main.c @@ -26,25 +26,8 @@ #include "portab.h" -#if defined(STM32_WSPI_USE_OCTOSPI1) -/* 16MB device, 2 cycles delay after NCS.*/ -const WSPIConfig WSPIcfg1 = { - .end_cb = NULL, - .dcr1 = STM32_DCR1_DEVSIZE(24U) | STM32_DCR1_CSHT(1U), - .dcr2 = 0U, - .dcr3 = 0U, - .dcr4 = 0U -}; -#else /* It is a quad SPI.*/ -/* 16MB device, 2 cycles delay after NCS.*/ -const WSPIConfig WSPIcfg1 = { - .end_cb = NULL, - .dcr = STM32_DCR_FSIZE(24U) | STM32_DCR_CSHT(1U) -}; -#endif - const SNORConfig snorcfg1 = { - .busp = &WSPID1, + .busp = &PORTAB_WSPI1, .buscfg = &WSPIcfg1 }; @@ -107,7 +90,7 @@ int main(void) { /* Normal main() thread activity, in this demo it does nothing.*/ while (true) { if (palReadLine(PORTAB_LINE_BUTTON) == PORTAB_BUTTON_PRESSED) { - test_execute((BaseSequentialStream *)&PORTAB_SD1, &mfs_test_suite); + test_execute((BaseSequentialStream *)&PORTAB_SD1, &mfs_test_suite); } chThdSleepMilliseconds(500); } -- cgit v1.2.3