Author: Paul_R
Date: 2008-09-16 12:42:40 +0200 (Tue, 16 Sep 2008)
New Revision: 1851
Modified:
firmware/tuxup/trunk/bootloader.c
firmware/tuxup/trunk/tux-api.h
firmware/tuxup/trunk/version.h
Log:
* Changed the OPCode to enter the bootloader : 0x02 -> 0x03.
* Increase the packet size for the libusb : 5 bytes -> 64 bytes
* Incremented the versioni number.
This version requires fuxusb version 0.5.2 or higher. With a lower version,
nothing will happens.
Modified: firmware/tuxup/trunk/bootloader.c
===================================================================
--- firmware/tuxup/trunk/bootloader.c 2008-09-16 10:03:33 UTC (rev 1850)
+++ firmware/tuxup/trunk/bootloader.c 2008-09-16 10:42:40 UTC (rev 1851)
@@ -301,7 +301,7 @@
printf("\n");
#endif
- data_buffer[0] = LIBUSB_I2C_HEADER;
+ data_buffer[0] = HID_I2C_HEADER;
data_buffer[1] = BOOT_FILLPAGE;
/*
@@ -389,7 +389,7 @@
#ifndef WIN32
else
{
- ret = usb_get_commands(parser->dev_handle, data_buffer, 5);
+ ret = usb_get_commands(parser->dev_handle, data_buffer, 64);
counter ++;
}
#endif
@@ -418,7 +418,7 @@
}
else
{
- if ((ret == 5) && (data_buffer[0] == 0xF0) && (data_buffer[1] == 0))
+ if ((ret == 64) && (data_buffer[0] == 0xF0) && (data_buffer[1] == 0))
{
while ((counter >= progress))
{
@@ -736,7 +736,7 @@
printf("FLASH [\033[s\033[61C]\033[u\033[1B");
#endif
/* Bootloader initialization */
- data_buffer[0] = LIBUSB_I2C_HEADER;
+ data_buffer[0] = HID_I2C_HEADER;
data_buffer[1] = BOOT_INIT;
data_buffer[2] = cpu_address;
data_buffer[3] = page_size;
@@ -757,7 +757,7 @@
/* Send the command to active the bootloader */
ret = usb_send_commands(dev_h, data_buffer, 5);
/* ... and read the status to be ure that it's correctly initialized */
- ret = usb_get_commands(dev_h, data_buffer, 5);
+ ret = usb_get_commands(dev_h, data_buffer, 64);
}
#endif
#ifdef WIN32
@@ -781,7 +781,7 @@
#if (PRINT_DATA)
printf("Boot init status: %x\n", ret);
#endif
- if ((ret != 5) && data_buffer[2] != BOOT_INIT_ACK)
+ if ((ret != 64) && data_buffer[2] != BOOT_INIT_ACK)
{
fprintf(stderr, "\nInitialization failed\n");
return FALSE;
@@ -800,7 +800,7 @@
}
/* Exit bootloader */
- data_buffer[0] = LIBUSB_I2C_HEADER;
+ data_buffer[0] = HID_I2C_HEADER;
data_buffer[1] = BOOT_EXIT;
data_buffer[2] = 0;
data_buffer[3] = 0;
@@ -829,7 +829,7 @@
else
{
ret = usb_send_commands(dev_h, data_buffer, 5);
- ret = usb_get_commands(dev_h, data_buffer, 5);
+ ret = usb_get_commands(dev_h, data_buffer, 64);
}
#endif
return rc;
Modified: firmware/tuxup/trunk/tux-api.h
===================================================================
--- firmware/tuxup/trunk/tux-api.h 2008-09-16 10:03:33 UTC (rev 1850)
+++ firmware/tuxup/trunk/tux-api.h 2008-09-16 10:42:40 UTC (rev 1851)
@@ -27,7 +27,7 @@
* This is the first byte of the USB packet
*/
#define LIBUSB_RF_HEADER 0
-#define LIBUSB_I2C_HEADER 2
+#define HID_I2C_HEADER 3
enum mem_type_t
{ FLASH, EEPROM };
Modified: firmware/tuxup/trunk/version.h
===================================================================
--- firmware/tuxup/trunk/version.h 2008-09-16 10:03:33 UTC (rev 1850)
+++ firmware/tuxup/trunk/version.h 2008-09-16 10:42:40 UTC (rev 1851)
@@ -22,6 +22,6 @@
#ifndef version_h
#define version_h
-#define VERSION "0.4.1 (SVN/UNRELEASED)"
+#define VERSION "0.5.0 (SVN/UNRELEASED)"
#endif
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
