netease
/
SmartAudio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support PLATFORM_R311 support

This commit is contained in:
HuangXin 2018-08-30 14:30:01 +08:00
parent 0a00ceb174
commit 1baa607aaf
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/netease/alarm/src/assistant.c
View File

@ -9,7 +9,7 @@
#include <time.h> #include <time.h>
#include <uthash/utlist.h> #include <uthash/utlist.h>
#if defined(PLATFORM_R16) || defined (PLATFORM_CPU) #if defined(PLATFORM_R16) || defined (PLATFORM_CPU) || defined(PLATFORM_R311)
#include "log.h" #include "log.h"
#include "libuv_dbus.h" #include "libuv_dbus.h"
#include "crypto.h" #include "crypto.h"
@ -724,6 +724,7 @@ static void __dBusDeameonCb(MODULE_NAME modName, int status)
static void __assistantSyncThread(void *pParam) static void __assistantSyncThread(void *pParam)
{ {
int ret, i = 0, isSynced = -1; int ret, i = 0, isSynced = -1;
struct tm* pTmNextYear;
LOG_EX(LOG_Debug, "Beging Sync holiday Database\n"); LOG_EX(LOG_Debug, "Beging Sync holiday Database\n");
while(TRUE) while(TRUE)

2
package/netease/libuvdbus/src/Framework/Fifo/fifo.c
View File

@ -54,7 +54,7 @@
static inline int fls(int x); static inline int fls(int x);
#ifdef PLATFORM_R16 #if defined(PLATFORM_R16) || defined(PLATFORM_R311)
static inline int constant_fls(int x) static inline int constant_fls(int x)
{ {
int r = 32; int r = 32;

4
package/netease/libuvdbus/src/Framework/Timer/timer.c
View File

@ -281,7 +281,10 @@ static int __getOnTimestamp(PALARM_ITEM_DATA pInfo)
switch(pInfo->repeatMode) switch(pInfo->repeatMode)
{ {
case REPEAT_MODE_EVERY_MONTH_DAY: case REPEAT_MODE_EVERY_MONTH_DAY:
pInfo->setDateTime.tm_mon = -1;
pInfo->setDateTime.tm_year = -1;
case REPEAT_MODE_EVERY_YEAR_DAY: case REPEAT_MODE_EVERY_YEAR_DAY:
pInfo->setDateTime.tm_year = -1;
case REPEAT_MODE_NONE: case REPEAT_MODE_NONE:
if(pInfo->setDateTime.tm_year == -1) 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) if(pInfo->repeatMode == REPEAT_MODE_EVERY_MONTH_DAY)
{ {
DEBUG_CODE_LINE();
if(pInfo->onDateTime.tm_mon < 11) if(pInfo->onDateTime.tm_mon < 11)
{ {
pInfo->onDateTime.tm_mon++; pInfo->onDateTime.tm_mon++;

2
package/netease/libuvdbus/src/Makefile
View File

@ -25,7 +25,7 @@ commonSources := \
Framework/SvrManager/svr_manager.c \ Framework/SvrManager/svr_manager.c \
Framework/Compress/zlib.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_CFLAGS += -DENABLE_COUNT_DEBUG
local_LDFLAGS := $(LIB_BUILD_COMMON_LIB) local_LDFLAGS := $(LIB_BUILD_COMMON_LIB)

2
package/netease/libuvdbus/src/include/libuv_dbus.h
View File

@ -224,6 +224,8 @@ char* CfgGetStringValue(const char* pTags, char* pDefValue);
double CfgGetFloatValue(const char* pTags, double defValue); double CfgGetFloatValue(const char* pTags, double defValue);
int CfgGetBoolValue(const char* pTags, int defValue); int CfgGetBoolValue(const char* pTags, int defValue);
void SetHBLAutoExit(int flag); void SetHBLAutoExit(int flag);
extern char *strptime(const char *s, const char *format, struct tm *tm);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
package/netease/ota/src/Makefile
View File

@ -1,7 +1,7 @@
include $(TINA_BUILD_TOP)/package/netease/Makefile.common include $(TINA_BUILD_TOP)/package/netease/Makefile.common
TARGET := ota TARGET := ota
commonSources := ota.c commonSources := ota_r311.c
local_CFLAGS := local_CFLAGS :=
local_LDFLAGS := $(BUILD_COMMON_LIB) local_LDFLAGS := $(BUILD_COMMON_LIB)