[tuxdroid-svn] r1216 - firmware/tuxup/trunk

[Paul_R <c2m...@c2...>]

Author: Paul_R
Date: 2008-06-04 14:04:14 +0200 (Wed, 04 Jun 2008)
New Revision: 1216

Modified:
   firmware/tuxup/trunk/bootloader.c
   firmware/tuxup/trunk/bootloader.h
   firmware/tuxup/trunk/main.c
Log:
* Solved bugs due of the windows compatibility


Modified: firmware/tuxup/trunk/bootloader.c
===================================================================
--- firmware/tuxup/trunk/bootloader.c	2008-06-04 10:09:03 UTC (rev 1215)
+++ firmware/tuxup/trunk/bootloader.c	2008-06-04 12:04:14 UTC (rev 1216)
@@ -286,7 +286,7 @@
 int finishSegment(Parser_t * parser)
 {
     int i, idx = 0;
-    unsigned char data_buffer[36];
+    unsigned char data_buffer[64];
     int ret;
 
     /* Indicate that we completed a segment */
@@ -382,6 +382,7 @@
         counter ++;
 #else
         ret = (wait_status(++counter, USB_TIMEOUT));
+        ret = tux_hid_read(5, data_buffer);
 #endif
     }
 #ifndef WIN32
@@ -409,7 +410,6 @@
         }
         else
         {
-            printf("%d\n", 0xF0);
             fprintf(stderr,
                     "Bootloading failed, program aborted at dongle reply.\n");
             exit(1);

Modified: firmware/tuxup/trunk/bootloader.h
===================================================================
--- firmware/tuxup/trunk/bootloader.h	2008-06-04 10:09:03 UTC (rev 1215)
+++ firmware/tuxup/trunk/bootloader.h	2008-06-04 12:04:14 UTC (rev 1216)
@@ -22,6 +22,9 @@
 #ifndef bootloader_h
 #define bootloader_h
 #include <stdbool.h>
+#ifndef WIN32
+#include "usb-connection.h"
+#endif
 extern bool HID;
 #ifdef WIN32
 int bootload(uint8_t cpu_address, uint8_t mem_type, const char *filename);

Modified: firmware/tuxup/trunk/main.c
===================================================================
--- firmware/tuxup/trunk/main.c	2008-06-04 10:09:03 UTC (rev 1215)
+++ firmware/tuxup/trunk/main.c	2008-06-04 12:04:14 UTC (rev 1216)
@@ -41,7 +41,10 @@
 #endif
 #define countof(X) ( (size_t) ( sizeof(X)/sizeof*(X) ) )
 
+#ifdef WIN32
 #define PATH_MAX 100
+#endif
+
 /* Messages. */
 #ifndef WIN32
 static char const *msg_old_firmware =
@@ -316,7 +319,7 @@
 #ifdef WIN32
        printf(" OK \n");
 #else 
-        printf("\033[2C[ \033[01;32mOK\033[00m ]\n");
+       printf("\033[2C[ \033[01;32mOK\033[00m ]\n");
 #endif
         return 0;
     }