ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3rdparty/libchdr: Purge almost all remaining patches 

Leaving only the chd_read_header_* functions, of which exists an equivalent in later libchdr versions
This commit is contained in:
TheLastRar 2024-12-18 21:43:52 +00:00 committed by Ty
parent 3b89020082
commit 7f59757eea
4 changed files with 11 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
3rdparty/libchdr/include/libchdr/cdrom.h vendored
View File

@ -10,12 +10,10 @@
#pragma once #pragma once
#ifdef __cplusplus #ifndef __CDROM_H__
extern "C" { #define __CDROM_H__
#endif
#include <stdint.h> #include <stdint.h>
#include <stdbool.h>
#include <libchdr/chdconfig.h> #include <libchdr/chdconfig.h>
/*************************************************************************** /***************************************************************************
@ -49,15 +47,11 @@ enum
enum enum
{ {
CD_SUB_NONE = 0, /* no subcode data stored */ CD_SUB_NORMAL = 0, /* "cooked" 96 bytes per sector */
CD_SUB_RAW_INTERLEAVED, /* raw interleaved 96 bytes per sector */ CD_SUB_RAW, /* raw uninterleaved 96 bytes per sector */
CD_SUB_RAW, /* raw non-interleaved 96 bytes per sector */ CD_SUB_NONE /* no subcode data stored */
}; };
const char* cdrom_get_subtype_string(uint32_t subtype);
bool cdrom_parse_subtype_string(const char* typestring, uint32_t* subtype, uint32_t* subsize);
#define CD_FLAG_GDROM 0x00000001 /* disc is a GD-ROM, all tracks should be stored with GD-ROM metadata */ #define CD_FLAG_GDROM 0x00000001 /* disc is a GD-ROM, all tracks should be stored with GD-ROM metadata */
#define CD_FLAG_GDROMLE 0x00000002 /* legacy GD-ROM, with little-endian CDDA data */ #define CD_FLAG_GDROMLE 0x00000002 /* legacy GD-ROM, with little-endian CDDA data */
@ -87,10 +81,10 @@ static inline uint32_t lba_to_msf(uint32_t lba)
{ {
uint8_t m, s, f; uint8_t m, s, f;
m = (uint8_t)(lba / (60 * 75)); m = lba / (60 * 75);
lba -= m * (60 * 75); lba -= m * (60 * 75);
s = (uint8_t)(lba / 75); s = lba / 75;
f = (uint8_t)(lba % 75); f = lba % 75;
return ((m / 10) << 20) | ((m % 10) << 16) | return ((m / 10) << 20) | ((m % 10) << 16) |
((s / 10) << 12) | ((s % 10) << 8) | ((s / 10) << 12) | ((s % 10) << 8) |
@ -113,6 +107,4 @@ static inline uint32_t lba_to_msf_alt(int lba)
return ret; return ret;
} }
#ifdef __cplusplus #endif /* __CDROM_H__ */
} // extern "C"
#endif

2
3rdparty/libchdr/include/libchdr/chd.h vendored
View File

@ -48,7 +48,6 @@ extern "C" {
#include <libchdr/coretypes.h> #include <libchdr/coretypes.h>
#include <libchdr/chdconfig.h> #include <libchdr/chdconfig.h>
#include <stdbool.h>
/*************************************************************************** /***************************************************************************
@ -393,6 +392,7 @@ CHD_EXPORT core_file *chd_core_file(chd_file *chd);
CHD_EXPORT const char *chd_error_string(chd_error err); CHD_EXPORT const char *chd_error_string(chd_error err);
/* ----- CHD header management ----- */ /* ----- CHD header management ----- */
/* return a pointer to the extracted CHD header data */ /* return a pointer to the extracted CHD header data */

29
3rdparty/libchdr/src/libchdr_cdrom.c vendored
View File

@ -20,35 +20,6 @@
#include <libchdr/cdrom.h> #include <libchdr/cdrom.h>
const char* cdrom_get_subtype_string(uint32_t subtype)
{
switch (subtype)
{
case CD_SUB_RAW: return "RW";
case CD_SUB_RAW_INTERLEAVED: return "RW_RAW";
default: return "NONE";
}
}
bool cdrom_parse_subtype_string(const char* typestring, uint32_t* subtype, uint32_t* subsize)
{
// https://github.com/mamedev/mame/blob/d2d54fb8ed53a2e86d308067da8414f85b5929b0/src/lib/util/cdrom.cpp#L767
if (!strcmp(typestring, "RW"))
{
*subtype = CD_SUB_RAW;
*subsize = 96;
return true;
}
else if (!strcmp(typestring, "RW_RAW"))
{
*subtype = CD_SUB_RAW_INTERLEAVED;
*subsize = 96;
return true;
}
return false;
}
#ifdef WANT_RAW_DATA_SECTOR #ifdef WANT_RAW_DATA_SECTOR
/*************************************************************************** /***************************************************************************

3
3rdparty/libchdr/src/libchdr_chd.c vendored
View File

@ -42,7 +42,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <limits.h>
#include <libchdr/chd.h> #include <libchdr/chd.h>
#include <libchdr/cdrom.h> #include <libchdr/cdrom.h>
@ -1951,7 +1950,7 @@ cleanup:
memory memory
-------------------------------------------------*/ -------------------------------------------------*/
CHD_EXPORT chd_error chd_precache(chd_file* chd) CHD_EXPORT chd_error chd_precache(chd_file *chd)
{ {
INT64 count; INT64 count;
UINT64 size; UINT64 size;