diff --git a/Makefile.wii b/Makefile.wii index 1e0f72abe1..6f37a627c5 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -7,7 +7,7 @@ PERF_TEST = 0 WHOLE_ARCHIVE_LINK = 0 BIG_STACK = 0 -PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.6" +PC_DEVELOPMENT_IP_ADDRESS = 192.168.1.138 PC_DEVELOPMENT_UDP_PORT = 3490 # system platform diff --git a/console/logger/logger.c b/console/logger/logger.c index aee1eeafd4..c4fd54dab8 100644 --- a/console/logger/logger.c +++ b/console/logger/logger.c @@ -147,8 +147,13 @@ void logger_send(const char *__format,...) va_list args; va_start(args,__format); - vsnprintf(sendbuf,4000,__format, args); + logger_send_v(__format, args); va_end(args); +} + +void logger_send_v(const char *__format, va_list args) +{ + vsnprintf(sendbuf,4000,__format, args); int len=strlen(sendbuf); sendto(sock,sendbuf,len,MSG_DONTWAIT,(struct sockaddr*)&target,sizeof(target)); diff --git a/console/logger/logger.h b/console/logger/logger.h index c176ad4959..f04622574a 100644 --- a/console/logger/logger.h +++ b/console/logger/logger.h @@ -17,6 +17,8 @@ #ifndef _LOGGER_H_ #define _LOGGER_H_ +#include + #define BUFSIZE (64 * 1024) #define TCPDUMP_STACKSIZE (16 * 1024) #define TCPDUMP_PRIO (2048) @@ -24,5 +26,6 @@ void logger_init (void); void logger_shutdown (void); void logger_send (const char *__format,...); +void logger_send_v(const char *__format, va_list args); #endif diff --git a/console/logger/logger_override.h b/console/logger/logger_override.h index 06745b6eff..a166631c0a 100644 --- a/console/logger/logger_override.h +++ b/console/logger/logger_override.h @@ -25,36 +25,76 @@ logger_send("RetroArch Salamander: " __VA_ARGS__); \ } while(0) +#define RARCH_LOG_V(tag, fmt, vp) do { \ + logger_send("RetroArch Salamander: " tag); \ + logger_send_v(fmt, vp); \ +} while (0) + #define RARCH_LOG_OUTPUT(...) do { \ logger_send("RetroArch Salamander [OUTPUT] :: " __VA_ARGS__); \ } while(0) +#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \ + logger_send("RetroArch Salamander [OUTPUT] :: " tag); \ + logger_send_v(fmt, vp); \ +} while (0) + #define RARCH_ERR(...) do { \ logger_send("RetroArch Salamander [ERROR] :: " __VA_ARGS__); \ } while(0) +#define RARCH_ERR_V(tag, fmt, vp) do { \ + logger_send("RetroArch Salamander [ERROR] :: " tag); \ + logger_send_v(fmt, vp); \ +} while (0) + #define RARCH_WARN(...) do { \ logger_send("RetroArch Salamander [WARN] :: " __VA_ARGS__); \ } while(0) +#define RARCH_WARN_V(tag, fmt, vp) do { \ + logger_send("RetroArch Salamander [WARN] :: " tag); \ + logger_send_v(fmt, vp); \ +} while (0) + #else #define RARCH_LOG(...) do { \ logger_send("RetroArch: " __VA_ARGS__); \ } while(0) +#define RARCH_LOG_V(tag, fmt, vp) do { \ + logger_send("RetroArch: " tag); \ + logger_send_v(fmt, vp); \ +} while (0) + #define RARCH_ERR(...) do { \ logger_send("RetroArch [ERROR] :: " __VA_ARGS__); \ } while(0) +#define RARCH_ERR_V(tag, fmt, vp) do { \ + logger_send("RetroArch [ERROR] :: " tag); \ + logger_send_v(fmt, vp); \ +} while (0) + #define RARCH_WARN(...) do { \ logger_send("RetroArch [WARN] :: " __VA_ARGS__); \ } while(0) +#define RARCH_WARN_V(tag, fmt, vp) do { \ + logger_send("RetroArch [WARN] :: " tag); \ + logger_send_v(fmt, vp); \ +} while (0) + #define RARCH_LOG_OUTPUT(...) do { \ logger_send("RetroArch [OUTPUT] :: " __VA_ARGS__); \ } while(0) +#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \ + logger_send("RetroArch [OUTPUT] :: " tag); \ + logger_send_v(fmt, vp); \ +} while (0) + #endif #endif