This commit is contained in:
pvvx 2017-06-28 07:13:10 +03:00
parent c32ef5a08d
commit 4b5455f7d1
14 changed files with 2379 additions and 2354 deletions

View file

@ -657,7 +657,6 @@ void fATSR(void *arg) {
void fATSV(void *arg) {
char at_buf[32];
char fw_buf[32];
char cspimode[4] = { 'S', 'D', 'Q', '?' };
if (fspic_isinit == 0) {
@ -675,9 +674,8 @@ void fATSV(void *arg) {
strcpy(at_buf, ATCMD_VERSION"."ATCMD_SUBVERSION"."ATCMD_REVISION);
// get fw version
strcpy(fw_buf, SDK_VERSION);
printf("%s,%s(%s)\n", at_buf, fw_buf, RTL8195AFW_COMPILE_TIME);
at_printf("\r\n[ATSV] OK:%s,%s(%s)", at_buf, fw_buf,
printf("%s,%s(%s)\n", at_buf, SDK_VERSION, RTL8195AFW_COMPILE_TIME);
at_printf("\r\n[ATSV] OK:%s,%s(%s)", at_buf, SDK_VERSION,
RTL8195AFW_COMPILE_TIME);
}

View file

@ -34,8 +34,13 @@ void sys_recover_ota_signature(void);
void sys_log_uart_on(void);
void sys_log_uart_off(void);
void sys_adc_calibration(u8 write, u16 *offset, u16 *gain);
u8 sys_is_sdram_power_on(void);
#ifdef CONFIG_SDR_EN
void sys_sdram_off(void);
u8 sys_is_sdram_power_on(void);
#else
#define sys_sdram_off()
#define sys_is_sdram_power_on() (0)
#endif
/**
* @brief system software reset

View file

@ -203,28 +203,16 @@ void sys_reset(void)
(1 << 2)); // SYSRESETREQ
}
#ifdef CONFIG_SDR_EN
u8 sys_is_sdram_power_on(void)
{
#ifdef CONFIG_SDR_EN
// u8 ison = 0;
//#if defined ( __ICCARM__ )
return IsSdrPowerOn();
//#endif
// return ison;
#else
return 0;
#endif
}
void sys_sdram_off(void)
{
#ifdef CONFIG_SDR_EN
//#if defined ( __ICCARM__ )
if (IsSdrPowerOn()) {
SdrPowerOff();
}
//#endif
#endif
}
#endif

View file

@ -201,6 +201,39 @@ void acquire_wakelock(uint32_t lock_id) {
#endif
}
#if 0
void pmu_acquire_wakelock(uint32_t lock_id) {
wakelock |= BIT(lock_id);
#if (configGENERATE_RUN_TIME_STATS == 1)
uint32_t i;
uint32_t current_timestamp = osKernelSysTick();
for (i=0; i<32; i++) {
if ( (1<<i & BIT(lock_id)) && (last_wakelock_state[i] == 0) ) {
last_acquire_wakelock_time[i] = current_timestamp;
last_wakelock_state[i] = 1;
}
}
#endif
}
void pmu_release_wakelock(uint32_t lock_id) {
wakelock &= ~BIT(lock_id);
#if (configGENERATE_RUN_TIME_STATS == 1)
if (generate_wakelock_stats) {
uint32_t i;
uint32_t current_timestamp = osKernelSysTick();
for (i=0; i<32; i++) {
if ( (1<<i & BIT(lock_id)) && (last_wakelock_state[i] == 1) ) {
hold_wakelock_time[i] += current_timestamp - last_acquire_wakelock_time[i];
last_wakelock_state[i] = 0;
}
}
}
#endif
}
#endif
void release_wakelock(uint32_t lock_id) {
wakelock &= ~lock_id;
@ -218,6 +251,7 @@ void release_wakelock(uint32_t lock_id) {
}
uint32_t get_wakelock_status() {
return wakelock;
}

View file

@ -114,10 +114,10 @@ void register_post_sleep_callback( freertos_sleep_callback post_sleep_cb );
void set_pll_reserved(unsigned char reserve);
/* SDK 4.0a compatible */
#define pmu_release_wakelock release_wakelock
#define pmu_acquire_wakelock acquire_wakelock
#define pmu_acquire_wakelock(nDeviceId) acquire_wakelock(1<<(nDeviceId))
#define pmu_release_wakelock(nDeviceId) release_wakelock(1<<(nDeviceId))
#define pmu_get_wakelock_status get_wakelock_status
#define pmu_set_pll_reserved set_pll_reserved
#define pmu_enable_wakelock_stats
#define pmu_set_pll_reserved set_pll_reserved
#endif