[tuxdroid-svn] r1209 - in firmware/fuxusb/trunk: . src

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

Author: Paul_R
Date: 2008-05-30 16:28:22 +0200 (Fri, 30 May 2008)
New Revision: 1209

Modified:
   firmware/fuxusb/trunk/fuxusb.Opt
   firmware/fuxusb/trunk/src/fifo_mic.c
   firmware/fuxusb/trunk/src/fifo_mic.h
   firmware/fuxusb/trunk/src/fifo_spk.c
   firmware/fuxusb/trunk/src/fifo_spk.h
   firmware/fuxusb/trunk/src/spi_task.c
Log:
* Cleanup :
  - Removed unused define and variables
  - Renamed some stuff on the audio FIFOs modules


Modified: firmware/fuxusb/trunk/fuxusb.Opt
===================================================================
(Binary files differ)

Modified: firmware/fuxusb/trunk/src/fifo_mic.c
===================================================================
--- firmware/fuxusb/trunk/src/fifo_mic.c	2008-05-30 14:05:33 UTC (rev 1208)
+++ firmware/fuxusb/trunk/src/fifo_mic.c	2008-05-30 14:28:22 UTC (rev 1209)
@@ -32,11 +32,9 @@
 /** \name Fifo's constants 
  * @{ */
 /** Buffer size */
-#define FIFOTBL_MIC_MAX             64
-/** Overload value */
-#define FIFO_MIC_OVERLOAD           FIFOTBL_MIC_MAX
+#define MIC_BUF_SIZE 64
 /** Ready threshold. This value allow to fill the fifo */
-#define FIFO_MIC_READY_VALUE        32
+#define FIFO_MIC_READY 32
 /*! @} */
 
 /** \name Variables
@@ -44,16 +42,11 @@
  * access time.
  * @{ */
 /** Fifo buffer */
-uint8_t idata FifoTbl_MIC[FIFOTBL_MIC_MAX];
+uint8_t idata Mic_buf[MIC_BUF_SIZE];
 /** In index */
 uint8_t data FifoIn_MIC_Idx;
 /** Out index */
 uint8_t data FifoOut_MIC_Idx;
-/** Out counter */
-uint8_t data FifoOut_MIC_cmpt;
-/** Fifo ready flag. 
- \ingroup fifo_mic */
-bit data Fifoready_MIC = 0; 
 /*! @} */
 
 /**
@@ -63,10 +56,8 @@
  */
 void FIFO_MIC_init (void)
 {
-    FifoOut_MIC_cmpt = 0;
     FifoOut_MIC_Idx = 0;
     FifoIn_MIC_Idx = 0;
-    Fifoready_MIC = 0; 
 }
 
 /**
@@ -74,7 +65,7 @@
  */
 bit FIFO_MIC_ready(void)
 {
-    return ((FifoIn_MIC_Idx - FifoOut_MIC_Idx) > FIFO_MIC_READY_VALUE);
+    return ((FifoIn_MIC_Idx - FifoOut_MIC_Idx) > FIFO_MIC_READY);
 }
 
 /**
@@ -92,10 +83,10 @@
     i = n;
     do 
     {
-        if ((FifoIn_MIC_Idx - FifoOut_MIC_Idx) == FIFOTBL_MIC_MAX)
+        if ((FifoIn_MIC_Idx - FifoOut_MIC_Idx) == MIC_BUF_SIZE)
             return;
 
-        FifoTbl_MIC[FifoIn_MIC_Idx++ & (FIFOTBL_MIC_MAX-1)] = \
+        Mic_buf[FifoIn_MIC_Idx++ & (MIC_BUF_SIZE-1)] = \
                     received_rf_data[n-i];
     } while (-- i);
 }
@@ -111,5 +102,5 @@
     if (FifoOut_MIC_Idx == FifoIn_MIC_Idx)
         return 0x80;
 
-    return FifoTbl_MIC[FifoOut_MIC_Idx++ & (FIFOTBL_MIC_MAX - 1)];
+    return Mic_buf[FifoOut_MIC_Idx++ & (MIC_BUF_SIZE - 1)];
 }

Modified: firmware/fuxusb/trunk/src/fifo_mic.h
===================================================================
--- firmware/fuxusb/trunk/src/fifo_mic.h	2008-05-30 14:05:33 UTC (rev 1208)
+++ firmware/fuxusb/trunk/src/fifo_mic.h	2008-05-30 14:28:22 UTC (rev 1209)
@@ -28,8 +28,6 @@
 #ifndef _FIFO_MIC_H_
 #define _FIFO_MIC_H_
 
-extern bit Fifoready_MIC;
-
 extern void FIFO_MIC_init (void);
 extern bit FIFO_MIC_ready(void);
 extern void FIFO_MIC_put_n (uint8_t const n);

Modified: firmware/fuxusb/trunk/src/fifo_spk.c
===================================================================
--- firmware/fuxusb/trunk/src/fifo_spk.c	2008-05-30 14:05:33 UTC (rev 1208)
+++ firmware/fuxusb/trunk/src/fifo_spk.c	2008-05-30 14:28:22 UTC (rev 1209)
@@ -32,13 +32,9 @@
 /** \name Fifo's constants 
  * @{ */
 /** Buffer size */
-#define FIFOTBL_SPK_MAX 64
-/** Overload value */
-#define FIFO_SPK_OVERLOAD FIFOTBL_SPK_MAX
+#define SPK_BUF_SIZE 64
 /** Ready threshold. This value allow to empty the fifo */
-#define FIFO_SPK_READY_VALUE_MAX 32
-/** Too low level threshold. This value disable to empty the fifo */
-#define FIFO_SPK_READY_VALUE_MIN 16
+#define FIFO_SPK_READY 32
 /*! @} */
 
 /** \name Variables
@@ -46,16 +42,11 @@
  * access time.
  * @{ */
 /** Fifo buffer */
-uint8_t idata FifoTbl_SPK[FIFOTBL_SPK_MAX];
+uint8_t idata Spk_buf[SPK_BUF_SIZE];
 /** In index */
 uint8_t data FifoIn_SPK_Idx;
 /** Out index */
 uint8_t data FifoOut_SPK_Idx;
-/** Out counter */
-uint8_t data FifoOut_SPK_cmpt;
-/** Fifo ready flag. 
- \ingroup fifo_spk */
-bit data Fifoready_SPK = False;
 /*! @} */
 
 /**
@@ -65,10 +56,8 @@
  */
 void FIFO_SPK_init (void)
 {
-    FifoOut_SPK_cmpt = 0;
     FifoOut_SPK_Idx = 0;
     FifoIn_SPK_Idx = 0;
-    Fifoready_SPK = 0; 
 }
 
 /**
@@ -76,7 +65,7 @@
  */
 bit FIFO_SPK_ready(void)
 {
-    return ((FifoIn_SPK_Idx - FifoOut_SPK_Idx) > FIFO_SPK_READY_VALUE_MAX); 
+    return ((FifoIn_SPK_Idx - FifoOut_SPK_Idx) > FIFO_SPK_READY); 
 }
 /**
  * \brief Push N bytes in the Speaker FIFO.
@@ -92,10 +81,10 @@
 
     do
     {
-       if ((FifoIn_SPK_Idx - FifoOut_SPK_Idx) == FIFOTBL_SPK_MAX)
+       if ((FifoIn_SPK_Idx - FifoOut_SPK_Idx) == SPK_BUF_SIZE)
            return;
        
-       FifoTbl_SPK[FifoIn_SPK_Idx++ & (FIFOTBL_SPK_MAX - 1)] = \
+       Spk_buf[FifoIn_SPK_Idx++ & (SPK_BUF_SIZE - 1)] = \
                    Usb_read_byte();
 
     } while (-- i);
@@ -112,5 +101,5 @@
     if (FifoOut_SPK_Idx == FifoIn_SPK_Idx)
         return 0x80;
 
-    return FifoTbl_SPK[FifoOut_SPK_Idx++ & (FIFOTBL_SPK_MAX - 1)];
+    return Spk_buf[FifoOut_SPK_Idx++ & (SPK_BUF_SIZE - 1)];
 }

Modified: firmware/fuxusb/trunk/src/fifo_spk.h
===================================================================
--- firmware/fuxusb/trunk/src/fifo_spk.h	2008-05-30 14:05:33 UTC (rev 1208)
+++ firmware/fuxusb/trunk/src/fifo_spk.h	2008-05-30 14:28:22 UTC (rev 1209)
@@ -29,7 +29,6 @@
 #ifndef _FIFO_SPK_H_
 #define _FIFO_SPK_H_
 
-extern bit Fifoready_SPK;
 
 extern void FIFO_SPK_init (void);
 extern bit FIFO_SPK_ready(void);

Modified: firmware/fuxusb/trunk/src/spi_task.c
===================================================================
--- firmware/fuxusb/trunk/src/spi_task.c	2008-05-30 14:05:33 UTC (rev 1208)
+++ firmware/fuxusb/trunk/src/spi_task.c	2008-05-30 14:28:22 UTC (rev 1209)
@@ -201,7 +201,6 @@
                 if (spi_slave == HEADERS)
                 {
                     if (FIFO_SPK_ready())
-                    //if (Fifoready_SPK) // FIFO ready to be empty
                     {
                         if (new_command_received) //
                         {