Skip to content

update for RTL8710BN #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
librae8226 merged 2 commits into from
Aug 7, 2018
Merged

update for RTL8710BN #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f13f48
add macro to diff MK3080&RTL8710BN and modify monitor flow
raulcxw Aug 6, 2018
0696132
update monitor flow
raulcxw Aug 6, 2018
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
2 changes: 0 additions & 2 deletions board/amebaz_dev/amebaz_dev.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ $(NAME)_SOURCES := board.c
GLOBAL_INCLUDES += .
GLOBAL_DEFINES += STDIO_UART=0

GLOBAL_CFLAGS += -DON_PRE2=1

CONFIG_SYSINFO_PRODUCT_MODEL := ALI_AOS_RTL8710BN
CONFIG_SYSINFO_DEVICE_NAME := RTL8710BN

Expand Down
Binary file modified board/amebaz_dev/system.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion board/mk3080/mk3080.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SUPPORT_BINS := no
$(NAME)_SOURCES := board.c

GLOBAL_INCLUDES += .
GLOBAL_DEFINES += STDIO_UART=0
GLOBAL_DEFINES += STDIO_UART=0 USE_MX1290

CONFIG_SYSINFO_PRODUCT_MODEL := ALI_AOS_MK3080
CONFIG_SYSINFO_DEVICE_NAME := MK3080
Expand Down
2 changes: 2 additions & 0 deletions platform/mcu/rtl8710bn/aos/aos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ static void board_mode_check(void)

board_cli_init();

#ifdef USE_MX1290
board_mode_check();
#endif

aos_kernel_init(&kinit);

Expand Down
2 changes: 1 addition & 1 deletion platform/mcu/rtl8710bn/download.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif
download_app: gen_crc_bin display_map_summary kill_openocd
$(eval IMAGE_SIZE := $(shell $(PYTHON) $(IMAGE_SIZE_SCRIPT) $(BIN_OUTPUT_FILE)))
$(QUIET)$(ECHO) Downloading application to partition: $(APPLICATION_FIRMWARE_PARTITION_TCL) size: $(IMAGE_SIZE) bytes...
$(call CONV_SLASHES, $(OPENOCD_FULL_NAME)) -s $(SOURCE_ROOT) -f $(OPENOCD_CFG_PATH)interface/$(JTAG).cfg -f $(OPENOCD_CFG_PATH)rtl8710/rtl8710.cfg -c "gdb_port disabled" -c "tcl_port disabled" -c "telnet_port disabled" -c init -c erase_chip -c "program_flash $(OUTPUT_DIR)/binary/boot_all.bin 0" -c "program_flash $(SOURCE_ROOT)/board/mk3080/system.bin 0x9000" -c "program_flash $(OUTPUT_DIR)/binary/image2_all_ota1.bin 0xB000" -c reset -c shutdown $(DOWNLOAD_LOG) 2>&1 && $(ECHO) Download complete && $(ECHO_BLANK_LINE) || $(ECHO) Download failed. See $(OPENOCD_LOG_FILE) for detail.
$(call CONV_SLASHES, $(OPENOCD_FULL_NAME)) -s $(SOURCE_ROOT) -f $(OPENOCD_CFG_PATH)interface/$(JTAG).cfg -f $(OPENOCD_CFG_PATH)rtl8710bn/rtl8710bn.cfg -c "gdb_port disabled" -c "tcl_port disabled" -c "telnet_port disabled" -c init -c erase_chip -c "program_flash $(OUTPUT_DIR)/binary/boot_all.bin 0" -c "program_flash $(SOURCE_ROOT)/board/amebaz_dev/system.bin 0x9000" -c "program_flash $(OUTPUT_DIR)/binary/image2_all_ota1.bin 0xB000" -c reset -c shutdown $(DOWNLOAD_LOG) 2>&1 && $(ECHO) Download complete && $(ECHO_BLANK_LINE) || $(ECHO) Download failed. See $(OPENOCD_LOG_FILE) for detail.

download: download_app $(if $(findstring total,$(MAKECMDGOALS)), EXT_IMAGE_DOWNLOAD,)

Expand Down
33 changes: 19 additions & 14 deletions platform/mcu/rtl8710bn/hal/wifi_port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static void alink_set_sta_mode()
//Check if in AP mode
wext_get_mode(WLAN0_NAME, &mode);

if(mode == IW_MODE_MASTER) {
if(1) {
#if CONFIG_LWIP_LAYER
dhcps_deinit();
#endif
Expand Down Expand Up @@ -506,6 +506,17 @@ static int get_channel(hal_wifi_module_t *m)
return ch;
}

monitor_data_cb_t g_promisc_callback = NULL;
hal_wifi_link_info_t g_promisc_link_info;

static void wifi_promisc_hdl(u8 *buf, int buf_len, void *userdata)
{
g_promisc_link_info.rssi = (int8_t)(((ieee80211_frame_info_t *)userdata)->rssi);
if(g_promisc_callback){
g_promisc_callback((u8*)buf, buf_len, &g_promisc_link_info);
}
}

static void start_monitor(hal_wifi_module_t *m)
{
DBG_8195A("start_monitor\r\n");
Expand All @@ -515,32 +526,26 @@ static void start_monitor(hal_wifi_module_t *m)
#endif

wifi_enter_promisc_mode();

wifi_set_promisc(RTW_PROMISC_ENABLE_2, wifi_promisc_hdl, 0);
return;
}

static void stop_monitor(hal_wifi_module_t *m)
{
DBG_8195A("stop_monitor\r\n");

wifi_set_promisc(RTW_PROMISC_DISABLE, NULL, 0);

//wifi_set_promisc(RTW_PROMISC_DISABLE, NULL, 0);
#if CONFIG_AUTO_RECONNECT
wifi_set_autoreconnect(RTW_AUTORECONNECT_INFINITE);
#endif

//wifi_set_autoreconnect(RTW_AUTORECONNECT_INFINITE);
#endif
return;
}


static void register_monitor_cb(hal_wifi_module_t *m, monitor_data_cb_t fn)
{
wifi_off();
rtw_mdelay_os(20);
wifi_on(RTW_MODE_PROMISC);
wifi_disable_powersave();

DBG_8195A("register_monitor_cb\r\n");
wifi_set_promisc(RTW_PROMISC_ENABLE_2, fn, 0);
g_promisc_callback = fn;
DBG_8195A("register_monitor_cb, fn 0x%x\r\n", fn);
return;
}

Expand Down
37 changes: 0 additions & 37 deletions platform/mcu/rtl8710bn/sdk/component/common/application/google/google_nest.h
View file
Open in desktop

This file was deleted.

195 changes: 0 additions & 195 deletions platform/mcu/rtl8710bn/sdk/component/common/application/google/google_tls.c
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions platform/mcu/rtl8710bn/sdk/component/common/audio/g711/g711_codec.h
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions platform/mcu/rtl8710bn/sdk/component/common/audio/mp3/mp3_codec.h
View file
Open in desktop

This file was deleted.

Loading