From 7d70d1f9f2992cbe1dfb1928e8b2e6d5e7d52ec6 Mon Sep 17 00:00:00 2001
From: peabody124 <peabody124>
Date: Fri, 10 Dec 2010 20:19:28 +0000
Subject: [PATCH] Bootloader: A few cross-platform changes for the serial
 uploading functionality

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2213 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp | 2 +-
 ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp   | 3 +--
 ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h     | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp b/ground/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp
index 9194b475c..2bb529c96 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp
@@ -1,5 +1,5 @@
 #include "port.h"
-#include "..\delay.h"
+#include "delay.h"
 port::port(PortSettings settings,QString name):mstatus(port::closed)
 {
     timer.start();
diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
index d531bee50..bc4ff826e 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
@@ -2,7 +2,6 @@
 #include <cmath>
 #include <qwaitcondition.h>
 #include <QMutex>
-#include <conio.h>
 
 OP_DFU::OP_DFU(bool _debug,bool _use_serial,QString portname): debug(_debug),use_serial(_use_serial),mready(true)
 {
@@ -809,7 +808,7 @@ int OP_DFU::receiveData(void * data,int size)
         time.start();
         while(true)
         {
-            if(x=serialhandle->read_Packet(data+1)!=-1||time.elapsed()>10000)
+            if(x=serialhandle->read_Packet(((char *) data)+1)!=-1||time.elapsed()>10000)
             {
                 if(time.elapsed()>10000)
                     qDebug()<<"____timeout";
diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
index 9b3a8689a..ca0cb1d66 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
@@ -9,11 +9,11 @@
 #include <QList>
 #include <iostream>
 #include "delay.h"
-#include "../../../libs/qextserialport/src/qextserialport.h"
+#include "../../libs/qextserialport/src/qextserialport.h"
 #include <QTime>
-#include ".\SSP\qssp.h"
-#include ".\SSP\port.h"
-#include ".\SSP\qsspt.h"
+#include "SSP/qssp.h"
+#include "SSP/port.h"
+#include "SSP/qsspt.h"
 using namespace std;
 #define BUF_LEN 64