diff --git a/src/httpserver/http_tcp_server.c b/src/httpserver/http_tcp_server.c index 9279a7878..352be5133 100644 --- a/src/httpserver/http_tcp_server.c +++ b/src/httpserver/http_tcp_server.c @@ -13,11 +13,7 @@ #if PLATFORM_XR809 -#define kNoErr 0 //! No error occurred. -typedef void *beken_thread_arg_t; -typedef int OSStatus; -#define close lwip_close static OS_Thread_t g_http_thread; diff --git a/src/httpserver/new_http.c b/src/httpserver/new_http.c index 9a94814ea..0ff084826 100644 --- a/src/httpserver/new_http.c +++ b/src/httpserver/new_http.c @@ -307,7 +307,6 @@ void HTTP_AddBuildFooter(http_request_t *request) { poststr(request,upTimeStr); } - // add some more output safely, sending if necessary. // call with str == NULL to force send. - can be binary. // supply length diff --git a/src/logging/logging.c b/src/logging/logging.c index 184f835a2..aa2b95929 100644 --- a/src/logging/logging.c +++ b/src/logging/logging.c @@ -7,6 +7,12 @@ #if WINDOWS #include +#elif PLATFORM_XR809 +#include +#include "lwip/sockets.h" +#include "lwip/ip_addr.h" +#include "lwip/inet.h" + #else #include "str_pub.h" #endif @@ -71,6 +77,7 @@ char *logfeaturenames[] = { "CMD:", // = 10 "NTP:", // = 11 }; + #ifdef WINDOWS @@ -219,6 +226,7 @@ static void initLog( void ) { CMD_RegisterCommand("logtype", "", log_command, "logtype direct|all - direct logs only to serial immediately", NULL); CMD_RegisterCommand("logdelay", "", log_command, "logdelay 0..n - impose ms delay after every log", NULL); + bk_printf("Commands registered!\r\n"); } // adds a log to the log memory @@ -231,6 +239,15 @@ void addLog(char *fmt, ...){ if (!initialised) { initLog(); } +//#if PLATFORM_XR809 +// +// va_start(argList, fmt); +// vsprintf(tmp, fmt, argList); +// va_end(argList); +// +// printf(tmp); +//#else + taken = xSemaphoreTake( logMemory.mutex, 100 ); va_start(argList, fmt); @@ -275,6 +292,7 @@ void addLog(char *fmt, ...){ if (log_delay){ rtos_delay_milliseconds(log_delay); } +//#endif } diff --git a/src/new_common.h b/src/new_common.h index d1c2a434b..23a435d8d 100644 --- a/src/new_common.h +++ b/src/new_common.h @@ -23,6 +23,15 @@ typedef unsigned short uint16_t; #elif PLATFORM_XR809 +#define kNoErr 0 //! No error occurred. +typedef void *beken_thread_arg_t; +typedef void *beken_thread_t; +typedef void (*beken_thread_function_t)( beken_thread_arg_t arg ); +typedef int OSStatus; + +#define BEKEN_DEFAULT_WORKER_PRIORITY (6) +#define BEKEN_APPLICATION_PRIORITY (7) + typedef int bool; #define true 1 #define false 0 @@ -39,6 +48,8 @@ typedef unsigned int UINT32; #define os_free free #define os_memset memset +#define close lwip_close + #define rtos_delay_milliseconds OS_ThreadSleep #include