diff --git a/package/netease/alarm/src/assistant.c b/package/netease/alarm/src/assistant.c index e086684b4..ae471b99e 100644 --- a/package/netease/alarm/src/assistant.c +++ b/package/netease/alarm/src/assistant.c @@ -9,7 +9,7 @@ #include #include -#if defined(PLATFORM_R16) || defined (PLATFORM_CPU) +#if defined(PLATFORM_R16) || defined (PLATFORM_CPU) || defined(PLATFORM_R311) #include "log.h" #include "libuv_dbus.h" #include "crypto.h" @@ -724,6 +724,7 @@ static void __dBusDeameonCb(MODULE_NAME modName, int status) static void __assistantSyncThread(void *pParam) { int ret, i = 0, isSynced = -1; + struct tm* pTmNextYear; LOG_EX(LOG_Debug, "Beging Sync holiday Database\n"); while(TRUE) diff --git a/package/netease/libuvdbus/src/Framework/Fifo/fifo.c b/package/netease/libuvdbus/src/Framework/Fifo/fifo.c index d81a3e930..5fd3753d5 100644 --- a/package/netease/libuvdbus/src/Framework/Fifo/fifo.c +++ b/package/netease/libuvdbus/src/Framework/Fifo/fifo.c @@ -54,7 +54,7 @@ static inline int fls(int x); -#ifdef PLATFORM_R16 +#if defined(PLATFORM_R16) || defined(PLATFORM_R311) static inline int constant_fls(int x) { int r = 32; diff --git a/package/netease/libuvdbus/src/Framework/Timer/timer.c b/package/netease/libuvdbus/src/Framework/Timer/timer.c index eb019b00c..0263dd883 100644 --- a/package/netease/libuvdbus/src/Framework/Timer/timer.c +++ b/package/netease/libuvdbus/src/Framework/Timer/timer.c @@ -281,7 +281,10 @@ static int __getOnTimestamp(PALARM_ITEM_DATA pInfo) switch(pInfo->repeatMode) { case REPEAT_MODE_EVERY_MONTH_DAY: + pInfo->setDateTime.tm_mon = -1; + pInfo->setDateTime.tm_year = -1; case REPEAT_MODE_EVERY_YEAR_DAY: + pInfo->setDateTime.tm_year = -1; case REPEAT_MODE_NONE: if(pInfo->setDateTime.tm_year == -1) { @@ -347,6 +350,7 @@ static int __getOnTimestamp(PALARM_ITEM_DATA pInfo) { if(pInfo->repeatMode == REPEAT_MODE_EVERY_MONTH_DAY) { + DEBUG_CODE_LINE(); if(pInfo->onDateTime.tm_mon < 11) { pInfo->onDateTime.tm_mon++; diff --git a/package/netease/libuvdbus/src/Makefile b/package/netease/libuvdbus/src/Makefile index f08816c26..138edf1a9 100644 --- a/package/netease/libuvdbus/src/Makefile +++ b/package/netease/libuvdbus/src/Makefile @@ -25,7 +25,7 @@ commonSources := \ Framework/SvrManager/svr_manager.c \ Framework/Compress/zlib.c -local_CFLAGS := -I./include -DPLATFORM_R16 -DCURRENT_VERSION=\"$(GIT_TAG)\" +local_CFLAGS := -I./include -DPLATFORM_R311 -DCURRENT_VERSION=\"$(GIT_TAG)\" #local_CFLAGS += -DENABLE_COUNT_DEBUG local_LDFLAGS := $(LIB_BUILD_COMMON_LIB) diff --git a/package/netease/libuvdbus/src/include/libuv_dbus.h b/package/netease/libuvdbus/src/include/libuv_dbus.h index ef1a9c72f..e019b8eb6 100644 --- a/package/netease/libuvdbus/src/include/libuv_dbus.h +++ b/package/netease/libuvdbus/src/include/libuv_dbus.h @@ -224,6 +224,8 @@ char* CfgGetStringValue(const char* pTags, char* pDefValue); double CfgGetFloatValue(const char* pTags, double defValue); int CfgGetBoolValue(const char* pTags, int defValue); void SetHBLAutoExit(int flag); + +extern char *strptime(const char *s, const char *format, struct tm *tm); #ifdef __cplusplus } #endif diff --git a/package/netease/ota/src/Makefile b/package/netease/ota/src/Makefile index a19289577..c0b48f799 100644 --- a/package/netease/ota/src/Makefile +++ b/package/netease/ota/src/Makefile @@ -1,7 +1,7 @@ include $(TINA_BUILD_TOP)/package/netease/Makefile.common TARGET := ota -commonSources := ota.c +commonSources := ota_r311.c local_CFLAGS := local_LDFLAGS := $(BUILD_COMMON_LIB)