Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile

1 files changed, 0 insertions, 91 deletions

diff --git a/src/core/ao_packet.h b/src/core/ao_packet.h
deleted file mode 100644
index b8426cf9..00000000
--- a/src/core/ao_packet.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright © 2012 Keith Packard <keithp@keithp.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#ifndef _AO_PACKET_H_
-#define _AO_PACKET_H_
-
-/*
- * ao_packet.c
- *
- * Packet-based command interface
- */
-
-#define AO_PACKET_MAX		64
-#define AO_PACKET_SYN		(uint8_t) 0xff
-
-struct ao_packet {
-	uint8_t		addr;
-	uint8_t		len;
-	uint8_t		seq;
-	uint8_t		ack;
-	uint8_t		d[AO_PACKET_MAX];
-	uint8_t		callsign[AO_MAX_CALLSIGN];
-};
-
-struct ao_packet_recv {
-	struct ao_packet	packet;
-	int8_t			rssi;
-	uint8_t			status;
-};
-
-extern __xdata struct ao_packet_recv ao_rx_packet;
-extern __xdata struct ao_packet ao_tx_packet;
-extern __xdata struct ao_task	ao_packet_task;
-extern __xdata uint8_t ao_packet_enable;
-extern __xdata uint8_t ao_packet_master_sleeping;
-extern __pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
-extern __xdata uint8_t ao_packet_restart;
-
-void
-ao_packet_send(void);
-
-uint8_t
-ao_packet_recv(void);
-
-void
-ao_packet_flush(void);
-
-void
-ao_packet_putchar(char c) __reentrant;
-
-int
-_ao_packet_pollchar(void);
-
-#if PACKET_HAS_MASTER
-/* ao_packet_master.c */
-
-extern __xdata int8_t ao_packet_last_rssi;
-
-void
-ao_packet_master_init(void);
-#endif
-
-#if PACKET_HAS_SLAVE
-/* ao_packet_slave.c */
-
-void
-ao_packet_slave_start(void);
-
-void
-ao_packet_slave_stop(void);
-
-void
-ao_packet_slave_init(uint8_t enable);
-
-#endif
-
-#endif /* _AO_PACKET_H_ */