[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9090 - in usrp2/trunk/firmware: apps lib
From: |
matt |
Subject: |
[Commit-gnuradio] r9090 - in usrp2/trunk/firmware: apps lib |
Date: |
Thu, 31 Jul 2008 20:09:39 -0600 (MDT) |
Author: matt
Date: 2008-07-31 20:09:38 -0600 (Thu, 31 Jul 2008)
New Revision: 9090
Modified:
usrp2/trunk/firmware/apps/app_common_v2.c
usrp2/trunk/firmware/apps/txrx.c
usrp2/trunk/firmware/lib/memory_map.h
usrp2/trunk/firmware/lib/u2_init.c
Log:
conditional debugging stuff. turned off
Modified: usrp2/trunk/firmware/apps/app_common_v2.c
===================================================================
--- usrp2/trunk/firmware/apps/app_common_v2.c 2008-08-01 02:08:07 UTC (rev
9089)
+++ usrp2/trunk/firmware/apps/app_common_v2.c 2008-08-01 02:09:38 UTC (rev
9090)
@@ -186,6 +186,8 @@
u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno);
size_t byte_len = (buffer_pool_status->last_line[bufno] - 3) * 4;
+ // static size_t last_len = 0; // kludge
+
// hal_toggle_leds(0x1);
// inspect rcvd frame and figure out what do do.
@@ -204,12 +206,19 @@
case 0:
default:
#if 0
+ if (last_len != 0){
+ if (byte_len != last_len){
+ printf("Len: %d last: %d\n", byte_len, last_len);
+ }
+ }
+ last_len = byte_len;
+
if((pkt->thdr.seqno) == exp_seqno){
exp_seqno++;
//putchar('.');
}
else {
- // putchar('S');
+ puts("Seq");
//printf("S%d %d ",exp_seqno,pkt->thdr.seqno);
exp_seqno = pkt->thdr.seqno + 1;
}
Modified: usrp2/trunk/firmware/apps/txrx.c
===================================================================
--- usrp2/trunk/firmware/apps/txrx.c 2008-08-01 02:08:07 UTC (rev 9089)
+++ usrp2/trunk/firmware/apps/txrx.c 2008-08-01 02:09:38 UTC (rev 9090)
@@ -261,11 +261,21 @@
ethernet_init();
+#if 0
// make bit 15 of Tx gpio's be a s/w output
hal_gpio_set_sel(GPIO_TX_BANK, 15, 's');
hal_gpio_set_ddr(GPIO_TX_BANK, 0x8000, 0x8000);
+#endif
+ output_regs->debug_mux_ctrl = 1;
+#if 0
+ hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
+ hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
+ hal_gpio_set_ddr(GPIO_TX_BANK, 0xffff, 0xffff);
+ hal_gpio_set_ddr(GPIO_RX_BANK, 0xffff, 0xffff);
+#endif
+
// initialize double buffering state machine for ethernet -> DSP Tx
dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
@@ -299,8 +309,8 @@
int which = 0;
while(1){
- hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
- which ^= 0x8000;
+ // hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
+ // which ^= 0x8000;
buffer_irq_handler(0);
Modified: usrp2/trunk/firmware/lib/memory_map.h
===================================================================
--- usrp2/trunk/firmware/lib/memory_map.h 2008-08-01 02:08:07 UTC (rev
9089)
+++ usrp2/trunk/firmware/lib/memory_map.h 2008-08-01 02:09:38 UTC (rev
9090)
@@ -352,6 +352,7 @@
volatile uint32_t adc_ctrl;
volatile uint32_t leds;
volatile uint32_t phy_ctrl; // LSB is reset line to eth phy
+ volatile uint32_t debug_mux_ctrl;
} output_regs_t;
#define SERDES_ENABLE 8
Modified: usrp2/trunk/firmware/lib/u2_init.c
===================================================================
--- usrp2/trunk/firmware/lib/u2_init.c 2008-08-01 02:08:07 UTC (rev 9089)
+++ usrp2/trunk/firmware/lib/u2_init.c 2008-08-01 02:09:38 UTC (rev 9090)
@@ -55,6 +55,8 @@
// set up the default clocks
clocks_init();
+ // clocks_enable_test_clk(true);
+
// Enable ADCs
output_regs->adc_ctrl = ADC_CTRL_ON;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9090 - in usrp2/trunk/firmware: apps lib,
matt <=