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

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

Author: jaguarondi
Date: 2007-03-23 03:05:48 +0100 (Fri, 23 Mar 2007)
New Revision: 206

Modified:
   firmware/tuxup/trunk/Makefile
   firmware/tuxup/trunk/main.c
   firmware/tuxup/trunk/usb-connection.c
   firmware/tuxup/trunk/usb-connection.h
Log:
- UPD: forgot to use the CFLAGS in the Makefile, cleaned the code by removing unused variables and avoid any warning.

Modified: firmware/tuxup/trunk/Makefile
===================================================================
--- firmware/tuxup/trunk/Makefile	2007-03-23 02:01:47 UTC (rev 205)
+++ firmware/tuxup/trunk/Makefile	2007-03-23 02:05:48 UTC (rev 206)
@@ -18,7 +18,7 @@
 
 ## Compile and link
 tuxup: main.c bootloader.c bootloader.h usb-connection.c usb-connection.h tux-api.h version.h common/commands.h
-	${CC} ${LIB} -o tuxup main.c bootloader.c usb-connection.c
+	${CC} ${LIB} ${CFLAGS} -o tuxup main.c bootloader.c usb-connection.c
 
 clean :
 	-rm -f $(TARGET) *.o

Modified: firmware/tuxup/trunk/main.c
===================================================================
--- firmware/tuxup/trunk/main.c	2007-03-23 02:01:47 UTC (rev 205)
+++ firmware/tuxup/trunk/main.c	2007-03-23 02:05:48 UTC (rev 206)
@@ -147,7 +147,6 @@
     FILE *fs = NULL;
     char word[80];
     char hex_nr[3];
-    int cpu_nbr, ver_major, ver_minor, ver_update;
 
     hex_nr[2]=(char)'\0';
     if ((fs = fopen(filename, "r")) == NULL)
@@ -271,7 +270,7 @@
 
 int prog_usb(char *filename)
 {
-    char send_data[5] = {0x01, 0x01, 0x00, 0x00, 0xFF}; /* XXX include those as defines in commands.h */
+    uint8_t send_data[5] = {0x01, 0x01, 0x00, 0x00, 0xFF}; /* XXX include those as defines in commands.h */
     char tmp_string[90];
     int ret;
     printf("Programming %s in USB CPU\n", filename);
@@ -398,9 +397,7 @@
  */
 int main(int argc,char *argv[])
 {
-    char path[90], tmp_string[90];
-    char *filename;
-    int arg;
+    char path[90];
     enum program_modes_t program_mode = NONE;
     time_t start_time, end_time;
 
@@ -487,10 +484,12 @@
     if (optind < argc) /* Input files have been given. */
     {
         if (program_mode != INPUTFILES)
+        {
             if (argc == optind + 1)
                 strcpy(path, argv[optind]);
             else
                 usage (stderr, 1);
+        }
     }
     else /* No arguments given. */
         usage (stderr, 1);

Modified: firmware/tuxup/trunk/usb-connection.c
===================================================================
--- firmware/tuxup/trunk/usb-connection.c	2007-03-23 02:01:47 UTC (rev 205)
+++ firmware/tuxup/trunk/usb-connection.c	2007-03-23 02:05:48 UTC (rev 206)
@@ -118,10 +118,10 @@
  * \todo Need to define the format of the data array to send and pass it as parameter
  * \todo Need to add some doc or links about what this status is really
  */
-int usb_send_commands(usb_dev_handle *dev_h, char *send_data, int size)
+int usb_send_commands(usb_dev_handle *dev_h, uint8_t *send_data, int size)
 {
     int status;
-    if((status = usb_interrupt_write(dev_h, USB_W_ENDPOINT, send_data, size, USB_W_TIMEOUT)) < 0)
+    if((status = usb_interrupt_write(dev_h, USB_W_ENDPOINT, (char*)send_data, size, USB_W_TIMEOUT)) < 0)
         /* error on usb_interrupt_write() */
     { 
         fprintf(stderr, "usb_interrupt_write error: status = %d :: %s \n", status, usb_strerror());
@@ -147,7 +147,7 @@
 {
     int status;
 
-    if((status = usb_interrupt_read(dev_h, USB_R_ENDPOINT, receive_data, size, USB_R_TIMEOUT)) < 0)
+    if((status = usb_interrupt_read(dev_h, USB_R_ENDPOINT, (char*)receive_data, size, USB_R_TIMEOUT)) < 0)
     {
         fprintf(stderr, "usb_interrupt_read error: status = %d :: %s \n", status, usb_strerror());
     }

Modified: firmware/tuxup/trunk/usb-connection.h
===================================================================
--- firmware/tuxup/trunk/usb-connection.h	2007-03-23 02:01:47 UTC (rev 205)
+++ firmware/tuxup/trunk/usb-connection.h	2007-03-23 02:05:48 UTC (rev 206)
@@ -65,7 +65,7 @@
 usb_dev_handle * usb_open_tux(struct usb_device* dev);
 struct usb_device* usb_find_tux();
 int usb_check_tux_status(usb_dev_handle *dev_h);
-int usb_send_commands(usb_dev_handle *dev_h, char *send_data, int size);
+int usb_send_commands(usb_dev_handle *dev_h, uint8_t *send_data, int size);
 int usb_get_commands(usb_dev_handle *dev_h, uint8_t *receive_data, int size);
 
 #endif /* USB_CONNECTION_H */