GCC14 fixes

Mostly copied over from OPL, credits to uyjulian.
rickgaiser · Jul 8, 2024 · 8f9476f · 8f9476f
1 parent 7cf4211
commit 8f9476f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/iop/cdvdfsv/src/scmd.c b/iop/cdvdfsv/src/scmd.c
@@ -121,7 +121,7 @@ static inline void rpcSCmd_cdreadModelID(void *buf)
 
     M_DEBUG("%s\n", __FUNCTION__);
 
-    r->result = sceCdReadModelID(&r->param1);
+    r->result = sceCdReadModelID((unsigned int *)&r->param1);
 }
 
 //-------------------------------------------------------------------------
@@ -132,7 +132,7 @@ static inline void rpcSCmd_cdreaddvddualinfo(void *buf)
 
     M_DEBUG("%s\n", __FUNCTION__);
 
-    r->result = sceCdReadDvdDualInfo((int *)&r->param1, &r->param2);
+    r->result = sceCdReadDvdDualInfo((int *)&r->param1, (unsigned int *)&r->param2);
 }
 
 //-------------------------------------------------------------------------

diff --git a/iop/cdvdman_emu/src/scmd.c b/iop/cdvdman_emu/src/scmd.c
@@ -188,15 +188,15 @@ int sceCdReadGUID(u64 *GUID)
 }
 
 //--------------------------------------------------------------
-int sceCdReadModelID(unsigned long int *ModelID)
+int sceCdReadModelID(unsigned int *ModelID)
 {
     M_DEBUG("%s(-)\n", __FUNCTION__);
 
     return cdvdman_readID(1, (u8 *)ModelID);
 }
 
 //-------------------------------------------------------------------------
-int sceCdReadDvdDualInfo(int *on_dual, u32 *layer1_start)
+int sceCdReadDvdDualInfo(int *on_dual, unsigned int *layer1_start)
 {
     M_DEBUG("%s(-, -)\n", __FUNCTION__);
 

diff --git a/iop/cdvdman_emu/src/searchfile.c b/iop/cdvdman_emu/src/searchfile.c
@@ -130,7 +130,7 @@ static struct dirTocEntry *cdvdman_locatefile(char *name, u32 tocLBA, int tocLen
 
                     if (!(cdvdman_settings.flags & IOPCORE_COMPAT_EMU_DVDDL)) {
                         int on_dual;
-                        u32 layer1_start;
+                        unsigned int layer1_start;
                         sceCdReadDvdDualInfo(&on_dual, &layer1_start);
 
                         if (layer)
@@ -187,7 +187,7 @@ static int cdvdman_findfile(sceCdlFILE *pcdfile, const char *name, int layer)
 
     lsn = tocEntryPointer->fileLBA;
     if (layer) {
-        sceCdReadDvdDualInfo((int *)&pcdfile->lsn, &pcdfile->size);
+        sceCdReadDvdDualInfo((int *)&pcdfile->lsn, (unsigned int *)&pcdfile->size);
         lsn += pcdfile->size;
     }
 
@@ -237,7 +237,7 @@ void cdvdman_searchfile_init(void)
     // DVD DL support
     if (!(cdvdman_settings.flags & IOPCORE_COMPAT_EMU_DVDDL)) {
         int on_dual;
-        u32 layer1_start;
+        unsigned int layer1_start;
         sceCdReadDvdDualInfo(&on_dual, &layer1_start);
         if (on_dual) {
             //u32 lsn0 = mediaLsnCount;