Fixed some non OS X bugs with missing defines. Also remove some extra…

… unused code in the USB fronted.
profanum429 · Aug 10, 2014 · 73cf8f6 · 73cf8f6
1 parent a7c1d9f
commit 73cf8f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/usb/backend/native_usb.cpp b/src/usb/backend/native_usb.cpp
@@ -108,8 +108,14 @@ int native_usb::write_usb(QByteArray packet)
     QByteArray correct_packet;
     int actual_length;
 
+#if defined(Q_OS_MAC)
     if(usb == -1)
         return -1;
+#endif
+#if defined(Q_OS_LINUX) || defined(Q_OS_WIN)
+    if(usb == NULL)
+        return -1;
+#endif
 
     if(packet.length() > 64)
         return -1;

diff --git a/src/usb/v800usb.cpp b/src/usb/v800usb.cpp
@@ -189,7 +189,7 @@ QList<QString> V800usb::get_v800_data(QString request, bool debug)
             {
                 if(!request.contains(tr(".")))
                 {
-                    data = extract_dir_and_files(full, debug);
+                    data = extract_dir_and_files(full);
 
                     qDebug("Directory request finished!");
                 }
@@ -292,10 +292,9 @@ QList<QString> V800usb::get_v800_data(QString request, bool debug)
     return data;
 }
 
-QList<QString> V800usb::extract_dir_and_files(QByteArray full, bool debug)
+QList<QString> V800usb::extract_dir_and_files(QByteArray full)
 {
     QList<QString> dir_and_files;
-    char unknown_byte;
     int full_state = 0, size = 0, loc = 0;
 
     while(loc < full.length())
@@ -309,7 +308,6 @@ QList<QString> V800usb::extract_dir_and_files(QByteArray full, bool debug)
                 full_state = 1;
             }
 
-            unknown_byte = (char)full[loc];
             loc++;
             break;
         case 1: /* is this the second 0x0A? */
@@ -329,9 +327,6 @@ QList<QString> V800usb::extract_dir_and_files(QByteArray full, bool debug)
         case 3: /* now get the full string */
             QString name(tr(QByteArray(full.constData()+loc, size)));
 
-            if(debug)
-                name.prepend(QString(tr("%1")).arg(unknown_byte));
-
             dir_and_files.append(name);
 
             full_state = 0;

diff --git a/src/usb/v800usb.h b/src/usb/v800usb.h
@@ -32,7 +32,7 @@ public slots:
     void get_file(QString path, QString save_dir);
 
 private:
-    QList<QString> extract_dir_and_files(QByteArray full, bool debug=false);
+    QList<QString> extract_dir_and_files(QByteArray full);
     QByteArray generate_request(QString request);
     QByteArray generate_ack(unsigned char packet_num);
     int is_end(QByteArray packet);