Merge pull request #56 from CreeperMario/unrelated-fixes

Various small fixes

samples/gx2/triangle/CMakeLists.txt

@@ -11,4 +11,6 @@ target_link_libraries(triangle
     defaultheap
     gx2
     gfd
-    proc_ui)
+    nsysnet
+    proc_ui
+    sysapp)

samples/gx2/triangle/src/main.c

@@ -113,7 +113,7 @@ exit:
    WHBLogPrintf("Exiting...");
    GX2RDestroyBufferEx(&positionBuffer, 0);
    GX2RDestroyBufferEx(&colourBuffer, 0);
-   //WHBUnmountSdCard(); !! freezes on unmount for unkown reason !!
+   WHBUnmountSdCard();
    WHBGfxShutdown();
    WHBProcShutdown();
    return result;

src/crt/newlib.c

@@ -70,7 +70,7 @@ static int __libwut_lock_close(int *lock)
 
 static int __libwut_lock_acquire(int *lock)
 {
-   OSMutex *mutex = (OSMutex *)lock;
+   OSMutex *mutex = (OSMutex *)*lock;
    if (!lock || *lock == 0) {
       return -1;
    }
@@ -81,7 +81,7 @@ static int __libwut_lock_acquire(int *lock)
 
 static int __libwut_lock_release(int *lock)
 {
-   OSMutex *mutex = (OSMutex *)lock;
+   OSMutex *mutex = (OSMutex *)*lock;
    if (!lock || *lock == 0) {
       return -1;
    }

src/libwhb/include/whb/log_cafe.h

@@ -0,0 +1,21 @@
+#pragma once
+#include <wut.h>
+
+/**
+ * \defgroup whb_log_cafe Cafe OS System Log Output
+ * \ingroup whb
+ * @{
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+BOOL
+WHBLogCafeInit();
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */

src/libwhb/src/log_cafe.c

@@ -0,0 +1,15 @@
+#include <coreinit/debug.h>
+#include <whb/log.h>
+
+static void
+cafeLogHandler(const char * msg)
+{
+   OSReport("%s\n", msg);
+}
+
+BOOL
+WHBLogCafeInit()
+{
+   WHBAddLogHandler(cafeLogHandler);
+   return TRUE;
+}

src/libwhb/src/sdcard.c

@@ -67,6 +67,8 @@ WHBUnmountSdCard()
       return TRUE;
    }
 
+   FSInitCmdBlock(&cmd);
+
    result = FSUnmount(&sClient, &cmd, sMountPath, -1);
    if (result < 0) {
       WHBLogPrintf("%s: FSUnmount error %d", __FUNCTION__, result);