From 4297185079b7e442de6ec821326b24ba1e47b8f5 Mon Sep 17 00:00:00 2001 From: asterix Date: Tue, 10 Jun 2008 14:36:14 +0000 Subject: [PATCH] Camelcase the testSetUp functions. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1430 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/drv/dataflash.h | 2 +- bertos/drv/dataflash_test.c | 8 ++++---- bertos/drv/pwm.h | 2 +- bertos/drv/pwm_test.c | 4 ++-- bertos/kern/kfile.h | 17 +++++++++-------- bertos/kern/kfile_test.c | 8 ++++---- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/bertos/drv/dataflash.h b/bertos/drv/dataflash.h index 923b9ec3..8fd3a4f7 100644 --- a/bertos/drv/dataflash.h +++ b/bertos/drv/dataflash.h @@ -190,7 +190,7 @@ bool dataflash_init(KFileDataflash *fd, KFile *ch, DataflashType type, dataflash * * (see drv/datafalsh_test.c for more detail) */ -int dataflash_testSetup(void); +int dataflash_testSetUp(void); int dataflash_testRun(void); int dataflash_testTearDown(void); diff --git a/bertos/drv/dataflash_test.c b/bertos/drv/dataflash_test.c index ae7673be..d8b05610 100644 --- a/bertos/drv/dataflash_test.c +++ b/bertos/drv/dataflash_test.c @@ -109,9 +109,9 @@ static uint8_t save_buf[DATAFLASH_TEST_STR_LEN]; * Setup all needed to test dataflash memory * */ -int dataflash_testSetup(void) +int dataflash_testSetUp(void) { - kfile_testSetup(); + kfile_testSetUp(); LOG_INFO("KFILE setup..ok\n"); LOG_INFO("Check if kernel is enable (if enable you should see the assert message.)\n"); @@ -213,7 +213,7 @@ int main(void) proc_init(); #endif - if (!dataflash_testSetup()) + if (!dataflash_testSetUp()) { LOG_INFO("DATAFLASH setup..ok\n"); } @@ -223,7 +223,7 @@ int main(void) return EOF; } - dataflash_testRun(); + dataflash_testRun(); for(;;) { diff --git a/bertos/drv/pwm.h b/bertos/drv/pwm.h index db9b3a2c..1f5facf1 100644 --- a/bertos/drv/pwm.h +++ b/bertos/drv/pwm.h @@ -77,7 +77,7 @@ void pwm_init(void); * See pwm_test.c for implemntation of these functions. */ int pwm_testRun(void); -int pwm_testSetup(void); +int pwm_testSetUp(void); int pwm_testTearDown(void); #endif /* DRV_PWM_H */ diff --git a/bertos/drv/pwm_test.c b/bertos/drv/pwm_test.c index 81d38f89..beb765e5 100644 --- a/bertos/drv/pwm_test.c +++ b/bertos/drv/pwm_test.c @@ -119,7 +119,7 @@ static PwmTest pwm_test_cfg[PWM_CNT] = * Setup all needed to test PWM on AT91 * */ -int pwm_testSetup(void) +int pwm_testSetUp(void) { LOG_INFO("Init pwm.."); pwm_init(); @@ -138,7 +138,7 @@ int pwm_testRun(void) int duty = 0; int delay = 0; - pwm_testSetup(); + pwm_testSetUp(); LOG_INFO("\n\n===== BeRTOS PWM test =====\n\n"); diff --git a/bertos/kern/kfile.h b/bertos/kern/kfile.h index ccaeb802..0e375cf3 100644 --- a/bertos/kern/kfile.h +++ b/bertos/kern/kfile.h @@ -45,8 +45,8 @@ * \code * typedef struct KFileSerial * { - * KFile fd; - * Serial *ser; + * KFile fd; + * Serial *ser; * } KFileSerial; * \endcode * @@ -55,8 +55,8 @@ * \code * INLINE KFileSerial * KFILESERIAL(KFile *fd) * { - * ASSERT(fd->_type == KFT_SERIAL); - * return (KFileSerial *)fd; + * ASSERT(fd->_type == KFT_SERIAL); + * return (KFileSerial *)fd; * } * \endcode * @@ -67,9 +67,9 @@ * \code * static int ser_kfile_close(struct KFile *fd) * { - * KFileSerial *fds = KFILESERIAL(fd); - * ser_close(fds->ser); - * return 0; + * KFileSerial *fds = KFILESERIAL(fd); + * ser_close(fds->ser); + * return 0; * } * \endcode * KFILESERIAL macro helps to ensure that obj passed is really a Serial. @@ -80,6 +80,7 @@ * are demanded to specific driver implementation. * * \version $Id$ + * * \author Bernardo Innocenti * \author Francesco Sacchi * \author Daniele Basile @@ -262,7 +263,7 @@ INLINE void kfile_clearerr(struct KFile *fd) /** * Kfile test function. */ -int kfile_testSetup(void); +int kfile_testSetUp(void); int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size); int kfile_testTearDown(void); diff --git a/bertos/kern/kfile_test.c b/bertos/kern/kfile_test.c index e54edb2f..d7a62093 100644 --- a/bertos/kern/kfile_test.c +++ b/bertos/kern/kfile_test.c @@ -106,7 +106,7 @@ static bool kfile_rwTest(KFile *f, uint8_t *buf, size_t size) /** * Setup all needed for kfile test */ -int kfile_testSetup(void) +int kfile_testSetUp(void) { MOD_INIT(kfile_test); LOG_INFO("Mod init..ok\n"); @@ -123,7 +123,7 @@ int kfile_testSetup(void) */ int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size) { - kfile_testSetup(); + kfile_testSetUp(); /* * Part of test buf size that you would write. @@ -134,8 +134,8 @@ int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size) /* Fill test buffer */ - for (size_t i = 0; i < size; i++) - test_buf[i] = (i & 0xff); + for (size_t i = 0; i < size; i++) + test_buf[i] = (i & 0xff); /* * If necessary, user can save content, -- 2.25.1