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

commit-gnuradio

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From:	eb
Subject:	[Commit-gnuradio] r7359 - in usrp2/trunk/firmware: apps lib
Date:	Sat, 5 Jan 2008 11:47:17 -0700 (MST)

Author: eb
Date: 2008-01-05 11:47:17 -0700 (Sat, 05 Jan 2008)
New Revision: 7359

Modified:
   usrp2/trunk/firmware/apps/app_common.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/rx_only.c
   usrp2/trunk/firmware/apps/test_serdes.c
   usrp2/trunk/firmware/apps/tx_only.c
   usrp2/trunk/firmware/apps/tx_standalone.c
   usrp2/trunk/firmware/lib/memcpy_wa.c
   usrp2/trunk/firmware/lib/memcpy_wa.h
Log:
s/memcpy_wordaligned/memcpy_wa/g

Modified: usrp2/trunk/firmware/apps/app_common.c
===================================================================
--- usrp2/trunk/firmware/apps/app_common.c      2008-01-05 08:46:11 UTC (rev 
7358)
+++ usrp2/trunk/firmware/apps/app_common.c      2008-01-05 18:47:17 UTC (rev 
7359)
@@ -50,7 +50,7 @@
 
   // FIXME don't copy, we can byte address (read-only) in the buffer
   // copy 64 bytes of payload into stack buffer
-  memcpy_wordaligned(payload,
+  memcpy_wa(payload,
                     (unsigned char *) buffer_ram(bufno) + 
sizeof(u2_eth_packet_t),
                     sizeof(payload));
 
@@ -81,7 +81,7 @@
     // FIXME need to see if ethernet tx is busy
 
     // copy reply into CPU_TX_BUF
-    memcpy_wordaligned(buffer_ram(CPU_TX_BUF), reply, reply_len);
+    memcpy_wa(buffer_ram(CPU_TX_BUF), reply, reply_len);
 
     bp_send_from_buf(CPU_TX_BUF, PORT_ETH, 1, 0, reply_len / 4);
     break;
@@ -117,7 +117,7 @@
 
   // FIXME don't copy it in
   // copy first part of frame to stack buffer so we can byte address it
-  memcpy_wordaligned(&pkt, buffer_ram(bufno), sizeof(pkt));
+  memcpy_wa(&pkt, buffer_ram(bufno), sizeof(pkt));
 
   if (pkt.ehdr.ethertype != U2_ETHERTYPE)
     return true;       // ignore, probably bogus PAUSE frame from MAC

Modified: usrp2/trunk/firmware/apps/gen_eth_packets.c
===================================================================
--- usrp2/trunk/firmware/apps/gen_eth_packets.c 2008-01-05 08:46:11 UTC (rev 
7358)
+++ usrp2/trunk/firmware/apps/gen_eth_packets.c 2008-01-05 18:47:17 UTC (rev 
7359)
@@ -126,7 +126,7 @@
   }
 
   // copy header into buffer
-  memcpy_wordaligned(buf, pkt, sizeof(*pkt));
+  memcpy_wa(buf, pkt, sizeof(*pkt));
 }
 
 static void

Modified: usrp2/trunk/firmware/apps/gen_pause_frames.c
===================================================================
--- usrp2/trunk/firmware/apps/gen_pause_frames.c        2008-01-05 08:46:11 UTC 
(rev 7358)
+++ usrp2/trunk/firmware/apps/gen_pause_frames.c        2008-01-05 18:47:17 UTC 
(rev 7359)
@@ -121,7 +121,7 @@
   }
 
   // copy header into buffer
-  memcpy_wordaligned(buf, pkt, sizeof(*pkt));
+  memcpy_wa(buf, pkt, sizeof(*pkt));
 }
 
 static void

Modified: usrp2/trunk/firmware/apps/rcv_eth_packets.c
===================================================================
--- usrp2/trunk/firmware/apps/rcv_eth_packets.c 2008-01-05 08:46:11 UTC (rev 
7358)
+++ usrp2/trunk/firmware/apps/rcv_eth_packets.c 2008-01-05 18:47:17 UTC (rev 
7359)
@@ -124,7 +124,7 @@
   }
 
   // copy header into buffer
-  memcpy_wordaligned(buf, pkt, sizeof(*pkt));
+  memcpy_wa(buf, pkt, sizeof(*pkt));
 }
 
 static void
@@ -188,7 +188,7 @@
 
 #if 0
       // copy to stack buffer so we can byte address it
-      memcpy_wordaligned(&pkt, (void *)buffer_ram(2), sizeof(pkt));
+      memcpy_wa(&pkt, (void *)buffer_ram(2), sizeof(pkt));
       
       putstr("Rx: src: ");
       print_mac_addr(pkt.ehdr.dst_addr);

Modified: usrp2/trunk/firmware/apps/rx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/rx_only.c 2008-01-05 08:46:11 UTC (rev 7358)
+++ usrp2/trunk/firmware/apps/rx_only.c 2008-01-05 18:47:17 UTC (rev 7359)
@@ -148,8 +148,8 @@
   u2p_set_word0(&pkt.fixed, 0, 0);
   // DSP RX will fill in timestamp
 
-  memcpy_wordaligned(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wordaligned(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
+  memcpy_wa(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
+  memcpy_wa(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
 
 
   // setup RX DSP regs

Modified: usrp2/trunk/firmware/apps/test_serdes.c
===================================================================
--- usrp2/trunk/firmware/apps/test_serdes.c     2008-01-05 08:46:11 UTC (rev 
7358)
+++ usrp2/trunk/firmware/apps/test_serdes.c     2008-01-05 18:47:17 UTC (rev 
7359)
@@ -120,7 +120,7 @@
   }
 
   // copy header into buffer
-  memcpy_wordaligned(buf, pkt, sizeof(*pkt));
+  memcpy_wa(buf, pkt, sizeof(*pkt));
 }
 
 static void

Modified: usrp2/trunk/firmware/apps/tx_only.c
===================================================================
--- usrp2/trunk/firmware/apps/tx_only.c 2008-01-05 08:46:11 UTC (rev 7358)
+++ usrp2/trunk/firmware/apps/tx_only.c 2008-01-05 18:47:17 UTC (rev 7359)
@@ -29,7 +29,6 @@
 #include "ethernet.h"
 #include "nonstdio.h"
 #include "usrp2_eth_packet.h"
-#include "memcpy_wa.h"
 #include "dbsm.h"
 #include "app_common.h"
 #include <stddef.h>

Modified: usrp2/trunk/firmware/apps/tx_standalone.c
===================================================================
--- usrp2/trunk/firmware/apps/tx_standalone.c   2008-01-05 08:46:11 UTC (rev 
7358)
+++ usrp2/trunk/firmware/apps/tx_standalone.c   2008-01-05 18:47:17 UTC (rev 
7359)
@@ -202,8 +202,8 @@
                U2P_TX_IMMEDIATE | U2P_TX_START_OF_BURST, 0);
   u2p_set_timestamp(&pkt.fixed, T_NOW);
 
-  memcpy_wordaligned(buffer_ram(DSP_TX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wordaligned(buffer_ram(DSP_TX_BUF_1), &pkt, sizeof(pkt));
+  memcpy_wa(buffer_ram(DSP_TX_BUF_0), &pkt, sizeof(pkt));
+  memcpy_wa(buffer_ram(DSP_TX_BUF_1), &pkt, sizeof(pkt));
 
 
   int tx_scale = 256;

Modified: usrp2/trunk/firmware/lib/memcpy_wa.c
===================================================================
--- usrp2/trunk/firmware/lib/memcpy_wa.c        2008-01-05 08:46:11 UTC (rev 
7358)
+++ usrp2/trunk/firmware/lib/memcpy_wa.c        2008-01-05 18:47:17 UTC (rev 
7359)
@@ -22,10 +22,10 @@
 
 /*
  * For copying to/from non-byte-adressable memory, such as
- * the buffers
+ * the buffers.  dst, src, and nbytes must all satisfy (x % 4 == 0)
  */
 void
-memcpy_wordaligned(void *dst, const void *src, size_t nbytes)
+memcpy_wa(void *dst, const void *src, size_t nbytes)
 {
   if (((intptr_t) dst & 0x3)
       || ((intptr_t) src & 0x3)

Modified: usrp2/trunk/firmware/lib/memcpy_wa.h
===================================================================
--- usrp2/trunk/firmware/lib/memcpy_wa.h        2008-01-05 08:46:11 UTC (rev 
7358)
+++ usrp2/trunk/firmware/lib/memcpy_wa.h        2008-01-05 18:47:17 UTC (rev 
7359)
@@ -23,9 +23,9 @@
 
 /*
  * For copying to/from non-byte-adressable memory, such as
- * the buffers
+ * the buffers.  dst, src, and nbytes must all satisfy (x % 4 == 0)
  */
-void memcpy_wordaligned(void *dst, const void *src, size_t nbytes);
+void memcpy_wa(void *dst, const void *src, size_t nbytes);
 
 #endif /* INCLUDED_MEMCPY_WA_H */

[Prev in Thread]

Current Thread

[Next in Thread]

[Commit-gnuradio] r7359 - in usrp2/trunk/firmware: apps lib, eb <=

Prev by Date: [Commit-gnuradio] r7358 - gnuradio/branches/developers/michaelld/usrp_fusb_fix/usrp/host/lib/legacy
Next by Date: [Commit-gnuradio] r7360 - usrp2/trunk/firmware/apps
Previous by thread: [Commit-gnuradio] r7358 - gnuradio/branches/developers/michaelld/usrp_fusb_fix/usrp/host/lib/legacy
Next by thread: [Commit-gnuradio] r7360 - usrp2/trunk/firmware/apps
Index(es):
- Date
- Thread