[tuxdroid-svn] r1147 - in firmware/fuxusb/trunk: . src
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r1147 - in firmware/fuxusb/trunk: . src
|
From: Paul_R <c2m...@c2...> - 2008-05-14 14:52:20
|
Author: Paul_R
Date: 2008-05-14 16:52:07 +0200 (Wed, 14 May 2008)
New Revision: 1147
Modified:
firmware/fuxusb/trunk/fuxusb.Opt
firmware/fuxusb/trunk/src/bootloader.c
firmware/fuxusb/trunk/src/usb_commands.c
firmware/fuxusb/trunk/src/usb_ep.c
Log:
* Bug fix with the bootloader mode
Modified: firmware/fuxusb/trunk/fuxusb.Opt
===================================================================
--- firmware/fuxusb/trunk/fuxusb.Opt 2008-05-14 13:47:30 UTC (rev 1146)
+++ firmware/fuxusb/trunk/fuxusb.Opt 2008-05-14 14:52:07 UTC (rev 1147)
@@ -15,16 +15,16 @@
GRPOPT 2,(mcu),0,0,0
GRPOPT 3,(headers),1,0,0
-OPTFFF 1,1,1,16777216,0,33,35,0,<.\src\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,0,0,0,66,0,0,0,168,3,0,0,43,1,0,0 }
-OPTFFF 1,2,1,218103809,0,19,19,0,<.\src\global.c><global.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,22,0,0,0,22,0,0,0,124,3,0,0,255,0,0,0 }
-OPTFFF 1,3,1,0,0,47,47,0,<.\src\usb_task.c><usb_task.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,0,0,0,44,0,0,0,142,3,0,0,17,1,0,0 }
-OPTFFF 1,4,1,67108864,0,952,952,0,<.\src\usb_enum.c><usb_enum.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,22,0,0,0,124,3,0,0,255,0,0,0 }
-OPTFFF 1,5,1,0,0,1,1,0,<.\src\usb_ep.c><usb_ep.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,3,0,0,233,0,0,0 }
-OPTFFF 1,6,1,855638016,0,163,163,0,<.\src\usb_commands.c><usb_commands.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,22,0,0,0,102,3,0,0,73,1,0,0 }
+OPTFFF 1,1,1,603979776,0,21,21,0,<.\src\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,0,0,0,0,0,0,0,0,92,4,0,0,61,1,0,0 }
+OPTFFF 1,2,1,218103808,0,0,0,0,<.\src\global.c><global.c>
+OPTFFF 1,3,1,0,0,0,0,0,<.\src\usb_task.c><usb_task.c>
+OPTFFF 1,4,1,67108864,0,0,0,0,<.\src\usb_enum.c><usb_enum.c>
+OPTFFF 1,5,1,0,0,25,25,0,<.\src\usb_ep.c><usb_ep.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,233,255,255,255,0,0,0,0,0,0,0,0,104,3,0,0,250,0,0,0 }
+OPTFFF 1,6,1,0,0,82,99,0,<.\src\usb_commands.c><usb_commands.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,22,0,0,0,22,0,0,0,114,4,0,0,83,1,0,0 }
OPTFFF 1,7,1,318767104,0,0,0,0,<.\src\usb_misc.c><usb_misc.c>
-OPTFFF 1,8,1,335544320,0,81,81,0,<.\src\spi_task.c><spi_task.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,110,0,0,0,110,0,0,0,212,3,0,0,87,1,0,0 }
-OPTFFF 1,9,1,0,0,207,224,0,<.\src\bootloader.c><bootloader.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,0,0,0,66,0,0,0,146,3,0,0,117,1,0,0 }
-OPTFFF 1,10,1,553648128,0,23,23,0,<.\src\i2c.c><i2c.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,88,0,0,0,190,3,0,0,65,1,0,0 }
+OPTFFF 1,8,1,335544320,0,0,0,0,<.\src\spi_task.c><spi_task.c>
+OPTFFF 1,9,1,1862270976,0,69,76,0,<.\src\bootloader.c><bootloader.c> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,44,0,0,0,44,0,0,0,136,4,0,0,105,1,0,0 }
+OPTFFF 1,10,1,553648128,0,0,0,0,<.\src\i2c.c><i2c.c>
OPTFFF 1,11,1,721420288,0,0,0,0,<.\src\fifo_spk.c><fifo_spk.c>
OPTFFF 1,12,1,0,0,0,0,0,<.\src\fifo_mic.c><fifo_mic.c>
OPTFFF 1,13,1,0,0,0,0,0,<.\src\fifo_stt.c><fifo_stt.c>
@@ -34,17 +34,11 @@
OPTFFF 2,17,1,0,0,0,0,0,<.\src\lib_mcu\uart\uart_lib.c><uart_lib.c>
OPTFFF 2,18,1,167772160,0,0,0,0,<.\src\spi_lib.c><spi_lib.c>
OPTFFF 2,19,1,234881024,0,0,0,0,<.\src\lib_mcu\fa-usb\flash_api.c><flash_api.c>
-OPTFFF 3,20,5,150994944,0,9,25,0,<.\src\config.h><config.h> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,22,0,0,0,23,0,0,0,102,3,0,0,74,1,0,0 }
-OPTFFF 3,21,5,0,0,15,15,0,<.\src\version.h><version.h> { 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,0,0,0,44,0,0,0,146,3,0,0,8,1,0,0 }
+OPTFFF 3,20,5,33554434,0,29,37,0,<.\src\config.h><config.h> { 44,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,66,0,0,0,66,0,0,0,158,4,0,0,127,1,0,0 }
+OPTFFF 3,21,5,0,0,0,0,0,<.\src\version.h><version.h>
-ExtF <.\src\config.h> 9,25,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,22,0,0,0,23,0,0,0,102,3,0,0,74,1,0,0 }
-ExtF <.\src\version.h> 15,15,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,0,0,0,44,0,0,0,146,3,0,0,8,1,0,0 }
-ExtF <.\src\global.h> 1,14,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,44,0,0,0,44,0,0,0,124,3,0,0,95,1,0,0 }
-ExtF <.\src\i2c.h> 33,43,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,88,0,0,0,88,0,0,0,168,3,0,0,139,1,0,0 }
-ExtF <.\SRC\bootloader.h> 37,37,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,22,0,0,0,102,3,0,0,73,1,0,0 }
-ExtF <.\SRC\usb_commands.h> 11,11,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,0,0,0,44,0,0,0,124,3,0,0,95,1,0,0 }
-ExtF <C:\KEIL\C51\INC\STDIO.H> 1,1,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,252,255,255,255,233,255,255,255,65,0,0,0,66,0,0,0,167,3,0,0,30,1,0,0 }
-ExtF <.\SRC\COMMON\defines.h> 23,34,0,{ 44,0,0,0,0,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,233,255,255,255,44,0,0,0,44,0,0,0,124,3,0,0,95,1,0,0 }
+ExtF <.\src\config.h> 31,48,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,233,255,255,255,22,0,0,0,23,0,0,0,102,3,0,0,74,1,0,0 }
+ExtF <.\src\usb_commands.h> 34,41,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,233,255,255,255,0,0,0,0,0,0,0,0,124,3,0,0,222,0,0,0 }
TARGOPT 1, (fuxusb)
CLK51=32000000
Modified: firmware/fuxusb/trunk/src/bootloader.c
===================================================================
--- firmware/fuxusb/trunk/src/bootloader.c 2008-05-14 13:47:30 UTC (rev 1146)
+++ firmware/fuxusb/trunk/src/bootloader.c 2008-05-14 14:52:07 UTC (rev 1147)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#include "config.h"
#include "global.h"
@@ -222,13 +222,8 @@
EX0 = 0; /* Disable INT0 interrupt */
- /* Clear pending data on the CMD IN EP */
- Usb_select_ep(EP_CMD_IN);
- Usb_clear_tx_ready();
- Usb_clear_tx_complete();
- CMD_IN_Bank_Nb = 0;
- usb_reset_endpoint(EP_CMD_IN);
-
+ /* Acknoledge the boot init */
+ bl_acknowledge(TRUE, 1, 0, 0);
}
/**
Modified: firmware/fuxusb/trunk/src/usb_commands.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_commands.c 2008-05-14 13:47:30 UTC (rev 1146)
+++ firmware/fuxusb/trunk/src/usb_commands.c 2008-05-14 14:52:07 UTC (rev 1147)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#include "config.h"
#include "global.h"
@@ -181,15 +181,11 @@
printf("SEND ACK \n");
#endif
Usb_write_byte(BOOTLOADER_CMD);
- if (ack)
- Usb_write_byte(B_ACK);
- else
- Usb_write_byte(B_NACK);
+ Usb_write_byte(ack ? B_ACK : B_NACK);
Usb_write_byte(p1);
Usb_write_byte(p2);
Usb_write_byte(p3);
- FIFO_STT_flush();
CMD_IN_Bank_Nb ++;
send_status();
Modified: firmware/fuxusb/trunk/src/usb_ep.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_ep.c 2008-05-14 13:47:30 UTC (rev 1146)
+++ firmware/fuxusb/trunk/src/usb_ep.c 2008-05-14 14:52:07 UTC (rev 1147)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#include "config.h"
#include "usb_ep.h"
|
