[Commit-gnuradio] r7346 - in usrp2/trunk/firmware: apps lib

[eb]

Author: eb
Date: 2008-01-04 17:26:00 -0700 (Fri, 04 Jan 2008)
New Revision: 7346

Modified:
   usrp2/trunk/firmware/apps/buf_ram_test.c
   usrp2/trunk/firmware/apps/buf_ram_zero.c
   usrp2/trunk/firmware/apps/gen_eth_packets.c
   usrp2/trunk/firmware/apps/gen_pause_frames.c
   usrp2/trunk/firmware/apps/rcv_eth_packets.c
   usrp2/trunk/firmware/apps/test_serdes.c
   usrp2/trunk/firmware/apps/tx_standalone.c
   usrp2/trunk/firmware/lib/memory_map.h
Log:
renamed BUFFER_POOL_BUFFER_SIZE to BP_NLINES

Modified: usrp2/trunk/firmware/apps/buf_ram_test.c
===================================================================
--- usrp2/trunk/firmware/apps/buf_ram_test.c    2008-01-04 21:40:52 UTC (rev 
7345)
+++ usrp2/trunk/firmware/apps/buf_ram_test.c    2008-01-05 00:26:00 UTC (rev 
7346)
@@ -31,7 +31,7 @@
 
   for (n = 0; n < NBUFFERS; n++){
     volatile int *p = buffer_ram(n);
-    for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++)
+    for (i = 0; i < BP_NLINES; i++)
       p[i] = counter++;
   }
 }
@@ -46,7 +46,7 @@
 
   for (n = 0; n < NBUFFERS; n++){
     volatile int *p = buffer_ram(n);
-    for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++, counter++){
+    for (i = 0; i < BP_NLINES; i++, counter++){
       int rd = p[i];
       if (rd != counter){
        putchar('b');

Modified: usrp2/trunk/firmware/apps/buf_ram_zero.c
===================================================================
--- usrp2/trunk/firmware/apps/buf_ram_zero.c    2008-01-04 21:40:52 UTC (rev 
7345)
+++ usrp2/trunk/firmware/apps/buf_ram_zero.c    2008-01-05 00:26:00 UTC (rev 
7346)
@@ -33,7 +33,7 @@
 
   for (n = 0; n < NBUFFERS; n++){
     volatile int *p = buffer_ram(n);
-    for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++)
+    for (i = 0; i < BP_NLINES; i++)
       p[i] = counter++;
   }
 }
@@ -47,7 +47,7 @@
 
   for (n = 0; n < NBUFFERS; n++){
     volatile int *p = buffer_ram(n);
-    for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++)
+    for (i = 0; i < BP_NLINES; i++)
       if (p[i] != 0)
        nerrors++;
   }

Modified: usrp2/trunk/firmware/apps/gen_eth_packets.c
===================================================================
--- usrp2/trunk/firmware/apps/gen_eth_packets.c 2008-01-04 21:40:52 UTC (rev 
7345)
+++ usrp2/trunk/firmware/apps/gen_eth_packets.c 2008-01-05 00:26:00 UTC (rev 
7346)
@@ -121,7 +121,7 @@
   int i = 0;
   int mark = ((bufnum & 0xff) << 24) | 0x005A0000;
 
-  for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++){
+  for (i = 0; i < BP_NLINES; i++){
     buf[i] = mark | i;
     mark ^= 0x00FF0000;
   }

Modified: usrp2/trunk/firmware/apps/gen_pause_frames.c
===================================================================
--- usrp2/trunk/firmware/apps/gen_pause_frames.c        2008-01-04 21:40:52 UTC 
(rev 7345)
+++ usrp2/trunk/firmware/apps/gen_pause_frames.c        2008-01-05 00:26:00 UTC 
(rev 7346)
@@ -116,7 +116,7 @@
   int i = 0;
   int mark = ((bufnum & 0xff) << 24) | 0x005A0000;
 
-  for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++){
+  for (i = 0; i < BP_NLINES; i++){
     buf[i] = mark | i;
     mark ^= 0x00FF0000;
   }

Modified: usrp2/trunk/firmware/apps/rcv_eth_packets.c
===================================================================
--- usrp2/trunk/firmware/apps/rcv_eth_packets.c 2008-01-04 21:40:52 UTC (rev 
7345)
+++ usrp2/trunk/firmware/apps/rcv_eth_packets.c 2008-01-05 00:26:00 UTC (rev 
7346)
@@ -119,7 +119,7 @@
   int i = 0;
   int mark = ((bufnum & 0xff) << 24) | 0x005A0000;
 
-  for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++){
+  for (i = 0; i < BP_NLINES; i++){
     buf[i] = mark | i;
     mark ^= 0x00FF0000;
   }

Modified: usrp2/trunk/firmware/apps/test_serdes.c
===================================================================
--- usrp2/trunk/firmware/apps/test_serdes.c     2008-01-04 21:40:52 UTC (rev 
7345)
+++ usrp2/trunk/firmware/apps/test_serdes.c     2008-01-05 00:26:00 UTC (rev 
7346)
@@ -115,7 +115,7 @@
   int i = 0;
   int mark = ((bufnum & 0xff) << 24) | 0x005A0000;
 
-  for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++){
+  for (i = 0; i < BP_NLINES; i++){
     buf[i] = mark | i;
     mark ^= 0x00FF0000;
   }

Modified: usrp2/trunk/firmware/apps/tx_standalone.c
===================================================================
--- usrp2/trunk/firmware/apps/tx_standalone.c   2008-01-04 21:40:52 UTC (rev 
7345)
+++ usrp2/trunk/firmware/apps/tx_standalone.c   2008-01-05 00:26:00 UTC (rev 
7346)
@@ -238,7 +238,7 @@
 
   uint32_t const_sample = (32000 << 16) | 0;
   int i;
-  for (i = 0; i < BUFFER_POOL_BUFFER_SIZE; i++){
+  for (i = 0; i < BP_NLINES; i++){
     buffer_ram(DSP_TX_BUF_0)[i] = const_sample;
     buffer_ram(DSP_TX_BUF_1)[i] = const_sample;
   }

Modified: usrp2/trunk/firmware/lib/memory_map.h
===================================================================
--- usrp2/trunk/firmware/lib/memory_map.h       2008-01-04 21:40:52 UTC (rev 
7345)
+++ usrp2/trunk/firmware/lib/memory_map.h       2008-01-05 00:26:00 UTC (rev 
7346)
@@ -47,12 +47,12 @@
 #define BUFFER_POOL_RAM_BASE 0x4000
 
 #define        NBUFFERS                8
-#define BUFFER_POOL_BUFFER_SIZE 0x0200  // Buffer size in 32-bit lines
+#define BP_NLINES         0x0200  // number of 32-bit lines in a buffer
 
 #define buffer_pool_ram \
   ((uint32_t *) BUFFER_POOL_RAM_BASE)
 
-#define buffer_ram(n) (&buffer_pool_ram[(n) * BUFFER_POOL_BUFFER_SIZE])
+#define buffer_ram(n) (&buffer_pool_ram[(n) * BP_NLINES])
 
 
 /////////////////////////////////////////////////////