From c0b21702ed603e3d4f9d7884c8bd73715b52ad89 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Fri, 18 Feb 2011 11:11:31 -0500 Subject: [PATCH 1/2] add a cast to a debug message to remove a warning. --- lib/maca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maca.c b/lib/maca.c index 0e6e63e1f..c9cc4f6f2 100644 --- a/lib/maca.c +++ b/lib/maca.c @@ -150,7 +150,7 @@ void check_maca(void) { #if DEBUG_MACA if((count = count_packets()) != NUM_PACKETS) { - PRINTF("check maca: count_packets %d\n", count); + PRINTF("check maca: count_packets %d\n", (int)count); Print_Packets("check_maca"); #if PACKET_STATS for(i=0; i Date: Fri, 18 Feb 2011 12:35:20 -0500 Subject: [PATCH 2/2] add rx_time parameter and fill with *MACA_TIMESTAMP --- lib/include/packet.h | 1 + lib/maca.c | 1 + tests/tests.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/include/packet.h b/lib/include/packet.h index 58eaa37b9..44f7805b8 100644 --- a/lib/include/packet.h +++ b/lib/include/packet.h @@ -53,6 +53,7 @@ struct packet { uint8_t offset; uint8_t lqi; uint8_t status; + uint32_t rx_time; #if PACKET_STATS uint8_t seen; uint8_t post_tx; diff --git a/lib/maca.c b/lib/maca.c index c9cc4f6f2..e039062c3 100644 --- a/lib/maca.c +++ b/lib/maca.c @@ -615,6 +615,7 @@ void maca_isr(void) { *MACA_CLRIRQ = (1 << maca_irq_di); dma_rx->length = *MACA_GETRXLVL - 2; /* packet length does not include FCS */ dma_rx->lqi = get_lqi(); + dma_rx->rx_time = *MACA_TIMESTAMP; /* check if received packet needs an ack */ if(dma_rx->data[1] & 0x20) { diff --git a/tests/tests.c b/tests/tests.c index 75850492f..55a0e02c7 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -48,7 +48,7 @@ void print_packet(volatile packet_t *p) { volatile uint8_t i,j,k; #define PER_ROW 16 if(p) { - printf("len 0x%02x lqi 0x%02x", p->length, p->lqi); + printf("len 0x%02x lqi 0x%02x rx_time 0x%08x", p->length, p->lqi, (int)p->rx_time); for(j=0, k=0; j <= ( (p->length) / PER_ROW ); j++) { printf("\n\r"); for(i=0; i < PER_ROW; i++, k++) {