Removed some cruft and nonstandard int/uint types, added M series BIOS.

[virtualjaguar] / src / gui / filethread.cpp

diff --git a/src/gui/filethread.cpp b/src/gui/filethread.cpp
index 28d7389cb3156fe68e49c09019a86b275f09cb13..5d0d5834398a6abf1c04d888c3f0bb5b6772903b 100644 (file)
--- 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,6 +21,7 @@
 #include "crc32.h"
 #include "file.h"
 #include "filedb.h"
+//#include "memory.h"
 #include "settings.h"
 
 #define VERBOSE_LOGGING
@@ -91,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)
        {
@@ -118,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)
@@ -136,18 +140,18 @@ void FileThread::HandleFile(QFileInfo fileInfo)
        else
                crc = crc32_calcCheckSum(buffer, fileSize);
 
-       uint32 index = FindCRCIndexInFileList(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,
@@ -159,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)
@@ -182,7 +186,7 @@ void FileThread::HandleFile(QFileInfo fileInfo)
 // 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.