Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,7 @@ UINT32 rxsens_start_flag_get(void);
UINT32 tx_evm_mode_get(void);
void bk_cal_get_txpwr_tabl(uint8_t *cal_array_ptr);

#if CONFIG_SOC_BK7239XX
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do you use the definition?

#define CONFIG_SOC_BK7239XX 1
or
#define CONFIG_SOC_BK7239XX 0

like this?
or

#define CONFIG_SOC_BK7239XX
or
// #define CONFIG_SOC_BK7239XX

like this?

Your code is valid with first example. If you define it in a defconfig and it's a bool type,
then 2nd example is right.
When I search the config, your team mix-uses it.

@Poly-J @ziliguo Could you check your another codes for this point?

void bk_reg_reset_rf_reg(void);
#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ typedef struct {
char *(*_os_strstr)(const char *haystack, const char *needle);
///
UINT32 (*_rf_pll_ctrl)(UINT32 cmd, UINT32 param);
void (*_bk_reg_reset_rf_reg)(void);
void (*_send_udp_bc_pkt)(uint8_t data);
void (*_tx_verify_test_call_back)(void);
void (*_sys_hal_enter_low_analog)(void);
Expand Down
8 changes: 8 additions & 0 deletions os/board/bk7239n/src/components/bk_wifi/src/bk_wifi_adapter.c
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,13 @@ static void rtos_exit_critical_wrapper(uint32_t irq_level)
rtos_exit_critical(irq_level);
}

static void bk_reg_reset_rf_reg_wrapper(void)
{
#if CONFIG_SOC_BK7239XX
bk_reg_reset_rf_reg();
#endif
}

static uint32_t rtos_get_time_wrapper(void)
{
return rtos_get_time();
Expand Down Expand Up @@ -1677,6 +1684,7 @@ __attribute__((section(".dtcm_sec_data "))) wifi_os_funcs_t g_wifi_os_funcs = {
/////
._rf_pll_ctrl = rf_pll_ctrl_wrapper,
//._send_udp_bc_pkt = bk_airkiss_start_udp_boardcast_wrapper,
._bk_reg_reset_rf_reg = bk_reg_reset_rf_reg_wrapper,
._tx_verify_test_call_back = tx_verify_test_call_back_wrapper,
._sys_hal_enter_low_analog = sys_hal_enter_low_analog_wrapper,
._sys_hal_exit_low_analog = sys_hal_exit_low_analog_wrapper,
Expand Down
3 changes: 3 additions & 0 deletions os/board/bk7239n/src/components/bk_wifi/src/rw_msg_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1600,6 +1600,9 @@ void rwnx_handle_recv_msg(struct ke_msg *rx_msg)
{
#if NX_VERSION > NX_VERSION_PACK(6, 22, 0, 0)
rwnx_misc_disconnect_ind(ind);
#endif
#if CONFIG_WIFI_REGDOMAIN
regulatory_hint_disconnect();
#endif
wpa_ctrl_event_copy(WPA_CTRL_EVENT_DISCONNECT_IND, ind, sizeof(*ind));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1902,10 +1902,6 @@ int wpa_supplicant_handle_events(wpah_msg_t *msg)
union wpa_event_data data;
struct disassoc_info *info = (struct disassoc_info *)&data.disassoc_info;

#if CONFIG_WIFI_REGDOMAIN
regulatory_hint_disconnect();
#endif

os_memset(&data, 0, sizeof(data));
/*
* FIXME: IP specified that reason code <= 1 are local generated, but AP still can send us
Expand Down
Binary file modified os/board/bk7239n/src/libs/libbk_phy.a
Binary file not shown.
Binary file modified os/board/bk7239n/src/libs/libwifi.a
Binary file not shown.