altos: Remove *_TO_DATA macros

[fw/altos] / src / drivers / ao_packet.c

diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c
index 8c2db2755d423c51139dfa91a48c4de5a9b9c06e..1c931921ca83851d6f9db26afdbb9359d3c0fd3b 100644 (file)
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.c
@@ -3,7 +3,8 @@
  *
  * 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
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -81,16 +82,8 @@ ao_packet_recv(uint16_t timeout)
        /* Check to see if we got a valid packet */
        if (!dma_done)
                return 0;
-       if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK)) {
-               printf("bad crc addr %d len %d seq %d ack %d callsign %8.8s\n",
-                       ao_rx_packet.packet.addr,
-                       ao_rx_packet.packet.len,
-                       ao_rx_packet.packet.seq,
-                       ao_rx_packet.packet.ack,
-                       ao_rx_packet.packet.callsign);
-               flush();
+       if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
                return 0;
-       }
 
        /* Accept packets with matching call signs, or any packet if
         * our callsign hasn't been configured
@@ -98,10 +91,8 @@ ao_packet_recv(uint16_t timeout)
        if (ao_xmemcmp(ao_rx_packet.packet.callsign,
                       ao_config.callsign,
                       AO_MAX_CALLSIGN) != 0 &&
-           ao_xmemcmp(ao_config.callsign, CODE_TO_XDATA("N0CALL"), 7) != 0) {
-               printf ("bad call\n"); flush();
+           ao_xmemcmp(ao_config.callsign, "N0CALL", 7) != 0)
                return 0;
-       }
 
        /* SYN packets carry no data */
        if (ao_rx_packet.packet.len == AO_PACKET_SYN) {