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

[eb]

Author: eb
Date: 2008-01-04 00:28:00 -0700 (Fri, 04 Jan 2008)
New Revision: 7339

Modified:
   usrp2/trunk/firmware/lib/hal_uart.c
   usrp2/trunk/firmware/lib/hal_uart.h
   usrp2/trunk/firmware/lib/u2_init.c
   usrp2/trunk/firmware/u2_flash_tool
   usrp2/trunk/host/apps/rx_samples.cc
   usrp2/trunk/host/apps/tx_samples.cc
Log:
merged eb/u2 -r7328:7338 into usrp2/trunk

Modified: usrp2/trunk/firmware/lib/hal_uart.c
===================================================================
--- usrp2/trunk/firmware/lib/hal_uart.c 2008-01-04 06:59:14 UTC (rev 7338)
+++ usrp2/trunk/firmware/lib/hal_uart.c 2008-01-04 07:28:00 UTC (rev 7339)
@@ -54,7 +54,7 @@
   u->mcr = 0;
 
   hal_uart_config_t  c;
-  c.speed = US_57600;
+  c.speed = US_115200;
   hal_uart_set_config(&c);
 }
 

Modified: usrp2/trunk/firmware/lib/hal_uart.h
===================================================================
--- usrp2/trunk/firmware/lib/hal_uart.h 2008-01-04 06:59:14 UTC (rev 7338)
+++ usrp2/trunk/firmware/lib/hal_uart.h 2008-01-04 07:28:00 UTC (rev 7339)
@@ -39,7 +39,7 @@
 
 /*!
  * \brief Set uart parameters
- *  Default is 57,600 bps, 8N1.
+ *  Default is 115,200 bps, 8N1.
  */
 void hal_uart_set_config(const hal_uart_config_t *c);
 

Modified: usrp2/trunk/firmware/lib/u2_init.c
===================================================================
--- usrp2/trunk/firmware/lib/u2_init.c  2008-01-04 06:59:14 UTC (rev 7338)
+++ usrp2/trunk/firmware/lib/u2_init.c  2008-01-04 07:28:00 UTC (rev 7339)
@@ -63,8 +63,8 @@
   // Reg 7, Loss of reference detect, doesn't work yet, 0
 
 #define LOCK_TO_EXT_REF 0
-#define LOCK_TO_MIMO_REF 1
-#define LOCK_NONE 0
+#define LOCK_TO_MIMO_REF 0
+#define LOCK_NONE 1
 #define THEY_LOCK_TO_ME 0
 
   volatile int *pps_ctrl = 0xF800;

Modified: usrp2/trunk/firmware/u2_flash_tool
===================================================================
--- usrp2/trunk/firmware/u2_flash_tool  2008-01-04 06:59:14 UTC (rev 7338)
+++ usrp2/trunk/firmware/u2_flash_tool  2008-01-04 07:28:00 UTC (rev 7339)
@@ -25,6 +25,7 @@
     dev.write(file_data)
     dev.flush()
     dev.close()
+    return True
 
 
 def verify_flash(offset, filename, devname):
@@ -84,7 +85,8 @@
     offset = { "fpga" : FPGA_OFFSET, "s/w" : FIRMWARE_OFFSET }[options.target]
     
     if options.mode == "write":
-        r = write_flash(offset, filename, options.dev)
+        r = (write_flash(offset, filename, options.dev)
+             and verify_flash(offset, filename, options.dev))
     else:
         r = verify_flash(offset, filename, options.dev)
 

Modified: usrp2/trunk/host/apps/rx_samples.cc
===================================================================
--- usrp2/trunk/host/apps/rx_samples.cc 2008-01-04 06:59:14 UTC (rev 7338)
+++ usrp2/trunk/host/apps/rx_samples.cc 2008-01-04 07:28:00 UTC (rev 7339)
@@ -47,7 +47,7 @@
 static void
 usage(const char *progname)
 {
-  fprintf(stderr, "usage: %s [-o <output_file> ] [-N nsamples] [-h]\n",
+  fprintf(stderr, "usage: %s [-o <output_file> ] [-N nsamples] [-h] [-e 
ethN]\n",
          progname);
 }
 
@@ -56,9 +56,10 @@
 {
   int ch;
   const char *output_filename = "samples.dat";
+  const char *interface = "eth0";
   ssize_t nsamples = -1;       // inf
 
-  while ((ch = getopt(argc, argv, "o:N:h")) != EOF){
+  while ((ch = getopt(argc, argv, "o:N:he:")) != EOF){
     switch (ch){
     case 'o':
       output_filename = optarg;
@@ -68,6 +69,10 @@
       nsamples = strtol(optarg, 0, 0);
       break;
 
+    case 'e':
+      interface = optarg;
+      break;
+      
     case 'h':
     default:
       usage(argv[0]);
@@ -77,7 +82,6 @@
   
   FILE *of = fopen(output_filename, "wb");
 
-  const char *interface = "eth0";
   usrp2_basic *u2 = new usrp2_basic();
 
   if (!u2->open(interface)){

Modified: usrp2/trunk/host/apps/tx_samples.cc
===================================================================
--- usrp2/trunk/host/apps/tx_samples.cc 2008-01-04 06:59:14 UTC (rev 7338)
+++ usrp2/trunk/host/apps/tx_samples.cc 2008-01-04 07:28:00 UTC (rev 7339)
@@ -32,7 +32,7 @@
 static void
 usage(const char *progname)
 {
-  fprintf(stderr, "usage: %s [-h] [-r] [-i <input_file>]\n",
+  fprintf(stderr, "usage: %s [-h] [-r] [-i <input_file>] [-e ethN]\n",
          progname);
 }
 
@@ -41,11 +41,12 @@
 {
   int ch;
   const char *input_filename = 0;
+  const char *interface = "eth0";
   size_t nsamples_per_pkt = 250;
   bool repeat = false;
   
 
-  while ((ch = getopt(argc, argv, "i:hr")) != EOF){
+  while ((ch = getopt(argc, argv, "i:hre:")) != EOF){
     switch (ch){
     case 'r':
       repeat = true;
@@ -55,6 +56,10 @@
       input_filename = optarg;
       break;
       
+    case 'e':
+      interface = optarg;
+      break;
+      
     case 'h':
     default:
       usage(argv[0]);
@@ -73,7 +78,6 @@
     }
   }
 
-  const char *interface = "eth0";
   usrp2_basic *u2 = new usrp2_basic();
 
   if (!u2->open(interface)){