[tuxdroid-svn] r1066 - in firmware/fuxusb/branches/0.3: . modules modules/fifo modules/fifo_stt modules/spi modules/usb

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

Author: Paul_R
Date: 2008-05-02 11:42:15 +0200 (Fri, 02 May 2008)
New Revision: 1066

Added:
   firmware/fuxusb/branches/0.3/fuxusb.Uv2
Removed:
   firmware/fuxusb/branches/0.3/lib_board/
   firmware/fuxusb/branches/0.3/modules/scheduler/
   firmware/fuxusb/branches/0.3/usb_RFDongle.Uv2
Modified:
   firmware/fuxusb/branches/0.3/bootloading.c
   firmware/fuxusb/branches/0.3/config.h
   firmware/fuxusb/branches/0.3/global.c
   firmware/fuxusb/branches/0.3/main.c
   firmware/fuxusb/branches/0.3/modules/fifo/fifo_spk.c
   firmware/fuxusb/branches/0.3/modules/fifo_stt/fifo_stt.c
   firmware/fuxusb/branches/0.3/modules/spi/spi_task.c
   firmware/fuxusb/branches/0.3/modules/usb/usb_task.c
Log:
* Project cleanup :
  Removed unused modules
  Removed some #define
  Renamed the project (usb_RFDongle.Uv2 -> fuxusb.Uv2)


Modified: firmware/fuxusb/branches/0.3/bootloading.c
===================================================================
--- firmware/fuxusb/branches/0.3/bootloading.c	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/bootloading.c	2008-05-02 09:42:15 UTC (rev 1066)
@@ -6,7 +6,6 @@
  * $Id: main.c 28 2006-01-12 16:51:01Z david $
  */
 
-//#include "lib_mcu/twi/twi.h"
 #include "bootloading.h"
 #include "config.h"
 

Modified: firmware/fuxusb/branches/0.3/config.h
===================================================================
--- firmware/fuxusb/branches/0.3/config.h	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/config.h	2008-05-02 09:42:15 UTC (rev 1066)
@@ -25,9 +25,9 @@
 
 /*_____ M A C R O S ________________________________________________________*/
 
+//#define MAIN_DEBUG
 
 //#define USB_ENUM_DEBUG
-//#define MAIN_DEBUG
 //#define USB_TASK_DEBUG
 //#define BOOTLOAD_DEBUG
 //#define BOOTLOAD_USB_DEBUG

Added: firmware/fuxusb/branches/0.3/fuxusb.Uv2
===================================================================
--- firmware/fuxusb/branches/0.3/fuxusb.Uv2	                        (rev 0)
+++ firmware/fuxusb/branches/0.3/fuxusb.Uv2	2008-05-02 09:42:15 UTC (rev 1066)
@@ -0,0 +1,141 @@
+### uVision2 Project, (C) Keil Software
+### Do not modify !
+
+Target (fuxusb), 0x0000 // Tools: 'MCS-51'
+
+Group (system)
+Group (modules)
+Group (lib_mcu)
+Group (headers)
+
+File 1,1,<.\main.c><main.c> 0x0 
+File 1,1,<.\global.c><global.c> 0x0 
+File 1,1,<.\modules\usb\usb_task.c><usb_task.c> 0x0 
+File 1,1,<.\modules\spi\spi_task.c><spi_task.c> 0x0 
+File 1,1,<.\bootloading.c><bootloading.c> 0x0 
+File 1,1,<.\i2c.c><i2c.c> 0x0 
+File 2,1,<.\modules\timer_soft\timer_soft.c><timer_soft.c> 0x0 
+File 2,1,<.\modules\usb_enum\usb_enum.c><usb_enum.c> 0x0 
+File 2,1,<.\modules\fifo\fifo_spk.c><fifo_spk.c> 0x0 
+File 2,1,<.\modules\fifo\fifo_mic.c><fifo_mic.c> 0x0 
+File 2,1,<.\modules\fifo\fifo.c><fifo.c> 0x0 
+File 2,1,<.\modules\fifo_stt\fifo_stt.c><fifo_stt.c> 0x0 
+File 3,1,<.\lib_mcu\usb\usb_drv.c><usb_drv.c> 0x0 
+File 3,1,<.\lib_mcu\uart\uart_lib.c><uart_lib.c> 0x0 
+File 3,1,<.\lib_mcu\spi\spi_lib.c><spi_lib.c> 0x0 
+File 3,1,<.\lib_mcu\fa-usb\flash_api.c><flash_api.c> 0x0 
+File 4,5,<.\config.h><config.h> 0x0 
+File 4,5,<.\lib_mcu\reg_5131.h><reg_5131.h> 0x0 
+File 4,5,<.\lib_mcu\ext_5131.h><ext_5131.h> 0x0 
+File 4,5,<.\lib_mcu\5131_drv.h><5131_drv.h> 0x0 
+File 4,5,<.\lib_mcu\usb\usb_drv.h><usb_drv.h> 0x0 
+File 4,5,<.\global.h><global.h> 0x0 
+File 4,5,<.\bootloading.h><bootloading.h> 0x0 
+File 4,5,<.\i2c.h><i2c.h> 0x0 
+File 4,5,<.\lib_mcu\twi\twi.h><twi.h> 0x0 
+
+
+Options 1,0,0  // Target 'fuxusb'
+ Device (AT89C5131)
+ Vendor (Atmel)
+ Cpu (IRAM(0-0xFF) XRAM(0-0x3FF) CLOCK(32000000))
+ FlashUt ("batchisp" (-device $D -hardware RS232 -port COM1 -baudrate 19200 -operation MEMORY FLASH LOADBUFFER %H PROGRAM))
+ StupF ("LIB\STARTUP.A51" ("Standard 8051 Startup Code"))
+ FlashDR ()
+ Rgf (REG52.H)
+ Mem ()
+ C ()
+ A ()
+ RL ()
+ OH ()
+ UseEnv=0
+ EnvBin (C:\Keil\C51\BIN\)
+ EnvInc ()
+ EnvLib ()
+ EnvReg ()
+ OrgReg ()
+ TgStat=0
+ OutDir (.\obj\)
+ OutName (fuxusb.aof)
+ GenApp=1
+ GenLib=0
+ GenHex=1
+ Debug=1
+ Browse=1
+ LstDir (.\lst\)
+ HexSel=0
+ MG32K=0
+ TGMORE=0
+ RunUsr 0 0 <>
+ RunUsr 1 0 <>
+ BrunUsr 0 0 <>
+ BrunUsr 1 0 <>
+ SVCSID <>
+ MODEL5=2
+ RTOS5=0
+ ROMSZ5=2
+ DHOLD5=0
+ XHOLD5=0
+ T51FL=56
+ CBANKS5=0
+ XBANKS5=0
+ RCB51 { 0,0,0,0,0,255,255,0,0 }
+ RXB51 { 0,0,0,0,0,0,0,0,0 }
+ OCM51 { 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 }
+ OCR51 { 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 }
+ IRO51 { 0,0,0,0,0,0,0,0,0 }
+ IRA51 { 0,0,0,0,0,0,1,0,0 }
+ XRA51 { 0,0,0,0,0,0,4,0,0 }
+ XRA512 { 0,0,0,0,0,0,0,0,0 }
+ C51FL=21646608
+ C51VA=0
+ C51MSC ()
+ C51DEF (KEIL)
+ C51UDF ()
+ INCC5 (.\;.\;.\;.\lib_c\)
+ AX51FL=4
+ AX51MSC ()
+ AX51SET ()
+ AX51RST ()
+ INCA5 ()
+ PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ IncBld=1
+ AlwaysBuild=0
+ GenAsm=0
+ AsmAsm=0
+ PublicsOnly=0
+ StopCode=3
+ CustArgs ()
+ LibMods ()
+ BankNo=65535
+ LX51FL=292
+ LX51OVL ()
+ LX51MSC ()
+ LX51DWN (16)
+ LX51LFI ()
+ LX51ASN ()
+ LX51RES ()
+ LX51CCL ()
+ LX51UCL ()
+ LX51CSC ()
+ LX51UCS ()
+ LX51COB ()
+ LX51XDB ()
+ LX51PDB ()
+ LX51BIB ()
+ LX51DAB ()
+ LX51IDB ()
+ LX51PRC ()
+ LX51STK ()
+ LX51COS ()
+ LX51XDS ()
+ LX51BIS ()
+ LX51DAS ()
+ LX51IDS ()
+  OPTDL (S8051.DLL)()(DP51.DLL)(-p5131)(S8051.DLL)()(TP51.DLL)(-p5131)
+  OPTDBG 48126,-1,()()()()()()()()()() (BIN\MON51.DLL)()()()
+ FLASH1 { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ FLASH2 ()
+ FLASH3 ("batchisp" (-device $D -hardware RS232 -port COM1 -baudrate 19200 -operation MEMORY FLASH LOADBUFFER %H PROGRAM))
+EndOpt
+

Modified: firmware/fuxusb/branches/0.3/global.c
===================================================================
--- firmware/fuxusb/branches/0.3/global.c	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/global.c	2008-05-02 09:42:15 UTC (rev 1066)
@@ -12,12 +12,8 @@
  *****************************************************************************/
 
 #include "global.h" 
-
 #include "version.h"
 
-
-
-
 /*_____ M A C R O S ________________________________________________________*/
 
 /*_____ D E F I N I T I O N ________________________________________________*/
@@ -25,7 +21,6 @@
 /*_____ D E C L A R A T I O N ______________________________________________*/
 
 
-
 //-------------------------------------------------------
 //   SPI Controler 
 //-------------------------------------------------------

Modified: firmware/fuxusb/branches/0.3/main.c
===================================================================
--- firmware/fuxusb/branches/0.3/main.c	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/main.c	2008-05-02 09:42:15 UTC (rev 1066)
@@ -12,17 +12,14 @@
  *****************************************************************************/
 
 /*_____ I N C L U D E S ____________________________________________________*/
-
-
 #include "config.h"
 #include "lib_c/stdint.h"
 #include "global.h"
-#include "lib_mcu\uart\uart_lib.h"
 #include "modules\usb\usb_task.h"
 
-#include "modules\fifo\fifo_spk.h"
-#include "modules\fifo\fifo_mic.h"
-#include "modules\fifo_stt\fifo_stt.h"
+#ifdef MAIN_DEBUG
+    #include "lib_mcu\uart\uart_lib.h"
+#endif
 
 char code reserve [3] _at_ 0x23;      /* for Monitor-51 serial interrupt */
 

Modified: firmware/fuxusb/branches/0.3/modules/fifo/fifo_spk.c
===================================================================
--- firmware/fuxusb/branches/0.3/modules/fifo/fifo_spk.c	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/modules/fifo/fifo_spk.c	2008-05-02 09:42:15 UTC (rev 1066)
@@ -14,8 +14,8 @@
 #include "config.h"
 #include "fifo_spk.h"  
 #include "lib_mcu\usb\usb_drv.h"
-#include "lib_mcu\uart\uart_lib.h"
 
+
 unsigned char FifoTbl_SPK[FIFOTBL_SPK_MAX];
 
 unsigned char FifoIn_SPK_Idx;

Modified: firmware/fuxusb/branches/0.3/modules/fifo_stt/fifo_stt.c
===================================================================
--- firmware/fuxusb/branches/0.3/modules/fifo_stt/fifo_stt.c	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/modules/fifo_stt/fifo_stt.c	2008-05-02 09:42:15 UTC (rev 1066)
@@ -14,8 +14,8 @@
 #include "config.h"
 #include "fifo_stt.h"  
 #include "lib_mcu\usb\usb_drv.h"
-#include "lib_mcu\uart\uart_lib.h"
 
+
 unsigned char FifoTbl_Stt[FIFOTBL_STT_MAX];
 
 unsigned char FifoIn_STT_Idx;

Modified: firmware/fuxusb/branches/0.3/modules/spi/spi_task.c
===================================================================
--- firmware/fuxusb/branches/0.3/modules/spi/spi_task.c	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/modules/spi/spi_task.c	2008-05-02 09:42:15 UTC (rev 1066)
@@ -10,14 +10,12 @@
  *****************************************************************************/
 /*_____ I N C L U D E S ____________________________________________________*/
 
+#include "global.h"
 #include "config.h"
-#include "lib_mcu\usb\usb_drv.h"
 #include "lib_mcu\spi\spi_lib.h"
-#include "modules\usb_enum\usb_enum.h"
 #include "modules\spi\spi_task.h"
-#include "modules\fifo\fifo_spk.h"
-#include "modules\fifo\fifo_mic.h"
 #include "global.h"
+
 /*_____ M A C R O S ________________________________________________________*/
 
 /*_____ D E F I N I T I O N ________________________________________________*/

Modified: firmware/fuxusb/branches/0.3/modules/usb/usb_task.c
===================================================================
--- firmware/fuxusb/branches/0.3/modules/usb/usb_task.c	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/modules/usb/usb_task.c	2008-05-02 09:42:15 UTC (rev 1066)
@@ -15,8 +15,6 @@
 
 #include "lib_mcu\spi\spi_lib.h"
 #include "lib_mcu\usb\usb_drv.h"
-#include "lib_mcu\usb\uart_usb_lib.h"
-#include "lib_mcu\uart\uart_lib.h"
 #include "lib_mcu\fa-usb\flash_api.h"
 #include "modules\usb\usb_task.h"
 #include "modules\spi\spi_task.h"

Deleted: firmware/fuxusb/branches/0.3/usb_RFDongle.Uv2
===================================================================
--- firmware/fuxusb/branches/0.3/usb_RFDongle.Uv2	2008-05-02 08:19:25 UTC (rev 1065)
+++ firmware/fuxusb/branches/0.3/usb_RFDongle.Uv2	2008-05-02 09:42:15 UTC (rev 1066)
@@ -1,143 +0,0 @@
-### uVision2 Project, (C) Keil Software
-### Do not modify !
-
-Target (RF_Dongle), 0x0000 // Tools: 'MCS-51'
-
-Group (system)
-Group (modules)
-Group (lib_board)
-Group (lib_mcu)
-Group (headers)
-
-File 1,1,<.\main.c><main.c> 0x0 
-File 1,1,<.\global.c><global.c> 0x0 
-File 1,1,<.\modules\usb\usb_task.c><usb_task.c> 0x0 
-File 1,1,<.\modules\spi\spi_task.c><spi_task.c> 0x0 
-File 1,1,<.\bootloading.c><bootloading.c> 0x0 
-File 1,1,<.\i2c.c><i2c.c> 0x0 
-File 2,1,<.\modules\timer_soft\timer_soft.c><timer_soft.c> 0x0 
-File 2,1,<.\modules\usb_enum\usb_enum.c><usb_enum.c> 0x0 
-File 2,1,<.\modules\fifo\fifo_spk.c><fifo_spk.c> 0x0 
-File 2,1,<.\modules\fifo\fifo_mic.c><fifo_mic.c> 0x0 
-File 2,1,<.\modules\fifo\fifo.c><fifo.c> 0x0 
-File 2,1,<.\modules\fifo_stt\fifo_stt.c><fifo_stt.c> 0x0 
-File 4,1,<.\lib_mcu\usb\usb_drv.c><usb_drv.c> 0x0 
-File 4,1,<.\lib_mcu\uart\uart_lib.c><uart_lib.c> 0x0 
-File 4,1,<.\lib_mcu\spi\spi_lib.c><spi_lib.c> 0x0 
-File 4,1,<.\lib_mcu\fa-usb\flash_api.c><flash_api.c> 0x0 
-File 5,5,<.\config.h><config.h> 0x0 
-File 5,5,<.\lib_board\c5131_evab.h><c5131_evab.h> 0x0 
-File 5,5,<.\lib_mcu\reg_5131.h><reg_5131.h> 0x0 
-File 5,5,<.\lib_mcu\ext_5131.h><ext_5131.h> 0x0 
-File 5,5,<.\lib_mcu\5131_drv.h><5131_drv.h> 0x0 
-File 5,5,<.\lib_mcu\usb\usb_drv.h><usb_drv.h> 0x0 
-File 5,5,<.\global.h><global.h> 0x0 
-File 5,5,<.\bootloading.h><bootloading.h> 0x0 
-File 5,5,<.\i2c.h><i2c.h> 0x0 
-File 5,5,<.\lib_mcu\twi\twi.h><twi.h> 0x0 
-
-
-Options 1,0,0  // Target 'RF_Dongle'
- Device (AT89C5131)
- Vendor (Atmel)
- Cpu (IRAM(0-0xFF) XRAM(0-0x3FF) CLOCK(32000000))
- FlashUt ("batchisp" (-device $D -hardware RS232 -port COM1 -baudrate 19200 -operation MEMORY FLASH LOADBUFFER %H PROGRAM))
- StupF ("LIB\STARTUP.A51" ("Standard 8051 Startup Code"))
- FlashDR ()
- Rgf (REG52.H)
- Mem ()
- C ()
- A ()
- RL ()
- OH ()
- UseEnv=0
- EnvBin (C:\Keil\C51\BIN\)
- EnvInc ()
- EnvLib ()
- EnvReg ()
- OrgReg ()
- TgStat=0
- OutDir (.\obj\)
- OutName (fuxusb.aof)
- GenApp=1
- GenLib=0
- GenHex=1
- Debug=1
- Browse=1
- LstDir (.\lst\)
- HexSel=0
- MG32K=0
- TGMORE=0
- RunUsr 0 0 <>
- RunUsr 1 0 <>
- BrunUsr 0 0 <>
- BrunUsr 1 0 <>
- SVCSID <>
- MODEL5=2
- RTOS5=0
- ROMSZ5=2
- DHOLD5=0
- XHOLD5=0
- T51FL=56
- CBANKS5=0
- XBANKS5=0
- RCB51 { 0,0,0,0,0,255,255,0,0 }
- RXB51 { 0,0,0,0,0,0,0,0,0 }
- OCM51 { 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 }
- OCR51 { 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 }
- IRO51 { 0,0,0,0,0,0,0,0,0 }
- IRA51 { 0,0,0,0,0,0,1,0,0 }
- XRA51 { 0,0,0,0,0,0,4,0,0 }
- XRA512 { 0,0,0,0,0,0,0,0,0 }
- C51FL=21646608
- C51VA=0
- C51MSC ()
- C51DEF (KEIL)
- C51UDF ()
- INCC5 (.\;.\;.\;.\lib_c\)
- AX51FL=4
- AX51MSC ()
- AX51SET ()
- AX51RST ()
- INCA5 ()
- PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- IncBld=1
- AlwaysBuild=0
- GenAsm=0
- AsmAsm=0
- PublicsOnly=0
- StopCode=3
- CustArgs ()
- LibMods ()
- BankNo=65535
- LX51FL=292
- LX51OVL ()
- LX51MSC ()
- LX51DWN (16)
- LX51LFI ()
- LX51ASN ()
- LX51RES ()
- LX51CCL ()
- LX51UCL ()
- LX51CSC ()
- LX51UCS ()
- LX51COB ()
- LX51XDB ()
- LX51PDB ()
- LX51BIB ()
- LX51DAB ()
- LX51IDB ()
- LX51PRC ()
- LX51STK ()
- LX51COS ()
- LX51XDS ()
- LX51BIS ()
- LX51DAS ()
- LX51IDS ()
-  OPTDL (S8051.DLL)()(DP51.DLL)(-p5131)(S8051.DLL)()(TP51.DLL)(-p5131)
-  OPTDBG 48126,-1,()()()()()()()()()() (BIN\MON51.DLL)()()()
- FLASH1 { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- FLASH2 ()
- FLASH3 ("batchisp" (-device $D -hardware RS232 -port COM1 -baudrate 19200 -operation MEMORY FLASH LOADBUFFER %H PROGRAM))
-EndOpt
-