OctoClock bugfixes

* Bumped compatibility version to 3
* firmware: Ethernet, clkdist bugfixes
* lib: fixed invalid rev detection

10 files changed, 287 insertions, 382 deletions

diff --git a/firmware/octoclock/include/clkdist.h b/firmware/octoclock/include/clkdist.h
index 633df9ddf..357daf37b 100644
--- a/firmware/octoclock/include/clkdist.h
+++ b/firmware/octoclock/include/clkdist.h
@@ -23,7 +23,7 @@
 #include <octoclock.h>
 
 typedef enum {
-    Reg0, Reg1, Reg2, Reg3, Reg4, Reg5, Reg6, Reg7,
+    Reg0=0, Reg1, Reg2, Reg3, Reg4, Reg5, Reg6, Reg7,
     Reg8_Status_Control,
     Read_Command=0xE,
     RAM_EEPROM_Unlock=0x1F,
@@ -46,6 +46,8 @@ void reset_TI_CDCE18005(void);
 
 uint32_t get_TI_CDCE18005(CDCE18005 which_register);
 
+void set_TI_CDCE18005(CDCE18005 which_register, uint32_t bits);
+
 bool check_TI_CDCE18005(TI_Input_10_MHz which_input, CDCE18005 which_register);
 
 #endif /* _CLKDIST_H_ */
diff --git a/firmware/octoclock/include/debug.h b/firmware/octoclock/include/debug.h
index ee0618bc6..1f69896f0 100644
--- a/firmware/octoclock/include/debug.h
+++ b/firmware/octoclock/include/debug.h
@@ -66,8 +66,8 @@
                              DEBUG_LOG_HEX(((uint8_t*)&num)[0]);
 
 #define DEBUG_LOG_INT(num) DEBUG_LOG_HEX_NNL(((uint8_t*)&num)[3]); \
-                           DEBUG_LOG_HEX(((uint8_t*)&num)[2]); \
-                           DEBUG_LOG_HEX(((uint8_t*)&num)[1]); \
+                           DEBUG_LOG_HEX_NNL(((uint8_t*)&num)[2]); \
+                           DEBUG_LOG_HEX_NNL(((uint8_t*)&num)[1]); \
                            DEBUG_LOG_HEX(((uint8_t*)&num)[0]);
 
 #else
diff --git a/firmware/octoclock/include/gpsdo.h b/firmware/octoclock/include/gpsdo.h
index fc7d87324..df0440404 100644
--- a/firmware/octoclock/include/gpsdo.h
+++ b/firmware/octoclock/include/gpsdo.h
@@ -27,6 +27,4 @@ gpsdo_cache_state_t gpsdo_state;
 
 void send_gpsdo_cmd(char* buf, uint8_t size);
 
-void process_gpsdo_output(void);
-
 #endif /* _GPSDO_H_ */
diff --git a/firmware/octoclock/include/net/enc28j60.h b/firmware/octoclock/include/net/enc28j60.h
index 463303f3c..dc58b451b 100644
--- a/firmware/octoclock/include/net/enc28j60.h
+++ b/firmware/octoclock/include/net/enc28j60.h
@@ -1,299 +1,276 @@
-/*! \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.
-///
-//
-//*****************************************************************************
-//@{
+/*
+ * Copyright 2015 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 ENC28J60_H
-#define ENC28J60_H
+#ifndef _NET_ENC28J60_H_
+#define _NET_ENC28J60_H_
 
-#include <avrlibdefs.h>
+#include <avr/io.h>
 
-#include "enc28j60conf.h"
+#define SPI_DDR  DDRB
+#define SPI_PORT PORTB
+#define SPI_CS   0
+#define SPI_MOSI 2
+#define SPI_MISO 3
+#define SPI_SCK  1
 
-// 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
+// Register Masks
+#define ADDR_MASK 0x1F
+#define BANK_MASK 0x60
+#define SPRD_MASK 0x80
 
-// 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
+// All Banks Registers
+#define EIE      0x1B 
+#define EIR      0x1C
+#define ESTAT    0x1D
+#define ECON2    0x1E
+#define ECON1    0x1F
 
-// ENC28J60 Packet Control Byte Bit Definitions
-#define PKTCTRL_PHUGEEN		0x08
-#define PKTCTRL_PPADEN		0x04
-#define PKTCTRL_PCRCEN		0x02
-#define PKTCTRL_POVERRIDE	0x01
+// Bank 0 Registers
+#define ERDPTL   0x00
+#define ERDPTH   0x01
+#define EWRPTL   0x02
+#define EWRPTH   0x03
+#define ETXSTL   0x04
+#define ETXSTH   0x05
+#define ETXNDL   0x06
+#define ETXNDH   0x07
+#define ERXSTL   0x08
+#define ERXSTH   0x09
+#define ERXNDL   0x0A
+#define ERXNDH   0x0B
+#define ERXRDPTL 0x0C
+#define ERXRDPTH 0x0D
+#define ERXWRPTL 0x0E
+#define ERXWRPTH 0x0F
+#define EDMASTL  0x10
+#define EDMASTH  0x11
+#define EDMANDL  0x12
+#define EDMANDH  0x13
+#define EDMADSTL 0x14
+#define EDMADSTH 0x15
+#define EDMACSL  0x16
+#define EDMACSH  0x17
 
-// 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
+// Bank 1 Registers
+#define EHT0     0x20
+#define EHT1     0x21
+#define EHT2     0x22
+#define EHT3     0x23
+#define EHT4     0x24
+#define EHT5     0x25
+#define EHT6     0x26
+#define EHT7     0x27
+#define EPMM0    0x28
+#define EPMM1    0x29
+#define EPMM2    0x2A
+#define EPMM3    0x2B
+#define EPMM4    0x2C
+#define EPMM5    0x2D
+#define EPMM6    0x2E
+#define EPMM7    0x2F
+#define EPMCSL   0x30
+#define EPMCSH   0x31
+#define EPMOL    0x34
+#define EPMOH    0x35
+#define EWOLIE   0x36
+#define EWOLIR   0x37
+#define ERXFCON  0x38
+#define EPKTCNT  0x39
 
+// Bank 2 Register
+#define MACON1   0xC0
+#define MACON2   0xC1
+#define MACON3   0xC2
+#define MACON4   0xC3
+#define MABBIPG  0xC4
+#define MAIPGL   0xC6
+#define MAIPGH   0xC7
+#define MACLCON1 0xC8
+#define MACLCON2 0xC9
+#define MAMXFLL  0xCA
+#define MAMXFLH  0xCB
+#define MAPHSUP  0xCD
+#define MICON    0xD1
+#define MICMD    0xD2
+#define MIREGADR 0xD4
+#define MIWRL    0xD6
+#define MIWRH    0xD7
+#define MIRDL    0xD8
+#define MIRDH    0xD9
 
-// 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
+// Bank 3 Registers
+#define MAADR1   0xE0
+#define MAADR0   0xE1
+#define MAADR3   0xE2
+#define MAADR2   0xE3
+#define MAADR5   0xE4
+#define MAADR4   0xE5
+#define EBSTSD   0x66
+#define EBSTCON  0x67
+#define EBSTCSL  0x68
+#define EBSTCSH  0x69
+#define MISTAT   0xEA
+#define EREVID   0x72
+#define ECOCON   0x75
+#define EFLOCON  0x77
+#define EPAUSL   0x78
+#define EPAUSH   0x79
 
-#define	MAX_FRAMELEN	1518	// maximum ethernet frame length
+// 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
 
-// Ethernet constants
-#define ETHERNET_MIN_PACKET_LENGTH	0x3C
-//#define ETHERNET_HEADER_LENGTH		0x0E
+// ERXFCON bit definitions
+#define UCEN      0x80
+#define ANDOR     0x40
+#define CRCEN     0x20
+#define PMEN      0x10
+#define MPEN      0x08
+#define HTEN      0x04
+#define MCEN      0x02
+#define BCEN      0x01
 
-// setup ports for I/O
-//void ax88796SetupPorts(void);
+// EIE bit definitions
+#define INTIE     0x80
+#define PKTIE     0x40
+#define DMAIE     0x20
+#define LINKIE    0x10
+#define TXIE      0x08
+#define WOLIE     0x04
+#define TXERIE    0x02
+#define RXERIE    0x01
 
-//! 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);
+// EIR bit definitions
+#define PKTIF     0x40
+#define DMAIF     0x20
+#define LINKIF    0x10
+#define TXIF      0x08
+#define WOLIF     0x04
+#define TXERIF    0x02
+#define RXERIF    0x01
 
-//! initialize the ethernet interface for transmit/receive
-void enc28j60Init(u08* macaddr);
+// ESTAT bit definitions
+#define INT       0x80
+#define LATECOL   0x10
+#define RXBUSY    0x04
+#define TXABRT    0x02
+#define CLKRDY    0x01
 
-//! 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);
+// ECON2 bit definitions
+#define AUTOINC   0x80
+#define PKTDEC    0x40
+#define PWRSV     0x20
+#define VRPS      0x08
 
-//! 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);
+// ECON1 bit definitions
+#define TXRST     0x80
+#define RXRST     0x40
+#define DMAST     0x20
+#define CSUMEN    0x10
+#define TXRTS     0x08
+#define ENCRXEN   0x04
+#define BSEL1     0x02
+#define BSEL0     0x01
 
-#endif
-//@}
+// MACON1 bit definitions
+#define LOOPBK    0x10
+#define TXPAUS    0x08
+#define RXPAUS    0x04
+#define PASSALL   0x02
+#define MARXEN    0x01
 
+// MACON2 bit definitions
+#define MARST     0x80
+#define RNDRST    0x40
+#define MARXRST   0x08
+#define RFUNRST   0x04
+#define MATXRST   0x02
+#define TFUNRST   0x01
+
+// MACON3 bit definitions
+#define PADCFG2   0x80
+#define PADCFG1   0x40
+#define PADCFG0   0x20
+#define TXCRCEN   0x10
+#define PHDRLEN   0x08
+#define HFRMLEN   0x04
+#define FRMLNEN   0x02
+#define FULDPX    0x01
+
+// MICMD bit definitions
+#define MIISCAN   0x02
+#define MIIRD     0x01
+
+// MISTAT bit definitions
+#define NVALID    0x04
+#define SCAN      0x02
+#define BUSY      0x01
+
+// PHCON1 bit definitions
+#define PRST      0x8000
+#define PLOOPBK   0x4000
+#define PPWRSV    0x0800
+#define PDPXMD    0x0100
+
+// PHSTAT1 bit definitions
+#define PFDPX     0x1000
+#define PHDPX     0x0800
+#define LLSTAT    0x0004
+#define JBSTAT    0x0002
+
+// PHCON2 bit definitions
+#define FRCLINK   0x4000
+#define TXDIS     0x2000
+#define JABBER    0x0400
+#define HDLDIS    0x0100
+
+// Packet Control bit Definitions
+#define PHUGEEN   0x08
+#define PPADEN    0x04
+#define PCRCEN    0x02
+#define POVERRIDE 0x01
+
+// SPI Instruction Set
+#define RCR 0x00 // Read Control Register
+#define RBM 0x3A // Read Buffer Memory
+#define WCR 0x40 // Write Control Register
+#define WBM 0x7A // Write Buffer Memory
+#define BFS 0x80 // Bit Field Set
+#define BFC 0xA0 // Bit Field Clear
+#define SC  0xFF // Soft Reset
+
+// Buffer
+#define RXSTART_INIT 0x0000
+#define RXSTOP_INIT  (0x1FFF-0x0600-1)
+#define TXSTART_INIT (0x1FFF-0x0600)
+#define TXSTOP_INIT  0x1FFF
+#define MAX_FRAMELEN 1500
+
+void enc28j60_init(uint8_t* mac_addr);
+
+uint16_t enc28j60_recv(uint8_t* buffer, uint16_t max_len);
+
+void enc28j60_send(uint8_t* buffer, uint16_t len);
+
+#endif /* _NET_ENC28J60_H_ */
diff --git a/firmware/octoclock/include/net/enc28j60conf.h b/firmware/octoclock/include/net/enc28j60conf.h
deleted file mode 100644
index 0acf5473c..000000000
--- a/firmware/octoclock/include/net/enc28j60conf.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*! \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_mac_addr.h b/firmware/octoclock/include/net/eth_mac_addr.h
index 0c790aa4f..78986bf04 100644
--- a/firmware/octoclock/include/net/eth_mac_addr.h
+++ b/firmware/octoclock/include/net/eth_mac_addr.h
@@ -21,11 +21,8 @@
 #include <stdint.h>
 
 // Ethernet MAC address
-
-#pragma pack(push,1)
 typedef struct {
   uint8_t	addr[6];
-} eth_mac_addr_t;
-#pragma pack(pop)
+} eth_mac_addr_t __attribute__((aligned(1)));
 
 #endif /* INCLUDED_ETH_MAC_ADDR_H */
diff --git a/firmware/octoclock/include/network.h b/firmware/octoclock/include/network.h
index 83e398bc5..6d126a197 100644
--- a/firmware/octoclock/include/network.h
+++ b/firmware/octoclock/include/network.h
@@ -69,17 +69,11 @@
 #define _IPH_PROTO_SET(hdr, proto) (hdr)->_ttl_proto = (htons((proto) | (_IPH_TTL(hdr) << 8)))
 #define _IPH_CHKSUM_SET(hdr, chksum) (hdr)->_chksum = (chksum)
 
-bool using_network_defaults;
+volatile bool using_network_defaults;
 
 // Ethernet I/O buffers
-uint8_t buf_in[512];
-uint8_t buf_out[512];
-
-// Default values loaded if EEPROM is incomplete
-static const uint32_t blank_eeprom_ip = _IP(255,255,255,255);
-static const uint32_t default_ip      = _IP(192,168,10,3);
-static const uint32_t default_dr      = _IP(192,168,10,1);
-static const uint32_t default_netmask = _IP(255,255,255,0);
+#define ETH_BUF_SIZE 512
+uint8_t eth_buf[ETH_BUF_SIZE];
 
 typedef void (*udp_receiver_t)(struct socket_address src, struct socket_address dst,
 			       unsigned char *payload, int payload_len);
diff --git a/firmware/octoclock/include/octoclock.h b/firmware/octoclock/include/octoclock.h
index 849ab7f96..34cad1c12 100644
--- a/firmware/octoclock/include/octoclock.h
+++ b/firmware/octoclock/include/octoclock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Ettus Research LLC
+ * Copyright 2014-2015 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
@@ -24,26 +24,21 @@
 #include <stdint.h>
 
 // Define frequency
-#define F_CPU 12500000UL
+#define F_CPU 7372800UL
 
 /*
- * Timer 0 (8-bit)
- *  * Set prescaler to 8
- *  * Enable overflow interrupt
- *  * Set timer to 0
- */
-#define TIMER0_INIT() TCCR0 = (1 << CS01); \
-                      TIMSK |= (1 << TOIE0); \
-                      TCNT0 = 0;
-/*
  * Timer 1 (16-bit)
  *  * Set prescaler to 1024
  *  * Enable overflow interrupt
  *  * Set timer to 0
  */
 #define TIMER1_INIT() TCCR1B = (1 << CS12) | (1 << CS10); \
-        TIMSK |= (1<<TOIE1); \
-        TCNT1 = 0;
+                      TIMSK |= (1<<TOIE1); \
+                      TCNT1 = 0;
+
+#define TIMER1_DISABLE() TCCR1B = 0; \
+                         TIMSK = 0; \
+                         TCNT1 = 0;
 
 #define TIMER1_ONE_SECOND ((uint32_t)(12207))
 
@@ -94,12 +89,6 @@
  * Bits_32(10000000,11111111,10101010,01010101) = 2164238933
  */
 
-typedef enum {
-    Top,
-    Middle,
-    Bottom
-} LEDs;
-
 void setup_atmel_io_ports(void);
 
 #endif /* _OCTOCLOCK_H_ */
diff --git a/firmware/octoclock/include/state.h b/firmware/octoclock/include/state.h
index 9734948cf..2170c2638 100644
--- a/firmware/octoclock/include/state.h
+++ b/firmware/octoclock/include/state.h
@@ -22,23 +22,24 @@
 
 #include <octoclock.h>
 
-// NOT PRESENT unless proven so...
-static ref_t global_which_ref = NO_REF;
-static bool global_gps_present = false;
-static bool global_ext_ref_is_present = false;
+// Global state variables
+extern volatile bool         g_ext_ref_present;
+extern volatile bool         g_gps_present;
+extern volatile switch_pos_t g_switch_pos;
+extern volatile ref_t        g_ref;
 
-void led(LEDs which, int turn_it_on);
+typedef enum {
+    LED_TOP,    // Internal
+    LED_MIDDLE, // External
+    LED_BOTTOM  // Status
+} led_t;
 
-void LEDs_off(void);
+void led(led_t which, bool on);
 
-void force_internal(void);
+void leds_off(void);
 
 void prefer_internal(void);
 
 void prefer_external(void);
 
-ref_t which_ref(void);
-
-switch_pos_t get_switch_pos(void);
-
 #endif /* _STATE_H_ */
diff --git a/firmware/octoclock/include/usart.h b/firmware/octoclock/include/usart.h
index 35ee9eb95..203255988 100644
--- a/firmware/octoclock/include/usart.h
+++ b/firmware/octoclock/include/usart.h
@@ -25,10 +25,6 @@ void usart_init(void);
 
 char usart_getc(void);
 
-char usart_getc_noblock(void);
-
 void usart_putc(char ch);
 
-void usart_putc_nowait(char ch);
-
 #endif /* _USART_H_ */