Changeset 45825a3 in thomson

Timestamp:

Jan 29, 2013, 9:11:50 PM (11 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

f7791a2

Parents:

65a4aad

Message:

Add some safety checks

git-svn-id: ​svn://localhost/thomson@31 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

Location:

elec/CrO2/software

Files:

• Tape.cpp (modified) (2 diffs)
• device_bekit.cpp (modified) (4 diffs)
• gui.cpp (modified) (1 diff)

elec/CrO2/software/Tape.cpp

@@ -12 +12 @@
 #include <string.h>
 #include <string>
+#include <stdexcept>
 
 Tape::~Tape()
@@ -21 +22 @@
 {
         std::string fnam(filename);
-        std::string fext(fnam.substr(fnam.length() - 3));
+        try {
+                std::string fext(fnam.substr(fnam.length() - 3));
 
-        // Load formats identified only by extension last
-        if (fext == "TAP" || fext == "tap");
-                return new ZXTAP(filename);
-        if (fext == ".K5" || fext == ".k5");
-                return new K5(filename);
+                // Load formats identified only by extension last
+                if (fext == "TAP" || fext == "tap");
+                        return new ZXTAP(filename);
+                if (fext == ".K5" || fext == ".k5");
+                        return new K5(filename);
+        } catch(std::out_of_range e) {}
         throw "Unable to guess tape format";
 }

elec/CrO2/software/device_bekit.cpp

@@ -17 +17 @@
         public:
                 DeviceScanner(uint32_t vid, uint32_t pid, const char* vendor, const char* product);
+                virtual ~DeviceScanner() {}
 
                 // BUSBRoster
-                status_t DeviceAdded(BUSBDevice* device);
-                void DeviceRemoved(BUSBDevice* device);
+                virtual status_t DeviceAdded(BUSBDevice* device);
+                virtual void DeviceRemoved(BUSBDevice* device);
 
                 BUSBDevice* handle;
@@ -33 +34 @@
         if (instance == NULL) {
                 DeviceScanner* scanner = new DeviceScanner(vid, pid, vendor, product);
+                scanner->Start();
+                        // Can't be done in the cosntructor, we need a fully setup vtable
 
                 while(scanner->handle == NULL); // FIXME don't hog CPU, and timeout
                 //throw "Device not found. Is the USB cable plugged correctly?";
 
+                instance = new HaikuDevice(scanner->handle);
+
                 // We have our device, don't need the roster anymore.
-                delete scanner;
-
-                instance = new HaikuDevice(scanner->handle);
+                //delete scanner;
         }
 
@@ -87 +90 @@
 
 DeviceScanner::DeviceScanner(uint32_t vid, uint32_t pid, const char* vendor, const char* product)
-        : vid(vid)
+        : handle(NULL)
+        , vid(vid)
         , pid(pid)
         , vendor(vendor)
@@ -128 +132 @@
         handle = NULL;
 }
-

elec/CrO2/software/gui.cpp

@@ -192 +192 @@
                         file = Tape::load(name);
                 } catch (const char* error) {
+                        // FIXME popup an error dialog
                         puts(error);
                         return IUP_DEFAULT;