diff options
Diffstat (limited to 'patch')
| -rw-r--r-- | patch/app_ble.c.patch | 21 | ||||
| -rw-r--r-- | patch/bk7231_ota.ld.patch | 17 | ||||
| -rw-r--r-- | patch/ble.c.patch | 39 | ||||
| -rw-r--r-- | patch/rwapp_config.h.patch | 12 | ||||
| -rw-r--r-- | patch/sys_config.h.patch | 45 |
5 files changed, 134 insertions, 0 deletions
diff --git a/patch/app_ble.c.patch b/patch/app_ble.c.patch new file mode 100644 index 0000000..3aa6a24 --- /dev/null +++ b/patch/app_ble.c.patch @@ -0,0 +1,21 @@ +--- sdk/driver/ble/ble_pub/modules/app/src/app_ble.c 2021-08-16 11:59:34.000000000 -0500 ++++ ../sdk/driver/ble/ble_pub/modules/app/src/app_ble.c 2023-07-11 09:46:34.035353420 -0500 +@@ -316,6 +316,7 @@ + * FUNCTION DEFINITIONS + **************************************************************************************** + */ ++void appm_ll_scan_init(void);// fix an annoying compiler warning + + void appm_init() + { +@@ -328,6 +329,10 @@ + // Reset the application manager environment + memset(&app_env, 0, sizeof(app_env)); + ++ // copy the name set by ble_main() ++ memcpy(app_env.dev_name, app_dflt_dev_name, APP_DFLT_DEVICE_NAME_LEN); ++ app_env.dev_name_len = strlen((const char *)app_env.dev_name); //ble_activate() should have made sure this is safe ++ + // Create APP task + kernel_task_create(TASK_APP, &TASK_DESC_APP); + diff --git a/patch/bk7231_ota.ld.patch b/patch/bk7231_ota.ld.patch new file mode 100644 index 0000000..b964716 --- /dev/null +++ b/patch/bk7231_ota.ld.patch @@ -0,0 +1,17 @@ +--- sdk/build/bk7231_ota.ld 2021-08-16 11:59:34.000000000 -0500 ++++ ../sdk/build/bk7231_ota.ld 2023-07-10 17:35:30.075799603 -0500 +@@ -37,6 +37,7 @@ + OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") + OUTPUT_ARCH(arm) + ENTRY(_vector_start); ++_bootloader_world_flag = 0x00400000; + _vector_start = ORIGIN(flash); + + SECTIONS +@@ -121,4 +122,4 @@ + libc.a + libm.a + libnosys.a +- ) +\ No newline at end of file ++ ) diff --git a/patch/ble.c.patch b/patch/ble.c.patch new file mode 100644 index 0000000..ec58cd4 --- /dev/null +++ b/patch/ble.c.patch @@ -0,0 +1,39 @@ +--- sdk/driver/ble/ble.c 2021-08-16 11:59:34.000000000 -0500 ++++ ../sdk/driver/ble/ble.c 2023-07-12 06:15:17.728550439 -0500 +@@ -237,7 +237,7 @@ + { + uint32_t fiq_status; + +- hal_machw_disable_int(); ++ //hal_machw_disable_int(); + nxmac_tx_rx_int_ack_clear(0xffffffff); + nxmac_gen_int_ack_clear(0xffffffff); + fiq_status = sddev_control(ICU_DEV_NAME, CMD_GET_INTR_STATUS, 0); +@@ -252,14 +252,14 @@ + + GLOBAL_INT_DECLARATION(); + GLOBAL_INT_DISABLE(); +- ++#if 0 // wifi stack is not used so this should never be active + if (txl_cntrl_pck_get() && ble_switch_skip_cnt < MAX_SKIP_CNT) + { + ble_switch_skip_cnt++; + GLOBAL_INT_RESTORE(); + return; + } +- ++#endif + if (ps_get_sleep_prevent() & 0x37) + { + GLOBAL_INT_RESTORE(); +@@ -316,8 +316,8 @@ + PS_WPRT("idle rec\r\n"); + bk_printf("idle rec\r\n"); + //long time wait idle interrupt,recover! +- hal_machw_disable_int(); +- rwnxl_reset_handle(0); ++ //hal_machw_disable_int(); ++ //rwnxl_reset_handle(0); + PS_WPRT("idle rec over\r\n"); + nxmac_next_state_setf(HW_IDLE); + } diff --git a/patch/rwapp_config.h.patch b/patch/rwapp_config.h.patch new file mode 100644 index 0000000..16834fa --- /dev/null +++ b/patch/rwapp_config.h.patch @@ -0,0 +1,12 @@ +--- sdk/driver/ble/ble_pub/modules/app/api/rwapp_config.h 2021-08-16 11:59:34.000000000 -0500 ++++ ../sdk/driver/ble/ble_pub/modules/app/api/rwapp_config.h 2023-07-10 17:10:11.508299753 -0500 +@@ -108,7 +108,8 @@ + // <e> BLE_APP_SEC + // <i> BLE_APP_SEC enable /disable + // </e> +-#if ( 0 ) ++// #if ( 0 ) ++#if ( 1 ) + #define CFG_APP_SEC + #endif + diff --git a/patch/sys_config.h.patch b/patch/sys_config.h.patch new file mode 100644 index 0000000..a1f9c15 --- /dev/null +++ b/patch/sys_config.h.patch @@ -0,0 +1,45 @@ +--- sdk/app/config/sys_config.h 2021-08-16 11:59:34.000000000 -0500 ++++ ../sdk/app/config/sys_config.h 2023-07-11 08:19:04.077829080 -0500 +@@ -13,7 +13,7 @@ + #define OSMALLOC_STATISTICAL 0 + + /*section 0-----app macro config-----*/ +-#define CFG_IEEE80211N 1 ++#define CFG_IEEE80211N 0 + + /*section 1-----OS macro config-----*/ + #define CFG_OS_FREERTOS 1 +@@ -36,17 +36,17 @@ + /*section 2-----function macro config-----*/ + #define CFG_TX_EVM_TEST 0 + #define CFG_RX_SENSITIVITY_TEST 0 +-#define CFG_ROLE_LAUNCH 1 ++#define CFG_ROLE_LAUNCH 0 + #define CFG_USE_WPA_29 0 + #define CFG_WPA_CTRL_IFACE 0 +-#define CFG_WLAN_FAST_CONNECT 1 ++#define CFG_WLAN_FAST_CONNECT 0 + /* PMF */ + #define CFG_IEEE80211W 0 + #if CFG_WPA_CTRL_IFACE + #undef CFG_ROLE_LAUNCH + #define CFG_ROLE_LAUNCH 0 + #endif +-#define CFG_WPA3 1 ++#define CFG_WPA3 0 + #if CFG_WPA3 + /* disable rl, enable ctrl iface, enable wpa29, pmf, sme */ + #undef CFG_ROLE_LAUNCH +@@ -123,10 +123,10 @@ + #endif + + /*section 8-----for netstack*/ +-#define CFG_USE_LWIP_NETSTACK 1 ++#define CFG_USE_LWIP_NETSTACK 0 + + /*section 9-----for DHCP servicers and client*/ +-#define CFG_USE_DHCP 1 ++#define CFG_USE_DHCP 0 + + /*section 10-----patch*/ + #define CFG_BK7221_MDM_WATCHDOG_PATCH 0 |