From: asterix Date: Fri, 10 Sep 2010 09:31:03 +0000 (+0000) Subject: Comply the init function names. X-Git-Tag: 2.6.0~174 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=cd31b2db0e5fc1aacb52c5acab53fdb89e6e7211;p=bertos.git Comply the init function names. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4227 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/cpu/arm/drv/flash_lpc2.c b/bertos/cpu/arm/drv/flash_lpc2.c index ffcc1b0a..6a8cc69b 100644 --- a/bertos/cpu/arm/drv/flash_lpc2.c +++ b/bertos/cpu/arm/drv/flash_lpc2.c @@ -342,7 +342,7 @@ static void common_init(Flash *fls) fls->blk.blk_size = FLASH_PAGE_SIZE_BYTES; fls->blk.blk_cnt = FLASH_MEM_SIZE / FLASH_PAGE_SIZE_BYTES; - init_bitarray(&lpc2_bitx, FLASH_PAGE_CNT, page_dirty, sizeof(page_dirty)); + bitarray_init(&lpc2_bitx, FLASH_PAGE_CNT, page_dirty, sizeof(page_dirty)); } void flash_hw_init(Flash *fls, int flags) diff --git a/bertos/struct/bitarray.h b/bertos/struct/bitarray.h index 3e96b7c5..63604938 100644 --- a/bertos/struct/bitarray.h +++ b/bertos/struct/bitarray.h @@ -175,7 +175,7 @@ INLINE void bitarray_dump(BitArray *bitx) kprintf("..%02x [%d]\n", bitx->array[i / 8], i); } -INLINE void init_bitarray(BitArray *bitx, size_t bitarray_len, uint8_t *array, size_t size) +INLINE void bitarray_init(BitArray *bitx, size_t bitarray_len, uint8_t *array, size_t size) { bitx->size = size; bitx->array = array; diff --git a/bertos/struct/bitarray_test.c b/bertos/struct/bitarray_test.c index bea6771f..b917d0f4 100644 --- a/bertos/struct/bitarray_test.c +++ b/bertos/struct/bitarray_test.c @@ -55,8 +55,8 @@ BitArray bitx2; int bitarray_testSetup(void) { kdbg_init(); - init_bitarray(&bitx1, TEST1_LEN, test1, sizeof(test1)); - init_bitarray(&bitx2, TEST2_LEN, test2, sizeof(test2)); + bitarray_init(&bitx1, TEST1_LEN, test1, sizeof(test1)); + bitarray_init(&bitx2, TEST2_LEN, test2, sizeof(test2)); return 0; }