updated avr utils

avr build scripts support subware culv3 now


git-svn-id: https://svn.spreadspace.org/mur.sat@668 7de4ea59-55d0-425e-a1af-a3118ea81d4c

8 files changed, 509 insertions, 13 deletions

diff --git a/software/avr.lib/anyio.c b/software/avr.lib/anyio.c
new file mode 100644
index 0000000..59fa52b
--- /dev/null
+++ b/software/avr.lib/anyio.c
@@ -0,0 +1,108 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+ *                     Othmar Gsenger <otti@wirdorange.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils 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
+ *  any later version.
+ *
+ *  spreadspace avr utils 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 spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+
+#include "anyio.h"
+
+#include <LUFA/Drivers/USB/USB.h>
+#include "lufa-descriptor-usbserial.h"
+#include "LUFA/Drivers/Peripheral/Serial.h"
+
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
+  {
+    .Config =
+      {
+        .ControlInterfaceNumber         = 0,
+
+        .DataINEndpointNumber           = CDC_TX_EPNUM,
+        .DataINEndpointSize             = CDC_TXRX_EPSIZE,
+        .DataINEndpointDoubleBank       = false,
+
+        .DataOUTEndpointNumber          = CDC_RX_EPNUM,
+        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,
+        .DataOUTEndpointDoubleBank      = false,
+
+        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,
+        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,
+        .NotificationEndpointDoubleBank = false,
+      },
+  };
+
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+  CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+}
+
+void EVENT_USB_Device_ControlRequest(void)
+{
+  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
+}
+/* end LUFA CDC-ACM specific definitions*/
+
+FILE usb_stream;
+FILE serial_stream;
+
+void anyio_init(const uint32_t baudrate, const uint8_t doublespeed)
+{
+  Serial_Init(baudrate, doublespeed);
+  Serial_CreateStream(&serial_stream);
+
+  USB_Init();
+  CDC_Device_CreateStream(&VirtualSerial_CDC_Interface,&usb_stream);
+}
+
+void anyio_task(void)
+{
+  CDC_Device_USBTask(&VirtualSerial_CDC_Interface); 
+  USB_USBTask(); 
+}
+
+int16_t anyio_bytes_received(void)
+{
+  if(stdin == &usb_stream)
+    return CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface);
+  else
+    return (int16_t)Serial_IsCharReceived();
+}
+
+void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)  
+{
+  if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)
+    stdin = stdout = stderr = &usb_stream;
+  else
+    stdin = stdout = stderr = &serial_stream;
+}
+
+void EVENT_USB_Device_Disconnect(void)
+{
+  stdin = stdout = stderr = &serial_stream;
+}
diff --git a/software/avr.lib/anyio.h b/software/avr.lib/anyio.h
new file mode 100644
index 0000000..d774a82
--- /dev/null
+++ b/software/avr.lib/anyio.h
@@ -0,0 +1,33 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+ *                     Othmar Gsenger <otti@wirdorange.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils 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
+ *  any later version.
+ *
+ *  spreadspace avr utils 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 spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SPREADAVR_anyio_h_INCLUDED
+#define SPREADAVR_anyio_h_INCLUDED
+
+#include <stdint.h>
+
+void anyio_init(const uint32_t baudrate, const uint8_t doublespeed);
+void anyio_task(void);
+int16_t anyio_bytes_received(void);
+
+#endif
diff --git a/software/avr.lib/led.c b/software/avr.lib/led.c
index d567cef..7305c00 100644
--- a/software/avr.lib/led.c
+++ b/software/avr.lib/led.c
@@ -2,7 +2,7 @@
  *  spreadspace avr utils
  *
  *
- *  Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org>
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
  *
  *  This file is part of spreadspace avr utils.
  *
@@ -28,7 +28,7 @@
 #define NUM_LEDS 2
 #elif defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) \
   || defined(__BOARD_arduinoNG__) ||  defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) \
-  || defined(__BOARD_hhd70dongle__)
+  || defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__)
 #define NUM_LEDS 1
 #else
 #define NUM_LEDS 0
@@ -56,7 +56,7 @@
 #define LED2_PINNUM 6
 #endif
 
-#if defined(__BOARD_hhd70dongle__)
+#if defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__)
 #define LED_PORT PORTE
 #define LED_DDR DDRE
 #define LED_PINNUM 6
diff --git a/software/avr.lib/led.h b/software/avr.lib/led.h
index d7a8e3b..b69015a 100644
--- a/software/avr.lib/led.h
+++ b/software/avr.lib/led.h
@@ -2,7 +2,7 @@
  *  spreadspace avr utils
  *
  *
- *  Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org>
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
  *
  *  This file is part of spreadspace avr utils.
  *
@@ -20,10 +20,11 @@
  *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SPREADSPACE_led_h_INCLUDED
-#define SPREADSPACE_led_h_INCLUDED
+#ifndef SPREADAVR_led_h_INCLUDED
+#define SPREADAVR_led_h_INCLUDED
 
 void led_init(void);
+
 void led_on(void);
 void led_off(void);
 void led_toggle(void);
diff --git a/software/avr.lib/lufa-descriptor-rndis.c b/software/avr.lib/lufa-descriptor-rndis.c
new file mode 100644
index 0000000..28ea637
--- /dev/null
+++ b/software/avr.lib/lufa-descriptor-rndis.c
@@ -0,0 +1,265 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2012.

+

+  dean [at] fourwalledcubicle [dot] com

+           www.lufa-lib.org

+*/

+

+/*

+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, distribute, and sell this

+  software and its documentation for any purpose is hereby granted

+  without fee, provided that the above copyright notice appear in

+  all copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special

+ *  computer-readable structures which the host requests upon device enumeration, to determine

+ *  the device's capabilities and functions.

+ */

+

+#include "lufa-descriptor-rndis.h"

+

+/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

+ *  device characteristics, including the supported USB version, control endpoint size and the

+ *  number of device configurations. The descriptor is read out by the USB host when the enumeration

+ *  process begins.

+ */

+const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =

+{

+	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},

+

+	.USBSpecification       = VERSION_BCD(01.10),

+	.Class                  = CDC_CSCP_CDCClass,

+	.SubClass               = CDC_CSCP_NoSpecificSubclass,

+	.Protocol               = CDC_CSCP_NoSpecificProtocol,

+

+	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,

+

+	.VendorID               = 0x03EB,

+	.ProductID              = 0x204C,

+	.ReleaseNumber          = VERSION_BCD(00.01),

+

+	.ManufacturerStrIndex   = 0x01,

+	.ProductStrIndex        = 0x02,

+	.SerialNumStrIndex      = NO_DESCRIPTOR,

+

+	.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS

+};

+

+/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage

+ *  of the device in one of its supported configurations, including information about any device interfaces

+ *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting

+ *  a configuration so that the host may correctly communicate with the USB device.

+ */

+const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =

+{

+	.Config =

+		{

+			.Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},

+

+			.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),

+			.TotalInterfaces        = 2,

+

+			.ConfigurationNumber    = 1,

+			.ConfigurationStrIndex  = NO_DESCRIPTOR,

+

+			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

+

+			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

+		},

+

+	.CDC_CCI_Interface =

+		{

+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

+

+			.InterfaceNumber        = 0,

+			.AlternateSetting       = 0,

+

+			.TotalEndpoints         = 1,

+

+			.Class                  = CDC_CSCP_CDCClass,

+			.SubClass               = CDC_CSCP_ACMSubclass,

+			.Protocol               = CDC_CSCP_VendorSpecificProtocol,

+

+			.InterfaceStrIndex      = NO_DESCRIPTOR

+		},

+

+	.CDC_Functional_Header =

+		{

+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},

+			.Subtype                = CDC_DSUBTYPE_CSInterface_Header,

+

+			.CDCSpecification       = VERSION_BCD(01.10),

+		},

+

+	.CDC_Functional_ACM =

+		{

+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},

+			.Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

+

+			.Capabilities           = 0x00,

+		},

+

+	.CDC_Functional_Union =

+		{

+			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},

+			.Subtype                = CDC_DSUBTYPE_CSInterface_Union,

+

+			.MasterInterfaceNumber  = 0,

+			.SlaveInterfaceNumber   = 1,

+		},

+

+	.CDC_NotificationEndpoint =

+		{

+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

+

+			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM),

+			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

+			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,

+			.PollingIntervalMS      = 0xFF

+		},

+

+	.CDC_DCI_Interface =

+		{

+			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

+

+			.InterfaceNumber        = 1,

+			.AlternateSetting       = 0,

+

+			.TotalEndpoints         = 2,

+

+			.Class                  = CDC_CSCP_CDCDataClass,

+			.SubClass               = CDC_CSCP_NoDataSubclass,

+			.Protocol               = CDC_CSCP_NoDataProtocol,

+

+			.InterfaceStrIndex      = NO_DESCRIPTOR

+		},

+

+	.RNDIS_DataOutEndpoint =

+		{

+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

+

+			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM),

+			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

+			.EndpointSize           = CDC_TXRX_EPSIZE,

+			.PollingIntervalMS      = 0x01

+		},

+

+	.RNDIS_DataInEndpoint =

+		{

+			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

+

+			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_TX_EPNUM),

+			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

+			.EndpointSize           = CDC_TXRX_EPSIZE,

+			.PollingIntervalMS      = 0x01

+		}

+};

+

+/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests

+ *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate

+ *  via the language ID table available at USB.org what languages the device supports for its string descriptors.

+ */

+const USB_Descriptor_String_t PROGMEM LanguageString =

+{

+	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

+

+	.UnicodeString          = {LANGUAGE_ID_ENG}

+};

+

+/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable

+ *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device

+ *  Descriptor.

+ */

+const USB_Descriptor_String_t PROGMEM ManufacturerString =

+{

+  .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

+#ifndef USB_MANUFACTURER

+  .UnicodeString          = L"Dean Camera"

+#else

+  .UnicodeString          = USB_MANUFACTURER

+#endif

+};

+

+/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,

+ *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device

+ *  Descriptor.

+ */

+const USB_Descriptor_String_t PROGMEM ProductString =

+{

+  .Header                 = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},

+#ifndef USB_PRODUCT

+  .UnicodeString          = L"LUFA USB-RS232 Adapter"

+#else

+  .UnicodeString          = USB_PRODUCT

+#endif

+};

+

+/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"

+ *  documentation) by the application code so that the address and size of a requested descriptor can be given

+ *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function

+ *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the

+ *  USB host.

+ */

+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

+                                    const uint8_t wIndex,

+                                    const void** const DescriptorAddress)

+{

+	const uint8_t  DescriptorType   = (wValue >> 8);

+	const uint8_t  DescriptorNumber = (wValue & 0xFF);

+

+	const void* Address = NULL;

+	uint16_t    Size    = NO_DESCRIPTOR;

+

+	switch (DescriptorType)

+	{

+		case DTYPE_Device:

+			Address = &DeviceDescriptor;

+			Size    = sizeof(USB_Descriptor_Device_t);

+			break;

+		case DTYPE_Configuration:

+			Address = &ConfigurationDescriptor;

+			Size    = sizeof(USB_Descriptor_Configuration_t);

+			break;

+		case DTYPE_String:

+			switch (DescriptorNumber)

+			{

+				case 0x00:

+					Address = &LanguageString;

+					Size    = pgm_read_byte(&LanguageString.Header.Size);

+					break;

+				case 0x01:

+					Address = &ManufacturerString;

+					Size    = pgm_read_byte(&ManufacturerString.Header.Size);

+					break;

+				case 0x02:

+					Address = &ProductString;

+					Size    = pgm_read_byte(&ProductString.Header.Size);

+					break;

+			}

+

+			break;

+	}

+

+	*DescriptorAddress = Address;

+	return Size;

+}

+

diff --git a/software/avr.lib/lufa-descriptor-rndis.h b/software/avr.lib/lufa-descriptor-rndis.h
new file mode 100644
index 0000000..508ac2f
--- /dev/null
+++ b/software/avr.lib/lufa-descriptor-rndis.h
@@ -0,0 +1,89 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2012.

+

+  dean [at] fourwalledcubicle [dot] com

+           www.lufa-lib.org

+*/

+

+/*

+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, distribute, and sell this

+  software and its documentation for any purpose is hereby granted

+  without fee, provided that the above copyright notice appear in

+  all copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *

+ *  Header file for Descriptors.c.

+ */

+

+#ifndef _DESCRIPTORS_H_

+#define _DESCRIPTORS_H_

+

+	/* Includes: */

+		#include <LUFA/Drivers/USB/USB.h>

+

+		#include <avr/pgmspace.h>

+

+	/* Macros: */

+		/** Endpoint number of the CDC device-to-host notification IN endpoint. */

+		#define CDC_NOTIFICATION_EPNUM         3

+

+		/** Endpoint number of the CDC device-to-host data IN endpoint. */

+		#define CDC_TX_EPNUM                   1

+

+		/** Endpoint number of the CDC host-to-device data OUT endpoint. */

+		#define CDC_RX_EPNUM                   2

+

+		/** Size in bytes of the CDC device-to-host notification IN endpoint. */

+		#define CDC_NOTIFICATION_EPSIZE        8

+

+		/** Size in bytes of the CDC data IN and OUT endpoints. */

+		#define CDC_TXRX_EPSIZE                64

+

+	/* Type Defines: */

+		/** Type define for the device configuration descriptor structure. This must be defined in the

+		 *  application code, as the configuration descriptor contains several sub-descriptors which

+		 *  vary between devices, and which describe the device's usage to the host.

+		 */

+		typedef struct

+		{

+			USB_Descriptor_Configuration_Header_t Config;

+

+			// RNDIS CDC Control Interface

+			USB_Descriptor_Interface_t            CDC_CCI_Interface;

+			USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header;

+			USB_CDC_Descriptor_FunctionalACM_t    CDC_Functional_ACM;

+			USB_CDC_Descriptor_FunctionalUnion_t  CDC_Functional_Union;

+			USB_Descriptor_Endpoint_t             CDC_NotificationEndpoint;

+

+			// RNDIS CDC Data Interface

+			USB_Descriptor_Interface_t            CDC_DCI_Interface;

+			USB_Descriptor_Endpoint_t             RNDIS_DataOutEndpoint;

+			USB_Descriptor_Endpoint_t             RNDIS_DataInEndpoint;

+		} USB_Descriptor_Configuration_t;

+

+	/* Function Prototypes: */

+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

+		                                    const uint8_t wIndex,

+		                                    const void** const DescriptorAddress)

+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

+

+#endif

+

diff --git a/software/avr.lib/util.c b/software/avr.lib/util.c
index 6624699..3de042e 100644
--- a/software/avr.lib/util.c
+++ b/software/avr.lib/util.c
@@ -2,7 +2,7 @@
  *  spreadspace avr utils
  *
  *
- *  Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org>
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
  *
  *  This file is part of spreadspace avr utils.
  *
@@ -49,7 +49,7 @@ void cpu_init(void)
   #define BOOTLOADER_VEC 0x3000
 #elif defined(__BOARD_minimus32__)
   #define BOOTLOADER_VEC 0x3800
-#elif defined(__BOARD_hhd70dongle__)
+#elif defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__)
   #define BOOTLOADER_VEC 0x3800
 #else
   #define BOOTLOADER_VEC 0x0000
@@ -61,7 +61,7 @@ f_ptr_type start_bootloader = (f_ptr_type)BOOTLOADER_VEC;
 void reset2bootloader(void)
 {
 #if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \
-    defined(__BOARD_hhd70dongle__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
+    defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
   cli();
   // disable watchdog, if enabled
   // disable all peripherals
@@ -99,7 +99,7 @@ void reset2bootloader(void)
     TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
     DDRB = 0; DDRC = 0; DDRD = 0;
     PORTB = 0; PORTC = 0; PORTD = 0;
-  #elif defined(__BOARD_hhd70dongle__)
+  #elif defined(__BOARD_hhd70dongle__) || defined(__culV3__)
     EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
     TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
     DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
diff --git a/software/avr.lib/util.h b/software/avr.lib/util.h
index 77afa2e..b8403b3 100644
--- a/software/avr.lib/util.h
+++ b/software/avr.lib/util.h
@@ -2,7 +2,7 @@
  *  spreadspace avr utils
  *
  *
- *  Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org>
+ *  Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
  *
  *  This file is part of spreadspace avr utils.
  *
@@ -20,8 +20,8 @@
  *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SPREADSPACE_util_h_INCLUDED
-#define SPREADSPACE_util_h_INCLUDED
+#ifndef SPREADAVR_util_h_INCLUDED
+#define SPREADAVR_util_h_INCLUDED
 
 void cpu_init(void);
 void reset2bootloader(void);