From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Tue, 4 Jun 2013 03:09:08 +0000 (+0000)
Subject: play raw file out of discovery working
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=4b654aa3f4c28ed50ec571710e3fc2d7d68ec131;p=freetel-svn-tracking.git

play raw file out of discovery working

git-svn-id: https://svn.code.sf.net/p/freetel/code@1308 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/codec2-dev/src/fifo.c b/codec2-dev/src/fifo.c
index be4995e8..566d77ab 100644
--- a/codec2-dev/src/fifo.c
+++ b/codec2-dev/src/fifo.c
@@ -100,7 +100,6 @@ int fifo_read(struct FIFO *fifo, short data[], int n)
 {
     int            i;
     short         *pdata;
-    short         *pin = fifo->pin;
     short         *pout = fifo->pout;
 
     assert(fifo != NULL);
diff --git a/codec2-dev/stm32/src/dac_play.c b/codec2-dev/stm32/src/dac_play.c
index 43263ec7..3e08abbd 100644
--- a/codec2-dev/stm32/src/dac_play.c
+++ b/codec2-dev/stm32/src/dac_play.c
@@ -35,34 +35,33 @@
 #define fread gdb_stdio_fread
 #define fwrite gdb_stdio_fwrite
 
-#define N1 24000
-#define N2   320
+#define N   2000
 
 int main(void) {
-    short *buf, *pbuf;
+    short  buf[N];
     FILE  *fin;
-    int    i, nframes;
 
-    buf = (short*)malloc(N1*sizeof(short));
     dac_open();
 
-    fin = fopen("stm_in.raw", "rb");
-    if (fin == NULL) {
-        printf("Error opening input file: stm_in.raw\n\nTerminating....\n");
-        exit(1);
-    }
-    fread(buf, sizeof(short), N1, fin);
-    fclose(fin);
-
-    nframes = N1/N2;
     while(1) {
+        fin = fopen("stm_in.raw", "rb");
+        if (fin == NULL) {
+            printf("Error opening input file: stm_in.raw\n\nTerminating....\n");
+            exit(1);
+        }
+    
         printf("Starting!\n");
-        pbuf = buf;
-        for(i=0; i<nframes; i++) {
-            while(dac_write(pbuf, N2) == -1);
-            pbuf += N2;
-        } 
+
+        while(fread(buf, sizeof(short), N, fin) == N) {
+            while(dac_write(buf, N) == -1);
+        }  
+
         printf("Finished!\n");
+        fclose(fin);
     }
+
+    /* let FIFO empty */
+
+    while(1);
 }
 
diff --git a/codec2-dev/stm32/src/stm32f4_dac.c b/codec2-dev/stm32/src/stm32f4_dac.c
index b9b6df5c..31c40c1e 100644
--- a/codec2-dev/stm32/src/stm32f4_dac.c
+++ b/codec2-dev/stm32/src/stm32f4_dac.c
@@ -35,8 +35,8 @@
 #define DAC_DHR12R2_ADDRESS    0x40007414
 #define DAC_DHR12L2_ADDRESS    0x40007418
 
-#define DAC_BUF_SZ    320
-#define FIFO_SZ      2000
+#define DAC_BUF_SZ   320
+#define FIFO_SZ      8000
 #define DAC_MAX      4096
 
 DAC_InitTypeDef  DAC_InitStructure;
@@ -47,6 +47,8 @@ unsigned short dac_buf[DAC_BUF_SZ];
 static void TIM6_Config(void);
 static void DAC_Ch2_Config(void);
 
+int dac_underflow;
+
 void dac_open(void) {
 
     memset(dac_buf, 32768, sizeof(short)*DAC_BUF_SZ);
@@ -209,8 +211,10 @@ void DMA1_Stream6_IRQHandler(void) {
     if(DMA_GetITStatus(DMA1_Stream6, DMA_IT_HTIF6) != RESET) {
         /* fill first half from fifo */
 
-        if (fifo_read(DMA1_Stream6_fifo, signed_buf, DAC_BUF_SZ/2) == -1)
+        if (fifo_read(DMA1_Stream6_fifo, signed_buf, DAC_BUF_SZ/2) == -1) {
             memset(signed_buf, 0, sizeof(short)*DAC_BUF_SZ/2);
+            dac_underflow++;
+        }
 
         /* convert to unsigned */
 
@@ -229,8 +233,10 @@ void DMA1_Stream6_IRQHandler(void) {
     if(DMA_GetITStatus(DMA1_Stream6, DMA_IT_TCIF6) != RESET) {
         /* fill second half from fifo */
 
-        if (fifo_read(DMA1_Stream6_fifo, signed_buf, DAC_BUF_SZ/2) == -1)
+        if (fifo_read(DMA1_Stream6_fifo, signed_buf, DAC_BUF_SZ/2) == -1) {
             memset(signed_buf, 0, sizeof(short)*DAC_BUF_SZ/2);
+            dac_underflow++;
+        }
 
         /* convert to unsigned */
 
diff --git a/codec2-dev/unittest/mksine.c b/codec2-dev/unittest/mksine.c
index 932d361a..f501f06a 100644
--- a/codec2-dev/unittest/mksine.c
+++ b/codec2-dev/unittest/mksine.c
@@ -13,7 +13,7 @@
 
 #define TWO_PI     6.283185307
 #define FS         8000.0
-#define AMP        1000.0
+#define AMP        32767.0
 
 int main(int argc, char *argv[]) {
     FILE *f;