diff --git a/libs/nw4r/include/nw4r/db/db_console.h b/libs/nw4r/include/nw4r/db/db_console.h index 39c942fd..c54ed8c1 100644 --- a/libs/nw4r/include/nw4r/db/db_console.h +++ b/libs/nw4r/include/nw4r/db/db_console.h @@ -43,17 +43,35 @@ namespace nw4r typedef void (*VisitStringCallback)(detail::ConsoleHead* console, u8* r4, long r5, u32 r6); //unused - u8 Console_SetVisible(detail::ConsoleHead* console, bool isVisible) { + void Console_VPrintf(detail::ConsoleHead* console, const char* format, va_list* vlist) + { + } + + //unused + u8 Console_SetVisible(detail::ConsoleHead* console, bool isVisible) + { u8 before; return 0; } + long Console_ShowLatestLine(detail::ConsoleHead* console) + { + long baseLine; + return 0; + } + //unused - long Console_SetViewBaseLine(detail::ConsoleHead* console, long line) { + long Console_SetViewBaseLine(detail::ConsoleHead* console, long line) + { long before; return 0; } + //unused + u16 Console_GetViewHeight(detail::ConsoleHead* console) + { + } + detail::ConsoleHead* Console_Create(void* buffer, u16 width, u16 height, u16 viewHeight, u16 priority, u16 attr); void Console_Destroy(detail::ConsoleHead* console); void Console_Clear(detail::ConsoleHead* console); diff --git a/libs/nw4r/src/db/db_console.cpp b/libs/nw4r/src/db/db_console.cpp index 6a152ae7..13b371a3 100644 --- a/libs/nw4r/src/db/db_console.cpp +++ b/libs/nw4r/src/db/db_console.cpp @@ -5,40 +5,42 @@ namespace nw4r { namespace db { + using namespace detail; + //unused static OSMutex sMutex; //unused - static void TerminateLine_(detail::ConsoleHead* console) + static void TerminateLine_(ConsoleHead* console) { } //unused - static u8* GetTextPtr_(detail::ConsoleHead* console, u16 line, u16 xPos) + static u8* GetTextPtr_(ConsoleHead* console, u16 line, u16 xPos) { return 0; } //unused - static u8* NextLine_(detail::ConsoleHead* console) + static u8* NextLine_(ConsoleHead* console) { return 0; } //unused - static u8* PutTab_(detail::ConsoleHead* console, u8* dstPtr) + static u8* PutTab_(ConsoleHead* console, u8* dstPtr) { return 0; } //unused - static u32 GetTabSize_(detail::ConsoleHead* console) + static u32 GetTabSize_(ConsoleHead* console) { return 0; } //unused - static u32 PutChar_(detail::ConsoleHead* console, const u8* str, u8* dstPtr) + static u32 PutChar_(ConsoleHead* console, const u8* str, u8* dstPtr) { return 0; } @@ -50,33 +52,33 @@ namespace nw4r } //unused - static detail::ConsoleHead* SearchConsoleFromListByPriority_(u16 r3) + static ConsoleHead* SearchConsoleFromListByPriority_(u16 r3) { return nullptr; } //unused - static void AppendConsoleToList_(detail::ConsoleHead* console) + static void AppendConsoleToList_(ConsoleHead* console) { } //unused - static void RemoveConsoleFromList_(detail::ConsoleHead* console) + static void RemoveConsoleFromList_(ConsoleHead* console) { } //unused - detail::ConsoleHead* Console_Create(void* buffer, u16 width, u16 height, u16 viewHeight, u16 priority, u16 attr) + ConsoleHead* Console_Create(void* buffer, u16 width, u16 height, u16 viewHeight, u16 priority, u16 attr) { } //unused - void Console_Destroy(detail::ConsoleHead* console) + void Console_Destroy(ConsoleHead* console) { } //unused - void Console_Clear(detail::ConsoleHead* console) + void Console_Clear(ConsoleHead* console) { } @@ -92,18 +94,18 @@ namespace nw4r } //unused - static void DoDrawString_(detail::ConsoleHead* console, u32 printLine, const u8* str, ut::TextWriterBase* writer) + static void DoDrawString_(ConsoleHead* console, u32 printLine, const u8* str, ut::TextWriterBase* writer) { } //unused - static void DoDrawConsole_(detail::ConsoleHead* console, ut::TextWriterBase* writer) + static void DoDrawConsole_(ConsoleHead* console, ut::TextWriterBase* writer) { } - static u16 GetRingUsedLines_(detail::ConsoleHead* console); + static u16 GetRingUsedLines_(ConsoleHead* console); - static u16 GetActiveLines_(detail::ConsoleHead* console) + static u16 GetActiveLines_(ConsoleHead* console) { u16 lines = GetRingUsedLines_(console); if(console->printXPos != 0){ @@ -113,7 +115,7 @@ namespace nw4r return lines; } - static u16 GetRingUsedLines_(detail::ConsoleHead* console) + static u16 GetRingUsedLines_(ConsoleHead* console) { long lines = console->printTop - console->ringTop; if(lines < 0){ @@ -123,12 +125,12 @@ namespace nw4r } //unused - void Console_Draw(detail::ConsoleHead* console, ut::TextWriterBase& writer) + void Console_Draw(ConsoleHead* console, ut::TextWriterBase& writer) { } //unused - void Console_DrawDirect(detail::ConsoleHead* console) + void Console_DrawDirect(ConsoleHead* console) { } @@ -143,7 +145,7 @@ namespace nw4r } //unused - static void PrintToBuffer_(detail::ConsoleHead* console, const u8* str) + static void PrintToBuffer_(ConsoleHead* console, const u8* str) { } @@ -154,49 +156,49 @@ namespace nw4r } //unused - static void Console_PrintString_(ConsoleOutputType type, detail::ConsoleHead* console, const u8* str) + static void Console_PrintString_(ConsoleOutputType type, ConsoleHead* console, const u8* str) { } //unused - void Console_VFPrintf(ConsoleOutputType type, detail::ConsoleHead* console, const char* format, va_list* vlist) + void Console_VFPrintf(ConsoleOutputType type, ConsoleHead* console, const char* format, va_list* vlist) { static u8 sStrBuf[1024]; } //unused - void Console_FPrintf(ConsoleOutputType type, detail::ConsoleHead* console, const char * format) + void Console_FPrintf(ConsoleOutputType type, ConsoleHead* console, const char * format) { } - void Console_Printf(detail::ConsoleHead* console, const char* format, ...) + void Console_Printf(ConsoleHead* console, const char* format, ...) { va_list vlist; va_start(vlist, format); } //unused - void Console_PrintfD(detail::ConsoleHead* console, const char* format, ...) + void Console_PrintfD(ConsoleHead* console, const char* format, ...) { } //unused - void Console_PrintfT(detail::ConsoleHead* console, const char* format, ...) + void Console_PrintfT(ConsoleHead* console, const char* format, ...) { } //unused - u16 Console_ChangePriority(detail::ConsoleHead* console, u16 r4) + u16 Console_ChangePriority(ConsoleHead* console, u16 r4) { return 0; } //unused - void Console_VisitString(detail::ConsoleHead* console, VisitStringCallback visitor) + void Console_VisitString(ConsoleHead* console, VisitStringCallback visitor) { } - long Console_GetTotalLines(detail::ConsoleHead* console) + long Console_GetTotalLines(ConsoleHead* console) { BOOL enabled = OSDisableInterrupts();