Restore sceCdRM ABI compatibility and keep safe copy

Author: NathanNeurotic

include/libcdvd_add.h

@@ -1,6 +1,3 @@
-// For size_t
-#include <stddef.h>
-
 // Initialize add-on functions. Currently only retrieves the MECHACON's version to determine what sceCdAltGetRegionParams() should do.
 int cdInitAdd(void);
 
@@ -16,8 +13,9 @@ int custom_sceCdReadRegionParams(u8 *data, u32 *stat);
  */
 int custom_sceCdReadPS1BootParam(char *param, u32 *stat);
 
-// Obtain model number from EEPROM via the mechacon SCMD 0x17
-int sceCdRM(char *ModelName, size_t modelNameSize, u32 *stat);
+// Obtain model number from EEPROM via the mechacon SCMD 0x17.
+// The caller must provide a buffer of at least 16 bytes (two 8-byte chunks).
+int sceCdRM(char *ModelName, u32 *stat);
 
 // Provides an equivalent of the sceCdBootCertify function from the newer CDVDMAN modules. The old CDVDFSV and CDVDMAN modules don't support this S-command.
 int sceCdBootCertify(const u8 *data);

src/libcdvd_add.c

@@ -66,13 +66,14 @@ int sceCdBootCertify(const u8 *data)
     return result;
 }
 
-int sceCdRM(char *ModelName, size_t modelNameSize, u32 *stat)
+int sceCdRM(char *ModelName, u32 *stat)
 {
     unsigned char rdata[9];
     unsigned char sdata;
     int result1, result2;
+    const size_t modelNameSize = 16; // Two 8-byte chunks
 
-    if (ModelName == NULL || stat == NULL || modelNameSize < 16) {
+    if (ModelName == NULL || stat == NULL) {
         return 0;
     }
 

src/modelname.c

@@ -52,7 +52,7 @@ static int ReadModelName(char *name)
 
         return 0; // Original returned -1
     } else {
-        if ((result = sceCdRM(name, MODEL_NAME_MAX_LEN, &stat)) == 1) { // Command issued successfully.
+        if ((result = sceCdRM(name, &stat)) == 1) { // Command issued successfully.
             if (stat & 0x80)
                 return -2;
             if ((stat & 0x40) || name[0] == '\0')

tools/codacy_shims/ps2sdk/ps2sdk_shim.h

@@ -241,10 +241,9 @@ static inline int sceCdMV(u8 *out, u32 *stat)
     return 0;
 }
 
-static inline int sceCdRM(char *out, size_t modelNameSize, u32 *stat)
+static inline int sceCdRM(char *out, u32 *stat)
 {
     (void)out;
-    (void)modelNameSize;
     (void)stat;
     return 0;
 }