[tuxdroid-svn] r1151 - in firmware/fuxusb/trunk: . src src/lib_mcu/fa-usb src/lib_mcu/spi src/lib_m
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r1151 - in firmware/fuxusb/trunk: . src src/lib_mcu/fa-usb src/lib_mcu/spi src/lib_mcu/uart/tools src/lib_mcu/usb
|
From: Paul_R <c2m...@c2...> - 2008-05-15 08:57:18
|
Author: Paul_R
Date: 2008-05-15 10:57:03 +0200 (Thu, 15 May 2008)
New Revision: 1151
Modified:
firmware/fuxusb/trunk/fuxusb.Opt
firmware/fuxusb/trunk/src/bootloader.c
firmware/fuxusb/trunk/src/bootloader.h
firmware/fuxusb/trunk/src/fifo_spk.c
firmware/fuxusb/trunk/src/global.h
firmware/fuxusb/trunk/src/lib_mcu/fa-usb/flash_api.c
firmware/fuxusb/trunk/src/lib_mcu/fa-usb/flash_api.h
firmware/fuxusb/trunk/src/lib_mcu/spi/spi_lib.c
firmware/fuxusb/trunk/src/lib_mcu/spi/spi_lib.h
firmware/fuxusb/trunk/src/lib_mcu/uart/tools/c51_bdr.c
firmware/fuxusb/trunk/src/lib_mcu/usb/usb_drv.c
firmware/fuxusb/trunk/src/lib_mcu/usb/usb_drv.h
firmware/fuxusb/trunk/src/main.c
firmware/fuxusb/trunk/src/misc.c
firmware/fuxusb/trunk/src/misc.h
firmware/fuxusb/trunk/src/spi_lib.c
firmware/fuxusb/trunk/src/spi_lib.h
firmware/fuxusb/trunk/src/spi_task.c
firmware/fuxusb/trunk/src/spi_task.h
firmware/fuxusb/trunk/src/usb_commands.c
firmware/fuxusb/trunk/src/usb_commands.h
firmware/fuxusb/trunk/src/usb_enum.c
firmware/fuxusb/trunk/src/usb_enum.h
firmware/fuxusb/trunk/src/usb_ep.c
firmware/fuxusb/trunk/src/usb_ep.h
firmware/fuxusb/trunk/src/usb_misc.c
firmware/fuxusb/trunk/src/usb_misc.h
firmware/fuxusb/trunk/src/usb_task.c
Log:
* Replaced all Uchar/Uint16 and unsigned XXX by uint8_t and uint16_t.
* Reorganised some definitions.
Modified: firmware/fuxusb/trunk/fuxusb.Opt
===================================================================
--- firmware/fuxusb/trunk/fuxusb.Opt 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/fuxusb.Opt 2008-05-15 08:57:03 UTC (rev 1151)
@@ -15,30 +15,39 @@
GRPOPT 2,(mcu),0,0,0
GRPOPT 3,(headers),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,1,1,0,0,0,0,0,<.\src\main.c><main.c>
+OPTFFF 1,2,1,0,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,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,4,1,201326592,0,1603,1612,0,<.\src\usb_enum.c><usb_enum.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,66,0,0,0,66,0,0,0,146,3,0,0,78,1,0,0 }
+OPTFFF 1,5,1,0,0,0,0,0,<.\src\usb_ep.c><usb_ep.c>
+OPTFFF 1,6,1,301989888,0,0,0,0,<.\src\usb_commands.c><usb_commands.c>
+OPTFFF 1,7,1,335544320,0,0,0,0,<.\src\usb_misc.c><usb_misc.c>
+OPTFFF 1,8,1,318767104,0,0,0,0,<.\src\spi_task.c><spi_task.c>
+OPTFFF 1,9,1,251658240,0,267,276,0,<.\src\bootloader.c><bootloader.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,88,0,0,0,88,0,0,0,168,3,0,0,100,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,11,1,0,0,57,67,0,<.\src\fifo_spk.c><fifo_spk.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,110,0,0,0,110,0,0,0,190,3,0,0,122,1,0,0 }
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>
OPTFFF 1,14,1,637534208,0,0,0,0,<.\src\rf.c><rf.c>
-OPTFFF 1,15,1,251658240,0,0,0,0,<.\src\misc.c><misc.c>
-OPTFFF 2,16,1,0,0,0,0,0,<.\src\lib_mcu\usb\usb_drv.c><usb_drv.c>
+OPTFFF 1,15,1,318767105,0,15,21,0,<.\src\misc.c><misc.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,88,0,0,0,88,0,0,0,164,3,0,0,96,1,0,0 }
+OPTFFF 2,16,1,0,0,387,397,0,<.\src\lib_mcu\usb\usb_drv.c><usb_drv.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,110,0,0,0,110,0,0,0,190,3,0,0,122,1,0,0 }
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,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 2,18,1,486539264,0,38,47,0,<.\src\spi_lib.c><spi_lib.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,66,0,0,0,66,0,0,0,146,3,0,0,78,1,0,0 }
+OPTFFF 2,19,1,301989888,0,211,220,0,<.\src\lib_mcu\fa-usb\flash_api.c><flash_api.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,80,3,0,0,12,1,0,0 }
+OPTFFF 3,20,5,33554432,0,0,0,0,<.\src\config.h><config.h>
OPTFFF 3,21,5,0,0,0,0,0,<.\src\version.h><version.h>
-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 }
+ExtF <.\SRC\COMMON\defines.h> 47,47,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,110,0,0,0,110,0,0,0,190,3,0,0,122,1,0,0 }
+ExtF <.\SRC\misc.h> 1,1,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,132,0,0,0,132,0,0,0,212,3,0,0,144,1,0,0 }
+ExtF <.\SRC\COMMON\api.h> 27,27,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,80,3,0,0,12,1,0,0 }
+ExtF <.\SRC\global.h> 17,25,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,22,0,0,0,102,3,0,0,34,1,0,0 }
+ExtF <.\SRC\LIB_MCU\compiler.h> 14,27,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,56,1,0,0 }
+ExtF <.\src\stdint.h> 22,31,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,132,0,0,0,132,0,0,0,212,3,0,0,144,1,0,0 }
+ExtF <.\src\lib_mcu\uart\tools\c51_bdr.c> 51,60,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,80,3,0,0,12,1,0,0 }
+ExtF <.\src\lib_mcu\spi\spi_lib.h> 11,11,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,44,0,0,0,44,0,0,0,124,3,0,0,56,1,0,0 }
+ExtF <.\src\spi_lib.h> 1,1,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,88,0,0,0,88,0,0,0,168,3,0,0,100,1,0,0 }
+ExtF <.\src\lib_mcu\usb\usb_drv.h> 283,283,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,132,0,0,0,132,0,0,0,212,3,0,0,144,1,0,0 }
+ExtF <.\src\lib_mcu\fa-usb\flash_api.h> 208,208,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,22,0,0,0,102,3,0,0,34,1,0,0 }
TARGOPT 1, (fuxusb)
CLK51=32000000
Modified: firmware/fuxusb/trunk/src/bootloader.c
===================================================================
--- firmware/fuxusb/trunk/src/bootloader.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/bootloader.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -30,17 +30,13 @@
#include "fifo_stt.h"
#include "lib_mcu\usb\usb_drv.h"
-static void bl_init(void);
-static void bl_exit(void);
-static void bl_fill_page(void);
-static void init_bootloader(void);
-static void bl_senddata(blHeader_t blHeader, uint8_t dataLength);
+/* Externs defs */
bit i2c_bootloading_Flag;
-bit bl_send_acknoledge;
+
+/* Statics defs */
bit i2c_task_on_Flag;
-
uint8_t page_size;
uint8_t packets_per_page;
uint8_t address_idx;
@@ -48,6 +44,13 @@
uint16_t address_tracking;
blHeader_t blHeader;
+static void bl_init(void);
+static void bl_exit(void);
+static void bl_fill_page(void);
+static void init_bootloader(void);
+static void bl_senddata(blHeader_t blHeader, uint8_t dataLength);
+
+
void bootloader_cmd_parser(void)
{
/* Disable spi_task */
@@ -270,7 +273,7 @@
i2cSendDataLength = dataLength + 2;
#ifdef BOOTLOAD_DEBUG
{
- unsigned char i;
+ uint8_t i;
printf("I2C: Page 0x%BX%BX:\n", i2cSendData[0], i2cSendData[1]);
for (i=2; i<i2cSendDataLength; i++)
printf("%BX", i2cSendData[i]);
Modified: firmware/fuxusb/trunk/src/bootloader.h
===================================================================
--- firmware/fuxusb/trunk/src/bootloader.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/bootloader.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,14 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#ifndef _BOOTLOADER_H_
#define _BOOTLOADER_H_
-void bootloader_cmd_parser(void);
-void i2c_task(void);
-
/** USB bootloader commands */
#define BOOT_INIT 1
#define BOOT_FILLPAGE 2
@@ -47,20 +44,13 @@
uint8_t xdata *blData;
} blHeader_t;
-extern bit bl_send_acknoledge;
+/* Variables */
extern bit i2c_bootloading_Flag;
extern blHeader_t blHeader;
-/*
- * Extern declarations
- */
-/*
-extern uint8_t Command_FromUSB_bootload_cmd;
-extern uint8_t cpu_address;
-extern uint8_t page_size;
-extern uint8_t page_address;
-extern uint8_t packets_per_page;
-extern uint8_t address_idx;
-extern uint8_t packet_idx;
-*/
+/* Functions */
+void bootloader_cmd_parser(void);
+void i2c_task(void);
+
+
#endif // _BOOTLOADER_H_
Modified: firmware/fuxusb/trunk/src/fifo_spk.c
===================================================================
--- firmware/fuxusb/trunk/src/fifo_spk.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/fifo_spk.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
/** \file fifo_spk.c
\brief Speaker FIFO
@@ -63,8 +63,8 @@
*/
void FIFO_SPK_put_n (uint8_t const n)
{
- Uchar i = n;
- Uchar FilterByte;
+ uint8_t i = n;
+ uint8_t FilterByte;
do
{
FifoOut_SPK_cmpt++;
@@ -95,7 +95,7 @@
*/
uint8_t FIFO_SPK_get(void)
{
- unsigned char Data;
+ uint8_t Data;
if (FifoOut_SPK_cmpt < FIFO_SPK_READY_VALUE_MIN)
Fifoready_SPK = 0; // FIFO empty
Modified: firmware/fuxusb/trunk/src/global.h
===================================================================
--- firmware/fuxusb/trunk/src/global.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/global.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -22,7 +22,7 @@
#ifndef _GLOBAL_H_
#define _GLOBAL_H_
-#include "src\common\api.h"
+#include "common\api.h"
#include "common\defines.h"
#define rf_reset_signal P0_1
Modified: firmware/fuxusb/trunk/src/lib_mcu/fa-usb/flash_api.c
===================================================================
--- firmware/fuxusb/trunk/src/lib_mcu/fa-usb/flash_api.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/lib_mcu/fa-usb/flash_api.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -19,10 +19,10 @@
/*_____ D E F I N I T I O N ________________________________________________*/
-Uchar data api_command _at_ 0x1C;
-Uchar data api_value _at_ 0x1D;
-Uchar data api_dpl _at_ 0x1F;
-Uchar data api_dph _at_ 0x1E;
+uint8_t data api_command _at_ 0x1C;
+uint8_t data api_value _at_ 0x1D;
+uint8_t data api_dpl _at_ 0x1F;
+uint8_t data api_dph _at_ 0x1E;
#define MSK_AUXR1_ENBOOT 0x20
@@ -55,7 +55,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uchar __api_rd_generic (Uchar command, Uchar dpl)
+uint8_t __api_rd_generic (uint8_t command, uint8_t dpl)
{
api_command = command;
api_dpl = dpl;
@@ -85,7 +85,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uchar __api_wr_generic (Uchar command, Uchar value, Uchar dpl)
+uint8_t __api_wr_generic (uint8_t command, uint8_t value, uint8_t dpl)
{
bit ea_save;
@@ -123,7 +123,7 @@
* REQUIREMENTS:
*****************************************************************************/
#ifdef __API_RD_CODE_BYTE
-Uchar __api_rd_code_byte (Uchar code * pt_address)
+uint8_t __api_rd_code_byte (uint8_t code * pt_address)
{
return(*pt_address);
}
@@ -152,7 +152,7 @@
* REQUIREMENTS:
*****************************************************************************/
#ifdef __API_WR_CODE_BYTE
-Uchar __api_wr_code_byte (Uchar xdata * pt_address, Uchar value)
+uint8_t __api_wr_code_byte (uint8_t xdata * pt_address, uint8_t value)
{
bit ea_save;
@@ -201,11 +201,11 @@
* REQUIREMENTS:
*****************************************************************************/
#ifdef __API_WR_CODE_PAGE
-Uchar __api_wr_code_page (Uchar xdata * pt_code, Uchar xdata * pt_xram, Uchar nb_data)
+uint8_t __api_wr_code_page (uint8_t xdata * pt_code, uint8_t xdata * pt_xram, uint8_t nb_data)
{
- Uchar data i, temp, temp_nb_data;
+ uint8_t data i, temp, temp_nb_data;
bit ea_save;
- Uint16 data add_pt_code, add_pt_xram;
+ uint16_t data add_pt_code, add_pt_xram;
add_pt_xram = pt_xram;
add_pt_code = pt_code;
@@ -215,9 +215,9 @@
api_command = _COMMAND_WR_CODE_BYTE;
for (i=0 ; i< temp_nb_data; i++,add_pt_xram++,add_pt_code++)
{
- temp = *(Uchar xdata *)add_pt_xram;
+ temp = *(uint8_t xdata *)add_pt_xram;
FCON = 0x08;
- *(Uchar xdata *)add_pt_code = temp;
+ *(uint8_t xdata *)add_pt_code = temp;
FCON = 0x00;
}
@@ -258,11 +258,11 @@
* REQUIREMENTS:
*****************************************************************************/
#ifdef __API_WR_CODE_PAGE_FIX
-Uchar __api_wr_code_page_fix (Uchar xdata * pt_code, Uchar xdata * pt_xram, Uchar nb_data)
+uint8_t __api_wr_code_page_fix (uint8_t xdata * pt_code, uint8_t xdata * pt_xram, uint8_t nb_data)
{
bit ea_save;
- Uint16 add_xram;
- data Uint16 add_code;
+ uint16_t add_xram;
+ data uint16_t add_code;
add_xram = DPTR; // save the DPTR
@@ -273,7 +273,7 @@
api_command =0x01;
api_value = nb_data;
api_dpl = LOW(add_xram);
- api_dph = ((Uchar)((add_xram)>>8));
+ api_dph = ((uint8_t)((add_xram)>>8));
AUXR1++;
// add_xram = DPTR; // save the DPTR
// DPTR = pt_code;
@@ -305,9 +305,9 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uchar __api_wr_fuse (Uchar mask, Uchar filter)
+uint8_t __api_wr_fuse (uint8_t mask, uint8_t filter)
{
- Uchar value;
+ uint8_t value;
bit ea_save;
ea_save = EA;
@@ -349,7 +349,7 @@
* REQUIREMENTS:
*****************************************************************************/
#ifdef __API_ERASE_BLOCK
-Uchar __api_erase_block (block_t num_block)
+uint8_t __api_erase_block (block_t num_block)
{
bit ea_save;
@@ -412,9 +412,9 @@
* REQUIREMENTS:
*****************************************************************************/
#ifdef __API_RD_EEPROM_BYTE
-Uchar __api_rd_eeprom_byte(Uchar xdata *address)
+uint8_t __api_rd_eeprom_byte(uint8_t xdata *address)
{
- Uchar val;
+ uint8_t val;
EECON = 0x02;
val = *address;
@@ -445,7 +445,7 @@
* REQUIREMENTS:
*****************************************************************************/
#ifdef __API_WR_EEPROM_BYTE
-Uchar __api_wr_eeprom_byte (Uchar xdata *address, Uchar value)
+uint8_t __api_wr_eeprom_byte (uint8_t xdata *address, uint8_t value)
{
bit ea_save;
Modified: firmware/fuxusb/trunk/src/lib_mcu/fa-usb/flash_api.h
===================================================================
--- firmware/fuxusb/trunk/src/lib_mcu/fa-usb/flash_api.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/lib_mcu/fa-usb/flash_api.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -98,9 +98,9 @@
-extern Uchar __api_rd_generic (Uchar command, Uchar dpl);
-extern Uchar __api_wr_generic (Uchar command, Uchar value, Uchar dpl);
-extern Uchar __api_wr_fuse (Uchar mask, Uchar filter);
+extern uint8_t __api_rd_generic (uint8_t command, uint8_t dpl);
+extern uint8_t __api_wr_generic (uint8_t command, uint8_t value, uint8_t dpl);
+extern uint8_t __api_wr_fuse (uint8_t mask, uint8_t filter);
/*---- API for Read access ------------------------------------------------*/
@@ -145,15 +145,15 @@
#define __api_rd_bootloader_version() __api_rd_generic(_COMMAND_RD_SPECIAL, 0x00)
#endif
-extern Uchar __api_rd_code_byte (Uchar code * pt_address);
+extern uint8_t __api_rd_code_byte (uint8_t code * pt_address);
/*---- API for Write access -----------------------------------------------*/
/****************************************************************************/
-extern Uchar __api_wr_code_byte (Uchar xdata* , Uchar);
-extern Uchar __api_wr_code_page (Uchar xdata* pt_code, Uchar xdata* pt_xram, Uchar nb_data);
-extern Uchar __api_wr_code_page_fix (Uchar xdata* pt_code, Uchar xdata* pt_xram, Uchar nb_data);
+extern uint8_t __api_wr_code_byte (uint8_t xdata* , uint8_t);
+extern uint8_t __api_wr_code_page (uint8_t xdata* pt_code, uint8_t xdata* pt_xram, uint8_t nb_data);
+extern uint8_t __api_wr_code_page_fix (uint8_t xdata* pt_code, uint8_t xdata* pt_xram, uint8_t nb_data);
#ifdef __API_WR_BSB
#define __api_wr_BSB(value) __api_wr_generic(_COMMAND_WR_XAF, value, 0)
@@ -191,7 +191,7 @@
#define __api_clr_BLJB() __api_wr_fuse(0x40, 0x00)
#endif
-extern Uchar __api_erase_block (block_t);
+extern uint8_t __api_erase_block (block_t);
/*---- API for EEPROM access ----------------------------------------------*/
/****************************************************************************/
@@ -201,11 +201,11 @@
#endif
#ifdef __API_RD_EEPROM_BYTE
- extern Uchar __api_rd_eeprom_byte (Uchar xdata *);
+ extern uint8_t __api_rd_eeprom_byte (uint8_t xdata *);
#endif
#ifdef __API_WR_EEPROM_BYTE
- extern Uchar __api_wr_eeprom_byte (Uchar xdata *, Uchar);
+ extern uint8_t __api_wr_eeprom_byte (uint8_t xdata *, uint8_t);
#endif
/*---- API to start bootloader execution ----------------------------------*/
Modified: firmware/fuxusb/trunk/src/lib_mcu/spi/spi_lib.c
===================================================================
--- firmware/fuxusb/trunk/src/lib_mcu/spi/spi_lib.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/lib_mcu/spi/spi_lib.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -44,7 +44,7 @@
*****************************************************************************/
-unsigned char spi_SendByte(Uchar Data)
+uint8_t spi_SendByte(uint8_t Data)
{
SPDAT = Data;
while(!(SPSTA&0x80));
Modified: firmware/fuxusb/trunk/src/lib_mcu/spi/spi_lib.h
===================================================================
--- firmware/fuxusb/trunk/src/lib_mcu/spi/spi_lib.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/lib_mcu/spi/spi_lib.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -26,6 +26,6 @@
/*_____ P R O T O T Y P E S ____________________________________________________________*/
extern void spi_init(void);
-extern unsigned char spi_SendByte(Uchar Data);
+extern uint8_t spi_SendByte(uint8_t Data);
#endif
Modified: firmware/fuxusb/trunk/src/lib_mcu/uart/tools/c51_bdr.c
===================================================================
--- firmware/fuxusb/trunk/src/lib_mcu/uart/tools/c51_bdr.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/lib_mcu/uart/tools/c51_bdr.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -57,7 +57,7 @@
1843200,
0 };
-unsigned int fosc;
+uint16_t fosc;
int bdr (int prescaler, int max, int val)
{
Modified: firmware/fuxusb/trunk/src/lib_mcu/usb/usb_drv.c
===================================================================
--- firmware/fuxusb/trunk/src/lib_mcu/usb/usb_drv.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/lib_mcu/usb/usb_drv.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -67,7 +67,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-void usb_configure_endpoint (Uchar ep_num, Uchar ep_type)
+void usb_configure_endpoint (uint8_t ep_num, uint8_t ep_type)
{
Usb_select_ep(ep_num);
Usb_configure_ep_type(ep_type);
@@ -90,7 +90,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uchar usb_select_enpoint_interrupt(void)
+uint8_t usb_select_enpoint_interrupt(void)
{
if (EP0INT) { Usb_select_ep(0); }
else if (EP1INT) { Usb_select_ep(1); }
@@ -124,7 +124,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uchar usb_get_nb_byte (void)
+uint8_t usb_get_nb_byte (void)
{
return (UBYCTLX);
}
@@ -148,9 +148,9 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uint16 usb_get_nb_byte_epw (void)
+uint16_t usb_get_nb_byte_epw (void)
{
- return ((((Uint16)UBYCTHX)<<8)|(UBYCTLX));
+ return ((((uint16_t)UBYCTHX)<<8)|(UBYCTLX));
}
/*F**************************************************************************
@@ -175,7 +175,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uchar* usb_send_ep0_packet (Uchar* tbuf, Uchar data_length)
+uint8_t * usb_send_ep0_packet (uint8_t * tbuf, uint8_t data_length)
{
Usb_select_ep(0);
@@ -209,7 +209,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uchar* usb_send_right_packet ( Uchar * tbuf, Uchar data_length)
+uint8_t * usb_send_right_packet (uint8_t * tbuf, uint8_t data_length)
{
for ( ; data_length-- ; tbuf++) { Usb_write_byte(*tbuf); }
//Usb_set_tx_ready();
@@ -243,7 +243,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-Uchar* usb_read_right_packet (Uchar* rbuf, Uchar data_length)
+uint8_t * usb_read_right_packet (uint8_t * rbuf, uint8_t data_length)
{
for (; data_length-- ; rbuf++) { *rbuf = Usb_read_byte(); }
@@ -268,7 +268,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-void usb_halt_endpoint (Uchar ep_num)
+void usb_halt_endpoint (uint8_t ep_num)
{
Usb_select_ep(ep_num);
UEPSTAX = 0x00;
@@ -292,7 +292,7 @@
*----------------------------------------------------------------------------
* REQUIREMENTS:
*****************************************************************************/
-void usb_reset_endpoint (Uchar ep_num)
+void usb_reset_endpoint (uint8_t ep_num)
{
UEPRST = 0x01 << ep_num ;
UEPRST = 0x00;
@@ -393,8 +393,8 @@
#if FOSC == 0000 /* frequency Auto-detection */
-Uchar i;
-Uchar reload;
+uint8_t i;
+uint8_t reload;
PLLCON = 0x00;
Modified: firmware/fuxusb/trunk/src/lib_mcu/usb/usb_drv.h
===================================================================
--- firmware/fuxusb/trunk/src/lib_mcu/usb/usb_drv.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/lib_mcu/usb/usb_drv.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -34,7 +34,7 @@
#define INTERRUPT_OUT 0x83
#define ISOCHRONOUS_IN 0x85
#define ISOCHRONOUS_OUT 0x81
-#define BULK_MAX_SIZE ((Uchar)64)
+#define BULK_MAX_SIZE ((uint8_t)64)
@@ -117,7 +117,7 @@
* EXAMPLE:
* if (Usb_test_it_ep(3)) // True if interrupt on endpoint 3
*****************************************************************************/
-#define Usb_test_it_ep(ep_num) (UEPINT & ((Uchar)1<<(ep_num)))
+#define Usb_test_it_ep(ep_num) (UEPINT & ((uint8_t)1<<(ep_num)))
/* {for langdoc}*/
@@ -289,16 +289,16 @@
/*_____ D E C L A R A T I O N ______________________________________________*/
-void usb_configure_endpoint (Uchar , Uchar);
-Uchar usb_get_nb_byte (void);
-Uint16 usb_get_nb_byte_epw (void);
-Uchar* usb_send_ep0_packet (Uchar*, Uchar);
-Uchar* usb_send_right_packet (Uchar*, Uchar);
-Uchar* usb_read_right_packet ( Uchar*, Uchar);
-void usb_reset_endpoint (Uchar);
-Uchar usb_select_enpoint_interrupt (void);
-void usb_halt_endpoint (Uchar);
-void configure_usb_clock (void);
+void usb_configure_endpoint(uint8_t, uint8_t);
+uint8_t usb_get_nb_byte(void);
+uint16_t usb_get_nb_byte_epw(void);
+uint8_t* usb_send_ep0_packet(uint8_t*, uint8_t);
+uint8_t* usb_send_right_packet(uint8_t*, uint8_t);
+uint8_t* usb_read_right_packet(uint8_t*, uint8_t);
+void usb_reset_endpoint(uint8_t);
+uint8_t usb_select_enpoint_interrupt (void);
+void usb_halt_endpoint(uint8_t);
+void configure_usb_clock(void);
#endif /* _USB_DRV_H_ */
Modified: firmware/fuxusb/trunk/src/main.c
===================================================================
--- firmware/fuxusb/trunk/src/main.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/main.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#include "config.h"
#include "global.h"
@@ -63,8 +63,11 @@
{
usb_task();
+ /* Bootloader active */
if (i2c_bootloading_Flag)
+ {
i2c_task();
+ }
else
{
/* If RF is online, goto spi_task */
Modified: firmware/fuxusb/trunk/src/misc.c
===================================================================
--- firmware/fuxusb/trunk/src/misc.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/misc.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -18,7 +18,7 @@
*/
/* $Id$ */
-
+#include "config.h"
#include "global.h"
#include "misc.h"
Modified: firmware/fuxusb/trunk/src/misc.h
===================================================================
--- firmware/fuxusb/trunk/src/misc.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/misc.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,12 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#ifndef _MISC_H_
#define _MISC_H_
-#include "config.h"
void led_behavior(void);
void wait_reset(void);
Modified: firmware/fuxusb/trunk/src/spi_lib.c
===================================================================
--- firmware/fuxusb/trunk/src/spi_lib.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/spi_lib.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -44,7 +44,7 @@
*****************************************************************************/
-uint8_t spi_SendByte(Uchar Data)
+uint8_t spi_SendByte(uint8_t Data)
{
SPDAT = Data;
while(!(SPSTA&0x80));
Modified: firmware/fuxusb/trunk/src/spi_lib.h
===================================================================
--- firmware/fuxusb/trunk/src/spi_lib.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/spi_lib.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -26,6 +26,6 @@
/*_____ P R O T O T Y P E S ____________________________________________________________*/
extern void spi_init(void);
-extern uint8_t spi_SendByte(Uchar Data);
+extern uint8_t spi_SendByte(uint8_t Data);
#endif
Modified: firmware/fuxusb/trunk/src/spi_task.c
===================================================================
--- firmware/fuxusb/trunk/src/spi_task.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/spi_task.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#include "global.h"
#include "config.h"
@@ -50,11 +50,13 @@
READ_COMMAND
} spi_master;
+/* Externs defs */
uint8_t RF_Status;
bit new_cmd_enabled;
bit new_command_received;
bit spi_task_on_Flag = True;
+/* Static defs */
static uint8_t spi_slave_config;
static uint8_t spi_master_config;
static uint8_t spi_count;
Modified: firmware/fuxusb/trunk/src/spi_task.h
===================================================================
--- firmware/fuxusb/trunk/src/spi_task.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/spi_task.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#ifndef _SPITASK_H_
#define _SPITASK_H_
@@ -25,11 +25,13 @@
#define SPI_START P3_4
#define SPI_DREADY P3_2
+/* Variables */
extern uint8_t RF_Status;
extern bit new_cmd_enabled;
extern bit new_command_received;
extern bit spi_task_on_Flag;
+/* Functions */
void spi_task_init(void);
void spi_task(void);
void spi_task_reset(void);
Modified: firmware/fuxusb/trunk/src/usb_commands.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_commands.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_commands.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -32,6 +32,7 @@
#include "lib_mcu\fa-usb\flash_api.h"
#include "lib_mcu\usb\usb_drv.h"
+/* Statics defs */
static void dongle_cmd_parser(void);
static void tux_cmd_parser(void);
static void jump_bootloader(void);
Modified: firmware/fuxusb/trunk/src/usb_commands.h
===================================================================
--- firmware/fuxusb/trunk/src/usb_commands.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_commands.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#ifndef _USB_COMMANDS_H_
#define _USB_COMMANDS_H_
@@ -38,6 +38,7 @@
#define TTS_OFF 0
#define TTS_ON 1
+/* Functions */
void bl_acknowledge(uint8_t ack, uint8_t p1, uint8_t p2, uint8_t p3);
void commands_parser(void);
void prepare_status(void);
Modified: firmware/fuxusb/trunk/src/usb_enum.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_enum.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_enum.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,18 +17,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#include "config.h"
#include "global.h"
#include "version.h"
#include "usb_enum.h"
-#include "usb_ep.h"
-#include "lib_mcu\usb\usb_drv.h"
-#include "spi_lib.h"
#include "spi_task.h"
#include "fifo_stt.h"
+#include "lib_mcu\usb\usb_drv.h"
+
uint8_t usb_configuration_nb = 0;
/*_____ M A C R O S _________________________________________________________*/
@@ -40,7 +39,7 @@
{
sizeof(usb_device_descriptor), DEVICE, USB_SPECIFICATION, DEVICE_CLASS,
DEVICE_SUB_CLASS, DEVICE_PROTOCOL, EP_CONTROL_LENGTH, VENDOR_ID, PRODUCT_ID,
- ((unsigned int)RELEASE_NUMBER), MAN_STRING_INDEX, PROD_STRING_INDEX,
+ ((uint16_t)RELEASE_NUMBER), MAN_STRING_INDEX, PROD_STRING_INDEX,
SN_STRING_INDEX, NB_CONFIGURATION
};
@@ -134,7 +133,7 @@
// Report descriptor
//-------------------------------------------------------------------------
- Uchar rep[SIZE_OF_REPORT];
+ uint8_t rep[SIZE_OF_REPORT];
}
usb_configuration =
{
@@ -618,12 +617,12 @@
};
static bit zlp;
-static Uchar endpoint_status[3];
-static Uchar hid_idle_duration;
-static Uchar *pbuffer;
-static Uchar bmRequestType;
-static Uchar bRequest;
-Uchar line_coding[7];
+static uint8_t endpoint_status[3];
+static uint8_t hid_idle_duration;
+static uint8_t *pbuffer;
+static uint8_t bmRequestType;
+static uint8_t bRequest;
+uint8_t line_coding[7];
/*_____ D E C L A R A T I O N _______________________________________________*/
@@ -677,8 +676,8 @@
usb_configuration_nb = 0;
//usb_connected_Flag = FALSE;
//usb_sof_counter = 0;
- CMD_IN_Bank_Nb = 0;
- CMD_OUT_Bank_Nb = 0;
+ //CMD_IN_Bank_Nb = 0;
+ //CMD_OUT_Bank_Nb = 0;
}
@@ -902,7 +901,7 @@
*****************************************************************************/
static void usb_set_address (void)
{
- Uchar add;
+ uint8_t add;
add = Usb_read_byte(); /* store the LSB of wValue = address */
Usb_clear_rx_setup();
@@ -938,7 +937,7 @@
// R modif
long tc;
//
- Uchar configuration_number;
+ uint8_t configuration_number;
configuration_number = Usb_read_byte(); /* read the conf. num. in wValue */
Usb_clear_DIR();
Usb_clear_rx_setup();
@@ -1007,11 +1006,11 @@
*****************************************************************************/
static void usb_set_interface (void)
{
- unsigned char LAlternateSetting;
- unsigned char HAlternateSetting;
+ uint8_t LAlternateSetting;
+ uint8_t HAlternateSetting;
- unsigned char Linterface_number;
- unsigned char Hinterface_number;
+ uint8_t Linterface_number;
+ uint8_t Hinterface_number;
LAlternateSetting = Usb_read_byte(); /* read the conf. num. in wValue */
HAlternateSetting = Usb_read_byte(); /* read the conf. num. in wValue */
@@ -1048,10 +1047,10 @@
*****************************************************************************/
static void usb_get_descriptor (void)
{
- Uint16 data_to_transfer;
- Uint16 wLength;
- Uchar descriptor_type;
- Uchar string_type;
+ uint16_t data_to_transfer;
+ uint16_t wLength;
+ uint8_t descriptor_type;
+ uint8_t string_type;
zlp = FALSE; /* no zero length packet */
string_type = Usb_read_byte(); /* read LSB of wValue */
@@ -1211,8 +1210,8 @@
ACC = Usb_read_byte(); /* don't care of wIndex field */
ACC = Usb_read_byte();
- ((Uchar*)&wLength)[1] = Usb_read_byte(); /* read wLength */
- ((Uchar*)&wLength)[0] = Usb_read_byte();
+ ((uint8_t *)&wLength)[1] = Usb_read_byte(); /* read wLength */
+ ((uint8_t *)&wLength)[0] = Usb_read_byte();
if (wLength > data_to_transfer)
{
if ((data_to_transfer % EP_CONTROL_LENGTH) == 0) { zlp = TRUE; }
@@ -1315,11 +1314,11 @@
*****************************************************************************/
static void usb_get_current (void)
{
- unsigned char LwValue = Usb_read_byte();
- unsigned char HwValue = Usb_read_byte();
+ uint8_t LwValue = Usb_read_byte();
+ uint8_t HwValue = Usb_read_byte();
- unsigned char LwIndex = Usb_read_byte();
- unsigned char HwIndex = Usb_read_byte();
+ uint8_t LwIndex = Usb_read_byte();
+ uint8_t HwIndex = Usb_read_byte();
Usb_clear_rx_setup();
Usb_set_DIR();
@@ -1347,11 +1346,11 @@
static void usb_get_min (void)
{
- unsigned char LwValue = Usb_read_byte();
- unsigned char HwValue = Usb_read_byte();
+ uint8_t LwValue = Usb_read_byte();
+ uint8_t HwValue = Usb_read_byte();
- unsigned char LwIndex = Usb_read_byte();
- unsigned char HwIndex = Usb_read_byte();
+ uint8_t LwIndex = Usb_read_byte();
+ uint8_t HwIndex = Usb_read_byte();
Usb_clear_rx_setup();
Usb_set_DIR();
@@ -1373,11 +1372,11 @@
static void usb_get_max (void)
{
- unsigned char LwValue = Usb_read_byte();
- unsigned char HwValue = Usb_read_byte();
+ uint8_t LwValue = Usb_read_byte();
+ uint8_t HwValue = Usb_read_byte();
- unsigned char LwIndex = Usb_read_byte();
- unsigned char HwIndex = Usb_read_byte();
+ uint8_t LwIndex = Usb_read_byte();
+ uint8_t HwIndex = Usb_read_byte();
Usb_clear_rx_setup();
Usb_set_DIR();
@@ -1399,11 +1398,11 @@
static void usb_get_res (void)
{
- unsigned char LwValue = Usb_read_byte();
- unsigned char HwValue = Usb_read_byte();
+ uint8_t LwValue = Usb_read_byte();
+ uint8_t HwValue = Usb_read_byte();
- unsigned char LwIndex = Usb_read_byte();
- unsigned char HwIndex = Usb_read_byte();
+ uint8_t LwIndex = Usb_read_byte();
+ uint8_t HwIndex = Usb_read_byte();
Usb_clear_rx_setup();
Usb_set_DIR();
@@ -1442,11 +1441,11 @@
*****************************************************************************/
static void usb_set_current (void)
{
- unsigned char LwValue = Usb_read_byte();
- unsigned char HwValue = Usb_read_byte();
+ uint8_t LwValue = Usb_read_byte();
+ uint8_t HwValue = Usb_read_byte();
- unsigned char LwIndex = Usb_read_byte();
- unsigned char HwIndex = Usb_read_byte();
+ uint8_t LwIndex = Usb_read_byte();
+ uint8_t HwIndex = Usb_read_byte();
Usb_clear_DIR();
Usb_clear_rx_setup();
@@ -1468,11 +1467,11 @@
static void usb_set_min (void)
{
- unsigned char LwValue = Usb_read_byte();
- unsigned char HwValue = Usb_read_byte();
+ uint8_t LwValue = Usb_read_byte();
+ uint8_t HwValue = Usb_read_byte();
- unsigned char LwIndex = Usb_read_byte();
- unsigned char HwIndex = Usb_read_byte();
+ uint8_t LwIndex = Usb_read_byte();
+ uint8_t HwIndex = Usb_read_byte();
Usb_clear_DIR();
Usb_clear_rx_setup();
@@ -1490,11 +1489,11 @@
static void usb_set_max (void)
{
- unsigned char LwValue = Usb_read_byte();
- unsigned char HwValue = Usb_read_byte();
+ uint8_t LwValue = Usb_read_byte();
+ uint8_t HwValue = Usb_read_byte();
- unsigned char LwIndex = Usb_read_byte();
- unsigned char HwIndex = Usb_read_byte();
+ uint8_t LwIndex = Usb_read_byte();
+ uint8_t HwIndex = Usb_read_byte();
Usb_clear_DIR();
Usb_clear_rx_setup();
@@ -1512,11 +1511,11 @@
static void usb_set_res (void)
{
- unsigned char LwValue = Usb_read_byte();
- unsigned char HwValue = Usb_read_byte();
+ uint8_t LwValue = Usb_read_byte();
+ uint8_t HwValue = Usb_read_byte();
- unsigned char LwIndex = Usb_read_byte();
- unsigned char HwIndex = Usb_read_byte();
+ uint8_t LwIndex = Usb_read_byte();
+ uint8_t HwIndex = Usb_read_byte();
Usb_clear_DIR();
Usb_clear_rx_setup();
@@ -1610,7 +1609,7 @@
*****************************************************************************/
static void usb_get_status (void)
{
- Uchar wIndex;
+ uint8_t wIndex;
ACC = Usb_read_byte(); /* dummy read */
ACC = Usb_read_byte(); /* dummy read */
Modified: firmware/fuxusb/trunk/src/usb_enum.h
===================================================================
--- firmware/fuxusb/trunk/src/usb_enum.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_enum.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#ifndef _USB_ENUM_H_
#define _USB_ENUM_H_
Modified: firmware/fuxusb/trunk/src/usb_ep.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_ep.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_ep.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -24,20 +24,23 @@
#include "usb_enum.h"
#include "usb_commands.h"
#include "spi_task.h"
-#include "lib_mcu\usb\usb_drv.h"
#include "fifo_spk.h"
#include "fifo_mic.h"
+#include "lib_mcu\usb\usb_drv.h"
+/* Externs defs */
+uint8_t CMD_OUT_Bank_Nb;
+uint8_t CMD_IN_Bank_Nb;
+bit tts_pipe_selected = False;
+bit status_requested = False;
+
+/* Statics defs */
static void clear_mic_ep(void);
static void read_tts_ep(void);
static void read_spk_ep(void);
static void clear_cmdout_ep(void);
static void clear_cmdin_ep(void);
-uint8_t CMD_OUT_Bank_Nb;
-uint8_t CMD_IN_Bank_Nb;
-bit tts_pipe_selected = False;
-bit status_requested = False;
static bit fifo_mic_loaded = False;
/**
@@ -84,7 +87,7 @@
clear_cmdin_ep();
}
-/*
+/**
* \brief Send the statuses previously prepared
*/
void send_status(void)
@@ -113,7 +116,7 @@
Usb_select_ep(EP_AUDIO_IN);
- i=8;
+ i = 8;
do {
Usb_write_byte(FIFO_MIC_get());
i--;
Modified: firmware/fuxusb/trunk/src/usb_ep.h
===================================================================
--- firmware/fuxusb/trunk/src/usb_ep.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_ep.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,16 +17,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#ifndef _USB_EP_H_
#define _USB_EP_H_
+/* Variables */
extern bit status_requested;
extern bit tts_pipe_selected;
extern uint8_t CMD_OUT_Bank_Nb;
extern uint8_t CMD_IN_Bank_Nb;
+/* Functions */
void endpoints_parser(void);
void send_status(void);
void fill_mic_ep(void);
Modified: firmware/fuxusb/trunk/src/usb_misc.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_misc.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_misc.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#include "config.h"
#include "global.h"
@@ -57,7 +57,8 @@
/* Detach and attach usb */
tc=10000;
Usb_detach();
- while(tc) tc --; //tempo(TIMER_5_MS);
+ while(tc) tc --;
Usb_attach();
}
+
Modified: firmware/fuxusb/trunk/src/usb_misc.h
===================================================================
--- firmware/fuxusb/trunk/src/usb_misc.h 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_misc.h 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#ifndef _USB_MISC_H_
#define _USB_MISC_H_
@@ -26,6 +26,7 @@
void resume_usb(void);
void reset_usb(void);
void reattach_usb(void);
+void usb_var_init (void);
#endif // _USB_MISC_H_
Modified: firmware/fuxusb/trunk/src/usb_task.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_task.c 2008-05-15 08:12:23 UTC (rev 1150)
+++ firmware/fuxusb/trunk/src/usb_task.c 2008-05-15 08:57:03 UTC (rev 1151)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
#include "config.h"
#include "global.h"
@@ -31,14 +31,13 @@
void usb_task_init(void)
{
- unsigned long SfTimer=10000;
+ uint16_t timer=10000;
configure_usb_clock();
Usb_enable();
- Usb_detach();
- while(SfTimer) SfTimer --;
- Usb_attach();
+ reattach_usb();
+
usb_configure_endpoint(EP_CONTROL, CONTROL);
usb_reset_endpoint(EP_CONTROL);
|
