diff --git a/src/flash_config/flash_config.c b/src/flash_config/flash_config.c index cb513fc46..e7be85253 100644 --- a/src/flash_config/flash_config.c +++ b/src/flash_config/flash_config.c @@ -266,6 +266,24 @@ INFO_ITEM_ST *config_search_item_type(UINT32 type){ return _search_item(&item, NULL); } +int bekken_hal_flash_read(const uint32_t addr, void *dst, const UINT32 size) +{ + UINT32 status; + if(NULL == dst) { + return 1; + } + hal_flash_lock(); + + DD_HANDLE flash_handle; + flash_handle = ddev_open(FLASH_DEV_NAME, &status, 0); + ddev_read(flash_handle, dst, size, addr); + ddev_close(flash_handle); + + hal_flash_unlock(); + + return 0; +} + int config_delete_item(UINT32 type) { UINT32 addr, end_addr; diff --git a/src/flash_config/flash_config.h b/src/flash_config/flash_config.h index 9aaafd161..d2257b1c1 100644 --- a/src/flash_config/flash_config.h +++ b/src/flash_config/flash_config.h @@ -38,6 +38,8 @@ int config_dump_table(); // debug int config_get_tableOffsets(int tableID, int *outStart, int *outLen); +// copy of tuya_hal_flash_read (in BK7231T it was in SDK source, but in BK7231N it was in tuya lib) +int bekken_hal_flash_read(const uint32_t addr, void *dst, const UINT32 size); ///////////////////////////////////////// diff --git a/src/httpserver/new_http.c b/src/httpserver/new_http.c index 71211bc1d..efa9b0916 100644 --- a/src/httpserver/new_http.c +++ b/src/httpserver/new_http.c @@ -800,7 +800,7 @@ int HTTP_ProcessPacket(http_request_t *request) { #elif PLATFORM_XR809 poststr(request,"TODO XR809
"); -#else +#elif PLATFORM_BK7231T AP_IF_S *ar; uint32_t num; @@ -812,6 +812,12 @@ int HTTP_ProcessPacket(http_request_t *request) { poststr(request,tmpA); } tuya_hal_wifi_release_ap(ar); +#elif PLATFORM_BK7231N + poststr(request,"TODO: BK7231N support for scan
"); + +#else +#error "Unknown platform" + poststr(request,Unknown platform
"); #endif } poststr(request,"
\ @@ -905,7 +911,7 @@ int HTTP_ProcessPacket(http_request_t *request) { poststr(request,tmpA); poststr(request,"
"); - ///res = tuya_hal_flash_read (ofs, buffer,len); + ///res = bekken_hal_flash_read (ofs, buffer,len); //sprintf(tmpA,"Result %i",res); // strcat(outbuf,tmpA); /// strcat(outbuf,"
"); @@ -923,7 +929,7 @@ int HTTP_ProcessPacket(http_request_t *request) { #define FLASH_INDEX_XR809 0 res = flash_read(FLASH_INDEX_XR809, nowOfs, buffer, now); #else - res = tuya_hal_flash_read (nowOfs, buffer,now); + res = bekken_hal_flash_read (nowOfs, buffer,now); #endif for(i = 0; i < now; i++) { u8 val = buffer[i]; diff --git a/src/win_stubs.c b/src/win_stubs.c index 43562cf23..a31b5316a 100644 --- a/src/win_stubs.c +++ b/src/win_stubs.c @@ -4,7 +4,7 @@ #if WINDOWS -int tuya_hal_flash_read(const uint32_t addr, uint8_t *dst, const uint32_t size) { +int bekken_hal_flash_read(const uint32_t addr, uint8_t *dst, const uint32_t size) { int i; memset(dst,0,size); for(i = 0; i < size; i++){