Author: jaguarondi
Date: 2008-08-11 16:00:52 +0200 (Mon, 11 Aug 2008)
New Revision: 1463
Modified:
software_suite_v1/daemon/trunk/libs/USBDaemon_status_table.c
software_suite_v1/daemon/trunk/versioning.c
Log:
* Updated so the versioning of the latest USB firmware works again.
Modified: software_suite_v1/daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- software_suite_v1/daemon/trunk/libs/USBDaemon_status_table.c
2008-08-11 13:11:24 UTC (rev 1462)
+++ software_suite_v1/daemon/trunk/libs/USBDaemon_status_table.c
2008-08-11 14:00:52 UTC (rev 1463)
@@ -755,7 +755,7 @@
case PONG_CMD:
pong_received++;
pong_event(new_status[1], pong_received);
- log_debug("pong %d %d %d %d", new_status[1], new_status[2],
+ log_debug("pong %u %u %u %u", new_status[1], new_status[2],
new_status[3], pong_received );
break;
Modified: software_suite_v1/daemon/trunk/versioning.c
===================================================================
--- software_suite_v1/daemon/trunk/versioning.c 2008-08-11 13:11:24 UTC (rev
1462)
+++ software_suite_v1/daemon/trunk/versioning.c 2008-08-11 14:00:52 UTC (rev
1463)
@@ -105,15 +105,12 @@
*/
void tux_information_cleaning(void)
{
- int firmware_num[4] = {TUXCORE_CPU_NUM, TUXAUDIO_CPU_NUM, TUXRF_CPU_NUM,
- RELEASE_INDEX};
- struct firmware_info_t *firmware;
int i;
- for (i=0; i<4; i++)
+ for (i=0; i<NUMBER_OF_FIRMWARE-1; i++)
{
- firmware = &tux_status.firmware_info[firmware_num[i]];
- memset((char*)firmware, 0, sizeof(struct firmware_info_t));
+ memset((char*)&tux_status.firmware_info[i], 0,
+ sizeof(struct firmware_info_t));
}
tux_status.sound_flash.number_of_sounds = 0;
}
@@ -140,7 +137,7 @@
firmware->version_update = data[3];
log_debug("FW: version of %s: %d.%d.%d", cpu_name[current_cpu],
- CPU_VER_MAJ(firmware->version_major), firmware->version_minor,
+ firmware->version_major, firmware->version_minor,
firmware->version_update);
}
@@ -380,6 +377,10 @@
break;
}
usb_command[1] = info_cpu_cmd[cpu_num];
+ if (cpu_num == FUXUSB_CPU_NUM)
+ usb_command[0] = USB_DONGLE_CMD;
+ else
+ usb_command[0] = USB_TUX_CMD;
/* By-pass if we already have the information. We need to do that
* otherwise the command will be sent and the version_string
* detected immediately after even though we might not yet have
-------------------------------------------------------------------------
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
