fix merge

3 files changed, 2 insertions, 102 deletions

diff --git a/src/sys/sys_joybus.c b/src/sys/sys_joybus.c
index 2a8d2f6f..cd613a39 100644
--- a/src/sys/sys_joybus.c
+++ b/src/sys/sys_joybus.c
@@ -67,7 +67,7 @@ void Controller_UpdateInput(void) {
 
     for (i = 0; i < 4; i++) {
         gControllerPlugged[i] = osContGetStatus(i);
-        if ((gControllerPlugged[i] == 1) && (sNextController[i].errno == 0)) {
+        if ((gControllerPlugged[i] == 1) && (sNextController[i].err_no == 0)) {
             sPrevController[i] = gControllerHold[i];
             gControllerHold[i] = sNextController[i];
             gControllerPress[i].button =
@@ -100,11 +100,7 @@ void Controller_ReadData(void) {
 
 void Save_ReadData(void) {
     if ((gStartNMI == 0) && (Save_ReadEeprom(&gSaveIOBuffer) == 0)) {
-<<<<<<< HEAD
-        osSendMesg(&gSaveMesgQueue, (OSMesg) SI_SAVE_SUCCESS, OS_MESG_NOBLOCK);
-=======
         osSendMesg(&gSaveMesgQueue, OS_MESG_32(SI_SAVE_SUCCESS), OS_MESG_PRI_NORMAL);
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
         return;
     }
     osSendMesg(&gSaveMesgQueue, OS_MESG_32(SI_SAVE_FAILED), OS_MESG_PRI_NORMAL);
@@ -112,11 +108,7 @@ void Save_ReadData(void) {
 
 void Save_WriteData(void) {
     if ((gStartNMI == 0) && (Save_WriteEeprom(&gSaveIOBuffer) == 0)) {
-<<<<<<< HEAD
-        osSendMesg(&gSaveMesgQueue, (OSMesg) SI_SAVE_SUCCESS, OS_MESG_NOBLOCK);
-=======
         osSendMesg(&gSaveMesgQueue, OS_MESG_32(SI_SAVE_SUCCESS), OS_MESG_PRI_NORMAL);
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
         return;
     }
     osSendMesg(&gSaveMesgQueue, OS_MESG_32(SI_SAVE_FAILED), OS_MESG_PRI_NORMAL);
diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c
index d8d00476..c9ef82f0 100644
--- a/src/sys/sys_main.c
+++ b/src/sys/sys_main.c
@@ -105,31 +105,6 @@ void Main_Initialize(void) {
 void Audio_ThreadEntry(void* arg0) {
     // SPTask* task;
 
-<<<<<<< HEAD
-    AudioLoad_Init();
-    Audio_InitSounds();
-
-    task = AudioThread_CreateTask();
-    if (task != NULL) {
-        task->mesgQueue = &gAudioTaskMesgQueue;
-        task->msg = OS_MESG_32(TASK_MESG_1);
-        osWritebackDCacheAll();
-        osSendMesg(&gTaskMesgQueue, OS_MESG_PTR(task), OS_MESG_PRI_NORMAL);
-    }
-    while (true) {
-        task = AudioThread_CreateTask();
-        if (task != NULL) {
-            task->msgQueue = &gAudioTaskMsgQueue;
-            task->msg = OS_MESG_32(TASK_MESG_1);
-            osWritebackDCacheAll();
-        }
-        MQ_GET_MESG(&gAudioTaskMesgQueue, NULL);
-        if (task != NULL) {
-            osSendMesg(&gTaskMsgQueue, OS_MESG_PTR(task), OS_MESG_PRI_NORMAL);
-        }
-        MQ_WAIT_FOR_MESG(&gAudioVImesgQueue, NULL);
-    }
-=======
     // AudioLoad_Init();
     // Audio_InitSounds();
     // task = AudioThread_CreateTask();
@@ -152,7 +127,6 @@ void Audio_ThreadEntry(void* arg0) {
     //     }
     //     MQ_WAIT_FOR_MESG(&gAudioVImesgQueue, NULL);
     // }
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
 }
 
 void Graphics_SetTask(void) {
@@ -238,15 +212,9 @@ void SerialInterface_ThreadUpdate() {
 void Timer_ThreadEntry(void* arg0) {
     OSMesg sp24;
 
-<<<<<<< HEAD
     while (true) {
         MQ_WAIT_FOR_MESG(&gTimerTaskMesgQueue, &sp24);
         // Timer_CompleteTask(sp24);
-=======
-    while (1) {
-        osRecvMesg(&gTimerTaskMesgQueue, &sp24, OS_MESG_BLOCK);
-        // Timer_CompleteTask(sp24.ptr);
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
     }
 }
 
@@ -387,66 +355,6 @@ void Main_HandleRSP(void) {
     // }
 }
 
-<<<<<<< HEAD
-void Main_GetNewTasks(void) {
-    u8 i;
-    SPTask** audioTask;
-    SPTask** gfxTask;
-    SPTask** newAudioTask;
-    SPTask** newGfxTask;
-    OSMesg spTaskMsg;
-    SPTask* newTask;
-
-    newAudioTask = sNewAudioTasks;
-    newGfxTask = sNewGfxTasks;
-    for (i = 0; i < ARRAY_COUNT(sNewAudioTasks); i += 1) {
-        *(newAudioTask++) = NULL;
-    }
-    for (i = 0; i < ARRAY_COUNT(sNewGfxTasks); i += 1) {
-        *(newGfxTask++) = NULL;
-    }
-
-    newAudioTask = sNewAudioTasks;
-    newGfxTask = sNewGfxTasks;
-    while (MQ_GET_MESG(&gTaskMesgQueue, &spTaskMsg)) {
-        newTask = (SPTask*) spTaskMsg.ptr;
-        newTask->state = SPTASK_STATE_NOT_STARTED;
-
-        switch (newTask->task.t.type) {
-            case M_AUDTASK:
-                *(newAudioTask++) = newTask;
-                break;
-            case M_GFXTASK:
-                *(newGfxTask++) = newTask;
-                break;
-        }
-    }
-    newAudioTask = sNewAudioTasks;
-    newGfxTask = sNewGfxTasks;
-    audioTask = sAudioTasks;
-    gfxTask = sGfxTasks;
-
-    for (i = 0; i < ARRAY_COUNT(sAudioTasks); i += 1, audioTask++) {
-        if (*audioTask == NULL) {
-            break;
-        }
-    }
-    for (i; i < ARRAY_COUNT(sAudioTasks); i += 1) {
-        *(audioTask++) = *(newAudioTask++);
-    }
-
-    for (i = 0; i < ARRAY_COUNT(sGfxTasks); i += 1, gfxTask++) {
-        if (*gfxTask == NULL) {
-            break;
-        }
-    }
-    for (i; i < ARRAY_COUNT(sGfxTasks); i += 1) {
-        *(gfxTask++) = *(newGfxTask++);
-    }
-}
-
-=======
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
 void Main_StartNextTask(void) {
     if (sAudioTasks[0] != NULL) {
         if (gCurrentTask != NULL) {
diff --git a/src/sys/sys_save.c b/src/sys/sys_save.c
index 6e5fc6e0..153c1ae5 100644
--- a/src/sys/sys_save.c
+++ b/src/sys/sys_save.c
@@ -20,7 +20,7 @@ s32 Save_WriteBlock(s32 arg0, u8* arg1) {
         PRINTF("ＥＥＰＲＯＭ インターフェース回路反応なし (ＷＲＩＴＥ)\n");
         return -1;
     } else {
-        Timer_Wait(MSEC_TO_CYCLES(15));
+        // Timer_Wait(MSEC_TO_CYCLES(15));
         PRINTF("EEPROM WRITE %02X: %02X %02X %02X %02X %02X %02X %02X %02X\n");
         return 0;
     }