Y'know what? Nevermind.

buu342 · Mar 12, 2023 · 6bba25a · 6bba25a
1 parent 3591582
commit 6bba25a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/UNFLoader/Makefile b/UNFLoader/Makefile
@@ -19,7 +19,7 @@ else
 endif
 
 LINKER_OPTIONS := -Wl,-rpath /usr/local/lib
-CFLAGS=-D LINUX -D_XOPEN_SOURCE_EXTENDED -Wall -Wno-unknown-pragmas -g -std=c++11
+CFLAGS=-D LINUX -D_XOPEN_SOURCE_EXTENDED -Wall -Wno-unknown-pragmas -g
 
 default: $(APP)
 

diff --git a/UNFLoader/device_sc64.cpp b/UNFLoader/device_sc64.cpp
@@ -7,7 +7,6 @@ Handles SC64 USB communication.
 
 #include "device_sc64.h"
 #include <string.h>
-#include <tuple>
 #include <thread>
 #include <chrono>
 
@@ -31,12 +30,22 @@ Handles SC64 USB communication.
 #define MEMORY_ADDRESS_SDRAM        0x00000000
 
 
+/*********************************
+             Typedefs
+*********************************/
+
+typedef struct {
+    DeviceError err;
+    uint32_t    val;
+} DevTuple;
+
+
 /*********************************
         Function Prototypes
 *********************************/
 
-static DeviceError                       device_send_cmd_sc64(FTDIDevice* cart, uint8_t cmd, uint32_t arg1, uint32_t arg2);
-static std::tuple<DeviceError, uint32_t> device_check_reply_sc64(FTDIDevice* cart, uint8_t cmd);
+static DeviceError device_send_cmd_sc64(FTDIDevice* cart, uint8_t cmd, uint32_t arg1, uint32_t arg2);
+static DevTuple    device_check_reply_sc64(FTDIDevice* cart, uint8_t cmd);
 
 
 /*==============================
@@ -80,7 +89,7 @@ static DeviceError device_send_cmd_sc64(FTDIDevice* cart, uint8_t cmd, uint32_t
              and packet data size
 ==============================*/
 
-static std::tuple<DeviceError, uint32_t> device_check_reply_sc64(FTDIDevice* cart, uint8_t cmd)
+static DevTuple device_check_reply_sc64(FTDIDevice* cart, uint8_t cmd)
 {
     uint8_t buff[4];
     DWORD read;
@@ -127,9 +136,8 @@ DeviceError device_open_sc64(FTDIDevice* cart)
 {
     ULONG modem_status;
     uint32_t version;
-    uint32_t packet_size;
     DeviceError err;
-    std::tuple<DeviceError, uint32_t> retval;
+    DevTuple retval;
 
     // Open the cart
     cart->status = FT_Open(cart->device_index, &cart->handle);
@@ -179,13 +187,11 @@ DeviceError device_open_sc64(FTDIDevice* cart)
     if (err != DEVICEERR_OK)
         return err;
     retval = device_check_reply_sc64(cart, CMD_VERSION_GET);
-    err = std::get<0>(retval);
-    packet_size = std::get<1>(retval);
-    if (err != DEVICEERR_OK)
-        return err;
+    if (retval.err != DEVICEERR_OK)
+        return retval.err;
     if (FT_Read(cart->handle, &version, 4, &cart->bytes_read) != FT_OK)
         return DEVICEERR_SC64_FIRMWARECHECKFAIL;
-    if (packet_size != 4 || cart->bytes_read != 4 || version != VERSION_V2)
+    if (retval.val != 4 || cart->bytes_read != 4 || version != VERSION_V2)
         return DEVICEERR_SC64_FIRMWAREUNKNOWN;
 
     // Ok