X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Ffilethread.cpp;h=5d0d5834398a6abf1c04d888c3f0bb5b6772903b;hb=0d7e70c5e34e691b15365901951700f43242065f;hp=db9c44febab4aa2135af0194469c52696020e68c;hpb=54f5867e394981dd72548990064238454a6e2395;p=virtualjaguar

diff --git a/src/gui/filethread.cpp b/src/gui/filethread.cpp
index db9c44f..5d0d583 100644
--- a/src/gui/filethread.cpp
+++ b/src/gui/filethread.cpp
@@ -1,10 +1,10 @@
 //
 // filethread.cpp - File discovery thread
 //
-// by James L. Hammons
+// by James Hammons
 // (C) 2010 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
@@ -21,7 +21,7 @@
 #include "crc32.h"
 #include "file.h"
 #include "filedb.h"
-#include "memory.h"
+//#include "memory.h"
 #include "settings.h"
 
 #define VERBOSE_LOGGING
@@ -92,10 +92,13 @@ printf("FileThread: Aborting!!!\n");
 //
 void FileThread::HandleFile(QFileInfo fileInfo)
 {
+	// Really, need to come up with some kind of cacheing scheme here, so we don't
+	// fish through these files every time we run VJ :-P
+#warning "!!! Need to come up with some kind of cacheing scheme here !!!"
 	bool haveZIPFile = (fileInfo.suffix().compare("zip", Qt::CaseInsensitive) == 0
 		? true : false);
 	uint32_t fileSize = 0;
-	uint8 * buffer = NULL;
+	uint8_t * buffer = NULL;
 
 	if (haveZIPFile)
 	{
@@ -119,17 +122,17 @@ void FileThread::HandleFile(QFileInfo fileInfo)
 		if (fileSize == 0)
 			return;
 
-		buffer = new uint8[fileSize];
+		buffer = new uint8_t[fileSize];
 		file.read((char *)buffer, fileSize);
 		file.close();
 	}
 
 	// Try to divine the file type by size & header
-	int fileType = ParseFileType(buffer[0], buffer[1], fileSize);
+	int fileType = ParseFileType(buffer, fileSize);
 
 	// Check for Alpine ROM w/Universal Header
 	bool foundUniversalHeader = HasUniversalHeader(buffer, fileSize);
-	uint32 crc;
+	uint32_t crc;
 
 //printf("FileThread: About to calc checksum on file with size %u... (buffer=%08X)\n", size, buffer);
 	if (foundUniversalHeader)
@@ -137,22 +140,18 @@ void FileThread::HandleFile(QFileInfo fileInfo)
 	else
 		crc = crc32_calcCheckSum(buffer, fileSize);
 
-	uint32 index = FindCRCIndexInFileList(crc);
-
-	if ((index != 0xFFFFFFFF) && (romList[index].flags & FF_BIOS))
-		HandleBIOSFile(buffer, crc);
-
+	uint32_t index = FindCRCIndexInFileList(crc);
 	delete[] buffer;
 
-	// Here we filter out files *not* in the DB (if configured that way) and
-	// BIOS files.
-	if (index == 0xFFFFFFFF)
+	// Here we filter out files that are *not* in the DB and of unknown type,
+	// and BIOS files. If desired, this can be overriden with a config option.
+	if ((index == 0xFFFFFFFF) && (fileType == JST_NONE))
 	{
 		// If we allow unknown software, we pass the (-1) index on, otherwise...
 		if (!allowUnknownSoftware)
 			return;								// CRC wasn't found, so bail...
 	}
-	else if (romList[index].flags & FF_BIOS)
+	else if ((index != 0xFFFFFFFF) && romList[index].flags & FF_BIOS)
 		return;
 
 //Here's a little problem. When we create the image here and pass it off to FilePicker,
@@ -164,7 +163,7 @@ void FileThread::HandleFile(QFileInfo fileInfo)
 	// See if we can fish out a label. :-)
 	if (haveZIPFile)
 	{
-		uint32 size = GetFileFromZIP(fileInfo.filePath().toAscii(), FT_LABEL, buffer);
+		uint32_t size = GetFileFromZIP(fileInfo.filePath().toAscii(), FT_LABEL, buffer);
 //printf("FT: Label size = %u bytes.\n", size);
 
 		if (size > 0)
@@ -183,59 +182,11 @@ void FileThread::HandleFile(QFileInfo fileInfo)
 	emit FoundAFile3(index, fileInfo.canonicalFilePath(), img, fileSize, foundUniversalHeader, fileType, crc);
 }
 
-//
-// Handle checking/copying BIOS files into Jaguar core memory
-//
-void FileThread::HandleBIOSFile(uint8 * buffer, uint32 crc)
-{
-/*
-	{ 0x55A0669C, "[BIOS] Atari Jaguar Developer CD (World)", FF_BIOS },
-	{ 0x687068D5, "[BIOS] Atari Jaguar CD (World)", FF_BIOS },
-	{ 0x8D15DBC6, "[BIOS] Atari Jaguar Stubulator '94 (World)", FF_BIOS },
-	{ 0xE60277BB, "[BIOS] Atari Jaguar Stubulator '93 (World)", FF_BIOS },
-	{ 0xFB731AAA, "[BIOS] Atari Jaguar (World)", FF_BIOS },
-
-uint8 jaguarBootROM[0x040000];					// 68K CPU BIOS ROM--uses only half of this!
-uint8 jaguarCDBootROM[0x040000];				// 68K CPU CD BIOS ROM (256K)
-uint8 jaguarDevBootROM1[0x040000];				// 68K CPU Stubulator 1 ROM--uses only half of this!
-uint8 jaguarDevBootROM2[0x040000];				// 68K CPU Stubulator 2 ROM--uses only half of this!
-uint8 jaguarDevCDBootROM[0x040000];				// 68K CPU Dev CD BIOS ROM (256K)
-
-enum { BIOS_NORMAL=0x01, BIOS_CD=0x02, BIOS_STUB1=0x04, BIOS_STUB2=0x08, BIOS_DEV_CD=0x10 };
-extern int biosAvailable;
-*/
-	if (crc == 0xFB731AAA && !(biosAvailable & BIOS_NORMAL))
-	{
-		memcpy(jaguarBootROM, buffer, 0x20000);
-		biosAvailable |= BIOS_NORMAL;
-	}
-	else if (crc == 0x687068D5 && !(biosAvailable & BIOS_CD))
-	{
-		memcpy(jaguarCDBootROM, buffer, 0x40000);
-		biosAvailable |= BIOS_CD;
-	}
-	else if (crc == 0x8D15DBC6 && !(biosAvailable & BIOS_STUB1))
-	{
-		memcpy(jaguarDevBootROM1, buffer, 0x20000);
-		biosAvailable |= BIOS_STUB1;
-	}
-	else if (crc == 0xE60277BB && !(biosAvailable & BIOS_STUB2))
-	{
-		memcpy(jaguarDevBootROM2, buffer, 0x20000);
-		biosAvailable |= BIOS_STUB2;
-	}
-	else if (crc == 0x55A0669C && !(biosAvailable & BIOS_DEV_CD))
-	{
-		memcpy(jaguarDevCDBootROM, buffer, 0x40000);
-		biosAvailable |= BIOS_DEV_CD;
-	}
-}
-
 //
 // Find a CRC in the ROM list (simple brute force algorithm).
 // If it's there, return the index, otherwise return $FFFFFFFF
 //
-uint32 FileThread::FindCRCIndexInFileList(uint32 crc)
+uint32_t FileThread::FindCRCIndexInFileList(uint32_t crc)
 {
 	// Instead of a simple brute-force search, we should probably do a binary
 	// partition search instead, since the CRCs are sorted numerically.