Revision 3:cc45604ca53f, committed 2013-03-08

Comitter:

okini3939

Date:

Fri Mar 08 14:02:14 2013 +0000

Parent:

2:a3e0f7f37ac9

Commit message:

add CircBuffer

Changed in this revision

diff -r a3e0f7f37ac9 -r cc45604ca53f SerRAM.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SerRAM.lib	Fri Mar 08 14:02:14 2013 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/okini3939/code/SerRAM/#5a261b6a88af

diff -r a3e0f7f37ac9 -r cc45604ca53f main.cpp
--- a/main.cpp	Wed Dec 05 07:56:09 2012 +0000
+++ b/main.cpp	Fri Mar 08 14:02:14 2013 +0000
@@ -4,25 +4,16 @@
  *   with DMA ( http://mbed.org/users/AjK/code/MODDMA/ )
  */
 #include "mbed.h"
-#include "MODDMA.h"
-
-#define ENABLE_DMA
+#include "SerRAM.h"
+#include "CBuffer_SRAM.h"
 
-#define CMD_READ    0x03
-#define CMD_WRITE   0x02
-#define CMD_RDMR    0x05
-#define CMD_WRMR    0x01
+#define FIFO_SIZE 250
 
 DigitalOut myled(LED1);
 Serial pc(USBTX, USBRX);
 
-SPI spi(p11, p12, p13); // mosi, miso, sclk
-DigitalOut cs(p14);
-
-MODDMA dma;
-MODDMA_Config *dmacfg0 = NULL, *dmacfg1 = NULL;
-DigitalOut led2(LED2), led3(LED3), led4(LED4);
-volatile int dmaexit;
+SerRAM memory(p5, p6, p7, p18, 1024);
+CircBuffer fifo(FIFO_SIZE);
 
 extern "C" void HardFault_Handler() {
     register unsigned int _msp __asm("msp");
@@ -30,208 +21,121 @@
     exit(-1);
 }  
 
-void tc0_callback () {
-    led2 = 1;
-    
-    MODDMA_Config *config = dma.getConfig();
-    dma.Disable( (MODDMA::CHANNELS)config->channelNum() );
-
-    // Clear DMA IRQ flags.
-    if (dma.irqType() == MODDMA::TcIrq) dma.clearTcIrq();    
-    if (dma.irqType() == MODDMA::ErrIrq) dma.clearErrIrq();    
-}
+int main() {
+    char c;
+    int i, r, w;
 
-void tc1_callback () {
-    dmaexit = 1;
-    led3 = 1;
-    
-    MODDMA_Config *config = dma.getConfig();
-    dma.Disable( (MODDMA::CHANNELS)config->channelNum() );
-
-    // Clear DMA IRQ flags.
-    if (dma.irqType() == MODDMA::TcIrq) dma.clearTcIrq();    
-    if (dma.irqType() == MODDMA::ErrIrq) dma.clearErrIrq();    
-}
-
-void err_callback () {
-    dmaexit = 1;
-    led4 = 1;
-    printf("err\r\n");
-}
-
-int ram_write (int addr, char *buf, int len) {
-    int i;
-    char dummy[len];
+    pc.baud(115200);
+    wait_ms(500);
+    pc.printf("*** SRAM TEST ***\r\n");
 
-    cs = 0;
-    spi.write(CMD_WRITE);
-    spi.write((addr >> 16) & 0xff);
-    spi.write((addr >> 8) & 0xff);
-    spi.write(addr & 0xff);
-    
-#ifdef ENABLE_DMA
-    dmacfg0
-     ->channelNum    ( MODDMA::Channel_0 )
-     ->srcMemAddr    ( (uint32_t)buf )
-     ->dstMemAddr    ( MODDMA::SSP0_Tx )
-     ->transferSize  ( len )
-     ->transferType  ( MODDMA::m2p )
-     ->dstConn       ( MODDMA::SSP0_Tx )
-     ->attach_tc     ( &tc0_callback )
-     ->attach_err    ( &err_callback )
-    ; // config end
-
-    dmacfg1
-     ->channelNum    ( MODDMA::Channel_1 )
-     ->srcMemAddr    ( MODDMA::SSP0_Rx )
-     ->dstMemAddr    ( (uint32_t)dummy )
-     ->transferSize  ( len )
-     ->transferType  ( MODDMA::p2m )
-     ->srcConn       ( MODDMA::SSP0_Rx )
-     ->attach_tc     ( &tc1_callback )
-     ->attach_err    ( &err_callback )
-    ; // config end
-    
-    if (dma.Setup( dmacfg0 ) && dma.Setup( dmacfg1 )) {
-        dmaexit = 0;
-        LPC_SSP0->DMACR = (1<<1)|(1<<0); // TX,RXDMAE
-        dma.Enable( dmacfg0 );
-        dma.Enable( dmacfg1 );
-        while (! dmaexit);
-    } else {
-        printf("error\r\n");
+    printf("- FULL\r\n", w);
+    for (w = 0; w < 256; w ++) {
+        if (fifo.queue(w) == false) {
+            printf("write full %d\r\n", w);
+            break;
+        }
     }
-    LPC_SSP0->DMACR = 0;
-#else
-    for (i = 0; i < len; i ++) {
-        spi.write(buf[i]);
+    for (r = 0; r < 256; r ++) {
+        if (fifo.dequeue(&c) == false) {
+            printf("read end %d\r\n", r);
+            break;
+        }
+        if (c != r) {
+            printf("data error %d != %d\r\n", r, c);
+            return -1;
+        }
     }
-#endif
-    cs = 1;
-    return i;
-}
-
-int ram_read (int addr, char *buf, int len) {
-    int i;
-
-    cs = 0;
-    spi.write(CMD_READ);
-    spi.write((addr >> 16) & 0xff);
-    spi.write((addr >> 8) & 0xff);
-    spi.write(addr & 0xff);
+    printf("- ok\r\n", w);
 
-#ifdef ENABLE_DMA
-    dmacfg0
-     ->channelNum    ( MODDMA::Channel_0 )
-     ->srcMemAddr    ( (uint32_t)buf )
-     ->dstMemAddr    ( MODDMA::SSP0_Tx )
-     ->transferSize  ( len )
-     ->transferType  ( MODDMA::m2p )
-     ->dstConn       ( MODDMA::SSP0_Tx )
-     ->attach_tc     ( &tc0_callback )
-     ->attach_err    ( &err_callback )
-    ; // config end
-
-    dmacfg1
-     ->channelNum    ( MODDMA::Channel_1 )
-     ->srcMemAddr    ( MODDMA::SSP0_Rx )
-     ->dstMemAddr    ( (uint32_t)buf )
-     ->transferSize  ( len )
-     ->transferType  ( MODDMA::p2m )
-     ->srcConn       ( MODDMA::SSP0_Rx )
-     ->attach_tc     ( &tc1_callback )
-     ->attach_err    ( &err_callback )
-    ; // config end
-    
-    if (dma.Setup( dmacfg0 ) && dma.Setup( dmacfg1 )) {
-        dmaexit = 0;
-        LPC_SSP0->DMACR = (1<<1)|(1<<0); // TX,RXDMAE
-        dma.Enable( dmacfg0 );
-        dma.Enable( dmacfg1 );
-        while (! dmaexit);
-    } else {
-        printf("error\r\n");
-    }
-    LPC_SSP0->DMACR = 0;
-#else
-    for (i = 0; i < len; i ++) {
-        buf[i] = spi.write(0);
-    }
-#endif
-    cs = 1;
-    return i;
-}
-
-int main() {
-    int i;
-    char buf[256];
-    Timer t;
+    fifo.flush();
 
-    cs = 1;
-#ifdef ENABLE_DMA
-    dmacfg0 = new MODDMA_Config;
-    dmacfg1 = new MODDMA_Config;
-#endif
-    pc.baud(115200);
-    spi.frequency(16000000);
-    wait_ms(500);
-
-    cs = 0;
-    spi.write(CMD_RDMR);
-    printf("RAM mode: %02x\r\n", spi.write(0));
-    cs = 1;
-    
-    printf("\r\nHELLO test\r\n");
-    
-    printf("RAM write\r\n");
-    strcpy(buf, "Hello!");
-    ram_write(0, buf, 6);
-    
-    for (i = 0; i < 256; i ++) {
-        buf[i] = i;
+    printf("- write > read\r\n", w);
+    for (w = 1; w < 60; w ++) {
+        if (fifo.queue(w) == false) {
+            printf("write full %d\r\n", w);
+            break;
+        }
     }
-    ram_write(8, buf, 200);
-
-    wait(1);
-    memset(buf, 0, 256);
-    
-    printf("RAM read\r\n");
-    ram_read(0, buf, 256);
-    for (i = 0; i < 256; i ++) {
-        printf(" %02x", buf[i]);
-        if ((i & 0x0f) == 0x0f)
-            printf("\r\n");
+    for (r = 1; r < 40; r ++) {
+        if (fifo.dequeue(&c) == false) {
+            printf("read end %d\r\n", r);
+            break;
+        }
+        if (c != r) {
+            printf("data error %d != %d\r\n", r, c);
+            return -1;
+        }
     }
-
-    wait(1);
-
-    printf("\r\nWrite/Read time\r\n");
-
-    printf("RAM write\r\n");
-    t.reset();
-    t.start();
-    for (i = 0; i < 0x20000; i += 256) {
-        buf[0] = (i >> 8) & 0xff;
-        ram_write(i, buf, 256);
-        if ((i & 0x0fff) == 0) printf(".");
+    for (; w < 120; w ++) {
+        if (fifo.queue(w) == false) {
+            printf("write full %d\r\n", w);
+            break;
+        }
     }
-    t.stop();
-    printf("\r\ntime %f, %f KBytes/sec\r\n", t.read(), (float)0x20000 / 1024 / t.read());
-
-    wait(1);
-
-    printf("RAM read\r\n");
-    t.reset();
-    t.start();
-    for (i = 0; i < 0x20000; i += 256) {
-        ram_read(i, buf, 256);
-        if (buf[0] != ((i >> 8) & 0xff)) {
-            printf("error %d\r\n", i);
+    for (; r < 121; r ++) {
+        if (fifo.dequeue(&c) == false) {
+            printf("read end %d\r\n", r);
             break;
         }
-        if ((i & 0x0fff) == 0) printf(".");
+        if (c != r) {
+            printf("data error %d != %d\r\n", r, c);
+            return -1;
+        }
+    }
+    printf("- ok\r\n", w);
+
+    fifo.flush();
+
+    printf("- write < read\r\n", w);
+    for (w = 0; w < 250; w ++) {
+        if (fifo.queue(w) == false) {
+            printf("write full %d\r\n", w);
+            break;
+        }
+    }
+    for (r = 0; r < 240; r ++) {
+        if (fifo.dequeue(&c) == false) {
+            printf("read end %d\r\n", r);
+            break;
+        }
+        if (c != (r & 0xff)) {
+            printf("data error %d != %d\r\n", r, c);
+            return -1;
+        }
     }
-    t.stop();
-    printf("\r\ntime %f, %f KBytes/sec\r\n", t.read(), 0x20000 / 1024 / t.read());
+    for (; w < 270; w ++) {
+        if (fifo.queue(w) == false) {
+            printf("write full %d\r\n", w);
+            break;
+        }
+    }
+    for (; r < 260; r ++) {
+        if (fifo.dequeue(&c) == false) {
+            printf("read end %d\r\n", r);
+            break;
+        }
+        if (c != (r & 0xff)) {
+            printf("data error %d != %d\r\n", r, c);
+            return -1;
+        }
+    }
+    for (; w < 400; w ++) {
+        if (fifo.queue(w) == false) {
+            printf("write full %d\r\n", w);
+            break;
+        }
+    }
+    for (; r < 401; r ++) {
+        if (fifo.dequeue(&c) == false) {
+            printf("read end %d\r\n", r);
+            break;
+        }
+        if (c != (r & 0xff)) {
+            printf("data error %d != %d\r\n", r, c);
+            return -1;
+        }
+    }
+    printf("- ok\r\n", w);
 
 }