From: batt Date: Thu, 23 Oct 2008 17:06:01 +0000 (+0000) Subject: Merged from external project: X-Git-Tag: 2.0.0~33 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=85f74ac66b7cabcc9cb9a7dde7c189e94f785dff;p=bertos.git Merged from external project: ********** r22539 | batt | 2008-10-23 19:05:36 +0200(gio, 23 ott 2008) | 1 line Reformat. ********** git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1901 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/drv/dataflash_hwtest.c b/bertos/drv/dataflash_hwtest.c index fa808558..05426fef 100644 --- a/bertos/drv/dataflash_hwtest.c +++ b/bertos/drv/dataflash_hwtest.c @@ -79,7 +79,7 @@ #define DATAFLASH_MEM_MODEL DFT_AT45DB642D // Function to set CS, this is typically implement in hw/hw_dataflash.{c, h} -#define DATAFLASH_FUNC_CS_SET &dataflash_hw_setCS +#define DATAFLASH_FUNC_CS_SET dataflash_hw_setCS // Function to reset memery, this is typically implement in hw/hw_dataflash.{c, h} #define DATAFLASH_FUNC_RESET NULL @@ -205,28 +205,27 @@ int dataflash_testTearDown(void) #if 0 int main(void) { - IRQ_ENABLE; + IRQ_ENABLE; kdbg_init(); #if CONFIG_KERN - proc_init(); - #endif - - if (!dataflash_testSetUp()) - { - LOG_INFO("DATAFLASH setup..ok\n"); - } - else - { - LOG_ERR("DATAFLASH setup..fail!\n"); - return EOF; - } - - dataflash_testRun(); - - for(;;) - { - } - + proc_init(); + #endif + + if (!dataflash_testSetUp()) + { + LOG_INFO("DATAFLASH setup..ok\n"); + } + else + { + LOG_ERR("DATAFLASH setup..fail!\n"); + return EOF; + } + + dataflash_testRun(); + + for(;;) + { + } } #endif