[Commit-gnuradio] r6471 - gnuradio/branches/developers/matt/u2f/firmware

[matt]

Author: matt
Date: 2007-09-18 17:25:36 -0600 (Tue, 18 Sep 2007)
New Revision: 6471

Modified:
   gnuradio/branches/developers/matt/u2f/firmware/sim_io.h
   gnuradio/branches/developers/matt/u2f/firmware/test1_main.c
Log:
moved printout away from ethernet core in address space.  Added port redirect 
to firmware so we can do ethernet or serdes.


Modified: gnuradio/branches/developers/matt/u2f/firmware/sim_io.h
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/sim_io.h     2007-09-18 
23:24:22 UTC (rev 6470)
+++ gnuradio/branches/developers/matt/u2f/firmware/sim_io.h     2007-09-18 
23:25:36 UTC (rev 6471)
@@ -26,7 +26,7 @@
 static inline void 
 sim_puthex(unsigned long x)
 {
-  volatile unsigned long *p = (unsigned long *) 0xC000;
+  volatile unsigned long *p = (unsigned long *) 0xC0F0;
   *p = x;
 }
 
@@ -34,7 +34,7 @@
 static inline void 
 sim_puthex_nl(unsigned long x)
 {
-  volatile unsigned long *p = (unsigned long *) 0xC100;
+  volatile unsigned long *p = (unsigned long *) 0xC1F0;
   *p = x;
 }
 
@@ -42,7 +42,7 @@
 static inline void 
 sim_putc(unsigned char s)
 {
-  volatile unsigned long *p = (unsigned long *) 0xC004;
+  volatile unsigned long *p = (unsigned long *) 0xC0F4;
   *p = s;
 }
 
@@ -50,7 +50,7 @@
 static inline void 
 sim_putc_nl(unsigned char s)
 {
-  volatile unsigned long *p = (unsigned long *) 0xC104;
+  volatile unsigned long *p = (unsigned long *) 0xC1F4;
   *p = s;
 }
 
@@ -58,13 +58,13 @@
 static inline void 
 sim_newline(void)
 {
-  volatile unsigned long *p = (unsigned long *) 0xC008;
+  volatile unsigned long *p = (unsigned long *) 0xC0F8;
   *p = 0;
 }
 
 static inline void
 sim_finish(void)
 {
-  volatile unsigned long *p = (unsigned long *) 0xC200;
+  volatile unsigned long *p = (unsigned long *) 0xC2F0;
   *p = 0;
 }

Modified: gnuradio/branches/developers/matt/u2f/firmware/test1_main.c
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/test1_main.c 2007-09-18 
23:24:22 UTC (rev 6470)
+++ gnuradio/branches/developers/matt/u2f/firmware/test1_main.c 2007-09-18 
23:25:36 UTC (rev 6471)
@@ -10,6 +10,7 @@
 #define FULL 2
 #define EMPTYING 3
 
+#define PORT 2    // ethernet = 2, serdes = 0
 int dsp_rx_buf, dsp_tx_buf, serdes_rx_buf, serdes_tx_buf;
 int dsp_rx_idle, dsp_tx_idle, serdes_rx_idle, serdes_tx_idle;
 
@@ -20,7 +21,7 @@
 void double_buffering();
 
 void int_handler_func () {
-  double_buffering();
+  double_buffering(PORT);
 }
 
 int
@@ -63,10 +64,9 @@
   // Set up serdes RX
   buffer_state[2] = FILLING;
   dsp_tx_idle = 1;
-  receive_to_buf(2, 0, 1, 5, 504);
+  receive_to_buf(2, PORT, 1, 5, 504);
 
   sim_puts("Done DSP TX setup\n");
-  sim_puts("Done DSP TX setup\n");
   dsp_tx_regs->run_tx = 1;
 
   while(1) {}
@@ -78,7 +78,7 @@
 }
 
 void 
-double_buffering() {
+double_buffering(int port) {
   unsigned int *status = (unsigned int *) 0xB020;
   unsigned int localstatus = *status;
 
@@ -94,7 +94,7 @@
        dsp_rx_idle = 1;
       if(serdes_tx_idle) {
        serdes_tx_idle = 0;
-       send_from_buf(0, 0, 1, 10, 509);  // SERDES_TX from buffer 0
+       send_from_buf(0, port, 1, 10, 509);  // SERDES_TX from buffer 0
        buffer_state[0] = EMPTYING;
       }
     }
@@ -106,7 +106,7 @@
        buffer_state[0] = FILLING;
       }
       if(buffer_state[1] == FULL) {
-       send_from_buf(1, 0, 1, 10, 509);  // SERDES_TX from buffer 1
+       send_from_buf(1, port, 1, 10, 509);  // SERDES_TX from buffer 1
        buffer_state[1] = EMPTYING;
       }
       else
@@ -126,7 +126,7 @@
        dsp_rx_idle = 1;
       if(serdes_tx_idle) {
        serdes_tx_idle = 0;
-       send_from_buf(1, 0, 1, 10, 509);  // SERDES_TX from buffer 0
+       send_from_buf(1, port, 1, 10, 509);  // SERDES_TX from buffer 1
        buffer_state[1] = EMPTYING;
       }
     }
@@ -138,7 +138,7 @@
        buffer_state[1] = FILLING;
       }
       if(buffer_state[0] == FULL) {
-       send_from_buf(0, 0, 1, 10, 509);  // SERDES_TX from buffer 1
+       send_from_buf(0, port, 1, 10, 509);  // SERDES_TX from buffer 0
        buffer_state[0] = EMPTYING;
       }
       else
@@ -151,7 +151,7 @@
     if(buffer_state[2] == FILLING) {
       buffer_state[2] = FULL;
       if(buffer_state[3] == EMPTY) {
-       receive_to_buf(3, 0, 1, 5, 504);  // SERDES_RX to buffer 3, use 500 
lines
+       receive_to_buf(3, port, 1, 5, 504);  // SERDES_RX to buffer 3, use 500 
lines
        buffer_state[3] = FILLING;
       }
       else
@@ -166,7 +166,7 @@
       buffer_state[2] = EMPTY;
       if(serdes_rx_idle) {
        serdes_rx_idle = 0;
-       receive_to_buf(2, 0, 1, 5, 504);  // SERDES_RX to buffer 2
+       receive_to_buf(2, port, 1, 5, 504);  // SERDES_RX to buffer 2
        buffer_state[2] = FILLING;
       }
       if(buffer_state[3] == FULL) {
@@ -183,7 +183,7 @@
     if(buffer_state[3] == FILLING) {
       buffer_state[3] = FULL;
       if(buffer_state[2] == EMPTY) {
-       receive_to_buf(2, 0, 1, 5, 504);  // SERDES_RX to buffer 2, use 500 
lines
+       receive_to_buf(2, port, 1, 5, 504);  // SERDES_RX to buffer 2, use 500 
lines
        buffer_state[2] = FILLING;
       }
       else
@@ -198,7 +198,7 @@
       buffer_state[3] = EMPTY;
       if(serdes_rx_idle) {
        serdes_rx_idle = 0;
-       receive_to_buf(3, 0, 1, 5, 504);  // SERDES_RX to buffer 3
+       receive_to_buf(3, port, 1, 5, 504);  // SERDES_RX to buffer 3
        buffer_state[3] = FILLING;
       }
       if(buffer_state[2] == FULL) {