You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/10/20 22:16:35 UTC
incubator-mynewt-core git commit: MYNEWT-410;
add hal_* prefix to bsp_* functions. bsp_init() -> hal_bsp_init(),
bsp_flash_dev() -> hal_bsp_flash_dev() etc.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 6f7a245b9 -> dd789d761
MYNEWT-410; add hal_* prefix to bsp_* functions.
bsp_init() -> hal_bsp_init(), bsp_flash_dev() -> hal_bsp_flash_dev() etc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/dd789d76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/dd789d76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/dd789d76
Branch: refs/heads/develop
Commit: dd789d76185b9181b69d279d2dc4c80ccd0312a1
Parents: 6f7a245
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Thu Oct 20 15:10:30 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Thu Oct 20 15:10:30 2016 -0700
----------------------------------------------------------------------
apps/bletest/src/main.c | 2 +-
apps/boot/src/boot.c | 2 +-
fs/nffs/src/nffs_misc.c | 2 +-
hw/bsp/arduino_primo_nrf52/src/hal_bsp.c | 12 ++++++------
hw/bsp/arduino_primo_nrf52/src/os_bsp.c | 2 +-
hw/bsp/bmd300eval/src/hal_bsp.c | 12 ++++++------
hw/bsp/bmd300eval/src/os_bsp.c | 2 +-
hw/bsp/frdm-k64f/src/hal_bsp.c | 13 +++++++------
hw/bsp/frdm-k64f/src/os_bsp.c | 3 ++-
hw/bsp/native/src/hal_bsp.c | 2 +-
hw/bsp/native/src/os_bsp.c | 2 +-
hw/bsp/nrf51-arduino_101/src/hal_bsp.c | 12 ++++++------
hw/bsp/nrf51-arduino_101/src/os_bsp.c | 2 +-
hw/bsp/nrf51-blenano/src/hal_bsp.c | 2 +-
hw/bsp/nrf51-blenano/src/os_bsp.c | 2 +-
hw/bsp/nrf51dk-16kbram/src/hal_bsp.c | 12 ++++++------
hw/bsp/nrf51dk-16kbram/src/os_bsp.c | 2 +-
hw/bsp/nrf51dk/src/hal_bsp.c | 12 ++++++------
hw/bsp/nrf51dk/src/os_bsp.c | 2 +-
hw/bsp/nrf52dk/src/hal_bsp.c | 12 ++++++------
hw/bsp/nrf52dk/src/os_bsp.c | 2 +-
hw/bsp/nucleo-f401re/src/hal_bsp.c | 14 +++++++-------
hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c | 16 ++++++++--------
hw/bsp/olimex_stm32-e407_devboard/src/os_bsp.c | 2 +-
hw/bsp/rb-nano2/src/hal_bsp.c | 12 ++++++------
hw/bsp/rb-nano2/src/os_bsp.c | 2 +-
hw/bsp/stm32f4discovery/src/hal_bsp.c | 16 ++++++++--------
hw/bsp/stm32f4discovery/src/os_bsp.c | 2 +-
hw/hal/include/hal/hal_bsp.h | 17 ++++++++---------
hw/hal/src/hal_flash.c | 12 ++++++------
hw/mcu/native/src/hal_hw_id.c | 2 +-
hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c | 2 +-
hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c | 2 +-
hw/mcu/nxp/MK64F12/src/hal_hw_id.c | 2 +-
hw/mcu/stm/stm32f4xx/src/stm32f4xx_hw_id.c | 2 +-
kernel/os/src/os.c | 2 +-
sys/coredump/src/coredump.c | 12 ++++++------
sys/flash_map/src/flash_map.c | 2 +-
.../test/src/testcases/flash_map_test_case_1.c | 4 ++--
sys/id/src/id.c | 8 ++++----
test/flash_test/src/flash_test/flash_test.c | 4 ++--
41 files changed, 125 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/apps/bletest/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletest/src/main.c b/apps/bletest/src/main.c
index eb555ac..23d2762 100755
--- a/apps/bletest/src/main.c
+++ b/apps/bletest/src/main.c
@@ -911,7 +911,7 @@ bletest_task_handler(void *arg)
#endif
/* Read unique HW id */
- rc = bsp_hw_id((void *)&g_bletest_hw_id[0], sizeof(g_bletest_hw_id));
+ rc = hal_bsp_hw_id((void *)&g_bletest_hw_id[0], sizeof(g_bletest_hw_id));
assert(rc == 16);
console_printf("HW id=%04x%04x%04x%04x\n",
(unsigned int)g_bletest_hw_id[0],
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/apps/boot/src/boot.c
----------------------------------------------------------------------
diff --git a/apps/boot/src/boot.c b/apps/boot/src/boot.c
index 5e49825..6a25b57 100755
--- a/apps/boot/src/boot.c
+++ b/apps/boot/src/boot.c
@@ -65,7 +65,7 @@ main(void)
sysinit();
#else
flash_map_init();
- bsp_init();
+ hal_bsp_init();
#endif
rc = boot_build_request(&req, AREA_DESC_MAX);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/fs/nffs/src/nffs_misc.c
----------------------------------------------------------------------
diff --git a/fs/nffs/src/nffs_misc.c b/fs/nffs/src/nffs_misc.c
index 9f399af..51cb834 100644
--- a/fs/nffs/src/nffs_misc.c
+++ b/fs/nffs/src/nffs_misc.c
@@ -471,7 +471,7 @@ nffs_misc_desc_from_flash_area(int id, int *cnt, struct nffs_area_desc *nad)
return -1;
}
- hf = bsp_flash_dev(fa->fa_device_id);
+ hf = hal_bsp_flash_dev(fa->fa_device_id);
for (i = 0; i < hf->hf_sector_cnt; i++) {
hf->hf_itf->hff_sector_info(i, &start, &size);
if (start >= fa->fa_off && start < fa->fa_off + fa->fa_size) {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c b/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c
index 90f3883..dedccee 100644
--- a/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c
+++ b/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c
@@ -30,15 +30,15 @@
/*
* What memory to include in coredump.
*/
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
}
};
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -49,8 +49,8 @@ bsp_flash_dev(uint8_t id)
return &nrf52k_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/arduino_primo_nrf52/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/src/os_bsp.c b/hw/bsp/arduino_primo_nrf52/src/os_bsp.c
index f12523d..dd5a666 100644
--- a/hw/bsp/arduino_primo_nrf52/src/os_bsp.c
+++ b/hw/bsp/arduino_primo_nrf52/src/os_bsp.c
@@ -80,7 +80,7 @@ static nrf_drv_saadc_config_t os_bsp_adc0_config = {
#endif
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/bmd300eval/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/bmd300eval/src/hal_bsp.c b/hw/bsp/bmd300eval/src/hal_bsp.c
index 4462e48..621413e 100644
--- a/hw/bsp/bmd300eval/src/hal_bsp.c
+++ b/hw/bsp/bmd300eval/src/hal_bsp.c
@@ -26,15 +26,15 @@
/*
* What memory to include in coredump.
*/
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
}
};
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -45,8 +45,8 @@ bsp_flash_dev(uint8_t id)
return &nrf52k_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/bmd300eval/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/bmd300eval/src/os_bsp.c b/hw/bsp/bmd300eval/src/os_bsp.c
index f94def3..0470bc4 100644
--- a/hw/bsp/bmd300eval/src/os_bsp.c
+++ b/hw/bsp/bmd300eval/src/os_bsp.c
@@ -77,7 +77,7 @@ static nrf_drv_saadc_config_t os_bsp_adc0_config = {
#endif
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/frdm-k64f/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/frdm-k64f/src/hal_bsp.c b/hw/bsp/frdm-k64f/src/hal_bsp.c
index 60ac4ca..7cfddf1 100644
--- a/hw/bsp/frdm-k64f/src/hal_bsp.c
+++ b/hw/bsp/frdm-k64f/src/hal_bsp.c
@@ -32,14 +32,15 @@
/*
* What memory to include in coredump.
*/
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &__DATA_ROM,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &__DATA_ROM,
+ .hbmd_size = RAM_SIZE
}
};
-const struct hal_flash *bsp_flash_dev(uint8_t id)
+const struct hal_flash *
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -50,8 +51,8 @@ const struct hal_flash *bsp_flash_dev(uint8_t id)
return &mk64f12_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/frdm-k64f/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/frdm-k64f/src/os_bsp.c b/hw/bsp/frdm-k64f/src/os_bsp.c
index 9135264..1eb9da0 100644
--- a/hw/bsp/frdm-k64f/src/os_bsp.c
+++ b/hw/bsp/frdm-k64f/src/os_bsp.c
@@ -69,7 +69,8 @@ static void init_hardware(void)
extern void BOARD_BootClockRUN(void);
-void bsp_init(void)
+void
+hal_bsp_init(void)
{
int rc = 0;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/native/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/native/src/hal_bsp.c b/hw/bsp/native/src/hal_bsp.c
index 3d707cf..2587fb3 100644
--- a/hw/bsp/native/src/hal_bsp.c
+++ b/hw/bsp/native/src/hal_bsp.c
@@ -27,7 +27,7 @@
#include <bsp/bsp.h>
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Just one to start with
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/native/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/native/src/os_bsp.c b/hw/bsp/native/src/os_bsp.c
index df939d9..98a3996 100644
--- a/hw/bsp/native/src/os_bsp.c
+++ b/hw/bsp/native/src/os_bsp.c
@@ -28,7 +28,7 @@
static struct uart_dev os_bsp_uart0;
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-arduino_101/src/hal_bsp.c b/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
index 43ed472..72ca985 100644
--- a/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
+++ b/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
@@ -27,15 +27,15 @@
/*
* What memory to include in coredump.
*/
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
}
};
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -46,8 +46,8 @@ bsp_flash_dev(uint8_t id)
return &nrf51_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf51-arduino_101/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-arduino_101/src/os_bsp.c b/hw/bsp/nrf51-arduino_101/src/os_bsp.c
index 905e0b7..d08b101 100644
--- a/hw/bsp/nrf51-arduino_101/src/os_bsp.c
+++ b/hw/bsp/nrf51-arduino_101/src/os_bsp.c
@@ -45,7 +45,7 @@ static const struct nrf51_uart_cfg os_bsp_uart0_cfg = {
#endif
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf51-blenano/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/src/hal_bsp.c b/hw/bsp/nrf51-blenano/src/hal_bsp.c
index 61fb8b5..ef7e86c 100644
--- a/hw/bsp/nrf51-blenano/src/hal_bsp.c
+++ b/hw/bsp/nrf51-blenano/src/hal_bsp.c
@@ -22,7 +22,7 @@
#include "mcu/nrf51_hal.h"
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf51-blenano/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/src/os_bsp.c b/hw/bsp/nrf51-blenano/src/os_bsp.c
index cc5cc24..3769f3b 100644
--- a/hw/bsp/nrf51-blenano/src/os_bsp.c
+++ b/hw/bsp/nrf51-blenano/src/os_bsp.c
@@ -49,7 +49,7 @@ static const struct nrf51_uart_cfg os_bsp_uart0_cfg = {
#endif
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c b/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
index 538d007..07edafa 100644
--- a/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
+++ b/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
@@ -30,15 +30,15 @@
/*
* What memory to include in coredump.
*/
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
}
};
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -49,8 +49,8 @@ bsp_flash_dev(uint8_t id)
return &nrf51_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf51dk-16kbram/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/src/os_bsp.c b/hw/bsp/nrf51dk-16kbram/src/os_bsp.c
index 2637d14..6d473c1 100644
--- a/hw/bsp/nrf51dk-16kbram/src/os_bsp.c
+++ b/hw/bsp/nrf51dk-16kbram/src/os_bsp.c
@@ -50,7 +50,7 @@ static const struct nrf51_uart_cfg os_bsp_uart0_cfg = {
#endif
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf51dk/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/src/hal_bsp.c b/hw/bsp/nrf51dk/src/hal_bsp.c
index 538d007..07edafa 100644
--- a/hw/bsp/nrf51dk/src/hal_bsp.c
+++ b/hw/bsp/nrf51dk/src/hal_bsp.c
@@ -30,15 +30,15 @@
/*
* What memory to include in coredump.
*/
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
}
};
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -49,8 +49,8 @@ bsp_flash_dev(uint8_t id)
return &nrf51_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf51dk/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/src/os_bsp.c b/hw/bsp/nrf51dk/src/os_bsp.c
index 2434abf..10c6eea 100644
--- a/hw/bsp/nrf51dk/src/os_bsp.c
+++ b/hw/bsp/nrf51dk/src/os_bsp.c
@@ -50,7 +50,7 @@ static const struct nrf51_uart_cfg os_bsp_uart0_cfg = {
#endif
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf52dk/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/src/hal_bsp.c b/hw/bsp/nrf52dk/src/hal_bsp.c
index 242c862..222a421 100644
--- a/hw/bsp/nrf52dk/src/hal_bsp.c
+++ b/hw/bsp/nrf52dk/src/hal_bsp.c
@@ -26,15 +26,15 @@
/*
* What memory to include in coredump.
*/
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
}
};
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -45,8 +45,8 @@ bsp_flash_dev(uint8_t id)
return &nrf52k_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nrf52dk/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/src/os_bsp.c b/hw/bsp/nrf52dk/src/os_bsp.c
index 2fabff4..ad09e38 100644
--- a/hw/bsp/nrf52dk/src/os_bsp.c
+++ b/hw/bsp/nrf52dk/src/os_bsp.c
@@ -78,7 +78,7 @@ static nrf_drv_saadc_config_t os_bsp_adc0_config = {
#endif
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/nucleo-f401re/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nucleo-f401re/src/hal_bsp.c b/hw/bsp/nucleo-f401re/src/hal_bsp.c
index 76fe33a..4958ec4 100644
--- a/hw/bsp/nucleo-f401re/src/hal_bsp.c
+++ b/hw/bsp/nucleo-f401re/src/hal_bsp.c
@@ -54,10 +54,10 @@ static const struct stm32f4_uart_cfg uart_cfg[UART_CNT] = {
};
#endif
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
}
};
@@ -85,7 +85,7 @@ struct stm32f4_hal_spi_cfg spi0_cfg = {
#endif
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -96,15 +96,15 @@ bsp_flash_dev(uint8_t id)
return &stm32f4_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
}
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c b/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c
index 45f6dd8..4fdaad2 100644
--- a/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c
+++ b/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c
@@ -39,14 +39,14 @@ static const struct stm32f4_uart_cfg uart_cfg[UART_CNT] = {
}
};
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
},
[1] = {
- .bmd_start = &_ccram_start,
- .bmd_size = CCRAM_SIZE
+ .hbmd_start = &_ccram_start,
+ .hbmd_size = CCRAM_SIZE
}
};
@@ -58,7 +58,7 @@ bsp_uart_config(int port)
}
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -69,8 +69,8 @@ bsp_flash_dev(uint8_t id)
return &stm32f4_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/olimex_stm32-e407_devboard/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/olimex_stm32-e407_devboard/src/os_bsp.c b/hw/bsp/olimex_stm32-e407_devboard/src/os_bsp.c
index b2c4bd0..49fe20a 100644
--- a/hw/bsp/olimex_stm32-e407_devboard/src/os_bsp.c
+++ b/hw/bsp/olimex_stm32-e407_devboard/src/os_bsp.c
@@ -279,7 +279,7 @@ struct stm32f4_hal_spi_cfg spi0_cfg = {
void _close(int fd);
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/rb-nano2/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/src/hal_bsp.c b/hw/bsp/rb-nano2/src/hal_bsp.c
index 242c862..222a421 100644
--- a/hw/bsp/rb-nano2/src/hal_bsp.c
+++ b/hw/bsp/rb-nano2/src/hal_bsp.c
@@ -26,15 +26,15 @@
/*
* What memory to include in coredump.
*/
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
}
};
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -45,8 +45,8 @@ bsp_flash_dev(uint8_t id)
return &nrf52k_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/rb-nano2/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/src/os_bsp.c b/hw/bsp/rb-nano2/src/os_bsp.c
index 1395116..badcfd8 100644
--- a/hw/bsp/rb-nano2/src/os_bsp.c
+++ b/hw/bsp/rb-nano2/src/os_bsp.c
@@ -56,7 +56,7 @@ static const struct nrf52_uart_cfg os_bsp_uart0_cfg = {
#endif
void
-bsp_init(void)
+hal_bsp_init(void)
{
int rc;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/stm32f4discovery/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/stm32f4discovery/src/hal_bsp.c b/hw/bsp/stm32f4discovery/src/hal_bsp.c
index 763002f..99be34a 100644
--- a/hw/bsp/stm32f4discovery/src/hal_bsp.c
+++ b/hw/bsp/stm32f4discovery/src/hal_bsp.c
@@ -39,14 +39,14 @@ static const struct stm32f4_uart_cfg uart_cfg[UART_CNT] = {
}
};
-static const struct bsp_mem_dump dump_cfg[] = {
+static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
- .bmd_start = &_ram_start,
- .bmd_size = RAM_SIZE
+ .hbmd_start = &_ram_start,
+ .hbmd_size = RAM_SIZE
},
[1] = {
- .bmd_start = &_ccram_start,
- .bmd_size = CCRAM_SIZE
+ .hbmd_start = &_ccram_start,
+ .hbmd_size = CCRAM_SIZE
}
};
@@ -58,7 +58,7 @@ bsp_uart_config(int port)
}
const struct hal_flash *
-bsp_flash_dev(uint8_t id)
+hal_bsp_flash_dev(uint8_t id)
{
/*
* Internal flash mapped to id 0.
@@ -69,8 +69,8 @@ bsp_flash_dev(uint8_t id)
return &stm32f4_flash_dev;
}
-const struct bsp_mem_dump *
-bsp_core_dump(int *area_cnt)
+const struct hal_bsp_mem_dump *
+hal_bsp_core_dump(int *area_cnt)
{
*area_cnt = sizeof(dump_cfg) / sizeof(dump_cfg[0]);
return dump_cfg;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/bsp/stm32f4discovery/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/stm32f4discovery/src/os_bsp.c b/hw/bsp/stm32f4discovery/src/os_bsp.c
index 7c8e33e..2d60a6c 100644
--- a/hw/bsp/stm32f4discovery/src/os_bsp.c
+++ b/hw/bsp/stm32f4discovery/src/os_bsp.c
@@ -27,6 +27,6 @@
void _close(int fd);
void
-bsp_init(void)
+hal_bsp_init(void)
{
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/hal/include/hal/hal_bsp.h
----------------------------------------------------------------------
diff --git a/hw/hal/include/hal/hal_bsp.h b/hw/hal/include/hal/hal_bsp.h
index 99bbda7..11f833b 100644
--- a/hw/hal/include/hal/hal_bsp.h
+++ b/hw/hal/include/hal/hal_bsp.h
@@ -29,15 +29,14 @@ extern "C" {
/*
* Initializes BSP; registers flash_map with the system.
*/
-void bsp_init_devs(void);
-void bsp_init(void);
+void hal_bsp_init(void);
/*
* Return pointer to flash device structure, given BSP specific
* flash id.
*/
struct hal_flash;
-const struct hal_flash *bsp_flash_dev(uint8_t flash_id);
+const struct hal_flash *hal_bsp_flash_dev(uint8_t flash_id);
/*
* Grows heap by given amount. XXX giving space back not implemented.
@@ -47,19 +46,19 @@ void *_sbrk(int incr);
/*
* Report which memory areas should be included inside a coredump.
*/
-struct bsp_mem_dump {
- void *bmd_start;
- uint32_t bmd_size;
+struct hal_bsp_mem_dump {
+ void *hbmd_start;
+ uint32_t hbmd_size;
};
-const struct bsp_mem_dump *bsp_core_dump(int *area_cnt);
+const struct hal_bsp_mem_dump *hal_bsp_core_dump(int *area_cnt);
/*
* Get unique HW identifier/serial number for platform.
* Returns the number of bytes filled in.
*/
-#define BSP_MAX_ID_LEN 32
-int bsp_hw_id(uint8_t *id, int max_len);
+#define HAL_BSP_MAX_ID_LEN 32
+int hal_bsp_hw_id(uint8_t *id, int max_len);
uint16_t bsp_get_refmv(void *cfgdata);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/hal/src/hal_flash.c
----------------------------------------------------------------------
diff --git a/hw/hal/src/hal_flash.c b/hw/hal/src/hal_flash.c
index b2aea19..0a82b85 100644
--- a/hw/hal/src/hal_flash.c
+++ b/hw/hal/src/hal_flash.c
@@ -32,7 +32,7 @@ hal_flash_init(void)
int rc = 0;
for (i = 0; ; i++) {
- hf = bsp_flash_dev(i);
+ hf = hal_bsp_flash_dev(i);
if (!hf) {
break;
}
@@ -48,7 +48,7 @@ hal_flash_align(uint8_t flash_id)
{
const struct hal_flash *hf;
- hf = bsp_flash_dev(flash_id);
+ hf = hal_bsp_flash_dev(flash_id);
if (!hf) {
return 1;
}
@@ -81,7 +81,7 @@ hal_flash_read(uint8_t id, uint32_t address, void *dst, uint32_t num_bytes)
{
const struct hal_flash *hf;
- hf = bsp_flash_dev(id);
+ hf = hal_bsp_flash_dev(id);
if (!hf) {
return -1;
}
@@ -98,7 +98,7 @@ hal_flash_write(uint8_t id, uint32_t address, const void *src,
{
const struct hal_flash *hf;
- hf = bsp_flash_dev(id);
+ hf = hal_bsp_flash_dev(id);
if (!hf) {
return -1;
}
@@ -114,7 +114,7 @@ hal_flash_erase_sector(uint8_t id, uint32_t sector_address)
{
const struct hal_flash *hf;
- hf = bsp_flash_dev(id);
+ hf = hal_bsp_flash_dev(id);
if (!hf) {
return -1;
}
@@ -134,7 +134,7 @@ hal_flash_erase(uint8_t id, uint32_t address, uint32_t num_bytes)
int i;
int rc;
- hf = bsp_flash_dev(id);
+ hf = hal_bsp_flash_dev(id);
if (!hf) {
return -1;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/mcu/native/src/hal_hw_id.c
----------------------------------------------------------------------
diff --git a/hw/mcu/native/src/hal_hw_id.c b/hw/mcu/native/src/hal_hw_id.c
index d3795d5..dca5a9c 100644
--- a/hw/mcu/native/src/hal_hw_id.c
+++ b/hw/mcu/native/src/hal_hw_id.c
@@ -31,7 +31,7 @@
* it's supposed to be unique for this particular MCU.
*/
int
-bsp_hw_id(uint8_t *id, int max_len)
+hal_bsp_hw_id(uint8_t *id, int max_len)
{
memset(id, 0x42, max_len);
return max_len;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c b/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c
index b20bbed..8d795ab 100644
--- a/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c
+++ b/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c
@@ -33,7 +33,7 @@
* DEVICEID[0-1] and DEVICEADDR[0-1].
*/
int
-bsp_hw_id(uint8_t *id, int max_len)
+hal_bsp_hw_id(uint8_t *id, int max_len)
{
int len, cnt;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c b/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c
index a6d25d4..13162a3 100644
--- a/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c
+++ b/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c
@@ -33,7 +33,7 @@
* DEVICEID[0-1] and DEVICEADDR[0-1].
*/
int
-bsp_hw_id(uint8_t *id, int max_len)
+hal_bsp_hw_id(uint8_t *id, int max_len)
{
int len, cnt;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/mcu/nxp/MK64F12/src/hal_hw_id.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nxp/MK64F12/src/hal_hw_id.c b/hw/mcu/nxp/MK64F12/src/hal_hw_id.c
index e5ce55e..0e36016 100644
--- a/hw/mcu/nxp/MK64F12/src/hal_hw_id.c
+++ b/hw/mcu/nxp/MK64F12/src/hal_hw_id.c
@@ -31,7 +31,7 @@
/*
* TODO: Use serial# registers
*/
-int bsp_hw_id(uint8_t *id, int max_len)
+int hal_bsp_hw_id(uint8_t *id, int max_len)
{
memcpy(id, (void *)"ABCDEFG", 8);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/hw/mcu/stm/stm32f4xx/src/stm32f4xx_hw_id.c
----------------------------------------------------------------------
diff --git a/hw/mcu/stm/stm32f4xx/src/stm32f4xx_hw_id.c b/hw/mcu/stm/stm32f4xx/src/stm32f4xx_hw_id.c
index c08e8fe..3efcb8e 100644
--- a/hw/mcu/stm/stm32f4xx/src/stm32f4xx_hw_id.c
+++ b/hw/mcu/stm/stm32f4xx/src/stm32f4xx_hw_id.c
@@ -31,7 +31,7 @@
* See ref manual chapter 39.1.
*/
int
-bsp_hw_id(uint8_t *id, int max_len)
+hal_bsp_hw_id(uint8_t *id, int max_len)
{
int cnt;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/kernel/os/src/os.c
----------------------------------------------------------------------
diff --git a/kernel/os/src/os.c b/kernel/os/src/os.c
index 1ef523d..98b2ca9 100644
--- a/kernel/os/src/os.c
+++ b/kernel/os/src/os.c
@@ -154,7 +154,7 @@ os_init(void)
assert(err == OS_OK);
/* Call bsp related OS initializations */
- bsp_init();
+ hal_bsp_init();
err = (os_error_t) os_dev_initialize_all(OS_DEV_INIT_PRIMARY);
assert(err == OS_OK);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/sys/coredump/src/coredump.c
----------------------------------------------------------------------
diff --git a/sys/coredump/src/coredump.c b/sys/coredump/src/coredump.c
index 13c7a89..f8530bf 100644
--- a/sys/coredump/src/coredump.c
+++ b/sys/coredump/src/coredump.c
@@ -47,7 +47,7 @@ coredump_dump(void *regs, int regs_sz)
struct coredump_tlv tlv;
const struct flash_area *fa;
struct image_version ver;
- const struct bsp_mem_dump *mem, *cur;
+ const struct hal_bsp_mem_dump *mem, *cur;
int area_cnt, i;
uint8_t hash[IMGMGR_HASH_LEN];
uint32_t off;
@@ -103,17 +103,17 @@ coredump_dump(void *regs, int regs_sz)
dump_core_tlv(fa, &off, &tlv, hash);
}
- mem = bsp_core_dump(&area_cnt);
+ mem = hal_bsp_core_dump(&area_cnt);
for (i = 0; i < area_cnt; i++) {
cur = &mem[i];
- area_off = (uint32_t)cur->bmd_start;
- area_end = area_off + cur->bmd_size;
+ area_off = (uint32_t)cur->hbmd_start;
+ area_end = area_off + cur->hbmd_size;
while (area_off < area_end) {
tlv.ct_type = COREDUMP_TLV_MEM;
- if (cur->bmd_size > USHRT_MAX) {
+ if (cur->hbmd_size > USHRT_MAX) {
tlv.ct_len = SHRT_MAX + 1;
} else {
- tlv.ct_len = cur->bmd_size;
+ tlv.ct_len = cur->hbmd_size;
}
tlv.ct_off = area_off;
dump_core_tlv(fa, &off, &tlv, (void *)area_off);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/sys/flash_map/src/flash_map.c
----------------------------------------------------------------------
diff --git a/sys/flash_map/src/flash_map.c b/sys/flash_map/src/flash_map.c
index 17aada4..124cfeb 100644
--- a/sys/flash_map/src/flash_map.c
+++ b/sys/flash_map/src/flash_map.c
@@ -77,7 +77,7 @@ flash_area_to_sectors(int id, int *cnt, struct flash_area *ret)
*cnt = 0;
- hf = bsp_flash_dev(fa->fa_device_id);
+ hf = hal_bsp_flash_dev(fa->fa_device_id);
for (i = 0; i < hf->hf_sector_cnt; i++) {
hf->hf_itf->hff_sector_info(i, &start, &size);
if (start >= fa->fa_off && start < fa->fa_off + fa->fa_size) {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/sys/flash_map/test/src/testcases/flash_map_test_case_1.c
----------------------------------------------------------------------
diff --git a/sys/flash_map/test/src/testcases/flash_map_test_case_1.c b/sys/flash_map/test/src/testcases/flash_map_test_case_1.c
index f46ba1e..7f307d8 100644
--- a/sys/flash_map/test/src/testcases/flash_map_test_case_1.c
+++ b/sys/flash_map/test/src/testcases/flash_map_test_case_1.c
@@ -39,8 +39,8 @@ TEST_CASE(flash_map_test_case_1)
continue;
}
- hf = bsp_flash_dev(fa->fa_device_id);
- TEST_ASSERT_FATAL(hf != NULL, "bsp_flash_dev");
+ hf = hal_bsp_flash_dev(fa->fa_device_id);
+ TEST_ASSERT_FATAL(hf != NULL, "hal_bsp_flash_dev");
rc = flash_area_to_sectors(i, &my_sec_cnt, my_secs);
TEST_ASSERT_FATAL(rc == 0, "flash_area_to_sectors failed");
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/sys/id/src/id.c
----------------------------------------------------------------------
diff --git a/sys/id/src/id.c b/sys/id/src/id.c
index c58a652..e7b2bd5 100644
--- a/sys/id/src/id.c
+++ b/sys/id/src/id.c
@@ -57,12 +57,12 @@ struct conf_handler id_conf = {
static char *
id_conf_get(int argc, char **argv, char *val, int val_len_max)
{
- uint8_t src_buf[BSP_MAX_ID_LEN];
+ uint8_t src_buf[HAL_BSP_MAX_ID_LEN];
int len;
if (argc == 1) {
if (!strcmp(argv[0], "hwid")) {
- len = bsp_hw_id(src_buf, sizeof(src_buf));
+ len = hal_bsp_hw_id(src_buf, sizeof(src_buf));
if (len > 0) {
return conf_str_from_bytes(src_buf, len, val, val_len_max);
}
@@ -92,12 +92,12 @@ static int
id_conf_export(void (*export_func)(char *name, char *val),
enum conf_export_tgt tgt)
{
- uint8_t src_buf[BSP_MAX_ID_LEN];
+ uint8_t src_buf[HAL_BSP_MAX_ID_LEN];
char str[sizeof(src_buf) * 2];
int len;
if (tgt == CONF_EXPORT_SHOW) {
- len = bsp_hw_id(src_buf, sizeof(src_buf));
+ len = hal_bsp_hw_id(src_buf, sizeof(src_buf));
if (len > 0) {
conf_str_from_bytes(src_buf, len, str, sizeof(str));
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dd789d76/test/flash_test/src/flash_test/flash_test.c
----------------------------------------------------------------------
diff --git a/test/flash_test/src/flash_test/flash_test.c b/test/flash_test/src/flash_test/flash_test.c
index 980cbba..70a8125 100644
--- a/test/flash_test/src/flash_test/flash_test.c
+++ b/test/flash_test/src/flash_test/flash_test.c
@@ -6,7 +6,7 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
@@ -46,7 +46,7 @@ flash_cli_cmd(int argc, char **argv)
char tmp_buf[8];
char pr_str[80];
- hf = bsp_flash_dev(0);
+ hf = hal_bsp_flash_dev(0);
if (!hf) {
console_printf("No flash device present\n");
return 0;