[Commit-gnuradio] r7759 - usrp2/trunk/firmware/lib

[eb]

Author: eb
Date: 2008-02-20 18:29:52 -0700 (Wed, 20 Feb 2008)
New Revision: 7759

Modified:
   usrp2/trunk/firmware/lib/hal_uart.c
   usrp2/trunk/firmware/lib/hal_uart.h
Log:
changed default baud rate to 230.4K

Modified: usrp2/trunk/firmware/lib/hal_uart.c
===================================================================
--- usrp2/trunk/firmware/lib/hal_uart.c 2008-02-21 01:12:29 UTC (rev 7758)
+++ usrp2/trunk/firmware/lib/hal_uart.c 2008-02-21 01:29:52 UTC (rev 7759)
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,19 +23,19 @@
 
 // First pass, no interrupts
 
-// Replaced with divisor.py which generates best divisor
+// Replaced with divisors.py which generates best divisor
 //#define CALC_DIVISOR(rate) (WISHBONE_CLK_RATE / ((rate) * 16))
 
-#define NSPEEDS 5
+#define NSPEEDS 6
 #define        MAX_WB_DIV 4
 
 static const uint16_t
 divisor_table[MAX_WB_DIV+1][NSPEEDS] = {
-  { 2, 2, 2, 2, 2},            // 0: can't happen
-  { 651, 326, 163, 109, 52},   // 1: 100 MHz
-  { 326, 163,  81,  54, 26 },  // 2:  50 MHz
-  { 217, 109,  54,  36, 17 },  // 3:  33.3333 MHz
-  { 163,  81,  41,  27, 13 },  // 4:  25 MHz
+  {   2,   2,   2,   2,  2,  2},   // 0: can't happen
+  { 651, 326, 163, 109, 54, 27 },  // 1: 100 MHz
+  { 326, 163,  81,  54, 27, 14 },  // 2:  50 MHz
+  { 217, 109,  54,  36, 18,  9 },  // 3:  33.3333 MHz
+  { 163,  81,  41,  27, 14,  7 },  // 4:  25 MHz
 };
 
 static hal_uart_config_t current_config;
@@ -54,7 +54,7 @@
   u->mcr = 0;
 
   hal_uart_config_t  c;
-  c.speed = US_115200;
+  c.speed = US_230400;
   hal_uart_set_config(&c);
 }
 

Modified: usrp2/trunk/firmware/lib/hal_uart.h
===================================================================
--- usrp2/trunk/firmware/lib/hal_uart.h 2008-02-21 01:12:29 UTC (rev 7758)
+++ usrp2/trunk/firmware/lib/hal_uart.h 2008-02-21 01:29:52 UTC (rev 7759)
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@
   US_38400,
   US_57600,
   US_115200,
+  US_230400,
 } hal_uart_speed_t;
 
 typedef struct {