From 20d954e09e748be6894dc0452a8b4d78e4c1c326 Mon Sep 17 00:00:00 2001 From: pvvx Date: Tue, 17 Oct 2017 17:42:32 +0300 Subject: [PATCH] update --- .cproject | 8 + ExampleHTM/dygraph/ws_test_ina219.html | 22 ++- ExampleHTM/dygraph/ws_test_ina219d.html | 18 +- Makefile | 4 + .../common/api/network/src/wlan_network.c | 2 - .../wpa_supplicant/wifi_wps_config.c | 2 + USDK/component/common/api/wifi/wifi_conf.c | 5 +- USDK/component/common/api/wifi/wifi_util.c | 4 +- USDK/component/common/api/wifi_api.c | 45 ++++- USDK/component/common/api/wifi_api.h | 1 + .../application/xmodem/uart_fw_update.c | 2 - .../application/xmodem/xmport_loguart.h | 2 - .../common/application/xmodem/xmport_uart.h | 2 - .../drivers/wlan/realtek/include/ieee80211.h | 2 + .../drivers/wlan/realtek/include/rtw_cmd.h | 1 + .../wlan/realtek/include/wifi_constants.h | 3 +- .../drivers/wlan/realtek/include/wifi_lib.h | 36 ++-- .../wlan/realtek/include/wifi_structures.h | 3 +- .../wlan/realtek/src/osdep/freertos/wrapper.h | 1 + .../file_system/fatfs/disk_if/src/sdcard.c | 2 - .../file_system/fatfs/disk_if/src/usbdisk.c | 2 - .../component/common/mbed/hal_ext/efuse_api.h | 2 - .../component/common/mbed/hal_ext/flash_api.h | 2 - USDK/component/common/mbed/hal_ext/i2s_api.h | 2 - .../mbed/targets/hal/rtl8195a/analogin_api.c | 2 - .../mbed/targets/hal/rtl8195a/efuse_api.c | 2 - .../mbed/targets/hal/rtl8195a/ethernet_api.c | 2 - .../mbed/targets/hal/rtl8195a/flash_api.c | 2 - .../mbed/targets/hal/rtl8195a/gpio_api.c | 2 - .../mbed/targets/hal/rtl8195a/gpio_irq_api.c | 2 - .../mbed/targets/hal/rtl8195a/i2c_api.c | 2 - .../mbed/targets/hal/rtl8195a/i2s_api.c | 2 - .../mbed/targets/hal/rtl8195a/log_uart_api.c | 2 - .../mbed/targets/hal/rtl8195a/nfc_api.c | 2 - .../common/mbed/targets/hal/rtl8195a/pinmap.c | 2 - .../mbed/targets/hal/rtl8195a/port_api.c | 2 - .../mbed/targets/hal/rtl8195a/rtc_api.c | 2 - .../mbed/targets/hal/rtl8195a/serial_api.c | 2 - .../mbed/targets/hal/rtl8195a/timer_api.c | 2 - .../mbed/targets/hal/rtl8195a/timer_api.h | 3 +- .../mbed/targets/hal/rtl8195a/us_ticker.c | 2 - USDK/component/os/os_dep/device_lock.c | 2 - .../component/os/os_dep/include/device_lock.h | 2 - .../os/os_dep/include/osdep_service.h | 3 +- .../realtek/8195a/cmsis/device/app_start.c | 3 +- .../soc/realtek/8195a/cmsis/device/diag.h | 2 - .../soc/realtek/8195a/cmsis/device/rand.h | 2 - .../realtek/8195a/cmsis/device/rtl_stdlib.h | 2 - .../soc/realtek/8195a/cmsis/device/strproc.h | 2 - .../soc/realtek/8195a/cmsis/device/va_list.h | 2 - .../soc/realtek/8195a/fwlib/hal_adc.h | 2 - .../soc/realtek/8195a/fwlib/hal_api.h | 2 - .../soc/realtek/8195a/fwlib/hal_common.h | 2 - .../soc/realtek/8195a/fwlib/hal_crypto.h | 2 - .../soc/realtek/8195a/fwlib/hal_diag.h | 2 - .../soc/realtek/8195a/fwlib/hal_gdma.h | 2 - .../soc/realtek/8195a/fwlib/hal_gpio.h | 2 - .../soc/realtek/8195a/fwlib/hal_i2c.h | 2 - .../soc/realtek/8195a/fwlib/hal_i2s.h | 2 - .../soc/realtek/8195a/fwlib/hal_irqn.h | 2 - .../soc/realtek/8195a/fwlib/hal_log_uart.h | 2 - .../soc/realtek/8195a/fwlib/hal_mii.h | 2 - .../soc/realtek/8195a/fwlib/hal_misc.h | 2 - .../soc/realtek/8195a/fwlib/hal_nfc.h | 2 - .../soc/realtek/8195a/fwlib/hal_pcm.h | 2 - .../soc/realtek/8195a/fwlib/hal_peri_on.h | 2 - .../soc/realtek/8195a/fwlib/hal_platform.h | 2 - .../soc/realtek/8195a/fwlib/hal_pwm.h | 2 - .../soc/realtek/8195a/fwlib/hal_sdio.h | 2 - .../soc/realtek/8195a/fwlib/hal_sdio_host.h | 2 - .../realtek/8195a/fwlib/hal_sdr_controller.h | 2 - .../soc/realtek/8195a/fwlib/hal_spi_flash.h | 2 - .../soc/realtek/8195a/fwlib/hal_ssi.h | 2 - .../soc/realtek/8195a/fwlib/hal_timer.h | 2 - .../soc/realtek/8195a/fwlib/hal_uart.h | 2 - .../soc/realtek/8195a/fwlib/hal_usb.h | 2 - .../soc/realtek/8195a/fwlib/hal_util.h | 2 - .../realtek/8195a/fwlib/hal_vector_table.h | 2 - .../8195a/fwlib/ram_lib/fw_loader_main.c | 2 - .../realtek/8195a/fwlib/ram_lib/rtl_boot.c | 183 +++++++++++++++--- .../soc/realtek/8195a/fwlib/ram_lib/startup.c | 10 +- .../usb_otg/include/Rtl8195a_otg_zero.h | 2 - .../ram_lib/usb_otg/include/dwc_otg_common.h | 2 - .../fwlib/ram_lib/usb_otg/include/hal_otg.h | 2 - .../ram_lib/usb_otg/include/rtl8195a_otg.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_adc.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_gdma.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_gpio.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_i2c.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_i2s.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_mii.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_nfc.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_pcm.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_pwm.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_sdio.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_sdio_host.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_ssi.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_timer.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_uart.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_usb.h | 2 - .../8195a/fwlib/rtl8195a/rtl8195a_wdt.h | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_adc.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_dac.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_gdma.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_gpio.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_i2c.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_i2s.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_mii.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_nfc.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_pcm.c | 2 - .../fwlib/rtl8195a/src/rtl8195a_sdio_device.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_ssi.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_timer.c | 2 - .../8195a/fwlib/rtl8195a/src/rtl8195a_uart.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_32k.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_adc.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_common.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_dac.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_gdma.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_gpio.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_i2c.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_i2s.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_mii.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_nfc.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_pcm.c | 2 - .../8195a/fwlib/src/hal_sdr_controller.c | 32 ++- .../8195a/fwlib/src/hal_soc_ps_monitor.c | 2 - .../8195a/fwlib/src/hal_spi_flash_ram.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_ssi.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_timer.c | 2 - .../soc/realtek/8195a/fwlib/src/hal_uart.c | 2 - .../realtek/8195a/misc/driver/rtl_consol.c | 2 - .../realtek/8195a/misc/driver/rtl_consol.h | 2 - .../soc/realtek/common/bsp/section_config.h | 2 - .../analogin_voltage/src/main.c | 2 - USDK/example_sources/crypto/src/main.c | 2 - USDK/example_sources/gdma/src/main.c | 2 - USDK/example_sources/gpio/src/main.c | 2 - USDK/example_sources/gpio_irq/src/main.c | 2 - USDK/example_sources/gpio_jtag/src/main.c | 2 - .../example_sources/gpio_level_irq/src/main.c | 2 - .../gpio_light_weight/src/main.c | 2 - USDK/example_sources/gpio_port/src/main.c | 2 - .../gpio_pulse_measure/src/main.c | 2 - USDK/example_sources/gtimer/src/main.c | 2 - USDK/example_sources/gtimer_rtc/src/main.c | 2 - USDK/example_sources/i2c/src/main.c | 2 - .../log_uart_char_loopback/src/main.c | 2 - .../log_uart_loopback/src/main.c | 2 - .../log_uart_stream_loopback/src/main.c | 2 - USDK/example_sources/nfc/src/main.c | 2 - USDK/example_sources/pm_deepsleep/src/main.c | 2 - .../example_sources/pm_deepstandby/src/main.c | 2 - USDK/example_sources/pm_sleep/src/main.c | 2 - USDK/example_sources/pwm-buzzer/src/main.c | 2 - USDK/example_sources/pwm/src/main.c | 2 - USDK/example_sources/rtc/src/main.c | 2 - USDK/example_sources/sdio_device/src/main.c | 2 - USDK/example_sources/spi/src/main.c | 2 - USDK/example_sources/spi_pl7223/src/main.c | 2 - .../spi_stream_twoboard/src/main.c | 2 - USDK/example_sources/spi_twoboard/src/main.c | 2 - USDK/example_sources/uart/src/main.c | 2 - .../uart_auto_flow_ctrl/src/main.c | 2 - USDK/example_sources/uart_clock/src/main.c | 2 - USDK/example_sources/uart_irq/src/main.c | 2 - .../uart_stream_dma/src/main.c | 2 - .../uart_stream_irq/src/main.c | 2 - USDK/example_sources/watchdog/src/main.c | 2 - USDK/flasher.mk | 9 +- USDK/flasher/RTL_RunRAM.JLinkScript | 2 +- flasher/RTL00ConsoleROM.JLinkScript | 2 +- flasher/RTL_Reset.JLinkScript | 2 +- flasher/RTL_RunRAM.JLinkScript | 2 +- flasher/RTL_RunRAM_SDR.JLinkScript | 18 ++ flasher/gdb_flasher.jlink | 15 +- flasher/gdb_init.jlink | 12 +- flasher/gdb_ota.jlink | 15 +- project.mk | 4 +- project/inc/lwipopts.h | 2 +- project/inc/platform_autoconf.h | 6 +- project/inc/tcpsrv/tcp_srv_conn.h | 4 +- project/inc/web/web_srv_int.h | 2 +- project/src/console/atcmd_user.c | 4 + project/src/console/wifi_console.c | 18 +- userset.mk | 2 +- 186 files changed, 357 insertions(+), 447 deletions(-) create mode 100644 flasher/RTL_RunRAM_SDR.JLinkScript diff --git a/.cproject b/.cproject index 523a983..e7b0321 100644 --- a/.cproject +++ b/.cproject @@ -730,6 +730,14 @@ true true + + mingw32-make.exe + -s + runsdram + true + true + false + diff --git a/ExampleHTM/dygraph/ws_test_ina219.html b/ExampleHTM/dygraph/ws_test_ina219.html index 5881edd..d3ed900 100644 --- a/ExampleHTM/dygraph/ws_test_ina219.html +++ b/ExampleHTM/dygraph/ws_test_ina219.html @@ -3,12 +3,12 @@ Get data INA219 - + -

Read regs U & I INA219

-
+

Read regs U & I INA219

+
diff --git a/ExampleHTM/dygraph/ws_test_ina219d.html b/ExampleHTM/dygraph/ws_test_ina219d.html index 6c64151..e34f4f5 100644 --- a/ExampleHTM/dygraph/ws_test_ina219d.html +++ b/ExampleHTM/dygraph/ws_test_ina219d.html @@ -3,7 +3,7 @@ Get data INA219 - + @@ -19,26 +19,28 @@ var gu = new Dygraph( showRangeSelector: true, labels: ['X', 'U', 'I'], // drawPoints: true, - rollPeriod: 5, +// rollPeriod: 2, // errorBars: true, // showRoller: true, ylabel: 'U(mV)', - y2label: 'I(mA)', + y2label: 'I(mA)', series : { 'I': { axis: 'y2' } } -// , axes: { y: {valueRange: [4500, 5500] }, y2: {valueRange: [75, 125] }} +// , axes: { y: {valueRange: [3000, 3500] }, y2: {valueRange: [0, 30] }} }); var oldblkid = 0; var rdnextflg = false; var cur_idx = 0; var sig = 10; +function wsping() {ws.send('ina219'); wstt = setTimeout(wsping, 50);}; ws = new WebSocket('ws://rtl871x0/web.cgi'); ws.binaryType = 'arraybuffer'; -ws.onopen = function(){ws.send('ina219'); ws.send('pr=0')}; +ws.onopen = function(){ ws.send('user=rtl871x:supervisor'); ws.send('sys_debug=0'); wstt = setTimeout(wsping, 50);}; ws.onmessage = function (event) { if(event.data instanceof ArrayBuffer) { + clearTimeout(wstt); var wordarray = new Int16Array(event.data); if(wordarray.length > 2) { var blksz = wordarray[0]; @@ -49,14 +51,14 @@ ws.onmessage = function (event) { } else rdnextflg = true; oldblkid = blkid + blksz; for (var i=2; i 50000 ) datau.shift(); - datau.push([cur_idx, wordarray[i]*0.5, wordarray[i+1]*0.1]); + if(cur_idx > 10000 ) datau.shift(); + datau.push([cur_idx*0.001, wordarray[i]*0.5, wordarray[i+1]*0.1]); cur_idx++; } gu.updateOptions({'file':datau}); } + wstt = setTimeout(wsping, 50); } - ws.send("ina219"); } } diff --git a/Makefile b/Makefile index 44e5e5c..c53a064 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,10 @@ runram: #JLink-RunRAM.bat @$(MAKE) --f $(SDK_PATH)flasher.mk runram +runsdram: + #JLink-RunRAM.bat + @$(MAKE) --f $(SDK_PATH)flasher.mk runsdram + reset: #JLink-Reset.bat @$(MAKE) -f $(SDK_PATH)flasher.mk reset diff --git a/USDK/component/common/api/network/src/wlan_network.c b/USDK/component/common/api/network/src/wlan_network.c index cac209f..e202f1a 100644 --- a/USDK/component/common/api/network/src/wlan_network.c +++ b/USDK/component/common/api/network/src/wlan_network.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "FreeRTOS.h" diff --git a/USDK/component/common/api/wifi/rtw_wpa_supplicant/wpa_supplicant/wifi_wps_config.c b/USDK/component/common/api/wifi/rtw_wpa_supplicant/wpa_supplicant/wifi_wps_config.c index e2cd89c..cb277ff 100644 --- a/USDK/component/common/api/wifi/rtw_wpa_supplicant/wpa_supplicant/wifi_wps_config.c +++ b/USDK/component/common/api/wifi/rtw_wpa_supplicant/wpa_supplicant/wifi_wps_config.c @@ -12,6 +12,8 @@ #include "wps/wps_defs.h" #include +extern int wpas_wps_registrar_button_pushed(); + /* * @brief struct wps_credential - WPS Credential */ diff --git a/USDK/component/common/api/wifi/wifi_conf.c b/USDK/component/common/api/wifi/wifi_conf.c index 633e345..a2a94b3 100644 --- a/USDK/component/common/api/wifi/wifi_conf.c +++ b/USDK/component/common/api/wifi/wifi_conf.c @@ -550,7 +550,7 @@ int wifi_connect( result = RTW_TIMEOUT; goto error; } else { - if(wifi_is_connected_to_ap( ) != RTW_SUCCESS) { + if(rltk_wlan_is_connected_to_ap( ) != RTW_SUCCESS) { result = RTW_ERROR; goto error; } @@ -570,7 +570,7 @@ int wifi_connect( if (join_result->network_info.password_len) { rtw_free(join_result->network_info.password); } - if (wifi_is_connected_to_ap() != RTW_SUCCESS) { + if (rltk_wlan_is_connected_to_ap() != RTW_SUCCESS) { result = RTW_ERROR; goto error; } @@ -889,6 +889,7 @@ int wifi_off(void) { #if defined(CONFIG_ENABLE_WPS_AP) && CONFIG_ENABLE_WPS_AP // @todo + extern void wpas_wps_deinit(); wpas_wps_deinit(); #endif rltk_wlan_deinit(); diff --git a/USDK/component/common/api/wifi/wifi_util.c b/USDK/component/common/api/wifi/wifi_util.c index 1391eeb..f4213df 100644 --- a/USDK/component/common/api/wifi/wifi_util.c +++ b/USDK/component/common/api/wifi/wifi_util.c @@ -900,7 +900,7 @@ int wext_send_eapol(const char *ifname, char *buf, __u16 buf_len, __u16 flags) { return iw_ioctl(ifname, SIOCSIWEAPOLSEND, &iwr); } -#if CONFIG_ENABLE_P2P +//#if CONFIG_ENABLE_P2P int wext_send_mgnt(const char *ifname, char *buf, __u16 buf_len, __u16 flags) { struct iwreq iwr; memset(&iwr, 0, sizeof(iwr)); @@ -909,7 +909,7 @@ int wext_send_mgnt(const char *ifname, char *buf, __u16 buf_len, __u16 flags) { iwr.u.data.flags = flags; return iw_ioctl(ifname, SIOCSIWMGNTSEND, &iwr); } -#endif +//#endif int wext_set_gen_ie(const char *ifname, char *buf, __u16 buf_len, __u16 flags) { struct iwreq iwr; diff --git a/USDK/component/common/api/wifi_api.c b/USDK/component/common/api/wifi_api.c index 9364126..a08c936 100644 --- a/USDK/component/common/api/wifi_api.c +++ b/USDK/component/common/api/wifi_api.c @@ -552,13 +552,21 @@ LOCAL int _wifi_on(rtw_mode_t mode) { chk_ap_netif_num(); // set wifi mib - wext_set_adaptivity(wifi_cfg.adaptivity & 3); // rtw_adaptivity_mode_t +// extern uint8_t rtw_adaptivity_en; +// rtw_adaptivity_en = 0; +// wext_set_adaptivity(RTW_ADAPTIVITY_DISABLE); // rtw_adaptivity_mode_t + wext_set_adaptivity(wifi_cfg.adaptivity & 3); + + debug_printf("Wlan0 init...\n"); ret = rltk_wlan_init(WLAN0_IDX, mode); // rtw_mode_t + debug_printf("netif_set_up 0...\n"); + netif_set_up(&xnetif[0]); if (ret < 0) return ret; if(devnum) { + debug_printf("Wlan1 init...\n"); ret = rltk_wlan_init(WLAN1_IDX, mode); if (ret < 0) return ret; netif_set_up(&xnetif[1]); @@ -567,15 +575,17 @@ LOCAL int _wifi_on(rtw_mode_t mode) { netif_set_down(&xnetif[1]); } + debug_printf("Wlan start...\n"); + uint32 timeout = xTaskGetTickCount(); rltk_wlan_start(WLAN0_IDX); if(devnum) rltk_wlan_start(WLAN1_IDX); while (1) { if (rltk_wlan_running(WLAN0_IDX) && rltk_wlan_running(devnum) ) { -#if CONFIG_DEBUG_LOG > 2 - printf("WIFI initialized (%d ms)\n", xTaskGetTickCount() - timeout); -#endif +//#if CONFIG_DEBUG_LOG > 2 + debug_printf("WIFI initialized (%d ms)\n", xTaskGetTickCount() - timeout); +//#endif break; } if(xTaskGetTickCount() - timeout > wifi_test_timeout_ms/portTICK_RATE_MS) { @@ -648,6 +658,10 @@ int wifi_run(rtw_mode_t mode) { error_printf("Wifi On failed!\n"); goto error_end; }; +/* + if(wifi_cfg.adaptivity) + wext_set_adaptivity(wifi_cfg.adaptivity & 3); +*/ if(wifi_set_country(wifi_cfg.country_code) != RTW_SUCCESS) { error_printf("WiFi: Error set tx country_code (%d)!", wifi_cfg.country_code); }; @@ -692,9 +706,11 @@ int wifi_run(rtw_mode_t mode) { case RTW_MODE_STA: ret = wifi_run_st(); if(_wext_set_lps_dtim(0, wifi_st_cfg.dtim)!= RTW_SUCCESS) { - error_printf("WiFi: Error set DTIM(%d)!", wifi_st_cfg.dtim); + error_printf("WiFi: Error set DTIM(%d)!", wifi_st_cfg.dtim); }; if(_wext_enable_powersave(0, wifi_st_cfg.sleep & 1, (wifi_st_cfg.sleep >> 1) & 1) != RTW_SUCCESS) { + // rtw_pm_set_ips(get_padaptern(0), wifi_st_cfg.sleep & 1 ); + // rtw_pm_set_lps(get_padaptern(0), (wifi_st_cfg.sleep >> 1) & 1 ); error_printf("WiFi: Error set powersave mode!"); }; break; @@ -887,3 +903,22 @@ int show_wifi_ap_clients(void) { printf("Get AP clients error!\n"); return -1; } + + +extern int max_skbbuf_used_num, skbbuf_used_num, max_skbdata_used_num, skbdata_used_num, max_timer_used_num; +void show_wlan_info(int idx) +{ + if(rltk_wlan_info[idx].enable) { + struct net_device_stats * stats = rltk_wlan_info[idx].dev->get_stats(rltk_wlan_info[idx].dev); + if(stats) { + printf("\tTotal %d packets received (%d bytes), dropped %d\n", stats->rx_packets, stats->rx_bytes, stats->rx_dropped); + printf("\tTotal %d packets transmitted (%d bytes), dropped %d\n", stats->tx_packets, stats->tx_bytes, stats->tx_dropped); + printf("\tRX fifo overflow count %d\n", stats->rx_overflow); + + printf("\tMax skb %d bufers used, buffers %d\n", max_skbbuf_used_num, skbbuf_used_num); + printf("\tMax skb %d data used, data %d\n", max_skbdata_used_num, skbdata_used_num); + printf("\tMax %d timers used\n", max_timer_used_num); +// printf("\tMax %d timers used, timers %d\n", max_timer_used_num, timer_used_num); + } + } +} diff --git a/USDK/component/common/api/wifi_api.h b/USDK/component/common/api/wifi_api.h index de113be..5734950 100644 --- a/USDK/component/common/api/wifi_api.h +++ b/USDK/component/common/api/wifi_api.h @@ -154,6 +154,7 @@ void show_wifi_st_ip(void); void show_wifi_cfg(void); void show_wifi_st_cfg(void); void show_wifi_ap_cfg(void); +void show_wlan_info(int idx); int show_wifi_ap_clients(void); uint32 read_wifi_cfg(uint32 flg); uint32 write_wifi_cfg(uint32 flg); diff --git a/USDK/component/common/application/xmodem/uart_fw_update.c b/USDK/component/common/application/xmodem/uart_fw_update.c index 2aceb5f..7620dc7 100644 --- a/USDK/component/common/application/xmodem/uart_fw_update.c +++ b/USDK/component/common/application/xmodem/uart_fw_update.c @@ -2,8 +2,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/application/xmodem/xmport_loguart.h b/USDK/component/common/application/xmodem/xmport_loguart.h index 27c3abf..3ed1cb4 100644 --- a/USDK/component/common/application/xmodem/xmport_loguart.h +++ b/USDK/component/common/application/xmodem/xmport_loguart.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _XMPORT_LOGUART_H_ diff --git a/USDK/component/common/application/xmodem/xmport_uart.h b/USDK/component/common/application/xmodem/xmport_uart.h index 2d8134c..1deedef 100644 --- a/USDK/component/common/application/xmodem/xmport_uart.h +++ b/USDK/component/common/application/xmodem/xmport_uart.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _XMPORT_UART_H_ diff --git a/USDK/component/common/drivers/wlan/realtek/include/ieee80211.h b/USDK/component/common/drivers/wlan/realtek/include/ieee80211.h index 69b98d7..2ef7f75 100644 --- a/USDK/component/common/drivers/wlan/realtek/include/ieee80211.h +++ b/USDK/component/common/drivers/wlan/realtek/include/ieee80211.h @@ -20,6 +20,8 @@ #ifndef __IEEE80211_H #define __IEEE80211_H +#include "wlan_bssdef.h" + #ifndef CONFIG_RTL8711FW // #include diff --git a/USDK/component/common/drivers/wlan/realtek/include/rtw_cmd.h b/USDK/component/common/drivers/wlan/realtek/include/rtw_cmd.h index 79b6ce1..f471f39 100644 --- a/USDK/component/common/drivers/wlan/realtek/include/rtw_cmd.h +++ b/USDK/component/common/drivers/wlan/realtek/include/rtw_cmd.h @@ -20,6 +20,7 @@ #ifndef __RTW_CMD_H_ #define __RTW_CMD_H_ +#include "drv_types.h" #include #include diff --git a/USDK/component/common/drivers/wlan/realtek/include/wifi_constants.h b/USDK/component/common/drivers/wlan/realtek/include/wifi_constants.h index dd67dc1..6528726 100644 --- a/USDK/component/common/drivers/wlan/realtek/include/wifi_constants.h +++ b/USDK/component/common/drivers/wlan/realtek/include/wifi_constants.h @@ -7,8 +7,7 @@ ****************************************************************************** * @attention * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. + * * * Copyright(c) 2016, Realtek Semiconductor Corporation. All rights reserved. ****************************************************************************** diff --git a/USDK/component/common/drivers/wlan/realtek/include/wifi_lib.h b/USDK/component/common/drivers/wlan/realtek/include/wifi_lib.h index f92608d..70b5421 100644 --- a/USDK/component/common/drivers/wlan/realtek/include/wifi_lib.h +++ b/USDK/component/common/drivers/wlan/realtek/include/wifi_lib.h @@ -8,6 +8,7 @@ #include "osdep_service.h" #include "freertos/wrapper.h" #include "rtl_bios_data.h" +#include "rtw_cmd.h" #define _atr_aligned2_ __attribute__((aligned(2))) #define _atr_aligned4_ __attribute__((aligned(4))) @@ -739,6 +740,23 @@ struct evt_priv { uint32_t evt_done_cnt; }; +struct dvobj_priv { + void *if1; + void *if2; + void *padapters[2]; + uint8_t iface_nums; + uint8_t RtOutPipe[3]; + uint8_t Queue2Pipe[8]; + uint8_t irq_alloc; + uint8_t irq_enabled; + _lock irq_th_lock; +}; + +struct fifo_more_data { + uint32_t more_data; + uint32_t len; +}; + struct _io_ops { int (*init_io_priv)(struct dvobj_priv *); int (*write8_endian)(struct dvobj_priv *, uint32_t, uint32_t, uint32_t); @@ -1227,18 +1245,6 @@ typedef struct net_device *_nic_hdl; }; */ -struct dvobj_priv { - void *if1; - void *if2; - void *padapters[2]; - uint8_t iface_nums; - uint8_t RtOutPipe[3]; - uint8_t Queue2Pipe[8]; - uint8_t irq_alloc; - uint8_t irq_enabled; - _lock irq_th_lock; -}; - struct phy_info { uint8_t RxPWDBAll; uint8_t SignalQuality; @@ -1484,11 +1490,6 @@ struct sta_info { }; */ -struct fifo_more_data { - uint32_t more_data; - uint32_t len; -}; - struct hw_xmit { _queue *sta_queue; int accnt; @@ -1877,7 +1878,6 @@ enum _PS_BBRegBackup_ // : sint32_t }; typedef struct _power_mgn_ Power_Mgn; - /* // hal_gpio.h enum $E1AD70AB12E7AA6E98B8D89D9B965EB5 //: sint32_t { diff --git a/USDK/component/common/drivers/wlan/realtek/include/wifi_structures.h b/USDK/component/common/drivers/wlan/realtek/include/wifi_structures.h index 3634d8a..7a380af 100644 --- a/USDK/component/common/drivers/wlan/realtek/include/wifi_structures.h +++ b/USDK/component/common/drivers/wlan/realtek/include/wifi_structures.h @@ -7,8 +7,7 @@ ****************************************************************************** * @attention * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. + * * * Copyright(c) 2016, Realtek Semiconductor Corporation. All rights reserved. ****************************************************************************** diff --git a/USDK/component/common/drivers/wlan/realtek/src/osdep/freertos/wrapper.h b/USDK/component/common/drivers/wlan/realtek/src/osdep/freertos/wrapper.h index fd6cf96..1c8b7c6 100644 --- a/USDK/component/common/drivers/wlan/realtek/src/osdep/freertos/wrapper.h +++ b/USDK/component/common/drivers/wlan/realtek/src/osdep/freertos/wrapper.h @@ -32,6 +32,7 @@ #include #ifdef PLATFORM_FREERTOS #include "freertos_service.h" +#include "osdep_service.h" #elif defined(PLATFORM_CMSIS_RTOS) #include "rtx_service.h" #endif diff --git a/USDK/component/common/file_system/fatfs/disk_if/src/sdcard.c b/USDK/component/common/file_system/fatfs/disk_if/src/sdcard.c index 2385832..aa723f8 100644 --- a/USDK/component/common/file_system/fatfs/disk_if/src/sdcard.c +++ b/USDK/component/common/file_system/fatfs/disk_if/src/sdcard.c @@ -3,8 +3,6 @@ * * Copyright (c) 2014 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ //#if FATFS_DISK_SD diff --git a/USDK/component/common/file_system/fatfs/disk_if/src/usbdisk.c b/USDK/component/common/file_system/fatfs/disk_if/src/usbdisk.c index 016b32c..d144066 100644 --- a/USDK/component/common/file_system/fatfs/disk_if/src/usbdisk.c +++ b/USDK/component/common/file_system/fatfs/disk_if/src/usbdisk.c @@ -3,8 +3,6 @@ * * Copyright (c) 2014 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "integer.h" #include diff --git a/USDK/component/common/mbed/hal_ext/efuse_api.h b/USDK/component/common/mbed/hal_ext/efuse_api.h index 26e28dd..45286bc 100644 --- a/USDK/component/common/mbed/hal_ext/efuse_api.h +++ b/USDK/component/common/mbed/hal_ext/efuse_api.h @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/hal_ext/flash_api.h b/USDK/component/common/mbed/hal_ext/flash_api.h index 00ab5d2..213b671 100644 --- a/USDK/component/common/mbed/hal_ext/flash_api.h +++ b/USDK/component/common/mbed/hal_ext/flash_api.h @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ #ifndef MBED_EXT_FLASH_API_EXT_H diff --git a/USDK/component/common/mbed/hal_ext/i2s_api.h b/USDK/component/common/mbed/hal_ext/i2s_api.h index 8533af3..dd2b6ce 100644 --- a/USDK/component/common/mbed/hal_ext/i2s_api.h +++ b/USDK/component/common/mbed/hal_ext/i2s_api.h @@ -3,8 +3,6 @@ * Copyright (c) 2015, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/analogin_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/analogin_api.c index 18c5d14..8df9e6a 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/analogin_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/analogin_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/efuse_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/efuse_api.c index f2345ae..5ad4ddd 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/efuse_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/efuse_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/ethernet_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/ethernet_api.c index 18bf0fc..16505cb 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/ethernet_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/ethernet_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/flash_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/flash_api.c index 86978a6..a8523b2 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/flash_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/flash_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/gpio_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/gpio_api.c index a664876..e71aa68 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/gpio_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/gpio_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ #include "objects.h" diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/gpio_irq_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/gpio_irq_api.c index 8926572..8818798 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/gpio_irq_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/gpio_irq_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ #include "objects.h" diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/i2c_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/i2c_api.c index cc7f095..172cc71 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/i2c_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/i2c_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/i2s_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/i2s_api.c index cc83b8a..19134ed 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/i2s_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/i2s_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2015, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ #include "objects.h" diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/log_uart_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/log_uart_api.c index cb0f60c..171af80 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/log_uart_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/log_uart_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/nfc_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/nfc_api.c index 87aa22d..25b1261 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/nfc_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/nfc_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ #include "objects.h" diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/pinmap.c b/USDK/component/common/mbed/targets/hal/rtl8195a/pinmap.c index c0dfdf0..6ac5277 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/pinmap.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/pinmap.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ //#include "mbed_assert.h" diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/port_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/port_api.c index 5457cab..46aa576 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/port_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/port_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ #include "objects.h" diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/rtc_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/rtc_api.c index bfdf1b1..332bad1 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/rtc_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/rtc_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2015, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. *******************************************************************************/ #include "rtc_api.h" diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/serial_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/serial_api.c index 0f495b6..fa4a62d 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/serial_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/serial_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/timer_api.c b/USDK/component/common/mbed/targets/hal/rtl8195a/timer_api.c index 836649a..408e519 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/timer_api.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/timer_api.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/timer_api.h b/USDK/component/common/mbed/targets/hal/rtl8195a/timer_api.h index e36d485..e726434 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/timer_api.h +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/timer_api.h @@ -2,8 +2,7 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * -* This module is a confidential and proprietary property of RealTek and -* possession or use of this module requires written permission of RealTek. + * *******************************************************************************/ #ifndef MBED_EXT_TIMER_API_EXT_H #define MBED_EXT_TIMER_API_EXT_H diff --git a/USDK/component/common/mbed/targets/hal/rtl8195a/us_ticker.c b/USDK/component/common/mbed/targets/hal/rtl8195a/us_ticker.c index b41dfbc..985ad74 100644 --- a/USDK/component/common/mbed/targets/hal/rtl8195a/us_ticker.c +++ b/USDK/component/common/mbed/targets/hal/rtl8195a/us_ticker.c @@ -3,8 +3,6 @@ * Copyright (c) 2014, Realtek Semiconductor Corp. * All rights reserved. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. ******************************************************************************* */ #include "objects.h" diff --git a/USDK/component/os/os_dep/device_lock.c b/USDK/component/os/os_dep/device_lock.c index 18522f6..9ecce1b 100644 --- a/USDK/component/os/os_dep/device_lock.c +++ b/USDK/component/os/os_dep/device_lock.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "osdep_service.h" diff --git a/USDK/component/os/os_dep/include/device_lock.h b/USDK/component/os/os_dep/include/device_lock.h index 7560254..db9dc07 100644 --- a/USDK/component/os/os_dep/include/device_lock.h +++ b/USDK/component/os/os_dep/include/device_lock.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _DEVICE_LOCK_H_ diff --git a/USDK/component/os/os_dep/include/osdep_service.h b/USDK/component/os/os_dep/include/osdep_service.h index ab38c52..90797d1 100644 --- a/USDK/component/os/os_dep/include/osdep_service.h +++ b/USDK/component/os/os_dep/include/osdep_service.h @@ -8,8 +8,7 @@ ****************************************************************************** * @attention * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. + * * * Copyright(c) 2016, Realtek Semiconductor Corporation. All rights reserved. ****************************************************************************** diff --git a/USDK/component/soc/realtek/8195a/cmsis/device/app_start.c b/USDK/component/soc/realtek/8195a/cmsis/device/app_start.c index 07ff402..b12d478 100644 --- a/USDK/component/soc/realtek/8195a/cmsis/device/app_start.c +++ b/USDK/component/soc/realtek/8195a/cmsis/device/app_start.c @@ -3,8 +3,7 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. + * */ //#include "build_info.h" #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/cmsis/device/diag.h b/USDK/component/soc/realtek/8195a/cmsis/device/diag.h index b81c084..ee8b7d6 100644 --- a/USDK/component/soc/realtek/8195a/cmsis/device/diag.h +++ b/USDK/component/soc/realtek/8195a/cmsis/device/diag.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _DIAG_H_ diff --git a/USDK/component/soc/realtek/8195a/cmsis/device/rand.h b/USDK/component/soc/realtek/8195a/cmsis/device/rand.h index 47ac51e..608ac9e 100644 --- a/USDK/component/soc/realtek/8195a/cmsis/device/rand.h +++ b/USDK/component/soc/realtek/8195a/cmsis/device/rand.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ u32 diff --git a/USDK/component/soc/realtek/8195a/cmsis/device/rtl_stdlib.h b/USDK/component/soc/realtek/8195a/cmsis/device/rtl_stdlib.h index aa54e7c..5f16a07 100644 --- a/USDK/component/soc/realtek/8195a/cmsis/device/rtl_stdlib.h +++ b/USDK/component/soc/realtek/8195a/cmsis/device/rtl_stdlib.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL_STDLIB_H_ diff --git a/USDK/component/soc/realtek/8195a/cmsis/device/strproc.h b/USDK/component/soc/realtek/8195a/cmsis/device/strproc.h index 49c66f6..bc74337 100644 --- a/USDK/component/soc/realtek/8195a/cmsis/device/strproc.h +++ b/USDK/component/soc/realtek/8195a/cmsis/device/strproc.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _STRPROC_H_ diff --git a/USDK/component/soc/realtek/8195a/cmsis/device/va_list.h b/USDK/component/soc/realtek/8195a/cmsis/device/va_list.h index d3a1dd1..724688b 100644 --- a/USDK/component/soc/realtek/8195a/cmsis/device/va_list.h +++ b/USDK/component/soc/realtek/8195a/cmsis/device/va_list.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _VA_LIST_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_adc.h b/USDK/component/soc/realtek/8195a/fwlib/hal_adc.h index fbea89e..efcad11 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_adc.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_adc.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_ADC_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_api.h b/USDK/component/soc/realtek/8195a/fwlib/hal_api.h index c50b6e7..43c8b5b 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_api.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_api.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_API_H_ #define _HAL_API_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_common.h b/USDK/component/soc/realtek/8195a/fwlib/hal_common.h index 113c1a1..24e39bc 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_common.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_common.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_COMMON_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_crypto.h b/USDK/component/soc/realtek/8195a/fwlib/hal_crypto.h index fe76e2d..4269dfe 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_crypto.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_crypto.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_diag.h b/USDK/component/soc/realtek/8195a/fwlib/hal_diag.h index 9e3f4ad..2c4ec26 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_diag.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_diag.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_DIAG_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_gdma.h b/USDK/component/soc/realtek/8195a/fwlib/hal_gdma.h index 6807363..90cc02d 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_gdma.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_gdma.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_GDMA_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_gpio.h b/USDK/component/soc/realtek/8195a/fwlib/hal_gpio.h index c7140f8..d9ac4a5 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_gpio.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_gpio.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_GPIO_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_i2c.h b/USDK/component/soc/realtek/8195a/fwlib/hal_i2c.h index c80bd4c..3a2e08c 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_i2c.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_i2c.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_I2C_H_ //#ifndef _HAL_I2C_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_i2s.h b/USDK/component/soc/realtek/8195a/fwlib/hal_i2s.h index 066b689..d602868 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_i2s.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_i2s.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_I2S_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_irqn.h b/USDK/component/soc/realtek/8195a/fwlib/hal_irqn.h index ac1ff95..2e3b368 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_irqn.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_irqn.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_IRQN_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_log_uart.h b/USDK/component/soc/realtek/8195a/fwlib/hal_log_uart.h index 63e770b..d85552a 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_log_uart.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_log_uart.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_LOG_UART_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_mii.h b/USDK/component/soc/realtek/8195a/fwlib/hal_mii.h index b2b5f66..3e98aef 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_mii.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_mii.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_MII_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_misc.h b/USDK/component/soc/realtek/8195a/fwlib/hal_misc.h index 040cd5d..cb64311 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_misc.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_misc.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _MISC_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_nfc.h b/USDK/component/soc/realtek/8195a/fwlib/hal_nfc.h index b73dada..f43f952 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_nfc.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_nfc.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_NFC_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_pcm.h b/USDK/component/soc/realtek/8195a/fwlib/hal_pcm.h index fa34432..3ef53f2 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_pcm.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_pcm.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_PCM_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_peri_on.h b/USDK/component/soc/realtek/8195a/fwlib/hal_peri_on.h index abcbdd0..0a23a16 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_peri_on.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_peri_on.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_PERI_ON_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_platform.h b/USDK/component/soc/realtek/8195a/fwlib/hal_platform.h index 61b37a8..4d02f4c 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_platform.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_platform.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_PLATFORM_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_pwm.h b/USDK/component/soc/realtek/8195a/fwlib/hal_pwm.h index 6876975..f63c5e0 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_pwm.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_pwm.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_PWM_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_sdio.h b/USDK/component/soc/realtek/8195a/fwlib/hal_sdio.h index 86d607b..68887f9 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_sdio.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_sdio.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_SDIO_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_sdio_host.h b/USDK/component/soc/realtek/8195a/fwlib/hal_sdio_host.h index 1603e31..a51bd6c 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_sdio_host.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_sdio_host.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_SDIO_HOST_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_sdr_controller.h b/USDK/component/soc/realtek/8195a/fwlib/hal_sdr_controller.h index 89c99bc..0a10a41 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_sdr_controller.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_sdr_controller.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_SDR_CONTROLLER_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_spi_flash.h b/USDK/component/soc/realtek/8195a/fwlib/hal_spi_flash.h index abb4b26..e223c5e 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_spi_flash.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_spi_flash.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_ssi.h b/USDK/component/soc/realtek/8195a/fwlib/hal_ssi.h index 64d13cf..d44b8a9 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_ssi.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_ssi.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_SSI_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_timer.h b/USDK/component/soc/realtek/8195a/fwlib/hal_timer.h index 750b346..876de71 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_timer.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_timer.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_TIMER_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_uart.h b/USDK/component/soc/realtek/8195a/fwlib/hal_uart.h index 06f6c3b..d154f38 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_uart.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_uart.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_UART_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_usb.h b/USDK/component/soc/realtek/8195a/fwlib/hal_usb.h index 3de8fa2..61ad80c 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_usb.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_usb.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_USB_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_util.h b/USDK/component/soc/realtek/8195a/fwlib/hal_util.h index 612ac0e..c4afab7 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_util.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_util.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_UTIL_H_ #define _HAL_UTIL_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/hal_vector_table.h b/USDK/component/soc/realtek/8195a/fwlib/hal_vector_table.h index e1eb2fb..e623a0a 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/hal_vector_table.h +++ b/USDK/component/soc/realtek/8195a/fwlib/hal_vector_table.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/fw_loader_main.c b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/fw_loader_main.c index be37a3f..62122e4 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/fw_loader_main.c +++ b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/fw_loader_main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c index dd478e1..914e5b6 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c +++ b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/rtl_boot.c @@ -8,6 +8,7 @@ #include "rtl_bios_data.h" #include "diag.h" #include "rtl8195a/rtl8195a_sys_on.h" +#include "rtl8195a/rtl8195a_sdr.h" #include "hal_spi_flash.h" @@ -30,7 +31,7 @@ #define DEFAULT_BOOT_CPU_CLOCK_SEL_VALUE (DEFAULT_BOOT_CLK_CPU-6) #endif #endif // DEFAULT_BOOT_CLK_CPU - +#define FIX_SDR_CALIBRATION // for speed #define BOOT_RAM_TEXT_SECTION // __attribute__((section(".boot.text"))) //------------------------------------------------------------------------- @@ -65,7 +66,6 @@ extern _LONG_CALL_ VOID HalInitPlatformLogUartV02(VOID); extern _LONG_CALL_ VOID HalInitPlatformTimerV02(VOID); //extern _LONG_CALL_ VOID DramInit_rom(IN DRAM_DEVICE_INFO *DramInfo); //extern _LONG_CALL_ u32 SdrCalibration_rom(VOID); -extern _LONG_CALL_ int SdrControllerInit_rom(PDRAM_DEVICE_INFO pDramInfo); extern _LONG_CALL_ u32 SpicCmpDataForCalibrationRtl8195A(void); // compare read_data and golden_data //extern _LONG_CALL_ VOID SpicWaitWipDoneRtl8195A(SPIC_INIT_PARA SpicInitPara); // wait spi-flash status register[0] = 0 //extern _LONG_CALL_ VOID SpicLoadInitParaFromClockRtl8195A(u8 CpuClkMode, u8 BaudRate, PSPIC_INIT_PARA pSpicInitPara); @@ -100,14 +100,14 @@ LOCAL void BOOT_RAM_TEXT_SECTION SetDebugFlgs() { CfgSysDebugErr = -1; ConfigDebugWarn = -1; // ConfigDebugInfo = 0; - ConfigDebugErr = -1; + ConfigDebugErr = ~_DBG_SDR_; #elif CONFIG_DEBUG_LOG > 0 // CfgSysDebugWarn = 0; // CfgSysDebugInfo = 0; CfgSysDebugErr = -1; // ConfigDebugWarn = 0; // ConfigDebugInfo = 0; - ConfigDebugErr = -1; + ConfigDebugErr = ~_DBG_SDR_; #else // CfgSysDebugWarn = 0; // CfgSysDebugInfo = 0; @@ -281,11 +281,137 @@ LOCAL int BOOT_RAM_TEXT_SECTION InitSpic(uint8 SpicBitMode) { } ACTCK_FLASH_CCTRL(1); SLPCK_FLASH_CCTRL(1); - HalPinCtrlRtl8195A(SPI_FLASH, 0, 1); + HalPinCtrlRtl8195A(SPI_FLASH, 0, ON); InitSpicFlashType(&spic_table_flash); return SetSpicBitMode(SpicBitMode); } +LOCAL void INFRA_START_SECTION sdr_preinit(void) { + + LDO25M_CTRL(ON); + + HAL_SYS_CTRL_WRITE32(REG_SYS_REGU_CTRL0, + ((HAL_SYS_CTRL_READ32(REG_SYS_REGU_CTRL0) & 0xfffff) | BIT_SYS_REGU_LDO25M_ADJ(0x03))); // ROM: BIT_SYS_REGU_LDO25M_ADJ(0x0e)? + + SRAM_MUX_CFG(0x2); + + SDR_CLK_SEL(SDR_CLOCK_SEL_VALUE); // REG_PESOC_CLK_SEL + + HAL_PERI_ON_WRITE32(REG_GPIO_PULL_CTRL4, 0); + + ACTCK_SDR_CCTRL(ON); + SLPCK_SDR_CCTRL(ON); + + HalPinCtrlRtl8195A(SDR, 0, ON); // SDR_PIN_FCTRL(ON); + + HAL_PERI_ON_WRITE32(REG_GPIO_PULL_CTRL4, 0); + + MEM_CTRL_FCTRL(ON); + + // HalDelayUs(3000); +} + +#ifdef CONFIG_SDR_EN +#ifndef FIX_SDR_CALIBRATION +extern _LONG_CALL_ int SdrCalibration_rom(void); +extern _LONG_CALL_ unsigned int Rand(void); +extern _LONG_CALL_ int SdrControllerInit_rom(PDRAM_DEVICE_INFO pDramInfo); + +LOCAL int INFRA_START_SECTION sdr_test(u32 LoopCnt) { + u32 LoopIndex = 0; + u32 Value32, Addr; + for (LoopIndex = 0; LoopIndex < LoopCnt; LoopIndex++) { + Value32 = Rand(); + Addr = Rand(); + Addr &= 0x1FFFFF; + Addr &= (~0x3); + HAL_SDRAM_WRITE32(Addr, Value32); + if (HAL_SDRAM_READ32(Addr) != Value32) + return 0; + } + return 1; +} +#endif + +LOCAL int INFRA_START_SECTION sdr_init_from_flash(void) { + // WRAP_MISC setting + HAL_SDR_WRITE32(REG_SDR_MISC, 0x00000001); + // PCTL setting + HAL_SDR_WRITE32(REG_SDR_DCR, 0x00000008); + HAL_SDR_WRITE32(REG_SDR_IOCR, 0x00000000); + HAL_SDR_WRITE32(REG_SDR_EMR2, 0x00000000); + HAL_SDR_WRITE32(REG_SDR_EMR1, 0x00000006); + HAL_SDR_WRITE32(REG_SDR_MR, 0x00000022); + HAL_SDR_WRITE32(REG_SDR_DRR, 0x09030e07); + HAL_SDR_WRITE32(REG_SDR_TPR0, 0x00002652); + HAL_SDR_WRITE32(REG_SDR_TPR1, 0x00068873); + HAL_SDR_WRITE32(REG_SDR_TPR2, 0x00000042); + // set all_mode _idle + HAL_SDR_WRITE32(REG_SDR_CSR, 0x700); + // start to init + HAL_SDR_WRITE32(REG_SDR_CCR, 0x01); + while ((HAL_SDR_READ32(REG_SDR_CCR) & 0x1) == 0x0); + // enter mem_mode + HAL_SDR_WRITE32(REG_SDR_CSR, 0x600); + +#ifdef FIX_SDR_CALIBRATION // for speed :) +#if 0 + // read calibration data from system data FLASH_SDRC_PARA_BASE + u32 reg = HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_SYSPLL_CTRL1); + u32 value = 0x00190031; + if(reg & BIT17) value = 0x00060031; + else if((reg & 0x70) == 0) value = 0x00230031; + HAL_PERI_ON_WRITE32(REG_PESOC_MEM_CTRL, value); +#else + #if DEFAULT_BOOT_CLK_CPU < 6 + HAL_PERI_ON_WRITE32(REG_PESOC_MEM_CTRL, 0x00060031); + #elif DEFAULT_BOOT_CLK_CPU == 7 + HAL_PERI_ON_WRITE32(REG_PESOC_MEM_CTRL, 0x00230031); + #else + HAL_PERI_ON_WRITE32(REG_PESOC_MEM_CTRL, 0x00190031); + #endif +#endif + return 1; +#else + union { u8 b[8]; u16 s[4]; u32 l[2]; u64 d;} value; + // read calibration data from system data FLASH_SDRC_PARA_BASE + u32 reg = HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_SYSPLL_CTRL1); + u32 faddr = SPI_FLASH_BASE + FLASH_SDRC_PARA_BASE + ((reg & 0x70) >> 1) + ((reg & BIT17) >> 11) ; // step 8 in FLASH_SDRC_PARA_BASE[64 + 64 bytes] + value.d = *((volatile u64 *)faddr); + DBG_8195A("SDR flash calibration [%08x] %02x-%02x-%02x\n", faddr, value.b[0], value.b[4], value.b[6]); + if(value.s[0] == 0xFE01 && (value.b[4]^value.b[5]) == 0xFF && (value.b[6]^value.b[7]) == 0xFF) { + HAL_SDR_WRITE32(REG_SDR_IOCR, (HAL_SDR_READ32(REG_SDR_IOCR) & 0xff) | ((u32)value.b[4] << PCTL_IOCR_RD_PIPE_BFO)); + SDR_DDL_FCTRL((u32)value.b[6]); + if(sdr_test(7)) + return 1; // ok + else + DBG_8195A("Not valid SDR calibration in flash!\n"); + } else + DBG_8195A("Error SDR calibration in flash!\n"); + if(SdrCalibration_rom()) { +// DBG_8195A("SDR calibration: %02x-%02x-%02x\n", value.b[0], value.b[4], value.b[6]); + value.s[0] = 0xFE01; + value.b[4] = HAL_SDR_READ32(REG_SDR_IOCR) >> PCTL_IOCR_RD_PIPE_BFO; + value.b[5] = value.b[4] ^ 0xFF; + value.b[6] = HAL_PERI_ON_READ32(REG_PESOC_MEM_CTRL) >> BIT_SHIFT_PESOC_SDR_DDL_CTRL; + value.b[7] = value.b[6] ^ 0xFF; + // DBG_8195A("%08x: %02x-%02x-%02x)\n", faddr, value.b[0], value.b[4], value.b[6]); + if((*((volatile u16 *)(faddr)) & value.s[0]) == value.s[0] + && (*((volatile u32 *)(faddr + 4)) & value.l[1]) == value.l[1]) { + *((volatile u32 *)(faddr + 4)) = value.l[1]; + DBG_8195A("Write new calibration [%08x] %02x-%02x-%02x\n", faddr, value.b[0], value.b[4], value.b[6]); + HalDelayUs(1000); + *((volatile u16 *)(faddr)) = value.s[0]; + } else { + DBG_8195A("Work recalibration: %02x-%02x-%02x!\n", value.b[0], value.b[4], value.b[6]); + } + return 2; // recalibration - ok + } else + DBG_8195A("SDR recalibration fail!\n"); + return 0; +#endif // FIX_SDR_CALIBRATION +} +#endif // CONFIG_SDR_EN /* SYSPlatformInit */ LOCAL void INFRA_START_SECTION SYSPlatformInit(void) { @@ -474,23 +600,21 @@ LOCAL int BOOT_RAM_TEXT_SECTION loadUserImges(int imgnum) { while (1) { faddr = (faddr + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1)); - uint32 img_id = load_img2_head(faddr, &hdr); // проверить заголовки запись + uint32 img_id = load_img2_head(faddr, &hdr); if ((img_id >> 8) > 4 && (uint8) img_id != 0) { // есть подпись "RTKW" + RUN или SWP, сегмент != unknown - // загрузить, если imagenum == imgnum - faddr = load_segs(faddr + 0x10, (PIMG2HEAD) &hdr.seg, imagenum == imgnum); // faddr == fnextaddr - if (imagenum == imgnum) { // если искомая img + faddr = load_segs(faddr + 0x10, (PIMG2HEAD) &hdr.seg, imagenum == imgnum); + if (imagenum == imgnum) { // DBG_8195A("Image%d: %s\n", imgnum, hdr.name); break; } - imagenum++; // перейти к следующей - } else if (imagenum) { // нет подписей у заданной imgnum + imagenum++; + } else if (imagenum) { DBG_8195A("No Image%d! Trying Image0...\n", imgnum); // пробуем загрузить image по умолчанию, по записи в секторе установок flashcpy(FLASH_SYSTEM_DATA_ADDR, &faddr, sizeof(faddr)); if (faddr < 0x8000000) faddr += SPI_FLASH_BASE; - if (get_seg_id(faddr, 0x100) == SEG_ID_FLASH) { // указывает в Flash? - // будем пробовать грузить + if (get_seg_id(faddr, 0x100) == SEG_ID_FLASH) { imagenum = 0; imgnum = 0; } else { @@ -499,7 +623,7 @@ LOCAL int BOOT_RAM_TEXT_SECTION loadUserImges(int imgnum) { break; }; } else { - imagenum = -1; // нет записей image + imagenum = -1; break; } }; @@ -564,7 +688,7 @@ LOCAL void BOOT_RAM_TEXT_SECTION EnterImage15(int flg) { else DBG_8195A("\r===== Enter SRAM-Boot %d ====\n", flg); #if CONFIG_DEBUG_LOG > 1 - DBG_8195A("CPU CLK: %d Hz, SOC FUNC EN: %p\r\n", HalGetCpuClk(), + DBG_8195A("CPU CLK: %d Hz, SOC FUNC EN: %p\n", HalGetCpuClk(), HAL_PERI_ON_READ32(REG_SOC_FUNC_EN)); #endif uint8 ChipId = _Get_ChipId(); @@ -572,27 +696,24 @@ LOCAL void BOOT_RAM_TEXT_SECTION EnterImage15(int flg) { //----- SDRAM Off SDR_PIN_FCTRL(OFF); LDO25M_CTRL(OFF); - HAL_PERI_ON_WRITE32(REG_SOC_FUNC_EN, HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) | BIT(21)); // Flag SDRAM Init + HAL_PERI_ON_WRITE32(REG_SOC_FUNC_EN, HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) | BIT(21)); // Flag SDRAM Init or None } else { //----- SDRAM On - LDO25M_CTRL(ON); - HAL_SYS_CTRL_WRITE32(REG_SYS_REGU_CTRL0, - (HAL_SYS_CTRL_READ32(REG_SYS_REGU_CTRL0) & 0xfffff) | BIT_SYS_REGU_LDO25M_ADJ(0x0e)); - SDR_PIN_FCTRL(ON); + sdr_preinit(); + }; if (!InitSpic(SpicDualBitMode)) { - DBG_8195A("Spic Init Error!\n"); + DBG_8195A("Spic Init fail!\n"); RtlConsolRam(); }; - if ((HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) & BIT(21)) == 0) { // Flag SDRAM Init? -// extern DRAM_DEVICE_INFO SdrDramInfo_rom; // 50 MHz - if (!SdrControllerInit_rom(&SdrDramInfo)) { // 100 MHz - DBG_8195A("SDR Controller Init fail!\n"); + if ((HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) & BIT(21)) == 0) { // Flag SDRAM No ReInit? + if(!sdr_init_from_flash()) { + DBG_8195A("SDR Init fail!\n"); RtlConsolRam(); } #if 0 // Test SDRAM else { - uint32 *ptr = SDR_SDRAM_BASE; + uint32 *ptr = (uint32 *)SDR_SDRAM_BASE; uint32 tt = 0x55AA55AA; for (int i = 0; i < 512 * 1024; i++) { ptr[i] = tt++; @@ -605,9 +726,9 @@ LOCAL void BOOT_RAM_TEXT_SECTION EnterImage15(int flg) { } tt++; }; - DBG_8195A("SDR tst end\n"); + DBG_8195A("SDR test end\n"); }; -#endif // test +#endif // Test SDRAM #ifdef CONFIG_SDR_EN // Тест и ожидание загрузки Jlink-ом sdram.bin (~7 sec) if(flg && *((uint32 *)0x1FFF0000) == 0x12345678) { @@ -615,9 +736,11 @@ LOCAL void BOOT_RAM_TEXT_SECTION EnterImage15(int flg) { uint32 tt = 0x03ffffff; // ~7 sec DBG_8195A("Waiting for SDRAM to load...\n"); while(*((volatile uint32 *)0x1FFF0000) == 0x87654321 && tt--); + if(*((volatile uint32 *)0x1FFF0000) == 1) + DBG_8195A("SDRAM load ok\n"); } -#endif // test - HAL_PERI_ON_WRITE32(REG_SOC_FUNC_EN, HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) | BIT(21)); // Flag SDRAM Init +#endif // CONFIG_SDR_EN + HAL_PERI_ON_WRITE32(REG_SOC_FUNC_EN, HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) | BIT(21)); // Flag SDRAM No ReInit }; if (!flg) diff --git a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/startup.c b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/startup.c index c09b301..b308f1a 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/startup.c +++ b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/startup.c @@ -171,12 +171,16 @@ extern HAL_GPIO_ADAPTER gBoot_Gpio_Adapter; uint8 ChipId = HalGetChipId(); if (ChipId >= CHIP_ID_8195AM) { #ifdef CONFIG_SDR_EN - if((HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) & BIT(21)) == 0) { // уже загружена? + if((HAL_PERI_ON_READ32(REG_SOC_FUNC_EN) & BIT(21)) == 0) { // ещё не инициализирована? SdrCtrlInit(); - if(SdrControllerInit()) { + if(!SdrControllerInit()) { DBG_8195A("SDR Controller Init fail!\n"); }; - }; + } else if (CPU_CLOCK_SEL_DIV5_3) { // clk 5/6 + if(((HAL_PERI_ON_READ32(REG_PESOC_MEM_CTRL) >> BIT_SHIFT_PESOC_SDR_DDL_CTRL) & 0xFF) < 0x15) { + SDR_DDL_FCTRL(0x23); + } + } #endif // clear SDRAM bss extern uint8 __sdram_bss_start__[]; diff --git a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/Rtl8195a_otg_zero.h b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/Rtl8195a_otg_zero.h index ef24f40..ca53d6f 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/Rtl8195a_otg_zero.h +++ b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/Rtl8195a_otg_zero.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef RTL8195A_OTG_ZERO_H diff --git a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/dwc_otg_common.h b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/dwc_otg_common.h index 934afc7..343e9d6 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/dwc_otg_common.h +++ b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/dwc_otg_common.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "basic_types.h" #include diff --git a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/hal_otg.h b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/hal_otg.h index 5c0f669..3d131e2 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/hal_otg.h +++ b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/hal_otg.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _HAL_OTG_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/rtl8195a_otg.h b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/rtl8195a_otg.h index 2d9c884..86be644 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/rtl8195a_otg.h +++ b/USDK/component/soc/realtek/8195a/fwlib/ram_lib/usb_otg/include/rtl8195a_otg.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL8195A_OTG_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_adc.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_adc.h index 48240b0..cd2e9af 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_adc.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_adc.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL8195A_ADC_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gdma.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gdma.h index b384942..47020d1 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gdma.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gdma.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gpio.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gpio.h index 30f25fa..4b02daf 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gpio.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_gpio.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2c.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2c.h index bf6190f..076d359 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2c.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2c.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL8195A_I2C_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2s.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2s.h index d466f9a..e726bfe 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2s.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_i2s.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_mii.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_mii.h index c243523..512db12 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_mii.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_mii.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL8195A_MII_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_nfc.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_nfc.h index 3b58167..605007a 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_nfc.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_nfc.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pcm.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pcm.h index c2bd793..93ea092 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pcm.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pcm.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pwm.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pwm.h index b675c24..3337f91 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pwm.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_pwm.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio.h index 500fe7c..3059436 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio_host.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio_host.h index 82d3f26..ddb6129 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio_host.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_sdio_host.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_ssi.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_ssi.h index 2e4bcc3..35edef4 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_ssi.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_ssi.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL8195A_SSI_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_timer.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_timer.h index 5424a74..020803a 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_timer.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_timer.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL8195A_TIMER_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_uart.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_uart.h index c0786ab..be6c358 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_uart.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_uart.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_usb.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_usb.h index 58f682e..c59a705 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_usb.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_usb.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL8195A_USB_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_wdt.h b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_wdt.h index edbedd2..798eb25 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_wdt.h +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/rtl8195a_wdt.h @@ -3,8 +3,6 @@ * * Copyright (c) 2014 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTL8195A_WDT_H_ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_adc.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_adc.c index 4c1d3a7..3150d72 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_adc.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_adc.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_dac.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_dac.c index a9bc7a7..1236f18 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_dac.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_dac.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_gdma.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_gdma.c index 5400456..e02ccf4 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_gdma.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_gdma.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_gpio.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_gpio.c index eb89fe4..05982e8 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_gpio.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_gpio.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_i2c.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_i2c.c index 8383cb5..64125ab 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_i2c.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_i2c.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_i2s.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_i2s.c index 8417fe9..e41cfa2 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_i2s.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_i2s.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_mii.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_mii.c index dc4af97..e6b7f06 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_mii.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_mii.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_nfc.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_nfc.c index d375226..9a077d2 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_nfc.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_nfc.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_pcm.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_pcm.c index 0b0197f..c0ac5b0 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_pcm.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_pcm.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_sdio_device.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_sdio_device.c index 951ad08..28094ff 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_sdio_device.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_sdio_device.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_ssi.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_ssi.c index d896a75..3c50b36 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_ssi.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_ssi.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_timer.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_timer.c index 581c4c4..54d02bc 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_timer.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_timer.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" #include "rtl8195a_timer.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_uart.c b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_uart.c index 9eb2a3d..d41027b 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_uart.c +++ b/USDK/component/soc/realtek/8195a/fwlib/rtl8195a/src/rtl8195a_uart.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_32k.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_32k.c index 0977a08..4553915 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_32k.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_32k.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_adc.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_adc.c index a5c6abb..c9e43fa 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_adc.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_adc.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "basic_types.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_common.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_common.c index 6594168..0d7a8f1 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_common.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_common.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_dac.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_dac.c index 81d1382..9feac2a 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_dac.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_dac.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_gdma.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_gdma.c index a3f242e..9b4a643 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_gdma.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_gdma.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_gpio.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_gpio.c index b683a90..0074097 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_gpio.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_gpio.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_i2c.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_i2c.c index eb628a2..2f56dd3 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_i2c.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_i2c.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_i2s.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_i2s.c index 2cd8163..0c4cc88 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_i2s.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_i2s.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_mii.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_mii.c index 5f14504..555f636 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_mii.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_mii.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_nfc.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_nfc.c index 324b57e..ccff2ea 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_nfc.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_nfc.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_pcm.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_pcm.c index e3a09e6..8ce0bc5 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_pcm.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_pcm.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_sdr_controller.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_sdr_controller.c index 1051f1d..a95e121 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_sdr_controller.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_sdr_controller.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" #include "platform_opts.h" @@ -109,7 +107,7 @@ DRAM_DEVICE_INFO SdrDramInfo = { #ifdef FPGA #ifdef FPGA_TEMP -#define MAX_TAP_DLY 0xC +#define MAX_TAP_DLY 0x22 #else #define MAX_TAP_DLY 0x7F #define SPEC_MAX_TAP 0xFF @@ -398,7 +396,7 @@ SdrControllerInit( VOID ) { -// ConfigDebugErr |= _DBG_MISC_; +// ConfigDebugErr |= _DBG_MISC_; DBG_8195A("SDR Controller Init\n"); HAL_SYS_CTRL_WRITE32(REG_SYS_REGU_CTRL0, @@ -406,9 +404,9 @@ VOID SRAM_MUX_CFG(0x2); - SDR_CLK_SEL(SDR_CLOCK_SEL_VALUE); + SDR_CLK_SEL(SDR_CLOCK_SEL_VALUE); // REG_PESOC_CLK_SEL - HAL_PERI_ON_WRITE32(REG_GPIO_PULL_CTRL4,0); + HAL_PERI_ON_WRITE32(REG_GPIO_PULL_CTRL4, 0); ACTCK_SDR_CCTRL(ON); @@ -416,22 +414,20 @@ VOID PinCtrl(SDR, 0, ON); - HAL_PERI_ON_WRITE32(REG_GPIO_PULL_CTRL4,0); + HAL_PERI_ON_WRITE32(REG_GPIO_PULL_CTRL4, 0); MEM_CTRL_FCTRL(ON); - HalDelayUs(3000); + HalDelayUs(1000); // 3000 // sdr initialization DramInit(&SdrDramInfo); // sdr calibration - if(!SdrCalibration()) { - return 0; - } - else { - return 1; - } + if(!SdrCalibration()) + return 0; // error! + else + return 1; // ok } @@ -441,7 +437,7 @@ DramInit ( IN DRAM_DEVICE_INFO *DramInfo ) { - DBG_8195A("%s(%p)\n", __func__, DramInfo); +// DBG_8195A("%s(%p)\n", __func__, DramInfo); u32 CsBstLen = 0; // 0:bst_4, 1:bst_8 u32 CasWr = 0;//, CasWrT; // cas write latency u32 CasRd = 0, CasRdT = 0, CrlSrt = 0; // cas read latency @@ -774,8 +770,8 @@ SdrCalibration( if(fspic_isinit == 0) flash_init(&flashobj); #endif //// - - u32 CpuType = ((HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_CLK_CTRL1) & (0x70)) >> 4); + valid = HAL_READ32(SYSTEM_CTRL_BASE, REG_SYS_CLK_CTRL1); + u32 CpuType = ((valid & (0x70)) >> 4) + ((valid & BIT17) >> 17) * 8; valid = RdPipe = TapCnt = 0xFFFFFFFF; value.l = HAL_READ32(SPI_FLASH_BASE, FLASH_SDRC_PARA_BASE+8*CpuType); @@ -967,7 +963,7 @@ SdrCalibration( value.b[2] = (u8)TapCnt; value.b[3] = ~value.b[2]; #if DEBUG_SDRAM > 1 - DiagPrintf("dump1w %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]); + DiagPrintf("dump2w %x, %x %x %x %x \n\r", value.l, value.b[0], value.b[1], value.b[2], value.b[3]); #endif if( HAL_READ32(SPI_FLASH_BASE, FLASH_SDRC_PARA_BASE+8*CpuType+4) == 0xFFFFFFFF) { diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_soc_ps_monitor.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_soc_ps_monitor.c index 09f0806..34bcecf 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_soc_ps_monitor.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_soc_ps_monitor.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" #include "hal_soc_ps_monitor.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_spi_flash_ram.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_spi_flash_ram.c index e30679c..d4e1afc 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_spi_flash_ram.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_spi_flash_ram.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" #include "hal_spi_flash.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_ssi.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_ssi.c index d7bb997..68fb822 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_ssi.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_ssi.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_timer.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_timer.c index 9a390db..14abaef 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_timer.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_timer.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/fwlib/src/hal_uart.c b/USDK/component/soc/realtek/8195a/fwlib/src/hal_uart.c index 8448b1c..17e1aed 100644 --- a/USDK/component/soc/realtek/8195a/fwlib/src/hal_uart.c +++ b/USDK/component/soc/realtek/8195a/fwlib/src/hal_uart.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ diff --git a/USDK/component/soc/realtek/8195a/misc/driver/rtl_consol.c b/USDK/component/soc/realtek/8195a/misc/driver/rtl_consol.c index 6e20814..2d747b4 100644 --- a/USDK/component/soc/realtek/8195a/misc/driver/rtl_consol.c +++ b/USDK/component/soc/realtek/8195a/misc/driver/rtl_consol.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtl8195a.h" diff --git a/USDK/component/soc/realtek/8195a/misc/driver/rtl_consol.h b/USDK/component/soc/realtek/8195a/misc/driver/rtl_consol.h index fd5f2a7..9fd2b6a 100644 --- a/USDK/component/soc/realtek/8195a/misc/driver/rtl_consol.h +++ b/USDK/component/soc/realtek/8195a/misc/driver/rtl_consol.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _RTK_CONSOL_H_ diff --git a/USDK/component/soc/realtek/common/bsp/section_config.h b/USDK/component/soc/realtek/common/bsp/section_config.h index d461988..87e219f 100644 --- a/USDK/component/soc/realtek/common/bsp/section_config.h +++ b/USDK/component/soc/realtek/common/bsp/section_config.h @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #ifndef _SECTION_CONFIG_H_ diff --git a/USDK/example_sources/analogin_voltage/src/main.c b/USDK/example_sources/analogin_voltage/src/main.c index ff8a06d..e84857f 100644 --- a/USDK/example_sources/analogin_voltage/src/main.c +++ b/USDK/example_sources/analogin_voltage/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/crypto/src/main.c b/USDK/example_sources/crypto/src/main.c index c958c98..ef346fe 100644 --- a/USDK/example_sources/crypto/src/main.c +++ b/USDK/example_sources/crypto/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "FreeRTOS.h" #include "task.h" diff --git a/USDK/example_sources/gdma/src/main.c b/USDK/example_sources/gdma/src/main.c index 4f144ed..bdd2395 100644 --- a/USDK/example_sources/gdma/src/main.c +++ b/USDK/example_sources/gdma/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gpio/src/main.c b/USDK/example_sources/gpio/src/main.c index 56c9c42..a1947d8 100644 --- a/USDK/example_sources/gpio/src/main.c +++ b/USDK/example_sources/gpio/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gpio_irq/src/main.c b/USDK/example_sources/gpio_irq/src/main.c index a51230b..49c81f5 100644 --- a/USDK/example_sources/gpio_irq/src/main.c +++ b/USDK/example_sources/gpio_irq/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gpio_jtag/src/main.c b/USDK/example_sources/gpio_jtag/src/main.c index bb80336..1278b00 100644 --- a/USDK/example_sources/gpio_jtag/src/main.c +++ b/USDK/example_sources/gpio_jtag/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gpio_level_irq/src/main.c b/USDK/example_sources/gpio_level_irq/src/main.c index 056e8b5..0e7b24d 100644 --- a/USDK/example_sources/gpio_level_irq/src/main.c +++ b/USDK/example_sources/gpio_level_irq/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gpio_light_weight/src/main.c b/USDK/example_sources/gpio_light_weight/src/main.c index 801b15e..2bbc833 100644 --- a/USDK/example_sources/gpio_light_weight/src/main.c +++ b/USDK/example_sources/gpio_light_weight/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gpio_port/src/main.c b/USDK/example_sources/gpio_port/src/main.c index 8c73520..acd203b 100644 --- a/USDK/example_sources/gpio_port/src/main.c +++ b/USDK/example_sources/gpio_port/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gpio_pulse_measure/src/main.c b/USDK/example_sources/gpio_pulse_measure/src/main.c index 18448bf..327ed06 100644 --- a/USDK/example_sources/gpio_pulse_measure/src/main.c +++ b/USDK/example_sources/gpio_pulse_measure/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gtimer/src/main.c b/USDK/example_sources/gtimer/src/main.c index 0fb5d6d..7827a20 100644 --- a/USDK/example_sources/gtimer/src/main.c +++ b/USDK/example_sources/gtimer/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/gtimer_rtc/src/main.c b/USDK/example_sources/gtimer_rtc/src/main.c index 149878f..81b709a 100644 --- a/USDK/example_sources/gtimer_rtc/src/main.c +++ b/USDK/example_sources/gtimer_rtc/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/i2c/src/main.c b/USDK/example_sources/i2c/src/main.c index 7afd5cf..4cbd367 100644 --- a/USDK/example_sources/i2c/src/main.c +++ b/USDK/example_sources/i2c/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "PinNames.h" diff --git a/USDK/example_sources/log_uart_char_loopback/src/main.c b/USDK/example_sources/log_uart_char_loopback/src/main.c index 58e931e..9f0c656 100644 --- a/USDK/example_sources/log_uart_char_loopback/src/main.c +++ b/USDK/example_sources/log_uart_char_loopback/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/log_uart_loopback/src/main.c b/USDK/example_sources/log_uart_loopback/src/main.c index 74f7dc4..455fca4 100644 --- a/USDK/example_sources/log_uart_loopback/src/main.c +++ b/USDK/example_sources/log_uart_loopback/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/log_uart_stream_loopback/src/main.c b/USDK/example_sources/log_uart_stream_loopback/src/main.c index 0ef41b5..1618ca9 100644 --- a/USDK/example_sources/log_uart_stream_loopback/src/main.c +++ b/USDK/example_sources/log_uart_stream_loopback/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/nfc/src/main.c b/USDK/example_sources/nfc/src/main.c index 455b59d..c30f128 100644 --- a/USDK/example_sources/nfc/src/main.c +++ b/USDK/example_sources/nfc/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "cmsis_os.h" diff --git a/USDK/example_sources/pm_deepsleep/src/main.c b/USDK/example_sources/pm_deepsleep/src/main.c index bf7a299..6edbfeb 100644 --- a/USDK/example_sources/pm_deepsleep/src/main.c +++ b/USDK/example_sources/pm_deepsleep/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/pm_deepstandby/src/main.c b/USDK/example_sources/pm_deepstandby/src/main.c index 7588f82..9085f3c 100644 --- a/USDK/example_sources/pm_deepstandby/src/main.c +++ b/USDK/example_sources/pm_deepstandby/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/pm_sleep/src/main.c b/USDK/example_sources/pm_sleep/src/main.c index 814afb1..2a3b103 100644 --- a/USDK/example_sources/pm_sleep/src/main.c +++ b/USDK/example_sources/pm_sleep/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/pwm-buzzer/src/main.c b/USDK/example_sources/pwm-buzzer/src/main.c index 3f6cf4e..02382ac 100644 --- a/USDK/example_sources/pwm-buzzer/src/main.c +++ b/USDK/example_sources/pwm-buzzer/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/pwm/src/main.c b/USDK/example_sources/pwm/src/main.c index 98b01ee..cb2168c 100644 --- a/USDK/example_sources/pwm/src/main.c +++ b/USDK/example_sources/pwm/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/rtc/src/main.c b/USDK/example_sources/rtc/src/main.c index 8cadc02..60c090b 100644 --- a/USDK/example_sources/rtc/src/main.c +++ b/USDK/example_sources/rtc/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "rtc_api.h" diff --git a/USDK/example_sources/sdio_device/src/main.c b/USDK/example_sources/sdio_device/src/main.c index cddf275..50ce9af 100644 --- a/USDK/example_sources/sdio_device/src/main.c +++ b/USDK/example_sources/sdio_device/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "FreeRTOS.h" #include "task.h" diff --git a/USDK/example_sources/spi/src/main.c b/USDK/example_sources/spi/src/main.c index 459e752..265fb12 100644 --- a/USDK/example_sources/spi/src/main.c +++ b/USDK/example_sources/spi/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2014 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/spi_pl7223/src/main.c b/USDK/example_sources/spi_pl7223/src/main.c index e21411b..d0ebf7d 100644 --- a/USDK/example_sources/spi_pl7223/src/main.c +++ b/USDK/example_sources/spi_pl7223/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include #include diff --git a/USDK/example_sources/spi_stream_twoboard/src/main.c b/USDK/example_sources/spi_stream_twoboard/src/main.c index 2ed93e7..ce19140 100644 --- a/USDK/example_sources/spi_stream_twoboard/src/main.c +++ b/USDK/example_sources/spi_stream_twoboard/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2014 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/spi_twoboard/src/main.c b/USDK/example_sources/spi_twoboard/src/main.c index 8b15fa0..f9fde4a 100644 --- a/USDK/example_sources/spi_twoboard/src/main.c +++ b/USDK/example_sources/spi_twoboard/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2014 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/uart/src/main.c b/USDK/example_sources/uart/src/main.c index 5ae87b2..3635a64 100644 --- a/USDK/example_sources/uart/src/main.c +++ b/USDK/example_sources/uart/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/uart_auto_flow_ctrl/src/main.c b/USDK/example_sources/uart_auto_flow_ctrl/src/main.c index 7f810f5..2b5c1a9 100644 --- a/USDK/example_sources/uart_auto_flow_ctrl/src/main.c +++ b/USDK/example_sources/uart_auto_flow_ctrl/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ // This example demo the function of Auto Flow control diff --git a/USDK/example_sources/uart_clock/src/main.c b/USDK/example_sources/uart_clock/src/main.c index 1a5d2e2..19e5522 100644 --- a/USDK/example_sources/uart_clock/src/main.c +++ b/USDK/example_sources/uart_clock/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/uart_irq/src/main.c b/USDK/example_sources/uart_irq/src/main.c index 7ad3067..3bc79e4 100644 --- a/USDK/example_sources/uart_irq/src/main.c +++ b/USDK/example_sources/uart_irq/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/uart_stream_dma/src/main.c b/USDK/example_sources/uart_stream_dma/src/main.c index 054579e..98d6d87 100644 --- a/USDK/example_sources/uart_stream_dma/src/main.c +++ b/USDK/example_sources/uart_stream_dma/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/uart_stream_irq/src/main.c b/USDK/example_sources/uart_stream_irq/src/main.c index 637a469..3bff3ab 100644 --- a/USDK/example_sources/uart_stream_irq/src/main.c +++ b/USDK/example_sources/uart_stream_irq/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2013 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/example_sources/watchdog/src/main.c b/USDK/example_sources/watchdog/src/main.c index 5782d1e..b8bc120 100644 --- a/USDK/example_sources/watchdog/src/main.c +++ b/USDK/example_sources/watchdog/src/main.c @@ -3,8 +3,6 @@ * * Copyright (c) 2015 Realtek Semiconductor Corp. * - * This module is a confidential and proprietary property of RealTek and - * possession or use of this module requires written permission of RealTek. */ #include "device.h" diff --git a/USDK/flasher.mk b/USDK/flasher.mk index 444fb02..ebd00c7 100644 --- a/USDK/flasher.mk +++ b/USDK/flasher.mk @@ -91,7 +91,7 @@ mp: OTA_IMAGE = $(BIN_DIR)/ota_mp.bin TST_IMAGE = $(BIN_DIR)/ram_2.bin -.PHONY: genbin1 genbin23 flashburn reset test readfullflash flashwebfs flash_OTA +.PHONY: genbin1 genbin23 flashburn reset test readfullflash flashwebfs flash_OTA runram runsdram .NOTPARALLEL: all mp genbin1 genbin23 flashburn reset test readfullflash _endgenbin flashwebfs flash_OTA all: $(ELFFILE) $(OTA_IMAGE) $(FLASH_IMAGE) _endgenbin @@ -114,11 +114,10 @@ reset: @$(JLINK_PATH)$(JLINK_EXE) -Device CORTEX-M3 -If SWD -Speed 1000 $(FLASHER_PATH)RTL_Reset.JLinkScript runram: -ifdef USE_SDRAM - $(JLINK_PATH)$(JLINK_EXE) -Device CORTEX-M3 -If SWD -Speed 1000 $(FLASHER_PATH)RTL_RunRAM_SDR.JLinkScript -else $(JLINK_PATH)$(JLINK_EXE) -Device CORTEX-M3 -If SWD -Speed 1000 $(FLASHER_PATH)RTL_RunRAM.JLinkScript -endif + +runsdram: + $(JLINK_PATH)$(JLINK_EXE) -Device CORTEX-M3 -If SWD -Speed 1000 $(FLASHER_PATH)RTL_RunRAM_SDR.JLinkScript readfullflash: @$(JLINK_PATH)$(JLINK_EXE) -Device CORTEX-M3 -If SWD -Speed 1000 $(FLASHER_PATH)RTL_FFlash.JLinkScript diff --git a/USDK/flasher/RTL_RunRAM.JLinkScript b/USDK/flasher/RTL_RunRAM.JLinkScript index 5991456..7632f1e 100644 --- a/USDK/flasher/RTL_RunRAM.JLinkScript +++ b/USDK/flasher/RTL_RunRAM.JLinkScript @@ -7,6 +7,6 @@ r loadbin build/bin/ram_1.r.bin 0x10000bc8 loadbin build/bin/ram_2.bin 0x10006000 r -w4 0x40000210,0x20111157 +w4 0x40000210,0x20111113 g q \ No newline at end of file diff --git a/flasher/RTL00ConsoleROM.JLinkScript b/flasher/RTL00ConsoleROM.JLinkScript index 5b85200..2754aa8 100644 --- a/flasher/RTL00ConsoleROM.JLinkScript +++ b/flasher/RTL00ConsoleROM.JLinkScript @@ -1,6 +1,6 @@ h loadbin flasher/RTL00Console_ROM.bin 0x10000ba8 r -w4 0x40000210,0x4011117 +w4 0x40000210,0x4011113 g q \ No newline at end of file diff --git a/flasher/RTL_Reset.JLinkScript b/flasher/RTL_Reset.JLinkScript index 3c0673f..6c89309 100644 --- a/flasher/RTL_Reset.JLinkScript +++ b/flasher/RTL_Reset.JLinkScript @@ -4,6 +4,6 @@ r1 trst1 h r -w4 0x40000210,0x0211157 +w4 0x40000210,0x0011113 g q \ No newline at end of file diff --git a/flasher/RTL_RunRAM.JLinkScript b/flasher/RTL_RunRAM.JLinkScript index 7632f1e..f8b665b 100644 --- a/flasher/RTL_RunRAM.JLinkScript +++ b/flasher/RTL_RunRAM.JLinkScript @@ -7,6 +7,6 @@ r loadbin build/bin/ram_1.r.bin 0x10000bc8 loadbin build/bin/ram_2.bin 0x10006000 r -w4 0x40000210,0x20111113 +w4 0x40000210,0x20011113 g q \ No newline at end of file diff --git a/flasher/RTL_RunRAM_SDR.JLinkScript b/flasher/RTL_RunRAM_SDR.JLinkScript new file mode 100644 index 0000000..3319606 --- /dev/null +++ b/flasher/RTL_RunRAM_SDR.JLinkScript @@ -0,0 +1,18 @@ +r0 +trst0 +r1 +trst1 +h +r +loadbin build/bin/ram_1.r.bin 0x10000bc8 +loadbin build/bin/ram_2.bin 0x10006000 +r +w4 0x40000210,0x20011113 +w4 0x1FFF0000,0x12345678 +g +sleep 3000 +h +loadbin build/bin/sdram.bin 0x30000000 +w4 0x1FFF0000,1 +g +q \ No newline at end of file diff --git a/flasher/gdb_flasher.jlink b/flasher/gdb_flasher.jlink index 2eb169c..75a75a9 100644 --- a/flasher/gdb_flasher.jlink +++ b/flasher/gdb_flasher.jlink @@ -43,32 +43,32 @@ end # Boot_Flash define SetBootFlash printf "SetBoot = Flash:\n" -monitor long 0x40000210 = 0x211157 +monitor long 0x40000210 = 0x00011113 end # Boot RAM start_addr0() Run if ( v400001F4 & 0x8000000 ) && ( v40000210 & 0x80000000 ) define SetBootCall0 printf "SetBoot = Call0:\n" -monitor long 0x40000210 = 0x80011117 +monitor long 0x40000210 = 0x80011113 end # Boot RAM start_addr1() Run if ( v40000210 & 0x20000000 ) define SetBootCall1 printf "SetBoot = Call1:\n" -monitor long 0x40000210 = 0x20011117 +monitor long 0x40000210 = 0x20011113 end # Boot RAM start_addr2() Run if ( v40000210 & 0x10000000 ) define SetBootCall2 printf "SetBoot = Call2:\n" -monitor long 0x40000210 = 0x10011117 +monitor long 0x40000210 = 0x10011113 end # Boot RAM start_addr3() Run if ( v400001F4 & 0x8000000 ) && ( v40000210 & 0x8000000 ) define SetBootCall3 printf "SetBoot = Call3:\n" -monitor long 0x40000210 = 0x8011117 +monitor long 0x40000210 = 0x8011113 end # Boot RAM start_addr4() Init console, Run if ( v40000210 & 0x4000000 ) define SetBootCall4 printf "SetBoot = Call4:\n" -monitor long 0x40000210 = 0x4011117 +monitor long 0x40000210 = 0x4011113 end # CPU CLK 166 MHz? define SetClk166MHz @@ -89,8 +89,7 @@ monitor long 0x40000304 = 0x1FC00002 monitor long 0x40000250 = 0x400 monitor long 0x40000340 = 0x0 monitor long 0x40000230 = 0xdcc4 -monitor long 0x40000210 = 0x11117 -monitor long 0x40000210 = 0x11157 +monitor long 0x40000210 = 0x11113 monitor long 0x400002c0 = 0x110011 monitor long 0x40000320 = 0xffffffff end diff --git a/flasher/gdb_init.jlink b/flasher/gdb_init.jlink index 0ffc247..7ba6f46 100644 --- a/flasher/gdb_init.jlink +++ b/flasher/gdb_init.jlink @@ -13,17 +13,17 @@ set mem inaccessible-by-default off #set remote memory-write-packet-size 4096 #set remote memory-write-packet-size fixed # Boot Flash -monitor long 0x40000210 = 0x211157 +monitor long 0x40000210 = 0x00011113 # Boot RAM start_addr0() Run if ( v400001F4 & 0x8000000 ) && ( v40000210 & 0x80000000 ) -#monitor long 0x40000210 = 0x80011117 +#monitor long 0x40000210 = 0x80011113 # Boot RAM start_addr1() Run if ( v40000210 & 0x20000000 ) -#monitor long 0x40000210 = 0x20011117 +#monitor long 0x40000210 = 0x20011113 # Boot RAM start_addr2() Run if ( v40000210 & 0x10000000 ) -#monitor long 0x40000210 = 0x10011117 +#monitor long 0x40000210 = 0x10011113 # Boot RAM start_addr3() Run if ( v400001F4 & 0x8000000 ) && ( v40000210 & 0x8000000 ) -#monitor long 0x40000210 = 0x8011117 +#monitor long 0x40000210 = 0x8011113 # Boot RAM start_addr4() Init console, Run if ( v40000210 & 0x4000000 ) -monitor long 0x40000210 = 0x4011117 +monitor long 0x40000210 = 0x4011113 # CPU CLK 166 MHz? # monitor long 0x40000014 = 0x00000011 # CPU CLK 83 MHz? diff --git a/flasher/gdb_ota.jlink b/flasher/gdb_ota.jlink index 9ed1306..9a4cf89 100644 --- a/flasher/gdb_ota.jlink +++ b/flasher/gdb_ota.jlink @@ -43,32 +43,32 @@ end # Boot_Flash define SetBootFlash printf "SetBoot = Flash:\n" -monitor long 0x40000210 = 0x211157 +monitor long 0x40000210 = 0x011113 end # Boot RAM start_addr0() Run if ( v400001F4 & 0x8000000 ) && ( v40000210 & 0x80000000 ) define SetBootCall0 printf "SetBoot = Call0:\n" -monitor long 0x40000210 = 0x80011117 +monitor long 0x40000210 = 0x80011113 end # Boot RAM start_addr1() Run if ( v40000210 & 0x20000000 ) define SetBootCall1 printf "SetBoot = Call1:\n" -monitor long 0x40000210 = 0x20011117 +monitor long 0x40000210 = 0x20011113 end # Boot RAM start_addr2() Run if ( v40000210 & 0x10000000 ) define SetBootCall2 printf "SetBoot = Call2:\n" -monitor long 0x40000210 = 0x10011117 +monitor long 0x40000210 = 0x10011113 end # Boot RAM start_addr3() Run if ( v400001F4 & 0x8000000 ) && ( v40000210 & 0x8000000 ) define SetBootCall3 printf "SetBoot = Call3:\n" -monitor long 0x40000210 = 0x8011117 +monitor long 0x40000210 = 0x8011113 end # Boot RAM start_addr4() Init console, Run if ( v40000210 & 0x4000000 ) define SetBootCall4 printf "SetBoot = Call4:\n" -monitor long 0x40000210 = 0x4011117 +monitor long 0x40000210 = 0x4011113 end # CPU CLK 166 MHz? define SetClk166MHz @@ -89,8 +89,7 @@ monitor long 0x40000304 = 0x1FC00002 monitor long 0x40000250 = 0x400 monitor long 0x40000340 = 0x0 monitor long 0x40000230 = 0xdcc4 -monitor long 0x40000210 = 0x11117 -monitor long 0x40000210 = 0x11157 +monitor long 0x40000210 = 0x11113 monitor long 0x400002c0 = 0x110011 monitor long 0x40000320 = 0xffffffff end diff --git a/project.mk b/project.mk index edc0215..f33179e 100644 --- a/project.mk +++ b/project.mk @@ -1,8 +1,8 @@ #============================================= # SDK CONFIG #============================================= -#WEB_INA219_DRV = 1 -WEB_MLX90614_DRV = 1 +WEB_INA219_DRV = 1 +#WEB_MLX90614_DRV = 1 #WEB_ADC_DRV = 1 #USE_SDCARD = 1 #USE_UVC = 1 diff --git a/project/inc/lwipopts.h b/project/inc/lwipopts.h index 7babf72..e5dd66a 100644 --- a/project/inc/lwipopts.h +++ b/project/inc/lwipopts.h @@ -152,7 +152,7 @@ a lot of data that needs to be copied, this should be set high. */ /* TCP_SND_QUEUELEN: TCP sender buffer space (pbufs). This must be at least as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work. */ -#define TCP_SND_QUEUELEN (4* TCP_SND_BUF/TCP_MSS) +#define TCP_SND_QUEUELEN (4*TCP_SND_BUF/TCP_MSS) /* TCP receive window. */ #define TCP_WND (4*TCP_MSS) // (2*TCP_MSS) diff --git a/project/inc/platform_autoconf.h b/project/inc/platform_autoconf.h index ea60c1f..10f114d 100644 --- a/project/inc/platform_autoconf.h +++ b/project/inc/platform_autoconf.h @@ -29,9 +29,9 @@ #undef CONFIG_CP #undef CONFIG_FT #define RTL8195A 1 -/* 0 - 166666666 Hz, 1 - 83333333 Hz, 2 - 41666666 Hz, 3 - 20833333 Hz, 4 - 10416666 Hz, 5 - 4000000? Hz, - 6 - 200000000 Hz, 7 - 10000000 Hz, 8 - 50000000 Hz, 9 - 25000000 Hz, 10 - 12500000 Hz, 11 - 4000000? Hz */ -#define CONFIG_CPU_CLK 1 +/* 0 - 166666666 Hz, 1 - 83333333 Hz, 2 - 41666666 Hz, 3 - 20833333 Hz, 4 - 10416666 Hz, 5 - 4000000? Hz, + 6 - 200000000 Hz, 7 - 100000000 Hz, 8 - 50000000 Hz, 9 - 25000000 Hz, 10 - 12500000 Hz, 11 - 4000000? Hz */ +#define CONFIG_CPU_CLK 0 //166.6MHZ - RUN/IDLE/SLP ~63/21/6.4 mA //83.3MHZ - RUN/IDLE/SLP ~55/15/6.4 mA //41.6MHZ - RUN/IDLE ~51/11 mA diff --git a/project/inc/tcpsrv/tcp_srv_conn.h b/project/inc/tcpsrv/tcp_srv_conn.h index 57ab07f..c2126da 100644 --- a/project/inc/tcpsrv/tcp_srv_conn.h +++ b/project/inc/tcpsrv/tcp_srv_conn.h @@ -67,12 +67,12 @@ enum srvconn_state { // максимальный размер выделяемого буфера в heap для приема порции #ifndef TCP_SRV_SERVER_MAX_RXBUF - #define TCP_SRV_SERVER_MAX_RXBUF (TCP_MSS*3) // 1460*2=2920, 1460*3=4380, 1460*4=5840 + #define TCP_SRV_SERVER_MAX_RXBUF TCP_WND // (TCP_MSS*3) // 1460*2=2920, 1460*3=4380, 1460*4=5840 #endif // размер выделяемого буфера в heap для передачи при буферизированном выводе #ifndef TCP_SRV_SERVER_DEF_TXBUF - #define TCP_SRV_SERVER_DEF_TXBUF (TCP_MSS*3) // 1460*2=2920, 1460*3=4380, 1460*4=5840 + #define TCP_SRV_SERVER_DEF_TXBUF TCP_SND_BUF //(TCP_MSS*3) // 1460*2=2920, 1460*3=4380, 1460*4=5840 #endif #define ID_CLIENTS_PORT 3 // до 3-х clients diff --git a/project/inc/web/web_srv_int.h b/project/inc/web/web_srv_int.h index 6681d79..2b28919 100644 --- a/project/inc/web/web_srv_int.h +++ b/project/inc/web/web_srv_int.h @@ -23,7 +23,7 @@ #define RESCHK_SEND_SIZE (RESCHKS_SEND_SIZE + RESCHKE_SEND_SIZE) #define MIN_SEND_SIZE (256 + RESCHK_SEND_SIZE) // минимальный размер буфера для передачи файла -#define MAX_SEND_SIZE ((TCP_MSS*4) + RESCHK_SEND_SIZE) // максимальный размер буфера для передачи 4*MSS = 5840 (MSS=1460) +#define MAX_SEND_SIZE ((TCP_SND_BUF) + RESCHK_SEND_SIZE) // ((TCP_MSS*4) + RESCHK_SEND_SIZE) // максимальный размер буфера для передачи 4*MSS = 5840 (MSS=1460) #define HTTP_SEND_SIZE 384 // минимальный размер буфера для передачи заголовка HTTP #define SCB_SEND_SIZE 128 // минимальный резерв в буфере для callback diff --git a/project/src/console/atcmd_user.c b/project/src/console/atcmd_user.c index 3debf5a..1613fd6 100644 --- a/project/src/console/atcmd_user.c +++ b/project/src/console/atcmd_user.c @@ -41,6 +41,10 @@ void fATST(int argc, char *argv[]) { (void) argc; (void) argv; ShowMemInfo(); +#if CONFIG_DEBUG_LOG > 1 + extern int min_free_heap_size; + printf("\nMin free heap size %d bytes\n", min_free_heap_size); +#endif #if 0 //CONFIG_DEBUG_LOG > 1 dump_mem_block_list(); tcm_heap_dump(); diff --git a/project/src/console/wifi_console.c b/project/src/console/wifi_console.c index 4cd0c3d..db33702 100644 --- a/project/src/console/wifi_console.c +++ b/project/src/console/wifi_console.c @@ -174,13 +174,19 @@ LOCAL void fATWI(int argc, char *argv[]) { && wifi_get_setting(wlan_ap_name, &Setting) == 0) { wifi_show_setting(wlan_ap_name, &Setting); // show_wifi_ap_ip(); - printf("\tIP: " IPSTR "\n", IP2STR(&xnetif[WLAN_AP_NETIF_NUM].ip_addr)); + printf("\tIP: " IPSTR "\n\n", IP2STR(&xnetif[WLAN_AP_NETIF_NUM].ip_addr)); +//#if CONFIG_DEBUG_LOG > 1 + show_wlan_info(WLAN_AP_NETIF_NUM); +//#endif } if((wifi_run_mode & RTW_MODE_STA) && wifi_get_setting(wlan_st_name, &Setting) == 0) { wifi_show_setting(wlan_st_name, &Setting); // show_wifi_st_ip(); - printf("\tIP: " IPSTR "\n", IP2STR(&xnetif[WLAN_ST_NETIF_NUM].ip_addr)); + printf("\tIP: " IPSTR "\n\n", IP2STR(&xnetif[WLAN_ST_NETIF_NUM].ip_addr)); +//#if CONFIG_DEBUG_LOG > 1 + show_wlan_info(WLAN_ST_NETIF_NUM); +//#endif } printf("\nWIFI config:\n"); printf(&str_rom_57ch3Dch0A[25]); // "================================\n" @@ -191,10 +197,12 @@ LOCAL void fATWI(int argc, char *argv[]) { printf("\nWIFI ST config:\n"); printf(&str_rom_57ch3Dch0A[25]); // "================================\n" show_wifi_st_cfg(); - printf("\nWIFI AP clients:\n"); - printf(&str_rom_57ch3Dch0A[25]); // "================================\n" #if SDK_VER_NUM > 0x4000 - show_wifi_ap_clients(); + if(wifi_mode & RTW_MODE_AP) { + printf("\nWIFI AP clients:\n"); + printf(&str_rom_57ch3Dch0A[25]); // "================================\n" + show_wifi_ap_clients(); + } #endif printf("\n"); } diff --git a/userset.mk b/userset.mk index 80b2342..7a408f8 100644 --- a/userset.mk +++ b/userset.mk @@ -4,7 +4,7 @@ #SDK_PATH = ../RTL00MP3/RTL00_SDKV35a/ SDK_PATH = USDK/ #GCC_PATH = d:/MCU/GNU_Tools_ARM_Embedded/6.2017-q1-update/bin/# + or set in PATH -OPENOCD_PATH = D:/MCU/OpenOCD/bin/ +#OPENOCD_PATH = D:/MCU/OpenOCD/bin/# + or set in PATH TOOLS_PATH ?= $(SDK_PATH)component/soc/realtek/8195a/misc/iar_utility/common/tools/ FLASHER_TYPE = Jlink #FLASHER_TYPE = cmsis-dap