OctoClock firmware upgrade, added host driver

* OctoClock can communicate with UHD over Ethernet
* Can read NMEA strings from GPSDO and send to host
* Added multi_usrp_clock class for clock devices
* uhd::device can now filter to return only USRP devices or clock devices
* New OctoClock bootloader can accept firmware download over Ethernet
* Added octoclock_burn_eeprom,octoclock_firmware_burner utilities
* Added test_clock_synch example to show clock API

8 files changed, 668 insertions, 0 deletions

diff --git a/firmware/octoclock/include/net/enc28j60.h b/firmware/octoclock/include/net/enc28j60.h
new file mode 100644
index 000000000..463303f3c
--- /dev/null
+++ b/firmware/octoclock/include/net/enc28j60.h
@@ -0,0 +1,299 @@
+/*! \file enc28j60.h \brief Microchip ENC28J60 Ethernet Interface Driver. */
+//*****************************************************************************
+//
+// File Name	: 'enc28j60.h'
+// Title		: Microchip ENC28J60 Ethernet Interface Driver
+// Author		: Pascal Stang (c)2005
+// Created		: 9/22/2005
+// Revised		: 9/22/2005
+// Version		: 0.1
+// Target MCU	: Atmel AVR series
+// Editor Tabs	: 4
+//
+///	\ingroup network
+///	\defgroup enc28j60 Microchip ENC28J60 Ethernet Interface Driver (enc28j60.c)
+///	\code #include "net/enc28j60.h" \endcode
+///	\par Overview
+///		This driver provides initialization and transmit/receive
+///	functions for the Microchip ENC28J60 10Mb Ethernet Controller and PHY.
+/// This chip is novel in that it is a full MAC+PHY interface all in a 28-pin
+/// chip, using an SPI interface to the host processor.
+///
+//
+//*****************************************************************************
+//@{
+
+#ifndef ENC28J60_H
+#define ENC28J60_H
+
+#include <avrlibdefs.h>
+
+#include "enc28j60conf.h"
+
+// ENC28J60 Control Registers
+// Control register definitions are a combination of address,
+// bank number, and Ethernet/MAC/PHY indicator bits.
+// - Register address	(bits 0-4)
+// - Bank number		(bits 5-6)
+// - MAC/PHY indicator	(bit 7)
+#define ADDR_MASK	0x1F
+#define BANK_MASK	0x60
+#define SPRD_MASK	0x80
+// All-bank registers
+#define EIE			0x1B
+#define EIR			0x1C
+#define ESTAT		0x1D
+#define ECON2		0x1E
+#define ECON1		0x1F
+// Bank 0 registers
+#define ERDPTL		(0x00|0x00)
+#define ERDPTH		(0x01|0x00)
+#define EWRPTL		(0x02|0x00)
+#define EWRPTH		(0x03|0x00)
+#define ETXSTL		(0x04|0x00)
+#define ETXSTH		(0x05|0x00)
+#define ETXNDL		(0x06|0x00)
+#define ETXNDH		(0x07|0x00)
+#define ERXSTL		(0x08|0x00)
+#define ERXSTH		(0x09|0x00)
+#define ERXNDL		(0x0A|0x00)
+#define ERXNDH		(0x0B|0x00)
+#define ERXRDPTL	(0x0C|0x00)
+#define ERXRDPTH	(0x0D|0x00)
+#define ERXWRPTL	(0x0E|0x00)
+#define ERXWRPTH	(0x0F|0x00)
+#define EDMASTL		(0x10|0x00)
+#define EDMASTH		(0x11|0x00)
+#define EDMANDL		(0x12|0x00)
+#define EDMANDH		(0x13|0x00)
+#define EDMADSTL	(0x14|0x00)
+#define EDMADSTH	(0x15|0x00)
+#define EDMACSL		(0x16|0x00)
+#define EDMACSH		(0x17|0x00)
+// Bank 1 registers
+#define EHT0		(0x00|0x20)
+#define EHT1		(0x01|0x20)
+#define EHT2		(0x02|0x20)
+#define EHT3		(0x03|0x20)
+#define EHT4		(0x04|0x20)
+#define EHT5		(0x05|0x20)
+#define EHT6		(0x06|0x20)
+#define EHT7		(0x07|0x20)
+#define EPMM0		(0x08|0x20)
+#define EPMM1		(0x09|0x20)
+#define EPMM2		(0x0A|0x20)
+#define EPMM3		(0x0B|0x20)
+#define EPMM4		(0x0C|0x20)
+#define EPMM5		(0x0D|0x20)
+#define EPMM6		(0x0E|0x20)
+#define EPMM7		(0x0F|0x20)
+#define EPMCSL		(0x10|0x20)
+#define EPMCSH		(0x11|0x20)
+#define EPMOL		(0x14|0x20)
+#define EPMOH		(0x15|0x20)
+#define EWOLIE		(0x16|0x20)
+#define EWOLIR		(0x17|0x20)
+#define ERXFCON		(0x18|0x20)
+#define EPKTCNT		(0x19|0x20)
+// Bank 2 registers
+#define MACON1		(0x00|0x40|0x80)
+#define MACON2		(0x01|0x40|0x80)
+#define MACON3		(0x02|0x40|0x80)
+#define MACON4		(0x03|0x40|0x80)
+#define MABBIPG		(0x04|0x40|0x80)
+#define MAIPGL		(0x06|0x40|0x80)
+#define MAIPGH		(0x07|0x40|0x80)
+#define MACLCON1	(0x08|0x40|0x80)
+#define MACLCON2	(0x09|0x40|0x80)
+#define MAMXFLL		(0x0A|0x40|0x80)
+#define MAMXFLH		(0x0B|0x40|0x80)
+#define MAPHSUP		(0x0D|0x40|0x80)
+#define MICON		(0x11|0x40|0x80)
+#define MICMD		(0x12|0x40|0x80)
+#define MIREGADR	(0x14|0x40|0x80)
+#define MIWRL		(0x16|0x40|0x80)
+#define MIWRH		(0x17|0x40|0x80)
+#define MIRDL		(0x18|0x40|0x80)
+#define MIRDH		(0x19|0x40|0x80)
+// Bank 3 registers
+#define MAADR1		(0x00|0x60|0x80)
+#define MAADR0		(0x01|0x60|0x80)
+#define MAADR3		(0x02|0x60|0x80)
+#define MAADR2		(0x03|0x60|0x80)
+#define MAADR5		(0x04|0x60|0x80)
+#define MAADR4		(0x05|0x60|0x80)
+#define EBSTSD		(0x06|0x60)
+#define EBSTCON		(0x07|0x60)
+#define EBSTCSL		(0x08|0x60)
+#define EBSTCSH		(0x09|0x60)
+#define MISTAT		(0x0A|0x60|0x80)
+#define EREVID		(0x12|0x60)
+#define ECOCON		(0x15|0x60)
+#define EFLOCON		(0x17|0x60)
+#define EPAUSL		(0x18|0x60)
+#define EPAUSH		(0x19|0x60)
+// PHY registers
+#define PHCON1		0x00
+#define PHSTAT1		0x01
+#define PHHID1		0x02
+#define PHHID2		0x03
+#define PHCON2		0x10
+#define PHSTAT2		0x11
+#define PHIE		0x12
+#define PHIR		0x13
+#define PHLCON		0x14
+
+// ENC28J60 EIE Register Bit Definitions
+#define EIE_INTIE		0x80
+#define EIE_PKTIE		0x40
+#define EIE_DMAIE		0x20
+#define EIE_LINKIE		0x10
+#define EIE_TXIE		0x08
+#define EIE_WOLIE		0x04
+#define EIE_TXERIE		0x02
+#define EIE_RXERIE		0x01
+// ENC28J60 EIR Register Bit Definitions
+#define EIR_PKTIF		0x40
+#define EIR_DMAIF		0x20
+#define EIR_LINKIF		0x10
+#define EIR_TXIF		0x08
+#define EIR_WOLIF		0x04
+#define EIR_TXERIF		0x02
+#define EIR_RXERIF		0x01
+// ENC28J60 ESTAT Register Bit Definitions
+#define ESTAT_INT		0x80
+#define ESTAT_LATECOL	0x10
+#define ESTAT_RXBUSY	0x04
+#define ESTAT_TXABRT	0x02
+#define ESTAT_CLKRDY	0x01
+// ENC28J60 ECON2 Register Bit Definitions
+#define ECON2_AUTOINC	0x80
+#define ECON2_PKTDEC	0x40
+#define ECON2_PWRSV		0x20
+#define ECON2_VRPS		0x08
+// ENC28J60 ECON1 Register Bit Definitions
+#define ECON1_TXRST		0x80
+#define	ECON1_RXRST		0x40
+#define ECON1_DMAST		0x20
+#define ECON1_CSUMEN	0x10
+#define ECON1_TXRTS		0x08
+#define	ECON1_RXEN		0x04
+#define ECON1_BSEL1		0x02
+#define ECON1_BSEL0		0x01
+// ENC28J60 MACON1 Register Bit Definitions
+#define MACON1_LOOPBK	0x10
+#define MACON1_TXPAUS	0x08
+#define MACON1_RXPAUS	0x04
+#define MACON1_PASSALL	0x02
+#define MACON1_MARXEN	0x01
+// ENC28J60 MACON2 Register Bit Definitions
+#define MACON2_MARST	0x80
+#define MACON2_RNDRST	0x40
+#define MACON2_MARXRST	0x08
+#define MACON2_RFUNRST	0x04
+#define MACON2_MATXRST	0x02
+#define MACON2_TFUNRST	0x01
+// ENC28J60 MACON3 Register Bit Definitions
+#define MACON3_PADCFG2	0x80
+#define MACON3_PADCFG1	0x40
+#define MACON3_PADCFG0	0x20
+#define MACON3_TXCRCEN	0x10
+#define MACON3_PHDRLEN	0x08
+#define MACON3_HFRMLEN	0x04
+#define MACON3_FRMLNEN	0x02
+#define MACON3_FULDPX	0x01
+// ENC28J60 MICMD Register Bit Definitions
+#define MICMD_MIISCAN	0x02
+#define MICMD_MIIRD		0x01
+// ENC28J60 MISTAT Register Bit Definitions
+#define MISTAT_NVALID	0x04
+#define MISTAT_SCAN		0x02
+#define MISTAT_BUSY		0x01
+// ENC28J60 PHY PHCON1 Register Bit Definitions
+#define	PHCON1_PRST		0x8000
+#define	PHCON1_PLOOPBK	0x4000
+#define	PHCON1_PPWRSV	0x0800
+#define	PHCON1_PDPXMD	0x0100
+// ENC28J60 PHY PHSTAT1 Register Bit Definitions
+#define	PHSTAT1_PFDPX	0x1000
+#define	PHSTAT1_PHDPX	0x0800
+#define	PHSTAT1_LLSTAT	0x0004
+#define	PHSTAT1_JBSTAT	0x0002
+// ENC28J60 PHY PHCON2 Register Bit Definitions
+#define PHCON2_FRCLINK	0x4000
+#define PHCON2_TXDIS	0x2000
+#define PHCON2_JABBER	0x0400
+#define PHCON2_HDLDIS	0x0100
+
+// ENC28J60 Packet Control Byte Bit Definitions
+#define PKTCTRL_PHUGEEN		0x08
+#define PKTCTRL_PPADEN		0x04
+#define PKTCTRL_PCRCEN		0x02
+#define PKTCTRL_POVERRIDE	0x01
+
+// SPI operation codes
+#define ENC28J60_READ_CTRL_REG	0x00
+#define ENC28J60_READ_BUF_MEM	0x3A
+#define ENC28J60_WRITE_CTRL_REG	0x40
+#define ENC28J60_WRITE_BUF_MEM	0x7A
+#define ENC28J60_BIT_FIELD_SET	0x80
+#define ENC28J60_BIT_FIELD_CLR	0xA0
+#define ENC28J60_SOFT_RESET		0xFF
+
+
+// buffer boundaries applied to internal 8K ram
+//	entire available packet buffer space is allocated
+#define TXSTART_INIT   	0x0000	// start TX buffer at 0
+#define RXSTART_INIT   	0x0600	// give TX buffer space for one full ethernet frame (~1500 bytes)
+#define RXSTOP_INIT    	0x1FFF	// receive buffer gets the rest
+
+#define	MAX_FRAMELEN	1518	// maximum ethernet frame length
+
+// Ethernet constants
+#define ETHERNET_MIN_PACKET_LENGTH	0x3C
+//#define ETHERNET_HEADER_LENGTH		0x0E
+
+// setup ports for I/O
+//void ax88796SetupPorts(void);
+
+//! do a ENC28J60 read operation
+u08 enc28j60ReadOp(u08 op, u08 address);
+//! do a ENC28J60 write operation
+void enc28j60WriteOp(u08 op, u08 address, u08 data);
+//! read the packet buffer memory
+void enc28j60ReadBuffer(u16 len, u08* data);
+//! write the packet buffer memory
+void enc28j60WriteBuffer(u16 len, u08* data);
+//! set the register bank for register at address
+void enc28j60SetBank(u08 address);
+//! read ax88796 register
+u08 enc28j60Read(u08 address);
+//! write ax88796 register
+void enc28j60Write(u08 address, u08 data);
+//! read a PHY register
+u16 enc28j60PhyRead(u08 address);
+//! write a PHY register
+void enc28j60PhyWrite(u08 address, u16 data);
+
+//! initialize the ethernet interface for transmit/receive
+void enc28j60Init(u08* macaddr);
+
+//! Packet transmit function.
+/// Sends a packet on the network.  It is assumed that the packet is headed by a valid ethernet header.
+/// \param len		Length of packet in bytes.
+/// \param packet	Pointer to packet data.
+/// \param len2		Length of the secound packet in bytes, can be 0.
+/// \param packet2	Pointer to the secound packet data, can be NULL.
+void enc28j60PacketSend(unsigned int len1, unsigned char* packet1, unsigned int len2, unsigned char* packet2);
+
+//! Packet receive function.
+/// Gets a packet from the network receive buffer, if one is available.
+/// The packet will by headed by an ethernet header.
+/// \param	maxlen	The maximum acceptable length of a retrieved packet.
+/// \param  buf 	Pointer to buffer.
+/// \return Packet length in bytes if a packet was retrieved, zero otherwise.
+unsigned int enc28j60PacketReceive(unsigned int maxlen, u08* buf);
+
+#endif
+//@}
+
diff --git a/firmware/octoclock/include/net/enc28j60conf.h b/firmware/octoclock/include/net/enc28j60conf.h
new file mode 100644
index 000000000..0acf5473c
--- /dev/null
+++ b/firmware/octoclock/include/net/enc28j60conf.h
@@ -0,0 +1,49 @@
+/*! \file enc28j60conf.h \brief Microchip ENC28J60 Ethernet Interface Driver Configuration. */
+//*****************************************************************************
+//
+// File Name	: 'enc28j60conf.h'
+// Title		: Microchip ENC28J60 Ethernet Interface Driver Configuration
+// Author		: Pascal Stang
+// Created		: 10/5/2004
+// Revised		: 8/22/2005
+// Version		: 0.1
+// Target MCU	: Atmel AVR series
+// Editor Tabs	: 4
+//
+// Description	: This driver provides initialization and transmit/receive
+//		functions for the ENC28J60 10Mb Ethernet Controller and PHY.
+//
+// This code is distributed under the GNU Public License
+//		which can be found at http://www.gnu.org/licenses/gpl.txt
+//
+//*****************************************************************************
+
+#ifndef ENC28J60CONF_H
+#define ENC28J60CONF_H
+
+#include <stdint.h>
+typedef uint8_t  u08;
+typedef uint16_t u16;
+typedef uint32_t u32;
+
+// ENC28J60 SPI port
+#define ENC28J60_SPI_PORT		PORTB
+#define ENC28J60_SPI_DDR		DDRB
+#define ENC28J60_SPI_SCK		PORTB1
+#define ENC28J60_SPI_MOSI		PORTB2
+#define ENC28J60_SPI_MISO		PORTB3
+#define ENC28J60_SPI_SS			PORTB0
+// ENC28J60 control port
+#define ENC28J60_CONTROL_PORT	PORTB
+#define ENC28J60_CONTROL_DDR	DDRB
+#define ENC28J60_CONTROL_CS		PORTB0
+
+// MAC address for this interface
+#define ENC28J60_MAC0 '0'
+#define ENC28J60_MAC1 'F'
+#define ENC28J60_MAC2 'F'
+#define ENC28J60_MAC3 'I'
+#define ENC28J60_MAC4 'C'
+#define ENC28J60_MAC5 'E'
+
+#endif /* ENC28J60CONF_H */
diff --git a/firmware/octoclock/include/net/eth_hdr.h b/firmware/octoclock/include/net/eth_hdr.h
new file mode 100644
index 000000000..9d5356c66
--- /dev/null
+++ b/firmware/octoclock/include/net/eth_hdr.h
@@ -0,0 +1,36 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,2010,2014 Ettus Research LLC
+ *
+ * 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, either version 3 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INCLUDED_ETH_HDR_H
+#define INCLUDED_ETH_HDR_H
+
+#include <compiler.h>
+#include <net/eth_mac_addr.h>
+
+#define ETH_HLEN 14
+
+/*!
+ * \brief Standard 14-byte ethernet header.
+ */
+
+typedef struct {
+  eth_mac_addr_t dst;
+  eth_mac_addr_t src;
+  uint16_t ethertype;
+} _AL2 eth_hdr_t;
+
+#endif /* INCLUDED_ETH_HDR_H */
diff --git a/firmware/octoclock/include/net/eth_mac_addr.h b/firmware/octoclock/include/net/eth_mac_addr.h
new file mode 100644
index 000000000..cb6fb234b
--- /dev/null
+++ b/firmware/octoclock/include/net/eth_mac_addr.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2009-2011,2014 Ettus Research LLC
+ *
+ * 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, either version 3 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INCLUDED_ETH_MAC_ADDR_H
+#define INCLUDED_ETH_MAC_ADDR_H
+
+#include <stdint.h>
+
+// Ethernet MAC address
+
+typedef struct {
+  uint8_t	addr[6];
+} eth_mac_addr_t;
+
+#endif /* INCLUDED_ETH_MAC_ADDR_H */
diff --git a/firmware/octoclock/include/net/ethertype.h b/firmware/octoclock/include/net/ethertype.h
new file mode 100644
index 000000000..0cfab8d65
--- /dev/null
+++ b/firmware/octoclock/include/net/ethertype.h
@@ -0,0 +1,27 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009-2011,2014 Ettus Research LLC
+ *
+ * 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, either version 3 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INCLUDED_ETHERTYPE_H
+#define INCLUDED_ETHERTYPE_H
+
+// all we care about
+
+#define	ETHERTYPE_IPV4	0x0800
+#define	ETHERTYPE_ARP	0x0806
+
+
+#endif /* INCLUDED_ETHERTYPE_H */
diff --git a/firmware/octoclock/include/net/if_arp.h b/firmware/octoclock/include/net/if_arp.h
new file mode 100644
index 000000000..63519c4be
--- /dev/null
+++ b/firmware/octoclock/include/net/if_arp.h
@@ -0,0 +1,153 @@
+/*
+ * INET		An implementation of the TCP/IP protocol suite for the LINUX
+ *		operating system.  INET is implemented using the  BSD Socket
+ *		interface as the means of communication with the user level.
+ *
+ *		Global definitions for the ARP (RFC 826) protocol.
+ *
+ * Version:	@(#)if_arp.h	1.0.1	04/16/93
+ *
+ * Authors:	Original taken from Berkeley UNIX 4.3, (c) UCB 1986-1988
+ *		Portions taken from the KA9Q/NOS (v2.00m PA0GRI) source.
+ *		Ross Biro
+ *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
+ *		Florian La Roche,
+ *		Jonathan Layes <layes@loran.com>
+ *		Arnaldo Carvalho de Melo <acme@conectiva.com.br> ARPHRD_HWX25
+ *
+ *		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; either version
+ *		2 of the License, or (at your option) any later version.
+ */
+#ifndef _LINUX_IF_ARP_H
+#define _LINUX_IF_ARP_H
+
+/* ARP protocol HARDWARE identifiers. */
+#define ARPHRD_NETROM	0		/* from KA9Q: NET/ROM pseudo	*/
+#define ARPHRD_ETHER 	1		/* Ethernet 10Mbps		*/
+#define	ARPHRD_EETHER	2		/* Experimental Ethernet	*/
+#define	ARPHRD_AX25	3		/* AX.25 Level 2		*/
+#define	ARPHRD_PRONET	4		/* PROnet token ring		*/
+#define	ARPHRD_CHAOS	5		/* Chaosnet			*/
+#define	ARPHRD_IEEE802	6		/* IEEE 802.2 Ethernet/TR/TB	*/
+#define	ARPHRD_ARCNET	7		/* ARCnet			*/
+#define	ARPHRD_APPLETLK	8		/* APPLEtalk			*/
+#define ARPHRD_DLCI	15		/* Frame Relay DLCI		*/
+#define ARPHRD_ATM	19		/* ATM 				*/
+#define ARPHRD_METRICOM	23		/* Metricom STRIP (new IANA id)	*/
+#define	ARPHRD_IEEE1394	24		/* IEEE 1394 IPv4 - RFC 2734	*/
+#define ARPHRD_EUI64	27		/* EUI-64                       */
+#define ARPHRD_INFINIBAND 32		/* InfiniBand			*/
+
+/* Dummy types for non ARP hardware */
+#define ARPHRD_SLIP	256
+#define ARPHRD_CSLIP	257
+#define ARPHRD_SLIP6	258
+#define ARPHRD_CSLIP6	259
+#define ARPHRD_RSRVD	260		/* Notional KISS type 		*/
+#define ARPHRD_ADAPT	264
+#define ARPHRD_ROSE	270
+#define ARPHRD_X25	271		/* CCITT X.25			*/
+#define ARPHRD_HWX25	272		/* Boards with X.25 in firmware	*/
+#define ARPHRD_CAN	280		/* Controller Area Network      */
+#define ARPHRD_PPP	512
+#define ARPHRD_CISCO	513		/* Cisco HDLC	 		*/
+#define ARPHRD_HDLC	ARPHRD_CISCO
+#define ARPHRD_LAPB	516		/* LAPB				*/
+#define ARPHRD_DDCMP    517		/* Digital's DDCMP protocol     */
+#define ARPHRD_RAWHDLC	518		/* Raw HDLC			*/
+
+#define ARPHRD_TUNNEL	768		/* IPIP tunnel			*/
+#define ARPHRD_TUNNEL6	769		/* IP6IP6 tunnel       		*/
+#define ARPHRD_FRAD	770             /* Frame Relay Access Device    */
+#define ARPHRD_SKIP	771		/* SKIP vif			*/
+#define ARPHRD_LOOPBACK	772		/* Loopback device		*/
+#define ARPHRD_LOCALTLK 773		/* Localtalk device		*/
+#define ARPHRD_FDDI	774		/* Fiber Distributed Data Interface */
+#define ARPHRD_BIF      775             /* AP1000 BIF                   */
+#define ARPHRD_SIT	776		/* sit0 device - IPv6-in-IPv4	*/
+#define ARPHRD_IPDDP	777		/* IP over DDP tunneller	*/
+#define ARPHRD_IPGRE	778		/* GRE over IP			*/
+#define ARPHRD_PIMREG	779		/* PIMSM register interface	*/
+#define ARPHRD_HIPPI	780		/* High Performance Parallel Interface */
+#define ARPHRD_ASH	781		/* Nexus 64Mbps Ash		*/
+#define ARPHRD_ECONET	782		/* Acorn Econet			*/
+#define ARPHRD_IRDA 	783		/* Linux-IrDA			*/
+/* ARP works differently on different FC media .. so  */
+#define ARPHRD_FCPP	784		/* Point to point fibrechannel	*/
+#define ARPHRD_FCAL	785		/* Fibrechannel arbitrated loop */
+#define ARPHRD_FCPL	786		/* Fibrechannel public loop	*/
+#define ARPHRD_FCFABRIC	787		/* Fibrechannel fabric		*/
+	/* 787->799 reserved for fibrechannel media types */
+#define ARPHRD_IEEE802_TR 800		/* Magic type ident for TR	*/
+#define ARPHRD_IEEE80211 801		/* IEEE 802.11			*/
+#define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header  */
+#define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header */
+
+#define ARPHRD_VOID	  0xFFFF	/* Void type, nothing is known */
+#define ARPHRD_NONE	  0xFFFE	/* zero header length */
+
+/* ARP protocol opcodes. */
+#define	ARPOP_REQUEST	1		/* ARP request			*/
+#define	ARPOP_REPLY	2		/* ARP reply			*/
+#define	ARPOP_RREQUEST	3		/* RARP request			*/
+#define	ARPOP_RREPLY	4		/* RARP reply			*/
+#define	ARPOP_InREQUEST	8		/* InARP request		*/
+#define	ARPOP_InREPLY	9		/* InARP reply			*/
+#define	ARPOP_NAK	10		/* (ATM)ARP NAK			*/
+
+
+/* ARP Flag values. */
+#define ATF_COM		0x02		/* completed entry (ha valid)	*/
+#define	ATF_PERM	0x04		/* permanent entry		*/
+#define	ATF_PUBL	0x08		/* publish entry		*/
+#define	ATF_USETRAILERS	0x10		/* has requested trailers	*/
+#define ATF_NETMASK     0x20            /* want to use a netmask (only
+					   for proxy entries) */
+#define ATF_DONTPUB	0x40		/* don't answer this addresses	*/
+
+typedef unsigned short  __be16;
+
+/*
+ *	This structure defines an ethernet arp header.
+ */
+struct arphdr
+{
+	__be16		ar_hrd;		/* format of hardware address	*/
+	__be16		ar_pro;		/* format of protocol address	*/
+	unsigned char	ar_hln;		/* length of hardware address	*/
+	unsigned char	ar_pln;		/* length of protocol address	*/
+	__be16		ar_op;		/* ARP opcode (command)		*/
+
+#if 0
+	 /*
+	  *	 Ethernet looks like this : This bit is variable sized however...
+	  */
+	unsigned char		ar_sha[ETH_ALEN];	/* sender hardware address	*/
+	unsigned char		ar_sip[4];		/* sender IP address		*/
+	unsigned char		ar_tha[ETH_ALEN];	/* target hardware address	*/
+	unsigned char		ar_tip[4];		/* target IP address		*/
+#endif
+
+};
+
+/*
+ *	This structure defines an ethernet arp header.
+ */
+struct arp_eth_ipv4
+{
+	__be16		ar_hrd;		/* format of hardware address	*/
+	__be16		ar_pro;		/* format of protocol address	*/
+	unsigned char	ar_hln;		/* length of hardware address	*/
+	unsigned char	ar_pln;		/* length of protocol address	*/
+	__be16		ar_op;		/* ARP opcode (command)		*/
+
+	unsigned char	ar_sha[6];	/* sender hardware address	*/
+	unsigned char	ar_sip[4];	/* sender IP address		*/
+	unsigned char	ar_tha[6];	/* target hardware address	*/
+	unsigned char	ar_tip[4];	/* target IP address		*/
+};
+
+
+#endif	/* _LINUX_IF_ARP_H */
diff --git a/firmware/octoclock/include/net/socket_address.h b/firmware/octoclock/include/net/socket_address.h
new file mode 100644
index 000000000..9d4b4c5b3
--- /dev/null
+++ b/firmware/octoclock/include/net/socket_address.h
@@ -0,0 +1,41 @@
+/* -*- c -*- */
+/*
+ * Copyright 2010,2014 Ettus Research LLC
+ *
+ * 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, either version 3 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INCLUDED_SOCKET_ADDRESS_H
+#define INCLUDED_SOCKET_ADDRESS_H
+
+#include <lwip/ip_addr.h>
+
+// port and address are in network byte order
+
+typedef struct socket_address {
+  unsigned short   port;
+  struct ip_addr   addr;
+} socket_address_t;
+
+static inline struct socket_address 
+make_socket_address(struct ip_addr addr, int port)
+{
+  struct socket_address r;
+  r.port = port;
+  r.addr = addr;
+  return r;
+}
+
+
+
+#endif /* INCLUDED_SOCKET_ADDRESS_H */
diff --git a/firmware/octoclock/include/net/udp_handlers.h b/firmware/octoclock/include/net/udp_handlers.h
new file mode 100644
index 000000000..3abc26a24
--- /dev/null
+++ b/firmware/octoclock/include/net/udp_handlers.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Ettus Research LLC
+ *
+ * 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, either version 3 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
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _NET_UDP_HANDLERS_H_
+#define _NET_UDP_HANDLERS_H_
+
+#include <network.h>
+#include <net/socket_address.h>
+
+void handle_udp_ctrl_packet(
+    struct socket_address src, struct socket_address dst,
+    unsigned char *payload, int payload_len
+);
+
+void handle_udp_gpsdo_packet(
+    struct socket_address src, struct socket_address dst,
+    unsigned char *payload, int payload_len
+);
+
+#endif /* _NET_UDP_HANDLERS_H */