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

fix advanscene import

This commit is contained in:
zeromus 2013-04-28 05:48:15 +00:00
parent 2a71904419
commit faf39c8f52
3 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/NDSSystem.cpp
View File

@ -588,10 +588,10 @@ int NDS_LoadROM(const char *filename, const char *physicalName, const char *logi
buf[2] = gameInfo.header.gameCode[2]; buf[2] = gameInfo.header.gameCode[2];
buf[3] = gameInfo.header.gameCode[3]; buf[3] = gameInfo.header.gameCode[3];
buf[4] = 0; buf[4] = 0;
if (advsc.checkDB(buf)) if (advsc.checkDB(buf, gameInfo.crc))
{ {
u8 sv = advsc.getSaveType(); u8 sv = advsc.getSaveType();
printf("ADVANsCEne database:\n"); printf("Found in game database by %s:\n",advsc.getIdMethod());
printf("\t* ROM save type: "); printf("\t* ROM save type: ");
if (sv == 0xFF) if (sv == 0xFF)
printf("Unknown"); printf("Unknown");

52
desmume/src/mc.cpp
View File

@ -1340,7 +1340,7 @@ void BackupDevice::forceManualBackupType()
} }
// ============================================= ADVANsCEne // ============================================= ADVANsCEne
u8 ADVANsCEne::checkDB(const char *serial) u8 ADVANsCEne::checkDB(const char *serial, u32 crc)
{ {
loaded = false; loaded = false;
FILE *fp = fopen(database_path, "rb"); FILE *fp = fopen(database_path, "rb");
@ -1366,8 +1366,15 @@ u8 ADVANsCEne::checkDB(const char *serial)
while (true) while (true)
{ {
if (fread(buf, 1, 21, fp) != 21) break; if (fread(buf, 1, 21, fp) != 21) break;
if (memcmp(&buf[4], serial, 4) == 0)
bool serialFound = (memcmp(&buf[4], serial, 4) == 0);
u32 dbcrc = LE_TO_LOCAL_32(*(u32*)(buf+8));
bool crcFound = (crc == dbcrc);
if(serialFound || crcFound)
{ {
foundAsCrc = crcFound;
foundAsSerial = serialFound;
memcpy(&crc32, &buf[8], 4); memcpy(&crc32, &buf[8], 4);
//printf("%s founded: crc32=%04X, save type %02X\n", serial, crc32, buf[12]); //printf("%s founded: crc32=%04X, save type %02X\n", serial, crc32, buf[12]);
saveType = buf[12]; saveType = buf[12];
@ -1386,6 +1393,8 @@ u8 ADVANsCEne::checkDB(const char *serial)
return false; return false;
} }
bool ADVANsCEne::getXMLConfig(const char *in_filaname) bool ADVANsCEne::getXMLConfig(const char *in_filaname)
{ {
TiXmlDocument *xml = NULL; TiXmlDocument *xml = NULL;
@ -1400,13 +1409,13 @@ bool ADVANsCEne::getXMLConfig(const char *in_filaname)
if (!el) return false; if (!el) return false;
el_configuration = el->FirstChildElement("configuration"); el_configuration = el->FirstChildElement("configuration");
if (!el_configuration) return false; if (!el_configuration) return false;
el = el_configuration->FirstChildElement("datName"); if (el) { datName = el->GetText(); } el = el_configuration->FirstChildElement("datName"); if (el) { datName = el->GetText() ? el->GetText() : ""; }
el = el_configuration->FirstChildElement("datVersion"); if (el) { datVersion = el->GetText(); } el = el_configuration->FirstChildElement("datVersion"); if (el) { datVersion = el->GetText() ? el->GetText() : ""; }
el_newDat = el_configuration->FirstChildElement("newDat"); el_newDat = el_configuration->FirstChildElement("newDat");
if (!el_newDat) return false; if (!el_newDat) return false;
el = el_newDat->FirstChildElement("datVersionURL"); if (el) { urlVersion = el->GetText(); } el = el_newDat->FirstChildElement("datVersionURL"); if (el) { urlVersion = el->GetText() ? el->GetText() : ""; }
el = el_newDat->FirstChildElement("datURL"); if (el) { urlDat = el->GetText(); } el = el_newDat->FirstChildElement("datURL"); if (el) { urlDat = el->GetText() ? el->GetText() : ""; }
delete xml; delete xml;
return true; return true;
@ -1414,7 +1423,10 @@ bool ADVANsCEne::getXMLConfig(const char *in_filaname)
u32 ADVANsCEne::convertDB(const char *in_filaname) u32 ADVANsCEne::convertDB(const char *in_filaname)
{ {
const char *saveTypeNames[] = { "Eeprom - 4 kbit", // EEPROM 4kbit //these strings are contained in the xml file, verbatim, so they function as enum values
//we leave the strings here rather than pooled elsewhere to remind us that theyre part of the advanscene format.
const char *saveTypeNames[] = {
"Eeprom - 4 kbit", // EEPROM 4kbit
"Eeprom - 64 kbit", // EEPROM 64kbit "Eeprom - 64 kbit", // EEPROM 64kbit
"Eeprom - 512 kbit", // EEPROM 512kbit "Eeprom - 512 kbit", // EEPROM 512kbit
"Fram - 256 kbit", // FRAM 256kbit ! "Fram - 256 kbit", // FRAM 256kbit !
@ -1442,8 +1454,8 @@ u32 ADVANsCEne::convertDB(const char *in_filaname)
printf("Converting DB...\n"); printf("Converting DB...\n");
if (getXMLConfig(in_filaname)) if (getXMLConfig(in_filaname))
{ {
if (!datName) return 0; if (datName.size()==0) return 0;
if (strcmp(datName, _ADVANsCEne_BASE_NAME) != 0) return 0; if (datName != _ADVANsCEne_BASE_NAME) return 0;
} }
fp = fopen(database_path, "wb"); fp = fopen(database_path, "wb");
@ -1453,8 +1465,8 @@ u32 ADVANsCEne::convertDB(const char *in_filaname)
fwrite(_ADVANsCEne_BASE_ID, 1, strlen(_ADVANsCEne_BASE_ID), fp); fwrite(_ADVANsCEne_BASE_ID, 1, strlen(_ADVANsCEne_BASE_ID), fp);
fputc(_ADVANsCEne_BASE_VERSION_MAJOR, fp); fputc(_ADVANsCEne_BASE_VERSION_MAJOR, fp);
fputc(_ADVANsCEne_BASE_VERSION_MINOR, fp); fputc(_ADVANsCEne_BASE_VERSION_MINOR, fp);
if (datVersion) if (datVersion.size())
fwrite(datVersion, 1, strlen(datVersion), fp); fwrite(&datVersion[0], 1, datVersion.size(), fp);
else else
fputc(0, fp); fputc(0, fp);
time_t __time = time(NULL); time_t __time = time(NULL);
@ -1472,11 +1484,22 @@ u32 ADVANsCEne::convertDB(const char *in_filaname)
u32 count = 0; u32 count = 0;
while (el) while (el)
{ {
el_serial = el->FirstChildElement("serial"); TiXmlElement* title = el->FirstChildElement("title");
if (fwrite(el_serial->GetText(), 1, 8, fp) != 8) if(title)
{ {
fclose(fp); return 0; //just a little diagnostic
//printf("Importing %s\n",title->GetText());
} }
else { fclose(fp); return 0; }
//zero 28-apr-2013 - serial doesnt seem to be present anymore
//el_serial = el->FirstChildElement("serial");
//if (!el_serial || fwrite(el_serial->GetText(), 1, 8, fp) != 8)
//{
// fclose(fp); return 0;
//}
fwrite("nothere",1,8,fp);
// CRC32 // CRC32
el_crc32 = el->FirstChildElement("files"); el_crc32 = el->FirstChildElement("files");
sscanf_s(el_crc32->FirstChildElement("romCRC")->GetText(), "%x", &crc32); sscanf_s(el_crc32->FirstChildElement("romCRC")->GetText(), "%x", &crc32);
@ -1518,6 +1541,7 @@ u32 ADVANsCEne::convertDB(const char *in_filaname)
count++; count++;
el = el->NextSiblingElement("game"); el = el->NextSiblingElement("game");
} }
printf("\n");
delete xml; delete xml;
fclose(fp); fclose(fp);
if (count > 0) if (count > 0)

16
desmume/src/mc.h
View File

@ -65,12 +65,13 @@ private:
u8 saveType; u8 saveType;
u32 crc32; u32 crc32;
bool loaded; bool loaded;
bool foundAsCrc, foundAsSerial;
// XML // XML
const char *datName; std::string datName;
const char *datVersion; std::string datVersion;
const char *urlVersion; std::string urlVersion;
const char *urlDat; std::string urlDat;
bool getXMLConfig(const char *in_filaname); bool getXMLConfig(const char *in_filaname);
public: public:
ADVANsCEne() : saveType(0xFF), ADVANsCEne() : saveType(0xFF),
@ -83,10 +84,15 @@ public:
} }
void setDatabase(const char *path) { loaded = false; strcpy(database_path, path); } void setDatabase(const char *path) { loaded = false; strcpy(database_path, path); }
u32 convertDB(const char *in_filaname); u32 convertDB(const char *in_filaname);
u8 checkDB(const char *serial); u8 checkDB(const char *serial, u32 crc);
u32 getSaveType() { return saveType; } u32 getSaveType() { return saveType; }
u32 getCRC32() { return crc32; } u32 getCRC32() { return crc32; }
bool isLoaded() { return loaded; } bool isLoaded() { return loaded; }
const char* getIdMethod() {
if(foundAsCrc) return "CRC";
if(foundAsSerial) return "Serial";
return "";
}
}; };