Merge remote-tracking branch 'upstream/master'

.github/workflows/continuous-integration-workflow.yml

@@ -10,10 +10,10 @@ jobs:
 
     steps:
     - name: Checkout libogc2
-      uses: actions/checkout@v2
+      uses: actions/checkout@main
 
     - name: Checkout libfat
-      uses: actions/checkout@v2
+      uses: actions/checkout@main
       with:
         repository: extremscorner/libfat
         path: libfat
@@ -26,7 +26,7 @@ jobs:
       working-directory: libfat
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@main
       with:
         name: libogc2
         path: /opt/devkitpro/libogc2

README.md

@@ -1,3 +1,10 @@
 # libogc2
 
 [![libogc2 build](https://github.com/extremscorner/libogc2/actions/workflows/continuous-integration-workflow.yml/badge.svg)](https://github.com/extremscorner/libogc2/actions/workflows/continuous-integration-workflow.yml)
+
+## Projects using libogc2
+
+- [GCMM](https://github.com/suloku/gcmm) - GameCube memory card manager
+- [iplboot](https://github.com/redolution/iplboot) - Minimal GameCube IPL
+- [Swiss](https://github.com/emukidid/swiss-gc) - The swiss army knife of GameCube homebrew
+- [Wii64/Cube64](https://github.com/emukidid/Wii64) - Nintendo 64 emulator

gc/ogc/cache.h

@@ -306,12 +306,13 @@ void L2Enhance(void);
 
 void LCEnable(void);
 void LCDisable(void);
+BOOL LCIsEnable(void);
 void LCLoadBlocks(void *,void *,u32);
 void LCStoreBlocks(void *,void *,u32);
 u32 LCLoadData(void *,void *,u32);
 u32 LCStoreData(void *,void *,u32);
 u32 LCQueueLength(void);
-u32 LCQueueWait(u32);
+void LCQueueWait(u32);
 void LCFlushQueue(void);
 void LCAlloc(void *,u32);
 void LCAllocNoInvalidate(void *,u32);

gc/ogc/video.h

@@ -87,6 +87,16 @@ void VIDEO_Flush(void);
  */
 void VIDEO_SetBlack(bool black);
 
+void VIDEO_Set3D(bool threeD);
+
+/*! 
+ * \fn u32 VIDEO_GetRetraceCount(void)
+ * \brief Get current retrace count
+ *
+ * \return retracecount
+ */
+u32 VIDEO_GetRetraceCount(void);
+
 
 /*! 
  * \fn u32 VIDEO_GetNextField(void)

gc/wiiuse/wpad.h

@@ -45,7 +45,13 @@ enum {
 	WPAD_BALANCE_BOARD,
 	WPAD_MAX_WIIMOTES,
 };
-
+
+#define WPAD_LED_NONE							0x00
+#define WPAD_LED_1								0x01
+#define WPAD_LED_2								0x02
+#define WPAD_LED_3								0x04
+#define WPAD_LED_4								0x08
+
 #define WPAD_BUTTON_2							0x0001
 #define WPAD_BUTTON_1							0x0002
 #define WPAD_BUTTON_B							0x0004
@@ -168,6 +174,7 @@ typedef void (*WPADDataCallback)(s32 chan, const WPADData *data);
 typedef void (*WPADShutdownCallback)(s32 chan);
 
 s32 WPAD_Init(void);
+s32 WPAD_ControlLed(s32 chan,s32 leds);
 s32 WPAD_ControlSpeaker(s32 chan,s32 enable);
 s32 WPAD_ReadEvent(s32 chan, WPADData *data);
 s32 WPAD_DroppedEvents(s32 chan);

libogc/cache.c

@@ -96,15 +96,12 @@ u32 LCStoreData(void *dstAddr,void *srcAddr,u32 nCount)
 
 u32 LCQueueLength(void)
 {
-	u32 hid2 = mfspr(920);
-	return _SHIFTR(hid2,4,4);
+	return _SHIFTR(mfspr(920),24,4);
 }
 
-u32 LCQueueWait(u32 len)
+void LCQueueWait(u32 len)
 {
-	len++;
-	while(_SHIFTR(mfspr(920),4,4)>=len);
-	return len;
+	while(_SHIFTR(mfspr(920),24,4)>len);
 }
 
 void LCFlushQueue(void)