espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-12-15 10:17:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(lwip): Fix compile warning in lwip

Browse Source
This commit is contained in:
Zhang Jun Hao
2018-05-02 21:27:17 +08:00
parent 41b4173a41
commit 60d90dee90
7 changed files with 24 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
components/lwip/apps/sntp/sntp_time.c
View File

@@ -11,8 +11,6 @@
static s8_t sntp_time_timezone = 8;
static u32_t sntp_time_realtime = 0;
static int sntp_time_month;
static int sntp_time_year;
static char sntp_time_result[100];
static sntp_tm_type sntp_time_rule[2];
static sntp_tm sntp_time_result_buf;
@@ -33,7 +31,6 @@ static sntp_tm *sntp_mktm_r(const sntp_time_t *tim_p, sntp_tm *res, int is_gmtim
{
long days, rem;
sntp_time_t lcltime;
int i;
int y;
int yleap;
const int *ip;
@@ -190,61 +187,6 @@ static sntp_tm *sntp_localtime(const sntp_time_t *tim_p)
return sntp_localtime_r (tim_p, &sntp_time_result_buf);
}
static int sntp_limitstime(int year)
{
int days, year_days, years;
int i, j;
if (year < EPOCH_YEAR)
return 0;
sntp_time_year = year;
years = (year - EPOCH_YEAR);
year_days = years * 365 +
(years - 1 + EPOCH_YEARS_SINCE_LEAP) / 4 - (years - 1 + EPOCH_YEARS_SINCE_CENTURY) / 100 +
(years - 1 + EPOCH_YEARS_SINCE_LEAP_CENTURY) / 400;
for (i = 0; i < 2; ++i)
{
if (sntp_time_rule[i].ch == 'J')
days = year_days + sntp_time_rule[i].d + (isleap(year) && sntp_time_rule[i].d >= 60);
else if (sntp_time_rule[i].ch == 'D')
days = year_days + sntp_time_rule[i].d;
else
{
int yleap = isleap(year);
int m_day, m_wday, wday_diff;
const int *ip = sntp_time_mon_lengths[yleap];
days = year_days;
for (j = 1; j < sntp_time_rule[i].m; ++j)
days += ip[j-1];
m_wday = (EPOCH_WDAY + days) % DAYSPERWEEK;
wday_diff = sntp_time_rule[i].d - m_wday;
if (wday_diff < 0)
wday_diff += DAYSPERWEEK;
m_day = (sntp_time_rule[i].n - 1) * DAYSPERWEEK + wday_diff;
while (m_day >= ip[j-1])
m_day -= DAYSPERWEEK;
days += m_day;
}
/* store the change-over time in GMT form by adding offset */
sntp_time_rule[i].change = days * SECSPERDAY + sntp_time_rule[i].s + sntp_time_rule[i].offset;
}
sntp_time_month = (sntp_time_rule[0].change < sntp_time_rule[1].change);
return 1;
}
static char *sntp_asctime_r(sntp_tm *tim_p ,char *result)
{
static const char day_name[7][4] = {

3
components/lwip/apps/sntp/time.c
View File

@@ -20,6 +20,7 @@
*/
#include "c_types.h"
#include "esp_timer.h"
#include "esp_system.h"
#include "lwip/apps/sntp.h"
#include "lwip/apps/sntp/time.h"
@@ -29,6 +30,8 @@ static os_timer_t micros_overflow_timer;
static uint32 micros_at_last_overflow_tick = 0;
static uint32 micros_overflow_count = 0;
extern void sntp_set_update_delay(uint32 ms);
static void micros_overflow_tick(void * arg)
{
uint32 m = system_get_time();