projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: coding style fixes (structure naming)
[bertos.git]
/
bertos
/
drv
/
dataflash_hwtest.c
diff --git
a/bertos/drv/dataflash_hwtest.c
b/bertos/drv/dataflash_hwtest.c
index 8c46215008b3230b42432b5fc03a49792d698501..a90814d90d0e8f1d5fdc218db53d66ee53945d1d 100644
(file)
--- a/
bertos/drv/dataflash_hwtest.c
+++ b/
bertos/drv/dataflash_hwtest.c
@@
-44,7
+44,6
@@
* we use a kfile_test module that perform some generic test.
*
*
* we use a kfile_test module that perform some generic test.
*
*
- * \version $Id$
* \author Daniele Basile <asterix@develer.com>
*/
* \author Daniele Basile <asterix@develer.com>
*/
@@
-66,7
+65,7
@@
#include <drv/dataflash.h>
#include <kern/proc.h>
#include <drv/dataflash.h>
#include <kern/proc.h>
-#include <
kern
/kfile.h>
+#include <
io
/kfile.h>
#include <string.h>
#include <string.h>
@@
-108,9
+107,9
@@
static uint8_t save_buf[DATAFLASH_TEST_STR_LEN];
* Setup all needed to test dataflash memory
*
*/
* Setup all needed to test dataflash memory
*
*/
-int dataflash_testSet
U
p(void)
+int dataflash_testSet
u
p(void)
{
{
- kfile_testSet
U
p();
+ kfile_testSet
u
p();
LOG_INFO("KFILE setup..ok\n");
LOG_INFO("Check if kernel is enable (if enable you should see the assert message.)\n");
LOG_INFO("KFILE setup..ok\n");
LOG_INFO("Check if kernel is enable (if enable you should see the assert message.)\n");
@@
-130,10
+129,10
@@
int dataflash_testSetUp(void)
* Init SPI module and dataflash driver.
*/
// Open SPI comunication channel
* Init SPI module and dataflash driver.
*/
// Open SPI comunication channel
- spimaster_init(&spi_fd,
CONFIG_SPI_PORT
);
+ spimaster_init(&spi_fd,
0
);
LOG_INFO("SPI0 init..ok\n");
LOG_INFO("SPI0 init..ok\n");
- ser_setbaudrate(&spi_fd,
CONFIG_SPI_BAUDRATE
);
+ ser_setbaudrate(&spi_fd,
5000000UL
);
LOG_INFO("SPI0 set baudrate..ok\n");
//Init dataflash memory
LOG_INFO("SPI0 set baudrate..ok\n");
//Init dataflash memory
@@
-173,7
+172,7
@@
int dataflash_testRun(void)
LOG_INFO("Run KFILE test.\n");
SILENT_ASSERT("bertos/drv/dataflash.c:405: Assertion failed: fd->fd.seek_pos + size <= fd->fd.size");
LOG_INFO("Run KFILE test.\n");
SILENT_ASSERT("bertos/drv/dataflash.c:405: Assertion failed: fd->fd.seek_pos + size <= fd->fd.size");
- if (kfile_testRun(&dflash_fd.fd, test_buf, save_buf, sizeof(test_buf)) != EOF)
+ if (kfile_testRun
Generic
(&dflash_fd.fd, test_buf, save_buf, sizeof(test_buf)) != EOF)
{
LOG_INFO("KFILE test..ok\n");
}
{
LOG_INFO("KFILE test..ok\n");
}
@@
-212,7
+211,7
@@
int main(void)
proc_init();
#endif
proc_init();
#endif
- if (!dataflash_testSet
U
p())
+ if (!dataflash_testSet
u
p())
{
LOG_INFO("DATAFLASH setup..ok\n");
}
{
LOG_INFO("DATAFLASH setup..ok\n");
}