Run wspurify script on /trunk/ and /branches/ C source files, to remove any trailing whitespace at the end of each line.

pull/1469/head
Dean Camera 13 years ago
parent 77f354609f
commit f201f6697b

@ -40,9 +40,9 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/boot.h> #include <avr/boot.h>
#include <stdbool.h> #include <stdbool.h>
#include <LUFA/Common/Common.h> #include <LUFA/Common/Common.h>
/* Function Prototypes: */ /* Function Prototypes: */
void BootloaderAPI_ErasePage(const uint32_t Address); void BootloaderAPI_ErasePage(const uint32_t Address);
void BootloaderAPI_WritePage(const uint32_t Address); void BootloaderAPI_WritePage(const uint32_t Address);

@ -104,10 +104,10 @@ void SetupHardware(void)
/* Initialize USB Subsystem */ /* Initialize USB Subsystem */
USB_Init(); USB_Init();
LEDs_Init(); LEDs_Init();
/* Bootloader active LED toggle timer initialization */ /* Bootloader active LED toggle timer initialization */
TIMSK1 = (1 << TOIE1); TIMSK1 = (1 << TOIE1);
TCCR1B = ((1 << CS11) | (1 << CS10)); TCCR1B = ((1 << CS11) | (1 << CS10));
} }
/** ISR to periodically toggle the LEDs on the board to indicate that the bootloader is active. */ /** ISR to periodically toggle the LEDs on the board to indicate that the bootloader is active. */
@ -266,7 +266,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
{ {
LowByte = FetchNextCommandByte(); LowByte = FetchNextCommandByte();
} }
HighByte = !HighByte; HighByte = !HighByte;
} }
else else
@ -365,7 +365,7 @@ void CDC_Task(void)
if (Command == 'E') if (Command == 'E')
{ {
RunBootloader = false; RunBootloader = false;
/* Send confirmation byte back to the host */ /* Send confirmation byte back to the host */
WriteNextResponseByte('\r'); WriteNextResponseByte('\r');
} }

@ -46,7 +46,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "Descriptors.h" #include "Descriptors.h"
#include "BootloaderAPI.h" #include "BootloaderAPI.h"
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/Board/LEDs.h>

@ -115,14 +115,14 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// CDC Control Interface // CDC Control Interface
USB_Descriptor_Interface_t CDC_CCI_Interface; USB_Descriptor_Interface_t CDC_CCI_Interface;
USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header;
USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM;
USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union;
USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint;
// CDC Data Interface // CDC Data Interface
USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Interface_t CDC_DCI_Interface;
USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;

@ -40,9 +40,9 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/boot.h> #include <avr/boot.h>
#include <stdbool.h> #include <stdbool.h>
#include <LUFA/Common/Common.h> #include <LUFA/Common/Common.h>
/* Function Prototypes: */ /* Function Prototypes: */
void BootloaderAPI_ErasePage(const uint32_t Address); void BootloaderAPI_ErasePage(const uint32_t Address);
void BootloaderAPI_WritePage(const uint32_t Address); void BootloaderAPI_WritePage(const uint32_t Address);

@ -113,10 +113,10 @@ int main(void)
/* If the TCK pin is not jumpered to ground, start the user application instead */ /* If the TCK pin is not jumpered to ground, start the user application instead */
RunBootloader = (!(PINF & (1 << 4))); RunBootloader = (!(PINF & (1 << 4)));
/* Re-enable JTAG debugging */ /* Re-enable JTAG debugging */
MCUCR &= ~(1 << JTD); MCUCR &= ~(1 << JTD);
MCUCR &= ~(1 << JTD); MCUCR &= ~(1 << JTD);
#endif #endif
/* Turn on first LED on the board to indicate that the bootloader has started */ /* Turn on first LED on the board to indicate that the bootloader has started */
@ -153,7 +153,7 @@ void SetupHardware(void)
/* Initialize the USB subsystem */ /* Initialize the USB subsystem */
USB_Init(); USB_Init();
LEDs_Init(); LEDs_Init();
/* Bootloader active LED toggle timer initialization */ /* Bootloader active LED toggle timer initialization */
TIMSK1 = (1 << TOIE1); TIMSK1 = (1 << TOIE1);
TCCR1B = ((1 << CS11) | (1 << CS10)); TCCR1B = ((1 << CS11) | (1 << CS10));
@ -181,7 +181,7 @@ ISR(TIMER1_OVF_vect, ISR_BLOCK)
* internally. * internally.
*/ */
void EVENT_USB_Device_ControlRequest(void) void EVENT_USB_Device_ControlRequest(void)
{ {
/* Ignore any requests that aren't directed to the DFU interface */ /* Ignore any requests that aren't directed to the DFU interface */
if ((USB_ControlRequest.bmRequestType & (CONTROL_REQTYPE_TYPE | CONTROL_REQTYPE_RECIPIENT)) != if ((USB_ControlRequest.bmRequestType & (CONTROL_REQTYPE_TYPE | CONTROL_REQTYPE_RECIPIENT)) !=
(REQTYPE_CLASS | REQREC_INTERFACE)) (REQTYPE_CLASS | REQREC_INTERFACE))
@ -742,3 +742,4 @@ static void ProcessReadCommand(void)
else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Read signature byte else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Read signature byte
ResponseByte = SignatureInfo[DataIndexToRead - 0x30]; ResponseByte = SignatureInfo[DataIndexToRead - 0x30];
} }

@ -159,11 +159,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
Address = &DeviceDescriptor; Address = &DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t); Size = sizeof(USB_Descriptor_Device_t);
break; break;
case DTYPE_Configuration: case DTYPE_Configuration:
Address = &ConfigurationDescriptor; Address = &ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t); Size = sizeof(USB_Descriptor_Configuration_t);
break; break;
case DTYPE_String: case DTYPE_String:
if (!(DescriptorNumber)) if (!(DescriptorNumber))
{ {
Address = &LanguageString; Address = &LanguageString;
@ -174,10 +174,10 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
Address = &ProductString; Address = &ProductString;
Size = ProductString.Header.Size; Size = ProductString.Header.Size;
} }
break; break;
} }
*DescriptorAddress = Address; *DescriptorAddress = Address;
return Size; return Size;
} }

@ -161,7 +161,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// DFU Interface // DFU Interface
USB_Descriptor_Interface_t DFU_Interface; USB_Descriptor_Interface_t DFU_Interface;
USB_Descriptor_DFU_Functional_t DFU_Functional; USB_Descriptor_DFU_Functional_t DFU_Functional;

@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -32,7 +32,7 @@
* *
* Main source file for the HID class bootloader. This file contains the complete bootloader logic. * Main source file for the HID class bootloader. This file contains the complete bootloader logic.
*/ */
#include "BootloaderHID.h" #include "BootloaderHID.h"
/** Flag to indicate if the bootloader should be running, or should exit and allow the application code to run /** Flag to indicate if the bootloader should be running, or should exit and allow the application code to run
@ -41,20 +41,20 @@
*/ */
static bool RunBootloader = true; static bool RunBootloader = true;
/** Main program entry point. This routine configures the hardware required by the bootloader, then continuously /** Main program entry point. This routine configures the hardware required by the bootloader, then continuously
* runs the bootloader processing routine until instructed to soft-exit. * runs the bootloader processing routine until instructed to soft-exit.
*/ */
int main(void) int main(void)
{ {
/* Setup hardware required for the bootloader */ /* Setup hardware required for the bootloader */
SetupHardware(); SetupHardware();
/* Enable global interrupts so that the USB stack can function */ /* Enable global interrupts so that the USB stack can function */
sei(); sei();
while (RunBootloader) while (RunBootloader)
USB_USBTask(); USB_USBTask();
/* Disconnect from the host - USB interface will be reset later along with the AVR */ /* Disconnect from the host - USB interface will be reset later along with the AVR */
USB_Detach(); USB_Detach();
@ -108,17 +108,17 @@ void EVENT_USB_Device_ControlRequest(void)
{ {
case HID_REQ_SetReport: case HID_REQ_SetReport:
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Wait until the command has been sent by the host */ /* Wait until the command has been sent by the host */
while (!(Endpoint_IsOUTReceived())); while (!(Endpoint_IsOUTReceived()));
/* Read in the write destination address */ /* Read in the write destination address */
#if (FLASHEND > 0xFFFF) #if (FLASHEND > 0xFFFF)
uint32_t PageAddress = ((uint32_t)Endpoint_Read_16_LE() << 8); uint32_t PageAddress = ((uint32_t)Endpoint_Read_16_LE() << 8);
#else #else
uint16_t PageAddress = Endpoint_Read_16_LE(); uint16_t PageAddress = Endpoint_Read_16_LE();
#endif #endif
/* Check if the command is a program page command, or a start application command */ /* Check if the command is a program page command, or a start application command */
#if (FLASHEND > 0xFFFF) #if (FLASHEND > 0xFFFF)
if ((uint16_t)(PageAddress >> 8) == COMMAND_STARTAPPLICATION) if ((uint16_t)(PageAddress >> 8) == COMMAND_STARTAPPLICATION)
@ -133,9 +133,9 @@ void EVENT_USB_Device_ControlRequest(void)
/* Erase the given FLASH page, ready to be programmed */ /* Erase the given FLASH page, ready to be programmed */
boot_page_erase(PageAddress); boot_page_erase(PageAddress);
boot_spm_busy_wait(); boot_spm_busy_wait();
/* Write each of the FLASH page's bytes in sequence */ /* Write each of the FLASH page's bytes in sequence */
for (uint8_t PageWord = 0; PageWord < (SPM_PAGESIZE / 2); PageWord++) for (uint8_t PageWord = 0; PageWord < (SPM_PAGESIZE / 2); PageWord++)
{ {
/* Check if endpoint is empty - if so clear it and wait until ready for next packet */ /* Check if endpoint is empty - if so clear it and wait until ready for next packet */
if (!(Endpoint_BytesInEndpoint())) if (!(Endpoint_BytesInEndpoint()))
@ -162,3 +162,4 @@ void EVENT_USB_Device_ControlRequest(void)
break; break;
} }
} }

@ -8,14 +8,14 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -32,7 +32,7 @@
* *
* Header file for TeensyHID.c. * Header file for TeensyHID.c.
*/ */
#ifndef _TEENSYHID_H_ #ifndef _TEENSYHID_H_
#define _TEENSYHID_H_ #define _TEENSYHID_H_
@ -47,15 +47,16 @@
#include "Descriptors.h" #include "Descriptors.h"
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
/* Macros: */ /* Macros: */
/** Bootloader special address to start the user application */ /** Bootloader special address to start the user application */
#define COMMAND_STARTAPPLICATION 0xFFFF #define COMMAND_STARTAPPLICATION 0xFFFF
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void); void SetupHardware(void);
void EVENT_USB_Device_ConfigurationChanged(void); void EVENT_USB_Device_ConfigurationChanged(void);
void EVENT_USB_Device_UnhandledControlRequest(void); void EVENT_USB_Device_UnhandledControlRequest(void);
#endif #endif

@ -8,14 +8,14 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -30,9 +30,9 @@
/** \file /** \file
* *
* USB Device Descriptors, for library use when in USB device mode. Descriptors are special * 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 * computer-readable structures which the host requests upon device enumeration, to determine
* the device's capabilities and functions. * the device's capabilities and functions.
*/ */
#include "Descriptors.h" #include "Descriptors.h"
@ -52,7 +52,7 @@ const USB_Descriptor_HIDReport_Datatype_t HIDReport[] =
HID_RI_LOGICAL_MINIMUM(8, 0x00), HID_RI_LOGICAL_MINIMUM(8, 0x00),
HID_RI_LOGICAL_MAXIMUM(8, 0xFF), HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
HID_RI_REPORT_SIZE(8, 0x08), HID_RI_REPORT_SIZE(8, 0x08),
HID_RI_REPORT_COUNT(16, (sizeof(uint16_t) + SPM_PAGESIZE)), HID_RI_REPORT_COUNT(16, (sizeof(uint16_t) + SPM_PAGESIZE)),
HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
HID_RI_END_COLLECTION(0), HID_RI_END_COLLECTION(0),
}; };
@ -91,49 +91,49 @@ const USB_Descriptor_Device_t DeviceDescriptor =
*/ */
const USB_Descriptor_Configuration_t ConfigurationDescriptor = const USB_Descriptor_Configuration_t ConfigurationDescriptor =
{ {
.Config = .Config =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration}, .Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t), .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
.TotalInterfaces = 1, .TotalInterfaces = 1,
.ConfigurationNumber = 1, .ConfigurationNumber = 1,
.ConfigurationStrIndex = NO_DESCRIPTOR, .ConfigurationStrIndex = NO_DESCRIPTOR,
.ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED, .ConfigAttributes = USB_CONFIG_ATTR_BUSPOWERED,
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100) .MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
}, },
.HID_Interface = .HID_Interface =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
.InterfaceNumber = 0x00, .InterfaceNumber = 0x00,
.AlternateSetting = 0x00, .AlternateSetting = 0x00,
.TotalEndpoints = 1, .TotalEndpoints = 1,
.Class = HID_CSCP_HIDClass, .Class = HID_CSCP_HIDClass,
.SubClass = HID_CSCP_NonBootSubclass, .SubClass = HID_CSCP_NonBootSubclass,
.Protocol = HID_CSCP_NonBootProtocol, .Protocol = HID_CSCP_NonBootProtocol,
.InterfaceStrIndex = NO_DESCRIPTOR .InterfaceStrIndex = NO_DESCRIPTOR
}, },
.HID_VendorHID = .HID_VendorHID =
{ {
.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalReportDescriptors = 1, .TotalReportDescriptors = 1,
.HIDReportType = HID_DTYPE_Report, .HIDReportType = HID_DTYPE_Report,
.HIDReportLength = sizeof(HIDReport) .HIDReportLength = sizeof(HIDReport)
}, },
.HID_ReportINEndpoint = .HID_ReportINEndpoint =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
@ -158,17 +158,17 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const void* Address = NULL; const void* Address = NULL;
uint16_t Size = NO_DESCRIPTOR; uint16_t Size = NO_DESCRIPTOR;
/* If/Else If chain compiles slightly smaller than a switch case */ /* If/Else If chain compiles slightly smaller than a switch case */
if (DescriptorType == DTYPE_Device) if (DescriptorType == DTYPE_Device)
{ {
Address = &DeviceDescriptor; Address = &DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t); Size = sizeof(USB_Descriptor_Device_t);
} }
else if (DescriptorType == DTYPE_Configuration) else if (DescriptorType == DTYPE_Configuration)
{ {
Address = &ConfigurationDescriptor; Address = &ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t); Size = sizeof(USB_Descriptor_Configuration_t);
} }
else if (DescriptorType == HID_DTYPE_HID) else if (DescriptorType == HID_DTYPE_HID)
{ {
@ -184,3 +184,4 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
*DescriptorAddress = Address; *DescriptorAddress = Address;
return Size; return Size;
} }

@ -8,14 +8,14 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -47,18 +47,18 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Generic HID Interface // Generic HID Interface
USB_Descriptor_Interface_t HID_Interface; USB_Descriptor_Interface_t HID_Interface;
USB_HID_Descriptor_HID_t HID_VendorHID; USB_HID_Descriptor_HID_t HID_VendorHID;
USB_Descriptor_Endpoint_t HID_ReportINEndpoint; USB_Descriptor_Endpoint_t HID_ReportINEndpoint;
} USB_Descriptor_Configuration_t; } USB_Descriptor_Configuration_t;
/* Macros: */ /* Macros: */
/** Endpoint number of the HID data IN endpoint. */ /** Endpoint number of the HID data IN endpoint. */
#define HID_IN_EPNUM 1 #define HID_IN_EPNUM 1
/** Size in bytes of the HID reporting IN endpoint. */ /** Size in bytes of the HID reporting IN endpoint. */
#define HID_IN_EPSIZE 64 #define HID_IN_EPSIZE 64
/* Function Prototypes: */ /* Function Prototypes: */
@ -68,3 +68,4 @@
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
#endif #endif

@ -710,10 +710,10 @@ int teensy_open(void)
{ {
teensy_close(); teensy_close();
uhid_teensy_fd = open_usb_device(0x16C0, 0x0478); uhid_teensy_fd = open_usb_device(0x16C0, 0x0478);
if (uhid_teensy_fd < 0) if (uhid_teensy_fd < 0)
uhid_teensy_fd = open_usb_device(0x03eb, 0x2067); uhid_teensy_fd = open_usb_device(0x03eb, 0x2067);
if (uhid_teensy_fd < 0) return 0; if (uhid_teensy_fd < 0) return 0;
return 1; return 1;
} }
@ -826,7 +826,7 @@ parse_hex_line(char *line)
int addr, code, num; int addr, code, num;
int sum, len, cksum, i; int sum, len, cksum, i;
char *ptr; char *ptr;
num = 0; num = 0;
if (line[0] != ':') return 0; if (line[0] != ':') return 0;
if (strlen(line) < 11) return 0; if (strlen(line) < 11) return 0;

@ -106,11 +106,11 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
#if defined(USE_TEST_TONE) #if defined(USE_TEST_TONE)
static uint8_t SquareWaveSampleCount; static uint8_t SquareWaveSampleCount;
static int16_t CurrentWaveValue; static int16_t CurrentWaveValue;
/* In test tone mode, generate a square wave at 1/256 of the sample rate */ /* In test tone mode, generate a square wave at 1/256 of the sample rate */
if (SquareWaveSampleCount++ == 0xFF) if (SquareWaveSampleCount++ == 0xFF)
CurrentWaveValue ^= 0x8000; CurrentWaveValue ^= 0x8000;
/* Only generate audio if the board button is being pressed */ /* Only generate audio if the board button is being pressed */
AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0; AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0;
#else #else
@ -122,7 +122,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
AudioSample -= (SAMPLE_MAX_RANGE / 2); AudioSample -= (SAMPLE_MAX_RANGE / 2);
#endif #endif
#endif #endif
Audio_Device_WriteSample16(&Microphone_Audio_Interface, AudioSample); Audio_Device_WriteSample16(&Microphone_Audio_Interface, AudioSample);
} }
@ -211,10 +211,10 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t*
CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]); CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]);
/* Adjust sample reload timer to the new frequency */ /* Adjust sample reload timer to the new frequency */
OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1); OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1);
} }
return true; return true;
case AUDIO_REQ_GetCurrent: case AUDIO_REQ_GetCurrent:
/* Check if we are just testing for a valid property, or actually reading it */ /* Check if we are just testing for a valid property, or actually reading it */
if (DataLength != NULL) if (DataLength != NULL)
@ -223,13 +223,14 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t*
Data[2] = (CurrentAudioSampleFrequency >> 16); Data[2] = (CurrentAudioSampleFrequency >> 16);
Data[1] = (CurrentAudioSampleFrequency >> 8); Data[1] = (CurrentAudioSampleFrequency >> 8);
Data[0] = (CurrentAudioSampleFrequency & 0xFF); Data[0] = (CurrentAudioSampleFrequency & 0xFF);
} }
return true; return true;
} }
} }
} }
return false; return false;
} }

@ -204,7 +204,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t)) .TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t))
}, },
.Audio_AudioFormatSampleRates = .Audio_AudioFormatSampleRates =
{ {
AUDIO_SAMPLE_FREQ(8000), AUDIO_SAMPLE_FREQ(8000),

@ -91,7 +91,7 @@ void SetupHardware(void)
ISR(TIMER0_COMPA_vect, ISR_BLOCK) ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{ {
uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint(); uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint();
/* Check that the USB bus is ready for the next sample to read */ /* Check that the USB bus is ready for the next sample to read */
if (Audio_Device_IsSampleReceived(&Speaker_Audio_Interface)) if (Audio_Device_IsSampleReceived(&Speaker_Audio_Interface))
{ {
@ -128,8 +128,8 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }
Endpoint_SelectEndpoint(PrevEndpoint); Endpoint_SelectEndpoint(PrevEndpoint);
} }
/** Event handler for the library USB Connection event. */ /** Event handler for the library USB Connection event. */
@ -248,10 +248,10 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t*
CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]); CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]);
/* Adjust sample reload timer to the new frequency */ /* Adjust sample reload timer to the new frequency */
OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1); OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1);
} }
return true; return true;
case AUDIO_REQ_GetCurrent: case AUDIO_REQ_GetCurrent:
/* Check if we are just testing for a valid property, or actually reading it */ /* Check if we are just testing for a valid property, or actually reading it */
if (DataLength != NULL) if (DataLength != NULL)
@ -260,13 +260,14 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t*
Data[2] = (CurrentAudioSampleFrequency >> 16); Data[2] = (CurrentAudioSampleFrequency >> 16);
Data[1] = (CurrentAudioSampleFrequency >> 8); Data[1] = (CurrentAudioSampleFrequency >> 8);
Data[0] = (CurrentAudioSampleFrequency & 0xFF); Data[0] = (CurrentAudioSampleFrequency & 0xFF);
} }
return true; return true;
} }
} }
} }
return false; return false;
} }

@ -204,7 +204,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t)), .TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t)),
}, },
.Audio_AudioFormatSampleRates = .Audio_AudioFormatSampleRates =
{ {
AUDIO_SAMPLE_FREQ(8000), AUDIO_SAMPLE_FREQ(8000),

@ -83,3 +83,4 @@
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
#endif #endif

@ -109,3 +109,4 @@
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
#endif #endif

@ -145,7 +145,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
{ {
uint8_t* Data = (uint8_t*)ReportData; uint8_t* Data = (uint8_t*)ReportData;
uint8_t CurrLEDMask = LEDs_GetLEDs(); uint8_t CurrLEDMask = LEDs_GetLEDs();
Data[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0); Data[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0);
Data[1] = ((CurrLEDMask & LEDS_LED2) ? 1 : 0); Data[1] = ((CurrLEDMask & LEDS_LED2) ? 1 : 0);
Data[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0); Data[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0);
@ -171,7 +171,7 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
{ {
uint8_t* Data = (uint8_t*)ReportData; uint8_t* Data = (uint8_t*)ReportData;
uint8_t NewLEDMask = LEDS_NO_LEDS; uint8_t NewLEDMask = LEDS_NO_LEDS;
if (Data[0]) if (Data[0])
NewLEDMask |= LEDS_LED1; NewLEDMask |= LEDS_LED1;
@ -183,7 +183,7 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
if (Data[3]) if (Data[3])
NewLEDMask |= LEDS_LED1; NewLEDMask |= LEDS_LED1;
LEDs_SetAllLEDs(NewLEDMask); LEDs_SetAllLEDs(NewLEDMask);
} }

@ -42,7 +42,7 @@
* descriptor is parsed by the host and its contents used to determine what data (and in what encoding) * descriptor is parsed by the host and its contents used to determine what data (and in what encoding)
* the device will send, and what it may be sent back from the host. Refer to the HID specification for * the device will send, and what it may be sent back from the host. Refer to the HID specification for
* more details on HID report descriptors. * more details on HID report descriptors.
*/ */
const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
{ {
/* Use the HID class driver's standard Joystick report. /* Use the HID class driver's standard Joystick report.

@ -8,7 +8,7 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in

@ -279,7 +279,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
Address = &ConfigurationDescriptor.HID2_MouseHID; Address = &ConfigurationDescriptor.HID2_MouseHID;
Size = sizeof(USB_HID_Descriptor_HID_t); Size = sizeof(USB_HID_Descriptor_HID_t);
} }
break; break;
case HID_DTYPE_Report: case HID_DTYPE_Report:
if (!(wIndex)) if (!(wIndex))

@ -258,3 +258,4 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }
} }

@ -77,7 +77,7 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM HIDReport[] =
HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE), HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
HID_RI_END_COLLECTION(0), HID_RI_END_COLLECTION(0),
HID_RI_END_COLLECTION(0), HID_RI_END_COLLECTION(0),
/* Keyboard Report */ /* Keyboard Report */
HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */ HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */
HID_RI_USAGE(8, 0x06), /* Keyboard */ HID_RI_USAGE(8, 0x06), /* Keyboard */
@ -280,7 +280,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
break; break;
case HID_DTYPE_HID: case HID_DTYPE_HID:
Address = &ConfigurationDescriptor.HID_HIDData; Address = &ConfigurationDescriptor.HID_HIDData;
Size = sizeof(USB_HID_Descriptor_HID_t); Size = sizeof(USB_HID_Descriptor_HID_t);
break; break;
case HID_DTYPE_Report: case HID_DTYPE_Report:
Address = &HIDReport; Address = &HIDReport;

@ -62,7 +62,7 @@
/** Size in bytes of each of the HID reporting IN endpoint. */ /** Size in bytes of each of the HID reporting IN endpoint. */
#define HID_EPSIZE 8 #define HID_EPSIZE 8
/* Enums: */ /* Enums: */
/** Enum for the HID report IDs used in the device. */ /** Enum for the HID report IDs used in the device. */
enum enum

@ -148,7 +148,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
uint8_t ButtonStatus_LCL = Buttons_GetStatus(); uint8_t ButtonStatus_LCL = Buttons_GetStatus();
if (!(ButtonStatus_LCL & BUTTONS_BUTTON1)) if (!(ButtonStatus_LCL & BUTTONS_BUTTON1))
{ {
USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData; USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;
KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT; KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;
@ -221,3 +221,4 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }

@ -287,7 +287,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
SCSI_ASENSE_WRITE_PROTECTED, SCSI_ASENSE_WRITE_PROTECTED,
SCSI_ASENSEQ_NO_QUALIFIER); SCSI_ASENSEQ_NO_QUALIFIER);
return false; return false;
} }
/* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */ /* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */
@ -311,7 +311,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
/* Adjust the given block address to the real media address based on the selected LUN */ /* Adjust the given block address to the real media address based on the selected LUN */
BlockAddress += ((uint32_t)MSInterfaceInfo->State.CommandBlock.LUN * LUN_MEDIA_BLOCKS); BlockAddress += ((uint32_t)MSInterfaceInfo->State.CommandBlock.LUN * LUN_MEDIA_BLOCKS);
#endif #endif
/* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */ /* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */
if (IsDataRead == DATA_READ) if (IsDataRead == DATA_READ)
DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks); DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks);
@ -345,3 +345,4 @@ static bool SCSI_Command_ModeSense_6(USB_ClassInfo_MS_Device_t* const MSInterfac
return true; return true;
} }

@ -73,7 +73,7 @@
/** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */ /** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */
#define LUN_MEDIA_BLOCKS (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS) #define LUN_MEDIA_BLOCKS (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS)
/** Indicates if the disk is write protected or not. */ /** Indicates if the disk is write protected or not. */
#define DISK_READ_ONLY false #define DISK_READ_ONLY false

@ -287,7 +287,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
SCSI_ASENSE_WRITE_PROTECTED, SCSI_ASENSE_WRITE_PROTECTED,
SCSI_ASENSEQ_NO_QUALIFIER); SCSI_ASENSEQ_NO_QUALIFIER);
return false; return false;
} }
/* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */ /* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */
@ -345,3 +345,4 @@ static bool SCSI_Command_ModeSense_6(USB_ClassInfo_MS_Device_t* const MSInterfac
return true; return true;
} }

@ -81,7 +81,7 @@
/** Indicates if the disk is write protected or not. */ /** Indicates if the disk is write protected or not. */
#define DISK_READ_ONLY false #define DISK_READ_ONLY false
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void); void SetupHardware(void);

@ -87,16 +87,16 @@ int main(void)
if (RNDIS_Device_IsPacketReceived(&Ethernet_RNDIS_Interface)) if (RNDIS_Device_IsPacketReceived(&Ethernet_RNDIS_Interface))
{ {
LEDs_SetAllLEDs(LEDMASK_USB_BUSY); LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
RNDIS_Device_ReadPacket(&Ethernet_RNDIS_Interface, &FrameIN.FrameData, &FrameIN.FrameLength); RNDIS_Device_ReadPacket(&Ethernet_RNDIS_Interface, &FrameIN.FrameData, &FrameIN.FrameLength);
Ethernet_ProcessPacket(&FrameIN, &FrameOUT); Ethernet_ProcessPacket(&FrameIN, &FrameOUT);
if (FrameOUT.FrameLength) if (FrameOUT.FrameLength)
{ {
RNDIS_Device_SendPacket(&Ethernet_RNDIS_Interface, &FrameOUT.FrameData, FrameOUT.FrameLength); RNDIS_Device_SendPacket(&Ethernet_RNDIS_Interface, &FrameOUT.FrameData, FrameOUT.FrameLength);
FrameOUT.FrameLength = 0; FrameOUT.FrameLength = 0;
} }
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
} }

@ -287,7 +287,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
SCSI_ASENSE_WRITE_PROTECTED, SCSI_ASENSE_WRITE_PROTECTED,
SCSI_ASENSEQ_NO_QUALIFIER); SCSI_ASENSEQ_NO_QUALIFIER);
return false; return false;
} }
/* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */ /* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */
@ -311,7 +311,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
/* Adjust the given block address to the real media address based on the selected LUN */ /* Adjust the given block address to the real media address based on the selected LUN */
BlockAddress += ((uint32_t)MSInterfaceInfo->State.CommandBlock.LUN * LUN_MEDIA_BLOCKS); BlockAddress += ((uint32_t)MSInterfaceInfo->State.CommandBlock.LUN * LUN_MEDIA_BLOCKS);
#endif #endif
/* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */ /* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */
if (IsDataRead == DATA_READ) if (IsDataRead == DATA_READ)
DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks); DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks);
@ -345,3 +345,4 @@ static bool SCSI_Command_ModeSense_6(USB_ClassInfo_MS_Device_t* const MSInterfac
return true; return true;
} }

@ -59,7 +59,7 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
.NotificationEndpointDoubleBank = false, .NotificationEndpointDoubleBank = false,
}, },
}; };
/** LUFA Mass Storage Class driver interface configuration and state information. This structure is /** LUFA Mass Storage Class driver interface configuration and state information. This structure is
* passed to all Mass Storage Class driver functions, so that multiple instances of the same class * passed to all Mass Storage Class driver functions, so that multiple instances of the same class
* within a device can be differentiated from one another. * within a device can be differentiated from one another.
@ -211,3 +211,4 @@ bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSI
return CommandSuccess; return CommandSuccess;
} }

@ -47,7 +47,7 @@
#include "Lib/SCSI.h" #include "Lib/SCSI.h"
#include "Lib/DataflashManager.h" #include "Lib/DataflashManager.h"
#include <LUFA/Version.h> #include <LUFA/Version.h>
#include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Board/Joystick.h> #include <LUFA/Drivers/Board/Joystick.h>
@ -74,7 +74,7 @@
/** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */ /** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */
#define LUN_MEDIA_BLOCKS (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS) #define LUN_MEDIA_BLOCKS (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS)
/** Indicates if the disk is write protected or not. */ /** Indicates if the disk is write protected or not. */
#define DISK_READ_ONLY false #define DISK_READ_ONLY false

@ -47,7 +47,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// SideShow Interface // SideShow Interface
USB_Descriptor_Interface_t SSHOW_Interface; USB_Descriptor_Interface_t SSHOW_Interface;
USB_Descriptor_Endpoint_t SSHOW_DataInEndpoint; USB_Descriptor_Endpoint_t SSHOW_DataInEndpoint;

@ -102,3 +102,4 @@
void SideShow_Discard_Byte_Stream(void); void SideShow_Discard_Byte_Stream(void);
#endif #endif

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org www.lufa-lib.org
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -38,7 +38,7 @@ TMC_Capabilities_t Capabilities =
{ {
.Status = TMC_STATUS_SUCCESS, .Status = TMC_STATUS_SUCCESS,
.TMCVersion = VERSION_BCD(1.00), .TMCVersion = VERSION_BCD(1.00),
.Interface = .Interface =
{ {
.ListenOnly = false, .ListenOnly = false,
@ -82,7 +82,7 @@ int main(void)
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei(); sei();
for (;;) for (;;)
{ {
TMC_Task(); TMC_Task();
@ -99,7 +99,7 @@ void SetupHardware(void)
/* Disable clock division */ /* Disable clock division */
clock_prescale_set(clock_div_1); clock_prescale_set(clock_div_1);
/* Hardware Initialization */ /* Hardware Initialization */
LEDs_Init(); LEDs_Init();
USB_Init(); USB_Init();
@ -167,43 +167,43 @@ void EVENT_USB_Device_ControlRequest(void)
{ {
/* Indicate that all in-progress/pending data OUT requests should be aborted */ /* Indicate that all in-progress/pending data OUT requests should be aborted */
IsTMCBulkOUTReset = true; IsTMCBulkOUTReset = true;
/* Save the split request for later checking when a new request is received */ /* Save the split request for later checking when a new request is received */
RequestInProgress = Req_InitiateAbortBulkOut; RequestInProgress = Req_InitiateAbortBulkOut;
} }
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Write the request response byte */ /* Write the request response byte */
Endpoint_Write_8(TMCRequestStatus); Endpoint_Write_8(TMCRequestStatus);
Endpoint_ClearIN(); Endpoint_ClearIN();
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
} }
break; break;
case Req_CheckAbortBulkOutStatus: case Req_CheckAbortBulkOutStatus:
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT)) if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))
{ {
/* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */ /* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */
if (RequestInProgress != Req_InitiateAbortBulkOut) if (RequestInProgress != Req_InitiateAbortBulkOut)
TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;
else if (IsTMCBulkOUTReset) else if (IsTMCBulkOUTReset)
TMCRequestStatus = TMC_STATUS_PENDING; TMCRequestStatus = TMC_STATUS_PENDING;
else else
RequestInProgress = 0; RequestInProgress = 0;
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Write the request response bytes */ /* Write the request response bytes */
Endpoint_Write_8(TMCRequestStatus); Endpoint_Write_8(TMCRequestStatus);
Endpoint_Write_16_LE(0); Endpoint_Write_16_LE(0);
Endpoint_Write_32_LE(LastTransferLength); Endpoint_Write_32_LE(LastTransferLength);
Endpoint_ClearIN(); Endpoint_ClearIN();
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
} }
break; break;
case Req_InitiateAbortBulkIn: case Req_InitiateAbortBulkIn:
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT)) if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))
@ -211,7 +211,7 @@ void EVENT_USB_Device_ControlRequest(void)
/* Check that no split transaction is already in progress and the data transfer tag is valid */ /* Check that no split transaction is already in progress and the data transfer tag is valid */
if (RequestInProgress != 0) if (RequestInProgress != 0)
{ {
TMCRequestStatus = TMC_STATUS_SPLIT_IN_PROGRESS; TMCRequestStatus = TMC_STATUS_SPLIT_IN_PROGRESS;
} }
else if (USB_ControlRequest.wValue != CurrentTransferTag) else if (USB_ControlRequest.wValue != CurrentTransferTag)
{ {
@ -221,13 +221,13 @@ void EVENT_USB_Device_ControlRequest(void)
{ {
/* Indicate that all in-progress/pending data IN requests should be aborted */ /* Indicate that all in-progress/pending data IN requests should be aborted */
IsTMCBulkINReset = true; IsTMCBulkINReset = true;
/* Save the split request for later checking when a new request is received */ /* Save the split request for later checking when a new request is received */
RequestInProgress = Req_InitiateAbortBulkIn; RequestInProgress = Req_InitiateAbortBulkIn;
} }
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Write the request response bytes */ /* Write the request response bytes */
Endpoint_Write_8(TMCRequestStatus); Endpoint_Write_8(TMCRequestStatus);
Endpoint_Write_8(CurrentTransferTag); Endpoint_Write_8(CurrentTransferTag);
@ -235,7 +235,7 @@ void EVENT_USB_Device_ControlRequest(void)
Endpoint_ClearIN(); Endpoint_ClearIN();
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
} }
break; break;
case Req_CheckAbortBulkInStatus: case Req_CheckAbortBulkInStatus:
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT)) if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))
@ -249,7 +249,7 @@ void EVENT_USB_Device_ControlRequest(void)
RequestInProgress = 0; RequestInProgress = 0;
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Write the request response bytes */ /* Write the request response bytes */
Endpoint_Write_8(TMCRequestStatus); Endpoint_Write_8(TMCRequestStatus);
Endpoint_Write_16_LE(0); Endpoint_Write_16_LE(0);
@ -258,7 +258,7 @@ void EVENT_USB_Device_ControlRequest(void)
Endpoint_ClearIN(); Endpoint_ClearIN();
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
} }
break; break;
case Req_InitiateClear: case Req_InitiateClear:
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
@ -266,34 +266,34 @@ void EVENT_USB_Device_ControlRequest(void)
/* Check that no split transaction is already in progress */ /* Check that no split transaction is already in progress */
if (RequestInProgress != 0) if (RequestInProgress != 0)
{ {
Endpoint_Write_8(TMC_STATUS_SPLIT_IN_PROGRESS); Endpoint_Write_8(TMC_STATUS_SPLIT_IN_PROGRESS);
} }
else else
{ {
/* Indicate that all in-progress/pending data IN and OUT requests should be aborted */ /* Indicate that all in-progress/pending data IN and OUT requests should be aborted */
IsTMCBulkINReset = true; IsTMCBulkINReset = true;
IsTMCBulkOUTReset = true; IsTMCBulkOUTReset = true;
/* Save the split request for later checking when a new request is received */ /* Save the split request for later checking when a new request is received */
RequestInProgress = Req_InitiateClear; RequestInProgress = Req_InitiateClear;
} }
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Write the request response byte */ /* Write the request response byte */
Endpoint_Write_8(TMCRequestStatus); Endpoint_Write_8(TMCRequestStatus);
Endpoint_ClearIN(); Endpoint_ClearIN();
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
} }
break; break;
case Req_CheckClearStatus: case Req_CheckClearStatus:
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
{ {
/* Check that a CLEAR transaction has been requested and that the request has completed */ /* Check that a CLEAR transaction has been requested and that the request has completed */
if (RequestInProgress != Req_InitiateClear) if (RequestInProgress != Req_InitiateClear)
TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;
else if (IsTMCBulkINReset || IsTMCBulkOUTReset) else if (IsTMCBulkINReset || IsTMCBulkOUTReset)
TMCRequestStatus = TMC_STATUS_PENDING; TMCRequestStatus = TMC_STATUS_PENDING;
else else
@ -304,22 +304,22 @@ void EVENT_USB_Device_ControlRequest(void)
/* Write the request response bytes */ /* Write the request response bytes */
Endpoint_Write_8(TMCRequestStatus); Endpoint_Write_8(TMCRequestStatus);
Endpoint_Write_8(0); Endpoint_Write_8(0);
Endpoint_ClearIN(); Endpoint_ClearIN();
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
} }
break; break;
case Req_GetCapabilities: case Req_GetCapabilities:
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
{ {
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
/* Write the device capabilities to the control endpoint */ /* Write the device capabilities to the control endpoint */
Endpoint_Write_Control_Stream_LE(&Capabilities, sizeof(TMC_Capabilities_t)); Endpoint_Write_Control_Stream_LE(&Capabilities, sizeof(TMC_Capabilities_t));
Endpoint_ClearOUT(); Endpoint_ClearOUT();
} }
break; break;
} }
} }
@ -351,16 +351,16 @@ void TMC_Task(void)
/* Device must be connected and configured for the task to run */ /* Device must be connected and configured for the task to run */
if (USB_DeviceState != DEVICE_STATE_Configured) if (USB_DeviceState != DEVICE_STATE_Configured)
return; return;
TMC_MessageHeader_t MessageHeader; TMC_MessageHeader_t MessageHeader;
uint8_t MessagePayload[128]; uint8_t MessagePayload[128];
/* Try to read in a TMC message from the interface, process if one is available */ /* Try to read in a TMC message from the interface, process if one is available */
if (ReadTMCHeader(&MessageHeader)) if (ReadTMCHeader(&MessageHeader))
{ {
/* Indicate busy */ /* Indicate busy */
LEDs_SetAllLEDs(LEDMASK_USB_BUSY); LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
switch (MessageHeader.MessageID) switch (MessageHeader.MessageID)
{ {
case TMC_MESSAGEID_DEV_DEP_MSG_OUT: case TMC_MESSAGEID_DEV_DEP_MSG_OUT:
@ -371,15 +371,15 @@ void TMC_Task(void)
if (IsTMCBulkOUTReset) if (IsTMCBulkOUTReset)
break; break;
} }
Endpoint_ClearOUT(); Endpoint_ClearOUT();
ProcessSentMessage(MessagePayload, LastTransferLength); ProcessSentMessage(MessagePayload, LastTransferLength);
break; break;
case TMC_MESSAGEID_DEV_DEP_MSG_IN: case TMC_MESSAGEID_DEV_DEP_MSG_IN:
Endpoint_ClearOUT(); Endpoint_ClearOUT();
MessageHeader.TransferSize = GetNextMessage(MessagePayload); MessageHeader.TransferSize = GetNextMessage(MessagePayload);
MessageHeader.MessageIDSpecific.DeviceOUT.LastMessageTransaction = true; MessageHeader.MessageIDSpecific.DeviceOUT.LastMessageTransaction = true;
WriteTMCHeader(&MessageHeader); WriteTMCHeader(&MessageHeader);
@ -400,7 +400,7 @@ void TMC_Task(void)
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
} }
/* All pending data has been processed - reset the data abort flags */ /* All pending data has been processed - reset the data abort flags */
IsTMCBulkINReset = false; IsTMCBulkINReset = false;
IsTMCBulkOUTReset = false; IsTMCBulkOUTReset = false;
@ -419,11 +419,11 @@ bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader)
/* Select the Data Out endpoint */ /* Select the Data Out endpoint */
Endpoint_SelectEndpoint(TMC_OUT_EPNUM); Endpoint_SelectEndpoint(TMC_OUT_EPNUM);
/* Abort if no command has been sent from the host */ /* Abort if no command has been sent from the host */
if (!(Endpoint_IsOUTReceived())) if (!(Endpoint_IsOUTReceived()))
return false; return false;
/* Read in the header of the command from the host */ /* Read in the header of the command from the host */
BytesTransferred = 0; BytesTransferred = 0;
while ((ErrorCode = Endpoint_Read_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), &BytesTransferred)) == while ((ErrorCode = Endpoint_Read_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), &BytesTransferred)) ==
@ -435,7 +435,7 @@ bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader)
/* Store the new command tag value for later use */ /* Store the new command tag value for later use */
CurrentTransferTag = MessageHeader->Tag; CurrentTransferTag = MessageHeader->Tag;
/* Indicate if the command has been aborted or not */ /* Indicate if the command has been aborted or not */
return (!(IsTMCBulkOUTReset) && (ErrorCode == ENDPOINT_RWSTREAM_NoError)); return (!(IsTMCBulkOUTReset) && (ErrorCode == ENDPOINT_RWSTREAM_NoError));
} }
@ -464,3 +464,4 @@ bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader)
/* Indicate if the command has been aborted or not */ /* Indicate if the command has been aborted or not */
return (!(IsTMCBulkINReset) && (ErrorCode == ENDPOINT_RWSTREAM_NoError)); return (!(IsTMCBulkINReset) && (ErrorCode == ENDPOINT_RWSTREAM_NoError));
} }

@ -163,16 +163,16 @@ void EVENT_USB_Device_ControlRequest(void)
/* Extract out the relevant request information to get the target Endpoint address and control being set */ /* Extract out the relevant request information to get the target Endpoint address and control being set */
uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex; uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex;
uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8); uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8);
/* Only handle SET CURRENT requests to the audio endpoint's sample frequency property */ /* Only handle SET CURRENT requests to the audio endpoint's sample frequency property */
if ((EndpointAddress == (ENDPOINT_DIR_IN | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)) if ((EndpointAddress == (ENDPOINT_DIR_IN | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq))
{ {
uint8_t SampleRate[3]; uint8_t SampleRate[3];
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
Endpoint_Read_Control_Stream_LE(SampleRate, sizeof(SampleRate)); Endpoint_Read_Control_Stream_LE(SampleRate, sizeof(SampleRate));
Endpoint_ClearIN(); Endpoint_ClearIN();
/* Set the new sampling frequency to the value given by the host */ /* Set the new sampling frequency to the value given by the host */
CurrentAudioSampleFrequency = (((uint32_t)SampleRate[2] << 16) | ((uint32_t)SampleRate[1] << 8) | (uint32_t)SampleRate[0]); CurrentAudioSampleFrequency = (((uint32_t)SampleRate[2] << 16) | ((uint32_t)SampleRate[1] << 8) | (uint32_t)SampleRate[0]);
@ -180,7 +180,7 @@ void EVENT_USB_Device_ControlRequest(void)
OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1); OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1);
} }
} }
break; break;
case AUDIO_REQ_GetCurrent: case AUDIO_REQ_GetCurrent:
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT)) if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))
@ -188,20 +188,20 @@ void EVENT_USB_Device_ControlRequest(void)
/* Extract out the relevant request information to get the target Endpoint address and control being retrieved */ /* Extract out the relevant request information to get the target Endpoint address and control being retrieved */
uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex; uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex;
uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8); uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8);
/* Only handle GET CURRENT requests to the audio endpoint's sample frequency property */ /* Only handle GET CURRENT requests to the audio endpoint's sample frequency property */
if ((EndpointAddress == (ENDPOINT_DIR_IN | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)) if ((EndpointAddress == (ENDPOINT_DIR_IN | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq))
{ {
uint8_t SampleRate[3]; uint8_t SampleRate[3];
/* Convert the sampling rate value into the 24-bit format the host expects for the property */ /* Convert the sampling rate value into the 24-bit format the host expects for the property */
SampleRate[2] = (CurrentAudioSampleFrequency >> 16); SampleRate[2] = (CurrentAudioSampleFrequency >> 16);
SampleRate[1] = (CurrentAudioSampleFrequency >> 8); SampleRate[1] = (CurrentAudioSampleFrequency >> 8);
SampleRate[0] = (CurrentAudioSampleFrequency & 0xFF); SampleRate[0] = (CurrentAudioSampleFrequency & 0xFF);
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
Endpoint_Write_Control_Stream_LE(SampleRate, sizeof(SampleRate)); Endpoint_Write_Control_Stream_LE(SampleRate, sizeof(SampleRate));
Endpoint_ClearOUT(); Endpoint_ClearOUT();
} }
} }
@ -225,11 +225,11 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
#if defined(USE_TEST_TONE) #if defined(USE_TEST_TONE)
static uint8_t SquareWaveSampleCount; static uint8_t SquareWaveSampleCount;
static int16_t CurrentWaveValue; static int16_t CurrentWaveValue;
/* In test tone mode, generate a square wave at 1/256 of the sample rate */ /* In test tone mode, generate a square wave at 1/256 of the sample rate */
if (SquareWaveSampleCount++ == 0xFF) if (SquareWaveSampleCount++ == 0xFF)
CurrentWaveValue ^= 0x8000; CurrentWaveValue ^= 0x8000;
/* Only generate audio if the board button is being pressed */ /* Only generate audio if the board button is being pressed */
AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0; AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0;
#else #else
@ -239,7 +239,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
#if defined(MICROPHONE_BIASED_TO_HALF_RAIL) #if defined(MICROPHONE_BIASED_TO_HALF_RAIL)
/* Microphone is biased to half rail voltage, subtract the bias from the sample value */ /* Microphone is biased to half rail voltage, subtract the bias from the sample value */
AudioSample -= (SAMPLE_MAX_RANGE / 2); AudioSample -= (SAMPLE_MAX_RANGE / 2);
#endif #endif
#endif #endif
/* Write the sample to the buffer */ /* Write the sample to the buffer */

@ -204,7 +204,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t)), .TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t)),
}, },
.Audio_AudioFormatSampleRates = .Audio_AudioFormatSampleRates =
{ {
AUDIO_SAMPLE_FREQ(8000), AUDIO_SAMPLE_FREQ(8000),

@ -189,16 +189,16 @@ void EVENT_USB_Device_ControlRequest(void)
/* Extract out the relevant request information to get the target Endpoint address and control being set */ /* Extract out the relevant request information to get the target Endpoint address and control being set */
uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex; uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex;
uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8); uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8);
/* Only handle SET CURRENT requests to the audio endpoint's sample frequency property */ /* Only handle SET CURRENT requests to the audio endpoint's sample frequency property */
if ((EndpointAddress == (ENDPOINT_DIR_OUT | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)) if ((EndpointAddress == (ENDPOINT_DIR_OUT | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq))
{ {
uint8_t SampleRate[3]; uint8_t SampleRate[3];
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
Endpoint_Read_Control_Stream_LE(SampleRate, sizeof(SampleRate)); Endpoint_Read_Control_Stream_LE(SampleRate, sizeof(SampleRate));
Endpoint_ClearOUT(); Endpoint_ClearOUT();
/* Set the new sampling frequency to the value given by the host */ /* Set the new sampling frequency to the value given by the host */
CurrentAudioSampleFrequency = (((uint32_t)SampleRate[2] << 16) | ((uint32_t)SampleRate[1] << 8) | (uint32_t)SampleRate[0]); CurrentAudioSampleFrequency = (((uint32_t)SampleRate[2] << 16) | ((uint32_t)SampleRate[1] << 8) | (uint32_t)SampleRate[0]);
@ -206,7 +206,7 @@ void EVENT_USB_Device_ControlRequest(void)
OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1); OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1);
} }
} }
break; break;
case AUDIO_REQ_GetCurrent: case AUDIO_REQ_GetCurrent:
if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT)) if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT))
@ -214,20 +214,20 @@ void EVENT_USB_Device_ControlRequest(void)
/* Extract out the relevant request information to get the target Endpoint address and control being retrieved */ /* Extract out the relevant request information to get the target Endpoint address and control being retrieved */
uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex; uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex;
uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8); uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8);
/* Only handle GET CURRENT requests to the audio endpoint's sample frequency property */ /* Only handle GET CURRENT requests to the audio endpoint's sample frequency property */
if ((EndpointAddress == (ENDPOINT_DIR_OUT | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)) if ((EndpointAddress == (ENDPOINT_DIR_OUT | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq))
{ {
uint8_t SampleRate[3]; uint8_t SampleRate[3];
/* Convert the sampling rate value into the 24-bit format the host expects for the property */ /* Convert the sampling rate value into the 24-bit format the host expects for the property */
SampleRate[2] = (CurrentAudioSampleFrequency >> 16); SampleRate[2] = (CurrentAudioSampleFrequency >> 16);
SampleRate[1] = (CurrentAudioSampleFrequency >> 8); SampleRate[1] = (CurrentAudioSampleFrequency >> 8);
SampleRate[0] = (CurrentAudioSampleFrequency & 0xFF); SampleRate[0] = (CurrentAudioSampleFrequency & 0xFF);
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
Endpoint_Write_Control_Stream_LE(SampleRate, sizeof(SampleRate)); Endpoint_Write_Control_Stream_LE(SampleRate, sizeof(SampleRate));
Endpoint_ClearOUT(); Endpoint_ClearOUT();
} }
} }
@ -286,7 +286,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }
Endpoint_SelectEndpoint(PrevEndpoint); Endpoint_SelectEndpoint(PrevEndpoint);
} }

@ -204,7 +204,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t)), .TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t)),
}, },
.Audio_AudioFormatSampleRates = .Audio_AudioFormatSampleRates =
{ {
AUDIO_SAMPLE_FREQ(8000), AUDIO_SAMPLE_FREQ(8000),

@ -83,3 +83,4 @@
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
#endif #endif

@ -109,3 +109,4 @@
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
#endif #endif

@ -157,7 +157,7 @@ void ProcessGenericHIDReport(uint8_t* DataArray)
holding the report sent from the host. holding the report sent from the host.
*/ */
uint8_t NewLEDMask = LEDS_NO_LEDS; uint8_t NewLEDMask = LEDS_NO_LEDS;
if (DataArray[0]) if (DataArray[0])
NewLEDMask |= LEDS_LED1; NewLEDMask |= LEDS_LED1;
@ -170,7 +170,7 @@ void ProcessGenericHIDReport(uint8_t* DataArray)
if (DataArray[3]) if (DataArray[3])
NewLEDMask |= LEDS_LED1; NewLEDMask |= LEDS_LED1;
LEDs_SetAllLEDs(NewLEDMask); LEDs_SetAllLEDs(NewLEDMask);
} }
@ -187,7 +187,7 @@ void CreateGenericHIDReport(uint8_t* DataArray)
*/ */
uint8_t CurrLEDMask = LEDs_GetLEDs(); uint8_t CurrLEDMask = LEDs_GetLEDs();
DataArray[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0); DataArray[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0);
DataArray[1] = ((CurrLEDMask & LEDS_LED2) ? 1 : 0); DataArray[1] = ((CurrLEDMask & LEDS_LED2) ? 1 : 0);
DataArray[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0); DataArray[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0);

@ -59,7 +59,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Mass Storage Interface // Mass Storage Interface
USB_Descriptor_Interface_t MS_Interface; USB_Descriptor_Interface_t MS_Interface;
USB_Descriptor_Endpoint_t MS_DataInEndpoint; USB_Descriptor_Endpoint_t MS_DataInEndpoint;

@ -287,12 +287,12 @@ static bool SCSI_Command_ReadWrite_10(const bool IsDataRead)
SCSI_ASENSE_WRITE_PROTECTED, SCSI_ASENSE_WRITE_PROTECTED,
SCSI_ASENSEQ_NO_QUALIFIER); SCSI_ASENSEQ_NO_QUALIFIER);
return false; return false;
} }
BlockAddress = SwapEndian_32(*(uint32_t*)&CommandBlock.SCSICommandData[2]); BlockAddress = SwapEndian_32(*(uint32_t*)&CommandBlock.SCSICommandData[2]);
TotalBlocks = SwapEndian_16(*(uint16_t*)&CommandBlock.SCSICommandData[7]); TotalBlocks = SwapEndian_16(*(uint16_t*)&CommandBlock.SCSICommandData[7]);
/* Check if the block address is outside the maximum allowable value for the LUN */ /* Check if the block address is outside the maximum allowable value for the LUN */
if (BlockAddress >= LUN_MEDIA_BLOCKS) if (BlockAddress >= LUN_MEDIA_BLOCKS)
{ {
@ -340,3 +340,4 @@ static bool SCSI_Command_ModeSense_6(void)
return true; return true;
} }

@ -309,7 +309,8 @@ static void ReturnCommandStatus(void)
if (IsMassStoreReset) if (IsMassStoreReset)
return; return;
} }
/* Finalize the stream transfer to send the last packet */ /* Finalize the stream transfer to send the last packet */
Endpoint_ClearIN(); Endpoint_ClearIN();
} }

@ -49,7 +49,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Mouse HID Interface // Mouse HID Interface
USB_Descriptor_Interface_t HID_Interface; USB_Descriptor_Interface_t HID_Interface;
USB_HID_Descriptor_HID_t HID_MouseHID; USB_HID_Descriptor_HID_t HID_MouseHID;

@ -73,9 +73,9 @@ void SetupHardware(void)
LEDs_Init(); LEDs_Init();
Serial_Init(9600, false); Serial_Init(9600, false);
USB_Init(); USB_Init();
/* Create a stdio stream for the serial port for stdin and stdout */ /* Create a stdio stream for the serial port for stdin and stdout */
Serial_CreateStream(NULL); Serial_CreateStream(NULL);
} }
/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and

@ -49,7 +49,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Mouse HID Interface // Mouse HID Interface
USB_Descriptor_Interface_t HID_Interface; USB_Descriptor_Interface_t HID_Interface;
USB_HID_Descriptor_HID_t HID_MouseHID; USB_HID_Descriptor_HID_t HID_MouseHID;

@ -74,7 +74,7 @@ void EVENT_USB_Host_DeviceUnattached(void)
* enumerated by the host and is now ready to be used by the application. * enumerated by the host and is now ready to be used by the application.
*/ */
void EVENT_USB_Host_DeviceEnumerationComplete(void) void EVENT_USB_Host_DeviceEnumerationComplete(void)
{ {
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;

@ -225,3 +225,4 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
} }

@ -96,7 +96,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }
Pipe_SelectPipe(PrevPipe); Pipe_SelectPipe(PrevPipe);
} }
@ -193,7 +193,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
TIMSK0 = (1 << OCIE0A); TIMSK0 = (1 << OCIE0A);
OCR0A = ((F_CPU / 8 / 48000) - 1); OCR0A = ((F_CPU / 8 / 48000) - 1);
TCCR0A = (1 << WGM01); // CTC mode TCCR0A = (1 << WGM01); // CTC mode
TCCR0B = (1 << CS01); // Fcpu/8 speed TCCR0B = (1 << CS01); // Fcpu/8 speed
/* Set speaker as output */ /* Set speaker as output */
DDRC |= (1 << 6); DDRC |= (1 << 6);

@ -81,11 +81,11 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
#if defined(USE_TEST_TONE) #if defined(USE_TEST_TONE)
static uint8_t SquareWaveSampleCount; static uint8_t SquareWaveSampleCount;
static int16_t CurrentWaveValue; static int16_t CurrentWaveValue;
/* In test tone mode, generate a square wave at 1/256 of the sample rate */ /* In test tone mode, generate a square wave at 1/256 of the sample rate */
if (SquareWaveSampleCount++ == 0xFF) if (SquareWaveSampleCount++ == 0xFF)
CurrentWaveValue ^= 0x8000; CurrentWaveValue ^= 0x8000;
/* Only generate audio if the board button is being pressed */ /* Only generate audio if the board button is being pressed */
AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0; AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0;
#else #else
@ -97,11 +97,11 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
AudioSample -= (SAMPLE_MAX_RANGE / 2); AudioSample -= (SAMPLE_MAX_RANGE / 2);
#endif #endif
#endif #endif
Audio_Host_WriteSample16(&Speaker_Audio_Interface, AudioSample); Audio_Host_WriteSample16(&Speaker_Audio_Interface, AudioSample);
Audio_Host_WriteSample16(&Speaker_Audio_Interface, AudioSample); Audio_Host_WriteSample16(&Speaker_Audio_Interface, AudioSample);
} }
Pipe_SelectPipe(PrevPipe); Pipe_SelectPipe(PrevPipe);
} }
@ -185,7 +185,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
USB_Host_SetDeviceConfiguration(0); USB_Host_SetDeviceConfiguration(0);
return; return;
} }
USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000); USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000);
if (Audio_Host_GetSetEndpointProperty(&Speaker_Audio_Interface, Speaker_Audio_Interface.Config.DataOUTPipeNumber, if (Audio_Host_GetSetEndpointProperty(&Speaker_Audio_Interface, Speaker_Audio_Interface.Config.DataOUTPipeNumber,
AUDIO_REQ_SetCurrent, AUDIO_EPCONTROL_SamplingFreq, AUDIO_REQ_SetCurrent, AUDIO_EPCONTROL_SamplingFreq,

@ -140,7 +140,7 @@ void KeyboardHost_Task(void)
{ {
PressedKey = '\n'; PressedKey = '\n';
} }
if (PressedKey) if (PressedKey)
putchar(PressedKey); putchar(PressedKey);
} }

@ -107,7 +107,7 @@ void KeyboardHost_Task(void)
{ {
if (USB_HostState != HOST_STATE_Configured) if (USB_HostState != HOST_STATE_Configured)
return; return;
if (HID_Host_IsReportReceived(&Keyboard_HID_Interface)) if (HID_Host_IsReportReceived(&Keyboard_HID_Interface))
{ {
uint8_t KeyboardReport[Keyboard_HID_Interface.State.LargestReportSize]; uint8_t KeyboardReport[Keyboard_HID_Interface.State.LargestReportSize];

@ -68,7 +68,7 @@ int main(void)
for (;;) for (;;)
{ {
MassStorageHost_Task(); MassStorageHost_Task();
MS_Host_USBTask(&FlashDisk_MS_Interface); MS_Host_USBTask(&FlashDisk_MS_Interface);
USB_USBTask(); USB_USBTask();
} }

@ -70,7 +70,7 @@
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void); void SetupHardware(void);
void MassStorageHost_Task(void); void MassStorageHost_Task(void);
void EVENT_USB_Host_HostError(const uint8_t ErrorCode); void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
void EVENT_USB_Host_DeviceAttached(void); void EVENT_USB_Host_DeviceAttached(void);
void EVENT_USB_Host_DeviceUnattached(void); void EVENT_USB_Host_DeviceUnattached(void);

@ -102,7 +102,7 @@ void MouseHost_Task(void)
{ {
if (USB_HostState != HOST_STATE_Configured) if (USB_HostState != HOST_STATE_Configured)
return; return;
if (HID_Host_IsReportReceived(&Mouse_HID_Interface)) if (HID_Host_IsReportReceived(&Mouse_HID_Interface))
{ {
uint8_t LEDMask = LEDS_NO_LEDS; uint8_t LEDMask = LEDS_NO_LEDS;

@ -107,7 +107,7 @@ void MouseHost_Task(void)
{ {
if (USB_HostState != HOST_STATE_Configured) if (USB_HostState != HOST_STATE_Configured)
return; return;
if (HID_Host_IsReportReceived(&Mouse_HID_Interface)) if (HID_Host_IsReportReceived(&Mouse_HID_Interface))
{ {
uint8_t MouseReport[Mouse_HID_Interface.State.LargestReportSize]; uint8_t MouseReport[Mouse_HID_Interface.State.LargestReportSize];

@ -71,7 +71,7 @@ int main(void)
for (;;) for (;;)
{ {
StillImageHost_Task(); StillImageHost_Task();
SI_Host_USBTask(&DigitalCamera_SI_Interface); SI_Host_USBTask(&DigitalCamera_SI_Interface);
USB_USBTask(); USB_USBTask();
} }

@ -62,7 +62,7 @@ USB_ClassInfo_CDC_Host_t VirtualSerial_CDC_Interface =
int main(void) int main(void)
{ {
SetupHardware(); SetupHardware();
puts_P(PSTR(ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE)); puts_P(PSTR(ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

@ -78,7 +78,7 @@ void SetupHardware(void)
void AndroidHost_Task(void) void AndroidHost_Task(void)
{ {
if (USB_HostState != HOST_STATE_Configured) if (USB_HostState != HOST_STATE_Configured)
return; return;
/* Select the data IN pipe */ /* Select the data IN pipe */
Pipe_SelectPipe(ANDROID_DATA_IN_PIPE); Pipe_SelectPipe(ANDROID_DATA_IN_PIPE);
@ -148,7 +148,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/* Get and process the configuration descriptor data */ /* Get and process the configuration descriptor data */
uint8_t ErrorCode = ProcessDeviceDescriptor(); uint8_t ErrorCode = ProcessDeviceDescriptor();
bool RequiresModeSwitch = (ErrorCode == NonAccessoryModeAndroidDevice); bool RequiresModeSwitch = (ErrorCode == NonAccessoryModeAndroidDevice);
/* Error out if the device is not an Android device or an error occurred */ /* Error out if the device is not an Android device or an error occurred */
@ -166,12 +166,12 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
} }
printf_P(PSTR("Android Device Detected - %sAccessory mode.\r\n"), (RequiresModeSwitch ? "Non-" : "")); printf_P(PSTR("Android Device Detected - %sAccessory mode.\r\n"), (RequiresModeSwitch ? "Non-" : ""));
/* Check if a valid Android device was attached, but it is not current in Accessory mode */ /* Check if a valid Android device was attached, but it is not current in Accessory mode */
if (RequiresModeSwitch) if (RequiresModeSwitch)
{ {
uint16_t AndroidProtocol; uint16_t AndroidProtocol;
/* Fetch the version of the Android Accessory Protocol supported by the device */ /* Fetch the version of the Android Accessory Protocol supported by the device */
if ((ErrorCode = Android_GetAccessoryProtocol(&AndroidProtocol)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = Android_GetAccessoryProtocol(&AndroidProtocol)) != HOST_SENDCONTROL_Successful)
{ {
@ -181,7 +181,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
return; return;
} }
/* Validate the returned protocol version */ /* Validate the returned protocol version */
if (AndroidProtocol != AOA_PROTOCOL_AccessoryV1) if (AndroidProtocol != AOA_PROTOCOL_AccessoryV1)
{ {
@ -190,7 +190,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
return; return;
} }
/* Send the device strings and start the Android Accessory Mode */ /* Send the device strings and start the Android Accessory Mode */
Android_SendString(AOA_STRING_Manufacturer, "Dean Camera"); Android_SendString(AOA_STRING_Manufacturer, "Dean Camera");
Android_SendString(AOA_STRING_Model, "LUFA Android Demo"); Android_SendString(AOA_STRING_Model, "LUFA Android Demo");
@ -199,7 +199,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
Android_SendString(AOA_STRING_URI, "http://www.lufa-lib.org"); Android_SendString(AOA_STRING_URI, "http://www.lufa-lib.org");
Android_SendString(AOA_STRING_Serial, "0000000012345678"); Android_SendString(AOA_STRING_Serial, "0000000012345678");
Android_StartAccessoryMode(); Android_StartAccessoryMode();
return; return;
} }

@ -46,7 +46,7 @@
#include "DeviceDescriptor.h" #include "DeviceDescriptor.h"
#include "ConfigDescriptor.h" #include "ConfigDescriptor.h"
#include "Lib/AndroidAccessoryCommands.h" #include "Lib/AndroidAccessoryCommands.h"
#include <LUFA/Version.h> #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h> #include <LUFA/Drivers/Misc/TerminalCodes.h>

@ -66,7 +66,7 @@ uint8_t ProcessConfigurationDescriptor(void)
default: default:
return DevControlError; return DevControlError;
} }
/* There should be only one compatible Android Accessory Mode interface in the device, attempt to find it */ /* There should be only one compatible Android Accessory Mode interface in the device, attempt to find it */
if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation, if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,
DCOMP_NextAndroidAccessoryInterface) != DESCRIPTOR_SEARCH_COMP_Found) DCOMP_NextAndroidAccessoryInterface) != DESCRIPTOR_SEARCH_COMP_Found)

@ -33,8 +33,8 @@
* Android Accessory Mode utility functions, for the configuration of an attached * Android Accessory Mode utility functions, for the configuration of an attached
* Android device into Android Accessory Mode ready for general communication. * Android device into Android Accessory Mode ready for general communication.
*/ */
#include "AndroidAccessoryCommands.h" #include "AndroidAccessoryCommands.h"
uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol) uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol)
{ {
@ -79,5 +79,6 @@ uint8_t Android_StartAccessoryMode(void)
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
return USB_Host_SendControlRequest(NULL); return USB_Host_SendControlRequest(NULL);
} }

@ -41,11 +41,12 @@
#include <stdbool.h> #include <stdbool.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
/* Function Prototypes: */ /* Function Prototypes: */
uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol); uint8_t Android_GetAccessoryProtocol(uint16_t* const Protocol);
uint8_t Android_SendString(const uint8_t StringIndex, uint8_t Android_SendString(const uint8_t StringIndex,
const char* const String); const char* const String);
uint8_t Android_StartAccessoryMode(void); uint8_t Android_StartAccessoryMode(void);
#endif #endif

@ -123,7 +123,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
return; return;
} }
if ((ErrorCode = USB_Host_SetInterfaceAltSetting(StreamingInterfaceIndex, if ((ErrorCode = USB_Host_SetInterfaceAltSetting(StreamingInterfaceIndex,
StreamingInterfaceAltSetting)) != HOST_SENDCONTROL_Successful) StreamingInterfaceAltSetting)) != HOST_SENDCONTROL_Successful)
{ {
@ -143,7 +143,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
.wIndex = StreamingEndpointAddress, .wIndex = StreamingEndpointAddress,
.wLength = sizeof(USB_Audio_SampleFreq_t), .wLength = sizeof(USB_Audio_SampleFreq_t),
}; };
USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000); USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000);
/* Select the control pipe for the request transfer */ /* Select the control pipe for the request transfer */
@ -153,7 +153,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
if ((ErrorCode = USB_Host_SendControlRequest(&SampleRate)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SendControlRequest(&SampleRate)) != HOST_SENDCONTROL_Successful)
{ {
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
USB_Host_SetDeviceConfiguration(0); USB_Host_SetDeviceConfiguration(0);
return; return;
} }
@ -161,7 +161,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
TIMSK0 = (1 << OCIE0A); TIMSK0 = (1 << OCIE0A);
OCR0A = ((F_CPU / 8 / 48000) - 1); OCR0A = ((F_CPU / 8 / 48000) - 1);
TCCR0A = (1 << WGM01); // CTC mode TCCR0A = (1 << WGM01); // CTC mode
TCCR0B = (1 << CS01); // Fcpu/8 speed TCCR0B = (1 << CS01); // Fcpu/8 speed
/* Set speaker as output */ /* Set speaker as output */
DDRC |= (1 << 6); DDRC |= (1 << 6);
@ -169,7 +169,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/* PWM speaker timer initialization */ /* PWM speaker timer initialization */
TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP
TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, F_CPU speed TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, F_CPU speed
puts_P(PSTR("Microphone Enumerated.\r\n")); puts_P(PSTR("Microphone Enumerated.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
} }
@ -238,7 +238,8 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }
Pipe_Freeze(); Pipe_Freeze();
Pipe_SelectPipe(PrevPipe); Pipe_SelectPipe(PrevPipe);
} }

@ -99,7 +99,7 @@ uint8_t ProcessConfigurationDescriptor(void)
} }
/* Save the interface in case we need to refer back to it later */ /* Save the interface in case we need to refer back to it later */
AudioControlInterface = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Interface_t); AudioControlInterface = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Interface_t);
/* Find the next Audio Streaming interface within that Audio Control interface */ /* Find the next Audio Streaming interface within that Audio Control interface */
if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation, if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,
@ -218,3 +218,4 @@ uint8_t DComp_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor)
return DESCRIPTOR_SEARCH_NotFound; return DESCRIPTOR_SEARCH_NotFound;
} }

@ -68,7 +68,7 @@ void SetupHardware(void)
Serial_Init(9600, false); Serial_Init(9600, false);
Buttons_Init(); Buttons_Init();
ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_32); ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_32);
ADC_SetupChannel(MIC_IN_ADC_CHANNEL); ADC_SetupChannel(MIC_IN_ADC_CHANNEL);
LEDs_Init(); LEDs_Init();
USB_Init(); USB_Init();
@ -126,7 +126,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
return; return;
} }
if ((ErrorCode = USB_Host_SetInterfaceAltSetting(StreamingInterfaceIndex, if ((ErrorCode = USB_Host_SetInterfaceAltSetting(StreamingInterfaceIndex,
StreamingInterfaceAltSetting)) != HOST_SENDCONTROL_Successful) StreamingInterfaceAltSetting)) != HOST_SENDCONTROL_Successful)
{ {
@ -146,7 +146,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
.wIndex = StreamingEndpointAddress, .wIndex = StreamingEndpointAddress,
.wLength = sizeof(USB_Audio_SampleFreq_t), .wLength = sizeof(USB_Audio_SampleFreq_t),
}; };
USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000); USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000);
/* Select the control pipe for the request transfer */ /* Select the control pipe for the request transfer */
@ -164,8 +164,8 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
TIMSK0 = (1 << OCIE0A); TIMSK0 = (1 << OCIE0A);
OCR0A = ((F_CPU / 8 / 48000) - 1); OCR0A = ((F_CPU / 8 / 48000) - 1);
TCCR0A = (1 << WGM01); // CTC mode TCCR0A = (1 << WGM01); // CTC mode
TCCR0B = (1 << CS01); // Fcpu/8 speed TCCR0B = (1 << CS01); // Fcpu/8 speed
puts_P(PSTR("Speaker Enumerated.\r\n")); puts_P(PSTR("Speaker Enumerated.\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
} }
@ -207,16 +207,16 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
/* Check if the current pipe can be written to (device ready for more data) */ /* Check if the current pipe can be written to (device ready for more data) */
if (Pipe_IsOUTReady()) if (Pipe_IsOUTReady())
{ {
int16_t AudioSample; int16_t AudioSample;
#if defined(USE_TEST_TONE) #if defined(USE_TEST_TONE)
static uint8_t SquareWaveSampleCount; static uint8_t SquareWaveSampleCount;
static int16_t CurrentWaveValue; static int16_t CurrentWaveValue;
/* In test tone mode, generate a square wave at 1/256 of the sample rate */ /* In test tone mode, generate a square wave at 1/256 of the sample rate */
if (SquareWaveSampleCount++ == 0xFF) if (SquareWaveSampleCount++ == 0xFF)
CurrentWaveValue ^= 0x8000; CurrentWaveValue ^= 0x8000;
/* Only generate audio if the board button is being pressed */ /* Only generate audio if the board button is being pressed */
AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0; AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0;
#else #else
@ -226,12 +226,12 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
#if defined(MICROPHONE_BIASED_TO_HALF_RAIL) #if defined(MICROPHONE_BIASED_TO_HALF_RAIL)
/* Microphone is biased to half rail voltage, subtract the bias from the sample value */ /* Microphone is biased to half rail voltage, subtract the bias from the sample value */
AudioSample -= (SAMPLE_MAX_RANGE / 2); AudioSample -= (SAMPLE_MAX_RANGE / 2);
#endif #endif
#endif #endif
Pipe_Write_16_LE(AudioSample); Pipe_Write_16_LE(AudioSample);
Pipe_Write_16_LE(AudioSample); Pipe_Write_16_LE(AudioSample);
if (!(Pipe_IsReadWriteAllowed())) if (!(Pipe_IsReadWriteAllowed()))
Pipe_ClearOUT(); Pipe_ClearOUT();
} }
@ -239,3 +239,4 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
Pipe_Freeze(); Pipe_Freeze();
Pipe_SelectPipe(PrevPipe); Pipe_SelectPipe(PrevPipe);
} }

@ -99,7 +99,7 @@ uint8_t ProcessConfigurationDescriptor(void)
} }
/* Save the interface in case we need to refer back to it later */ /* Save the interface in case we need to refer back to it later */
AudioControlInterface = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Interface_t); AudioControlInterface = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Interface_t);
/* Find the next Audio Streaming interface within that Audio Control interface */ /* Find the next Audio Streaming interface within that Audio Control interface */
if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation, if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,
@ -218,3 +218,4 @@ uint8_t DComp_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor)
return DESCRIPTOR_SEARCH_NotFound; return DESCRIPTOR_SEARCH_NotFound;
} }

@ -51,7 +51,7 @@ int main(void)
for (;;) for (;;)
{ {
ReadNextReport(); ReadNextReport();
USB_USBTask(); USB_USBTask();
} }
} }

@ -81,7 +81,7 @@
const uint8_t ReportIndex, const uint8_t ReportIndex,
const uint8_t ReportType, const uint8_t ReportType,
uint16_t ReportLength); uint16_t ReportLength);
void EVENT_USB_Host_HostError(const uint8_t ErrorCode); void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
void EVENT_USB_Host_DeviceAttached(void); void EVENT_USB_Host_DeviceAttached(void);
void EVENT_USB_Host_DeviceUnattached(void); void EVENT_USB_Host_DeviceUnattached(void);

@ -40,7 +40,7 @@
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include "JoystickHostWithParser.h" #include "JoystickHostWithParser.h"
/* Macros: */ /* Macros: */
/** HID Report Descriptor Usage Page value for a toggle button. */ /** HID Report Descriptor Usage Page value for a toggle button. */
#define USAGE_PAGE_BUTTON 0x09 #define USAGE_PAGE_BUTTON 0x09
@ -55,7 +55,7 @@
#define USAGE_X 0x30 #define USAGE_X 0x30
/** HID Report Descriptor Usage value for a Y axis movement. */ /** HID Report Descriptor Usage value for a Y axis movement. */
#define USAGE_Y 0x31 #define USAGE_Y 0x31
/* Enums: */ /* Enums: */
/** Enum for the possible return codes of the \ref GetHIDReportData() function. */ /** Enum for the possible return codes of the \ref GetHIDReportData() function. */

@ -99,7 +99,7 @@ void EVENT_USB_Host_DeviceUnattached(void)
void EVENT_USB_Host_DeviceEnumerationComplete(void) void EVENT_USB_Host_DeviceEnumerationComplete(void)
{ {
puts_P(PSTR("Getting Config Data.\r\n")); puts_P(PSTR("Getting Config Data.\r\n"));
uint8_t ErrorCode; uint8_t ErrorCode;
/* Get and process the configuration descriptor data */ /* Get and process the configuration descriptor data */
@ -179,7 +179,7 @@ void JoystickHost_Task(void)
{ {
if (USB_HostState != HOST_STATE_Configured) if (USB_HostState != HOST_STATE_Configured)
return; return;
/* Select and unfreeze joystick data pipe */ /* Select and unfreeze joystick data pipe */
Pipe_SelectPipe(JOYSTICK_DATA_IN_PIPE); Pipe_SelectPipe(JOYSTICK_DATA_IN_PIPE);
Pipe_Unfreeze(); Pipe_Unfreeze();
@ -268,3 +268,4 @@ void ProcessJoystickReport(uint8_t* JoystickReport)
/* Display the button information on the board LEDs */ /* Display the button information on the board LEDs */
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }

@ -65,7 +65,7 @@
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3) #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void); void SetupHardware(void);
void JoystickHost_Task(void); void JoystickHost_Task(void);

@ -181,7 +181,7 @@ void KeyboardHost_Task(void)
{ {
if (USB_HostState != HOST_STATE_Configured) if (USB_HostState != HOST_STATE_Configured)
return; return;
/* Select and unfreeze keyboard data pipe */ /* Select and unfreeze keyboard data pipe */
Pipe_SelectPipe(KEYBOARD_DATA_IN_PIPE); Pipe_SelectPipe(KEYBOARD_DATA_IN_PIPE);
Pipe_Unfreeze(); Pipe_Unfreeze();
@ -259,7 +259,7 @@ void ProcessKeyboardReport(uint8_t* KeyboardReport)
} }
else if (KeyCode == HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS) else if (KeyCode == HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS)
{ {
PressedKey = '0'; PressedKey = '0';
} }
else if (KeyCode == HID_KEYBOARD_SC_SPACE) else if (KeyCode == HID_KEYBOARD_SC_SPACE)
{ {

@ -165,7 +165,7 @@ void MIDIHost_Task(void)
{ {
if (USB_HostState != HOST_STATE_Configured) if (USB_HostState != HOST_STATE_Configured)
return; return;
Pipe_SelectPipe(MIDI_DATA_IN_PIPE); Pipe_SelectPipe(MIDI_DATA_IN_PIPE);
if (Pipe_IsINReceived()) if (Pipe_IsINReceived())
@ -185,7 +185,7 @@ void MIDIHost_Task(void)
printf_P(PSTR("MIDI Note %s - Channel %d, Pitch %d, Velocity %d\r\n"), NoteOnEvent ? "On" : "Off", printf_P(PSTR("MIDI Note %s - Channel %d, Pitch %d, Velocity %d\r\n"), NoteOnEvent ? "On" : "Off",
((MIDIEvent.Data1 & 0x0F) + 1), ((MIDIEvent.Data1 & 0x0F) + 1),
MIDIEvent.Data2, MIDIEvent.Data3); MIDIEvent.Data2, MIDIEvent.Data3);
} }
} }
Pipe_SelectPipe(MIDI_DATA_OUT_PIPE); Pipe_SelectPipe(MIDI_DATA_OUT_PIPE);

@ -108,7 +108,7 @@ static uint8_t MassStore_SendCommand(MS_CommandBlockWrapper_t* const SCSICommand
return ErrorCode; return ErrorCode;
} }
} }
/* Retrieve the returned SCSI status from the device */ /* Retrieve the returned SCSI status from the device */
MS_CommandStatusWrapper_t SCSIStatusBlock; MS_CommandStatusWrapper_t SCSIStatusBlock;
return MassStore_GetReturnedStatus(&SCSIStatusBlock); return MassStore_GetReturnedStatus(&SCSIStatusBlock);
@ -267,7 +267,7 @@ static uint8_t MassStore_GetReturnedStatus(MS_CommandStatusWrapper_t* const SCSI
{ {
return ErrorCode; return ErrorCode;
} }
/* Clear the data ready for next reception */ /* Clear the data ready for next reception */
Pipe_ClearIN(); Pipe_ClearIN();
@ -302,13 +302,13 @@ uint8_t MassStore_MassStorageReset(void)
/* Select the control pipe for the request transfer */ /* Select the control pipe for the request transfer */
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
return ErrorCode; return ErrorCode;
/* Select first data pipe to clear STALL condition if one exists */ /* Select first data pipe to clear STALL condition if one exists */
Pipe_SelectPipe(MASS_STORE_DATA_IN_PIPE); Pipe_SelectPipe(MASS_STORE_DATA_IN_PIPE);
if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful)
return ErrorCode; return ErrorCode;
@ -317,7 +317,7 @@ uint8_t MassStore_MassStorageReset(void)
if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful)
return ErrorCode; return ErrorCode;
return HOST_SENDCONTROL_Successful; return HOST_SENDCONTROL_Successful;
} }

@ -284,3 +284,4 @@ void ProcessMouseReport(uint8_t* MouseReport)
/* Display the button information on the board LEDs */ /* Display the button information on the board LEDs */
LEDs_SetAllLEDs(LEDMask); LEDs_SetAllLEDs(LEDMask);
} }

@ -218,7 +218,7 @@ void PrinterHost_Task(void)
puts_P(PSTR("Test Page Sent.\r\n")); puts_P(PSTR("Test Page Sent.\r\n"));
/* Indicate device no longer busy */ /* Indicate device no longer busy */
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
USB_Host_SetDeviceConfiguration(0); USB_Host_SetDeviceConfiguration(0);
} }

@ -83,6 +83,6 @@
void EVENT_USB_Host_HostError(const uint8_t ErrorCode); void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
const uint8_t SubErrorCode); const uint8_t SubErrorCode);
#endif #endif

@ -222,7 +222,7 @@ uint8_t DComp_NextCDCDataInterfaceEndpoint(void* CurrentDescriptor)
USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t); USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
/* Check the endpoint type, break out if correct BULK or INTERRUPT type endpoint found */ /* Check the endpoint type, break out if correct BULK or INTERRUPT type endpoint found */
if (((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_BULK) || if (((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_BULK) ||
((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)) ((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT))
{ {
return DESCRIPTOR_SEARCH_Found; return DESCRIPTOR_SEARCH_Found;

@ -177,7 +177,7 @@ uint8_t DComp_NextStillImageInterfaceDataEndpoint(void* CurrentDescriptor)
USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t); USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
/* Check the endpoint type, break out if correct BULK or INTERRUPT type endpoint found */ /* Check the endpoint type, break out if correct BULK or INTERRUPT type endpoint found */
if (((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_BULK) || if (((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_BULK) ||
((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)) ((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT))
{ {
return DESCRIPTOR_SEARCH_Found; return DESCRIPTOR_SEARCH_Found;

@ -221,7 +221,7 @@ uint8_t DComp_NextCDCDataInterfaceEndpoint(void* CurrentDescriptor)
{ {
USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t); USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
if (((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_BULK) || if (((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_BULK) ||
((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)) ((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT))
{ {
return DESCRIPTOR_SEARCH_Found; return DESCRIPTOR_SEARCH_Found;

@ -35,7 +35,7 @@
header, copy this into your project's root directory and supply header, copy this into your project's root directory and supply
the \c USE_LUFA_CONFIG_HEADER token to the compiler so that it is the \c USE_LUFA_CONFIG_HEADER token to the compiler so that it is
defined in all compiled source files. defined in all compiled source files.
For information on what each token does, refer to the LUFA For information on what each token does, refer to the LUFA
manual section "Summary of Compile Tokens". manual section "Summary of Compile Tokens".
*/ */
@ -85,7 +85,7 @@
// #define HOST_DEVICE_SETTLE_DELAY_MS {Insert Value Here} // #define HOST_DEVICE_SETTLE_DELAY_MS {Insert Value Here}
#elif (ARCH == ARCH_XMEGA) #elif (ARCH == ARCH_XMEGA)
/* Non-USB Related Configuration Tokens: */ /* Non-USB Related Configuration Tokens: */
// #define DISABLE_TERMINAL_CODES // #define DISABLE_TERMINAL_CODES
@ -151,6 +151,6 @@
// #define USB_HOST_TIMEOUT_MS {Insert Value Here} // #define USB_HOST_TIMEOUT_MS {Insert Value Here}
// #define HOST_DEVICE_SETTLE_DELAY_MS {Insert Value Here} // #define HOST_DEVICE_SETTLE_DELAY_MS {Insert Value Here}
#endif #endif
#endif #endif

@ -55,7 +55,7 @@
#if !defined(__INCLUDE_FROM_COMMON_H) #if !defined(__INCLUDE_FROM_COMMON_H)
#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality. #error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
#endif #endif
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -82,7 +82,7 @@
"M" (_SFR_IO_ADDR(MCUCR)) \ "M" (_SFR_IO_ADDR(MCUCR)) \
: "r0"); \ : "r0"); \
}MACROE }MACROE
/** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always /** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always
* be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer * be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer
* removes/reorders code to the point where break points cannot reliably be set. * removes/reorders code to the point where break points cannot reliably be set.
@ -136,7 +136,7 @@
#define pgm_read_ptr(Address) (void*)pgm_read_word(Address) #define pgm_read_ptr(Address) (void*)pgm_read_word(Address)
#endif #endif
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
} }

@ -66,10 +66,10 @@
/** Selects the Atmel 32-bit UC3 AVR (AT32UC3* chips) architecture. */ /** Selects the Atmel 32-bit UC3 AVR (AT32UC3* chips) architecture. */
#define ARCH_UC3 1 #define ARCH_UC3 1
/** Selects the Atmel XMEGA AVR (ATXMEGA*U chips) architecture. */ /** Selects the Atmel XMEGA AVR (ATXMEGA*U chips) architecture. */
#define ARCH_XMEGA 2 #define ARCH_XMEGA 2
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
#define ARCH_ ARCH_AVR8 #define ARCH_ ARCH_AVR8

@ -133,14 +133,14 @@
* \param[in] Func Name of the function which the given function name should alias. * \param[in] Func Name of the function which the given function name should alias.
*/ */
#define ATTR_ALIAS(Func) __attribute__ ((alias( #Func ))) #define ATTR_ALIAS(Func) __attribute__ ((alias( #Func )))
/** Marks a variable or struct element for packing into the smallest space available, omitting any /** Marks a variable or struct element for packing into the smallest space available, omitting any
* alignment bytes usually added between fields to optimize field accesses. * alignment bytes usually added between fields to optimize field accesses.
*/ */
#define ATTR_PACKED __attribute__ ((packed)) #define ATTR_PACKED __attribute__ ((packed))
/** Indicates the minimum alignment in bytes for a variable or struct element. /** Indicates the minimum alignment in bytes for a variable or struct element.
* *
* \param[in] Bytes Minimum number of bytes the item should be aligned to. * \param[in] Bytes Minimum number of bytes the item should be aligned to.
*/ */
#define ATTR_ALIGNED(Bytes) __attribute__ ((aligned(Bytes))) #define ATTR_ALIGNED(Bytes) __attribute__ ((aligned(Bytes)))

@ -140,13 +140,13 @@
/** Selects the Kernel Concepts USBFOO specific board drivers, including the Button and LEDs drivers. */ /** Selects the Kernel Concepts USBFOO specific board drivers, including the Button and LEDs drivers. */
#define BOARD_USBFOO 25 #define BOARD_USBFOO 25
/** Selects the Sparkfun ATMEGA8U2 specific board drivers, including the driver for the board LEDs. */ /** Selects the Sparkfun ATMEGA8U2 specific board drivers, including the driver for the board LEDs. */
#define BOARD_SPARKFUN8U2 26 #define BOARD_SPARKFUN8U2 26
/** Selects the Atmel EVK1101 specific board drivers, including the Button, Joystick and LED drivers. */ /** Selects the Atmel EVK1101 specific board drivers, including the Button, Joystick and LED drivers. */
#define BOARD_EVK1101 27 #define BOARD_EVK1101 27
/** Selects the Busware TUL specific board drivers, including the Button and LED drivers. */ /** Selects the Busware TUL specific board drivers, including the Button and LED drivers. */
#define BOARD_TUL 28 #define BOARD_TUL 28
@ -155,7 +155,7 @@
/** Selects the Atmel EVK1104 specific board drivers, including the Button and LED drivers. */ /** Selects the Atmel EVK1104 specific board drivers, including the Button and LED drivers. */
#define BOARD_EVK1104 30 #define BOARD_EVK1104 30
/** Selects the Atmel XMEGA A3BU Xplained specific board drivers, including Dataflash, Button and LED drivers. */ /** Selects the Atmel XMEGA A3BU Xplained specific board drivers, including Dataflash, Button and LED drivers. */
#define BOARD_A3BU_XPLAINED 31 #define BOARD_A3BU_XPLAINED 31

@ -42,7 +42,7 @@
* *
* @{ * @{
*/ */
/** \defgroup Group_GlobalInt Global Interrupt Macros /** \defgroup Group_GlobalInt Global Interrupt Macros
* \brief Convenience macros for the management of interrupts globally within the device. * \brief Convenience macros for the management of interrupts globally within the device.
* *
@ -54,13 +54,13 @@
/* Macros: */ /* Macros: */
#define __INCLUDE_FROM_COMMON_H #define __INCLUDE_FROM_COMMON_H
/* Includes: */ /* Includes: */
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
#if defined(USE_LUFA_CONFIG_HEADER) #if defined(USE_LUFA_CONFIG_HEADER)
#include "LUFAConfig.h" #include "LUFAConfig.h"
#endif #endif
@ -70,7 +70,7 @@
#include "ArchitectureSpecific.h" #include "ArchitectureSpecific.h"
#include "CompilerSpecific.h" #include "CompilerSpecific.h"
#include "Attributes.h" #include "Attributes.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -90,9 +90,9 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
#include <avr/boot.h> #include <avr/boot.h>
#include <util/delay.h> #include <util/delay.h>
typedef uint8_t uint_reg_t; typedef uint8_t uint_reg_t;
#define ARCH_HAS_EEPROM_ADDRESS_SPACE #define ARCH_HAS_EEPROM_ADDRESS_SPACE
#define ARCH_HAS_FLASH_ADDRESS_SPACE #define ARCH_HAS_FLASH_ADDRESS_SPACE
#define ARCH_HAS_MULTI_ADDRESS_SPACE #define ARCH_HAS_MULTI_ADDRESS_SPACE
@ -110,7 +110,7 @@
// ================================================= // =================================================
typedef uint32_t uint_reg_t; typedef uint32_t uint_reg_t;
#define ARCH_BIG_ENDIAN #define ARCH_BIG_ENDIAN
#include "Endianness.h" #include "Endianness.h"
@ -120,15 +120,15 @@
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include <avr/eeprom.h> #include <avr/eeprom.h>
#include <util/delay.h> #include <util/delay.h>
typedef uint8_t uint_reg_t; typedef uint8_t uint_reg_t;
#define ARCH_HAS_EEPROM_ADDRESS_SPACE #define ARCH_HAS_EEPROM_ADDRESS_SPACE
#define ARCH_HAS_FLASH_ADDRESS_SPACE #define ARCH_HAS_FLASH_ADDRESS_SPACE
#define ARCH_HAS_MULTI_ADDRESS_SPACE #define ARCH_HAS_MULTI_ADDRESS_SPACE
#define ARCH_LITTLE_ENDIAN #define ARCH_LITTLE_ENDIAN
#include "Endianness.h" #include "Endianness.h"
#else #else
#error Unknown device architecture specified. #error Unknown device architecture specified.
#endif #endif
@ -176,7 +176,7 @@
#if !defined(MIN) || defined(__DOXYGEN__) #if !defined(MIN) || defined(__DOXYGEN__)
#define MIN(x, y) (((x) < (y)) ? (x) : (y)) #define MIN(x, y) (((x) < (y)) ? (x) : (y))
#endif #endif
#if !defined(STRINGIFY) || defined(__DOXYGEN__) #if !defined(STRINGIFY) || defined(__DOXYGEN__)
/** Converts the given input into a string, via the C Preprocessor. This macro puts literal quotation /** Converts the given input into a string, via the C Preprocessor. This macro puts literal quotation
* marks around the input, converting the source into a string literal. * marks around the input, converting the source into a string literal.
@ -256,7 +256,7 @@
while (Milliseconds--) while (Milliseconds--)
{ {
__builtin_mtsr(AVR32_COUNT, 0); __builtin_mtsr(AVR32_COUNT, 0);
while (__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000)); while (__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000));
} }
#elif (ARCH == ARCH_XMEGA) #elif (ARCH == ARCH_XMEGA)
if (GCC_IS_COMPILE_CONST(Milliseconds)) if (GCC_IS_COMPILE_CONST(Milliseconds))
@ -267,7 +267,7 @@
{ {
while (Milliseconds--) while (Milliseconds--)
_delay_ms(1); _delay_ms(1);
} }
#endif #endif
} }
@ -316,12 +316,12 @@
else else
__builtin_csrf(AVR32_SR_GM_OFFSET); __builtin_csrf(AVR32_SR_GM_OFFSET);
#elif (ARCH == ARCH_XMEGA) #elif (ARCH == ARCH_XMEGA)
SREG = GlobalIntState; SREG = GlobalIntState;
#endif #endif
GCC_MEMORY_BARRIER(); GCC_MEMORY_BARRIER();
} }
/** Enables global interrupt handling for the device, allowing interrupts to be handled. /** Enables global interrupt handling for the device, allowing interrupts to be handled.
* *
* \ingroup Group_GlobalInt * \ingroup Group_GlobalInt
@ -340,7 +340,7 @@
#endif #endif
GCC_MEMORY_BARRIER(); GCC_MEMORY_BARRIER();
} }
/** Disabled global interrupt handling for the device, preventing interrupts from being handled. /** Disabled global interrupt handling for the device, preventing interrupts from being handled.
* *

@ -43,7 +43,7 @@
* *
* Compiler specific definitions to expose certain compiler features which may increase the level of code optimization * Compiler specific definitions to expose certain compiler features which may increase the level of code optimization
* for a specific compiler, or correct certain issues that may be present such as memory barriers for use in conjunction * for a specific compiler, or correct certain issues that may be present such as memory barriers for use in conjunction
* with atomic variable access. * with atomic variable access.
* *
* Where possible, on alternative compilers, these macros will either have no effect, or default to returning a sane value * Where possible, on alternative compilers, these macros will either have no effect, or default to returning a sane value
* so that they can be used in existing code without the need for extra compiler checks in the user application code. * so that they can be used in existing code without the need for extra compiler checks in the user application code.
@ -77,7 +77,7 @@
* assembly output in an unexpected manner on sections of code that are ordering-specific. * assembly output in an unexpected manner on sections of code that are ordering-specific.
*/ */
#define GCC_MEMORY_BARRIER() __asm__ __volatile__("" ::: "memory"); #define GCC_MEMORY_BARRIER() __asm__ __volatile__("" ::: "memory");
/** Evaluates to boolean true if the specified value can be determined at compile time to be a constant value /** Evaluates to boolean true if the specified value can be determined at compile time to be a constant value
* when compiling under GCC. * when compiling under GCC.
* *

@ -65,7 +65,7 @@
#if !defined(__INCLUDE_FROM_COMMON_H) #if !defined(__INCLUDE_FROM_COMMON_H)
#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality. #error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
#endif #endif
#if !(defined(ARCH_BIG_ENDIAN) || defined(ARCH_LITTLE_ENDIAN)) #if !(defined(ARCH_BIG_ENDIAN) || defined(ARCH_LITTLE_ENDIAN))
#error ARCH_BIG_ENDIAN or ARCH_LITTLE_ENDIAN not set for the specified architecture. #error ARCH_BIG_ENDIAN or ARCH_LITTLE_ENDIAN not set for the specified architecture.
#endif #endif
@ -115,11 +115,11 @@
#define CPU_TO_LE16(x) SWAPENDIAN_16(x) #define CPU_TO_LE16(x) SWAPENDIAN_16(x)
#define CPU_TO_LE32(x) SWAPENDIAN_32(x) #define CPU_TO_LE32(x) SWAPENDIAN_32(x)
#define CPU_TO_BE16(x) (x) #define CPU_TO_BE16(x) (x)
#define CPU_TO_BE32(x) (x) #define CPU_TO_BE32(x) (x)
#elif !defined(le16_to_cpu) #elif !defined(le16_to_cpu)
/** \name Run-time endianness conversion */ /** \name Run-time endianness conversion */
//@{ //@{
/** Performs a conversion between a Little Endian encoded 16-bit piece of data and the /** Performs a conversion between a Little Endian encoded 16-bit piece of data and the
* Endianness of the currently selected CPU architecture. * Endianness of the currently selected CPU architecture.
* *
@ -398,7 +398,7 @@
{ {
if (GCC_IS_COMPILE_CONST(Word)) if (GCC_IS_COMPILE_CONST(Word))
return SWAPENDIAN_16(Word); return SWAPENDIAN_16(Word);
uint8_t Temp; uint8_t Temp;
union union
@ -486,3 +486,4 @@
#endif #endif
/** @} */ /** @} */

@ -124,3 +124,4 @@
#endif #endif
/** @} */ /** @} */

@ -66,7 +66,7 @@
/* Macros: */ /* Macros: */
#define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)) #define JOY_FMASK ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
#define JOY_CMASK (1 << 6) #define JOY_CMASK (1 << 6)
#define JOY_PORTC_MASK_SHIFT 3 #define JOY_PORTC_MASK_SHIFT 3
#endif #endif

@ -127,3 +127,4 @@
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org www.lufa-lib.org
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -82,7 +82,7 @@
DDRB |= LEDS_ALL_LEDS; DDRB |= LEDS_ALL_LEDS;
PORTB &= ~LEDS_ALL_LEDS; PORTB &= ~LEDS_ALL_LEDS;
} }
static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
{ {
PORTB |= LEDMask; PORTB |= LEDMask;
@ -97,18 +97,18 @@
{ {
PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LEDMask); PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LEDMask);
} }
static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
const uint8_t ActiveMask) const uint8_t ActiveMask)
{ {
PORTB = ((PORTB & ~LEDMask) | ActiveMask); PORTB = ((PORTB & ~LEDMask) | ActiveMask);
} }
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
{ {
PORTB ^= LEDMask; PORTB ^= LEDMask;
} }
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void) static inline uint8_t LEDs_GetLEDs(void)
{ {
@ -120,7 +120,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org www.lufa-lib.org
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -35,7 +35,7 @@
* \note This file should not be included directly. It is automatically included as needed by the Buttons driver * \note This file should not be included directly. It is automatically included as needed by the Buttons driver
* dispatch header located in LUFA/Drivers/Board/Buttons.h. * dispatch header located in LUFA/Drivers/Board/Buttons.h.
*/ */
/** \ingroup Group_Buttons /** \ingroup Group_Buttons
* \defgroup Group_Buttons_MINIMUS MINIMUS * \defgroup Group_Buttons_MINIMUS MINIMUS
* \brief Board specific Buttons driver header for the MINIMUS. * \brief Board specific Buttons driver header for the MINIMUS.
@ -60,12 +60,12 @@
#if !defined(__INCLUDE_FROM_BUTTONS_H) #if !defined(__INCLUDE_FROM_BUTTONS_H)
#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** Button mask for the first button on the board. */ /** Button mask for the first button on the board. */
#define BUTTONS_BUTTON1 (1 << 7) #define BUTTONS_BUTTON1 (1 << 7)
/* Inline Functions: */ /* Inline Functions: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
static inline void Buttons_Init(void) static inline void Buttons_Init(void)
@ -85,7 +85,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org www.lufa-lib.org
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -82,7 +82,7 @@
DDRD |= LEDS_ALL_LEDS; DDRD |= LEDS_ALL_LEDS;
PORTD |= LEDS_ALL_LEDS; PORTD |= LEDS_ALL_LEDS;
} }
static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
{ {
PORTD &= ~LEDMask; PORTD &= ~LEDMask;
@ -97,18 +97,18 @@
{ {
PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask); PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
} }
static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
const uint8_t ActiveMask) const uint8_t ActiveMask)
{ {
PORTD = ((PORTD & ~LEDMask) | ActiveMask); PORTD = ((PORTD & ~LEDMask) | ActiveMask);
} }
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
{ {
PORTD ^= LEDMask; PORTD ^= LEDMask;
} }
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void) static inline uint8_t LEDs_GetLEDs(void)
{ {
@ -120,7 +120,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -66,7 +66,7 @@
/* Macros: */ /* Macros: */
#define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7)) #define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7))
#define JOY_EMASK ((1 << 4) | (1 << 5)) #define JOY_EMASK ((1 << 4) | (1 << 5))
#define JOY_PORTE_MASK_SHIFT 1 #define JOY_PORTE_MASK_SHIFT 1
#endif #endif

@ -35,7 +35,7 @@
* \note This file should not be included directly. It is automatically included as needed by the LEDs driver * \note This file should not be included directly. It is automatically included as needed by the LEDs driver
* dispatch header located in LUFA/Drivers/Board/LEDs.h. * dispatch header located in LUFA/Drivers/Board/LEDs.h.
*/ */
/** \ingroup Group_LEDs /** \ingroup Group_LEDs
* \defgroup Group_LEDs_TEENSY2 TEENSY2 * \defgroup Group_LEDs_TEENSY2 TEENSY2
* \brief Board specific LED driver header for the PJRC Teensy 2 boards. * \brief Board specific LED driver header for the PJRC Teensy 2 boards.
@ -88,7 +88,7 @@
DDRD |= LEDS_ALL_LEDS; DDRD |= LEDS_ALL_LEDS;
#if (BOARD == BOARD_TEENSY2) #if (BOARD == BOARD_TEENSY2)
PORTD &= ~LEDS_ALL_LEDS; PORTD &= ~LEDS_ALL_LEDS;
#else #else
PORTD |= LEDS_ALL_LEDS; PORTD |= LEDS_ALL_LEDS;
#endif #endif
@ -97,7 +97,7 @@
static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
{ {
#if (BOARD == BOARD_TEENSY2) #if (BOARD == BOARD_TEENSY2)
PORTD |= LEDMask; PORTD |= LEDMask;
#else #else
PORTD &= ~LEDMask; PORTD &= ~LEDMask;
#endif #endif
@ -106,7 +106,7 @@
static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
{ {
#if (BOARD == BOARD_TEENSY2) #if (BOARD == BOARD_TEENSY2)
PORTD &= ~LEDMask; PORTD &= ~LEDMask;
#else #else
PORTD |= LEDMask; PORTD |= LEDMask;
#endif #endif
@ -125,7 +125,7 @@
const uint8_t ActiveMask) const uint8_t ActiveMask)
{ {
#if (BOARD == BOARD_TEENSY2) #if (BOARD == BOARD_TEENSY2)
PORTD = ((PORTD & ~LEDMask) | ActiveMask); PORTD = ((PORTD & ~LEDMask) | ActiveMask);
#else #else
PORTD = ((PORTD | LEDMask) & ~ActiveMask); PORTD = ((PORTD | LEDMask) & ~ActiveMask);
#endif #endif
@ -140,7 +140,7 @@
static inline uint8_t LEDs_GetLEDs(void) static inline uint8_t LEDs_GetLEDs(void)
{ {
#if (BOARD == BOARD_TEENSY2) #if (BOARD == BOARD_TEENSY2)
return (PORTD & LEDS_ALL_LEDS); return (PORTD & LEDS_ALL_LEDS);
#else #else
return (~PORTD & LEDS_ALL_LEDS); return (~PORTD & LEDS_ALL_LEDS);
#endif #endif

@ -170,3 +170,4 @@
/** @} */ /** @} */

@ -66,7 +66,7 @@
/* Macros: */ /* Macros: */
#define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7)) #define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7))
#define JOY_EMASK ((1 << 4) | (1 << 5)) #define JOY_EMASK ((1 << 4) | (1 << 5))
#define JOY_PORTE_MASK_SHIFT 1 #define JOY_PORTE_MASK_SHIFT 1
#endif #endif

@ -130,3 +130,4 @@
#endif #endif
/** @} */ /** @} */

@ -35,7 +35,7 @@
* \note This file should not be included directly. It is automatically included as needed by the dataflash driver * \note This file should not be included directly. It is automatically included as needed by the dataflash driver
* dispatch header located in LUFA/Drivers/Board/Dataflash.h. * dispatch header located in LUFA/Drivers/Board/Dataflash.h.
*/ */
/** \ingroup Group_Dataflash /** \ingroup Group_Dataflash
* \defgroup Group_Dataflash_XPLAIN_REV1 XPLAIN_REV1 * \defgroup Group_Dataflash_XPLAIN_REV1 XPLAIN_REV1
* \brief Board specific Dataflash driver header for the original Atmel XPLAIN, revision 1. * \brief Board specific Dataflash driver header for the original Atmel XPLAIN, revision 1.

@ -35,7 +35,7 @@
* \note This file should not be included directly. It is automatically included as needed by the LEDs driver * \note This file should not be included directly. It is automatically included as needed by the LEDs driver
* dispatch header located in LUFA/Drivers/Board/LEDs.h. * dispatch header located in LUFA/Drivers/Board/LEDs.h.
*/ */
/** \ingroup Group_LEDs /** \ingroup Group_LEDs
* \defgroup Group_LEDs_XPLAIN_REV1 XPLAIN_REV1 * \defgroup Group_LEDs_XPLAIN_REV1 XPLAIN_REV1
* \brief Board specific LED driver header for the original Atmel XPLAIN, revision 1. * \brief Board specific LED driver header for the original Atmel XPLAIN, revision 1.

@ -78,7 +78,7 @@
* // Display which button was pressed (assuming two board buttons) * // Display which button was pressed (assuming two board buttons)
* printf("Button pressed: %s\r\n", (ButtonPress == BUTTONS_BUTTON1) ? "Button 1" : "Button 2"); * printf("Button pressed: %s\r\n", (ButtonPress == BUTTONS_BUTTON1) ? "Button 1" : "Button 2");
* \endcode * \endcode
* *
* @{ * @{
*/ */

@ -233,7 +233,7 @@
#elif (BOARD == BOARD_EVK527) #elif (BOARD == BOARD_EVK527)
#include "AVR8/EVK527/Dataflash.h" #include "AVR8/EVK527/Dataflash.h"
#elif (BOARD == BOARD_A3BU_XPLAINED) #elif (BOARD == BOARD_A3BU_XPLAINED)
#include "XMEGA/A3BU_XPLAINED/Dataflash.h" #include "XMEGA/A3BU_XPLAINED/Dataflash.h"
#else #else
#include "Board/Dataflash.h" #include "Board/Dataflash.h"
#endif #endif

@ -76,7 +76,7 @@
* *
* // Display which direction the joystick was moved in * // Display which direction the joystick was moved in
* printf("Joystick moved:\r\n"); * printf("Joystick moved:\r\n");
* *
* if (JoystickMovement & (JOY_UP | JOY_DOWN)) * if (JoystickMovement & (JOY_UP | JOY_DOWN))
* printf("%s ", (JoystickMovement & JOY_UP) ? "Up" : "Down"); * printf("%s ", (JoystickMovement & JOY_UP) ? "Up" : "Down");
* *

@ -78,13 +78,13 @@
* LEDs_Init(); * LEDs_Init();
* *
* // Turn on each of the four LEDs in turn * // Turn on each of the four LEDs in turn
* LEDs_SetAllLEDs(LEDS_LED1); * LEDs_SetAllLEDs(LEDS_LED1);
* Delay_MS(500); * Delay_MS(500);
* LEDs_SetAllLEDs(LEDS_LED1); * LEDs_SetAllLEDs(LEDS_LED1);
* Delay_MS(500); * Delay_MS(500);
* LEDs_SetAllLEDs(LEDS_LED1); * LEDs_SetAllLEDs(LEDS_LED1);
* Delay_MS(500); * Delay_MS(500);
* LEDs_SetAllLEDs(LEDS_LED1); * LEDs_SetAllLEDs(LEDS_LED1);
* Delay_MS(500); * Delay_MS(500);
* *
* // Turn on all LEDs * // Turn on all LEDs
@ -166,7 +166,7 @@
#elif (BOARD == BOARD_EVK1101) #elif (BOARD == BOARD_EVK1101)
#include "UC3/EVK1101/LEDs.h" #include "UC3/EVK1101/LEDs.h"
#elif (BOARD == BOARD_TUL) #elif (BOARD == BOARD_TUL)
#include "AVR8/TUL/LEDs.h" #include "AVR8/TUL/LEDs.h"
#elif (BOARD == BOARD_EVK1100) #elif (BOARD == BOARD_EVK1100)
#include "UC3/EVK1100/LEDs.h" #include "UC3/EVK1100/LEDs.h"
#elif (BOARD == BOARD_EVK1104) #elif (BOARD == BOARD_EVK1104)

@ -60,7 +60,7 @@
* // Display converted temperature in degrees Celsius * // Display converted temperature in degrees Celsius
* printf("Current Temperature: %d Degrees\r\n", Temperature_GetTemperature()); * printf("Current Temperature: %d Degrees\r\n", Temperature_GetTemperature());
* \endcode * \endcode
* *
* @{ * @{
*/ */
@ -91,7 +91,7 @@
/** ADC channel MUX mask for the temperature sensor. */ /** ADC channel MUX mask for the temperature sensor. */
#define TEMP_ADC_CHANNEL_MASK ADC_CHANNEL0 #define TEMP_ADC_CHANNEL_MASK ADC_CHANNEL0
/** Size of the temperature sensor lookup table, in lookup values */ /** Size of the temperature sensor lookup table, in lookup values */
#define TEMP_TABLE_SIZE 120 #define TEMP_TABLE_SIZE 120

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -44,7 +44,7 @@
* *
* @{ * @{
*/ */
#ifndef __BUTTONS_EVK1100_H__ #ifndef __BUTTONS_EVK1100_H__
#define __BUTTONS_EVK1100_H__ #define __BUTTONS_EVK1100_H__
@ -60,7 +60,7 @@
#if !defined(__INCLUDE_FROM_BUTTONS_H) #if !defined(__INCLUDE_FROM_BUTTONS_H)
#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
#endif #endif
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Macros: */ /* Macros: */
@ -97,7 +97,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -44,7 +44,7 @@
* *
* @{ * @{
*/ */
#ifndef __JOYSTICK_EVK1100_H__ #ifndef __JOYSTICK_EVK1100_H__
#define __JOYSTICK_EVK1100_H__ #define __JOYSTICK_EVK1100_H__
@ -67,7 +67,7 @@
#define JOY_PORT 0 #define JOY_PORT 0
#define JOY_MASK ((1UL << 28) | (1UL << 27) | (1UL << 26) | (1UL << 25) | (1UL << 20)) #define JOY_MASK ((1UL << 28) | (1UL << 27) | (1UL << 26) | (1UL << 25) | (1UL << 20))
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** Mask for the joystick being pushed in the left direction. */ /** Mask for the joystick being pushed in the left direction. */
@ -84,7 +84,7 @@
/** Mask for the joystick being pushed inward. */ /** Mask for the joystick being pushed inward. */
#define JOY_PRESS (1UL << 20) #define JOY_PRESS (1UL << 20)
/* Inline Functions: */ /* Inline Functions: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
static inline void Joystick_Init(void) static inline void Joystick_Init(void)
@ -92,7 +92,7 @@
AVR32_GPIO.port[JOY_PORT].gpers = JOY_MASK; AVR32_GPIO.port[JOY_PORT].gpers = JOY_MASK;
AVR32_GPIO.port[JOY_PORT].gpers = JOY_MASK; AVR32_GPIO.port[JOY_PORT].gpers = JOY_MASK;
}; };
static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint32_t Joystick_GetStatus(void) static inline uint32_t Joystick_GetStatus(void)
{ {
@ -108,3 +108,4 @@
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -92,7 +92,7 @@
/** LED mask for the eighth LED on the board. */ /** LED mask for the eighth LED on the board. */
#define LEDS_LED8 (1UL << 30) #define LEDS_LED8 (1UL << 30)
/** LED mask for all the LEDs on the board. */ /** LED mask for all the LEDs on the board. */
#define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4 \ #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4 \
LEDS_LED5 | LEDS_LED6 | LEDS_LED7 | LEDS_LED8) LEDS_LED5 | LEDS_LED6 | LEDS_LED7 | LEDS_LED8)
@ -108,7 +108,7 @@
AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS;
AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS;
} }
static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask) static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)
{ {
AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask; AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask;
@ -124,7 +124,7 @@
AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS;
AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask; AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask;
} }
static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask) static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask)
{ {
AVR32_GPIO.port[LEDS_PORT].ovrs = LEDMask; AVR32_GPIO.port[LEDS_PORT].ovrs = LEDMask;
@ -135,7 +135,7 @@
{ {
AVR32_GPIO.port[LEDS_PORT].ovrt = LEDMask; AVR32_GPIO.port[LEDS_PORT].ovrt = LEDMask;
} }
static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint32_t LEDs_GetLEDs(void) static inline uint32_t LEDs_GetLEDs(void)
{ {
@ -147,7 +147,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -44,7 +44,7 @@
* *
* @{ * @{
*/ */
#ifndef __BUTTONS_EVK1101_H__ #ifndef __BUTTONS_EVK1101_H__
#define __BUTTONS_EVK1101_H__ #define __BUTTONS_EVK1101_H__
@ -60,7 +60,7 @@
#if !defined(__INCLUDE_FROM_BUTTONS_H) #if !defined(__INCLUDE_FROM_BUTTONS_H)
#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
#endif #endif
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Macros: */ /* Macros: */
@ -94,7 +94,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -44,7 +44,7 @@
* *
* @{ * @{
*/ */
#ifndef __JOYSTICK_EVK1101_H__ #ifndef __JOYSTICK_EVK1101_H__
#define __JOYSTICK_EVK1101_H__ #define __JOYSTICK_EVK1101_H__
@ -69,7 +69,7 @@
#define JOY_PRESS_PORT 0 #define JOY_PRESS_PORT 0
#define JOY_PRESS_MASK (1UL << 13) #define JOY_PRESS_MASK (1UL << 13)
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** Mask for the joystick being pushed in the left direction. */ /** Mask for the joystick being pushed in the left direction. */
@ -86,7 +86,7 @@
/** Mask for the joystick being pushed inward. */ /** Mask for the joystick being pushed inward. */
#define JOY_PRESS (1UL << 13) #define JOY_PRESS (1UL << 13)
/* Inline Functions: */ /* Inline Functions: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
static inline void Joystick_Init(void) static inline void Joystick_Init(void)
@ -97,7 +97,7 @@
AVR32_GPIO.port[JOY_MOVE_PORT].puers = JOY_MOVE_MASK; AVR32_GPIO.port[JOY_MOVE_PORT].puers = JOY_MOVE_MASK;
AVR32_GPIO.port[JOY_PRESS_PORT].puers = JOY_PRESS_MASK; AVR32_GPIO.port[JOY_PRESS_PORT].puers = JOY_PRESS_MASK;
}; };
static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint32_t Joystick_GetStatus(void) static inline uint32_t Joystick_GetStatus(void)
{ {
@ -114,3 +114,4 @@
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -95,7 +95,7 @@
AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS;
AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS;
} }
static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask) static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)
{ {
AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask; AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask;
@ -111,7 +111,7 @@
AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS; AVR32_GPIO.port[LEDS_PORT].ovrs = LEDS_ALL_LEDS;
AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask; AVR32_GPIO.port[LEDS_PORT].ovrc = LEDMask;
} }
static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask) static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask)
{ {
AVR32_GPIO.port[LEDS_PORT].ovrs = LEDMask; AVR32_GPIO.port[LEDS_PORT].ovrs = LEDMask;
@ -122,7 +122,7 @@
{ {
AVR32_GPIO.port[LEDS_PORT].ovrt = LEDMask; AVR32_GPIO.port[LEDS_PORT].ovrt = LEDMask;
} }
static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint32_t LEDs_GetLEDs(void) static inline uint32_t LEDs_GetLEDs(void)
{ {
@ -134,7 +134,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -44,7 +44,7 @@
* *
* @{ * @{
*/ */
#ifndef __BUTTONS_EVK1104_H__ #ifndef __BUTTONS_EVK1104_H__
#define __BUTTONS_EVK1104_H__ #define __BUTTONS_EVK1104_H__
@ -60,7 +60,7 @@
#if !defined(__INCLUDE_FROM_BUTTONS_H) #if !defined(__INCLUDE_FROM_BUTTONS_H)
#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
#endif #endif
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Macros: */ /* Macros: */
@ -91,7 +91,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -100,7 +100,7 @@
AVR32_GPIO.port[3].oders = LEDS_LEDMASK3; AVR32_GPIO.port[3].oders = LEDS_LEDMASK3;
AVR32_GPIO.port[3].ovrs = LEDS_LEDMASK3; AVR32_GPIO.port[3].ovrs = LEDS_LEDMASK3;
} }
static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask) static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)
{ {
AVR32_GPIO.port[2].ovrc = (LEDMask & LEDS_LEDMASK2); AVR32_GPIO.port[2].ovrc = (LEDMask & LEDS_LEDMASK2);
@ -121,7 +121,7 @@
AVR32_GPIO.port[3].ovrs = LEDS_LEDMASK3; AVR32_GPIO.port[3].ovrs = LEDS_LEDMASK3;
AVR32_GPIO.port[3].ovrc = (LEDMask & LEDS_LEDMASK3); AVR32_GPIO.port[3].ovrc = (LEDMask & LEDS_LEDMASK3);
} }
static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask) static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask)
{ {
AVR32_GPIO.port[2].ovrs = (LEDMask & LEDS_LEDMASK2); AVR32_GPIO.port[2].ovrs = (LEDMask & LEDS_LEDMASK2);
@ -136,7 +136,7 @@
AVR32_GPIO.port[2].ovrt = (LEDMask & LEDS_LEDMASK2); AVR32_GPIO.port[2].ovrt = (LEDMask & LEDS_LEDMASK2);
AVR32_GPIO.port[3].ovrt = (LEDMask & LEDS_LEDMASK3); AVR32_GPIO.port[3].ovrt = (LEDMask & LEDS_LEDMASK3);
} }
static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint32_t LEDs_GetLEDs(void) static inline uint32_t LEDs_GetLEDs(void)
{ {
@ -148,7 +148,8 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -44,7 +44,7 @@
* *
* @{ * @{
*/ */
#ifndef __BUTTONS_A3BU_XPLAINED_H__ #ifndef __BUTTONS_A3BU_XPLAINED_H__
#define __BUTTONS_A3BU_XPLAINED_H__ #define __BUTTONS_A3BU_XPLAINED_H__
@ -78,7 +78,7 @@
{ {
PORTE_OUTCLR = BUTTONS_BUTTON1; PORTE_OUTCLR = BUTTONS_BUTTON1;
PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3); PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
PORTE_PIN5CTRL = PORT_OPC_PULLUP_gc; PORTE_PIN5CTRL = PORT_OPC_PULLUP_gc;
PORTF_PIN1CTRL = PORT_OPC_PULLUP_gc; PORTF_PIN1CTRL = PORT_OPC_PULLUP_gc;
PORTF_PIN2CTRL = PORT_OPC_PULLUP_gc; PORTF_PIN2CTRL = PORT_OPC_PULLUP_gc;
@ -100,4 +100,3 @@
/** @} */ /** @} */

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -124,4 +124,3 @@
/** @} */ /** @} */

@ -39,7 +39,7 @@
* or deletions) must not overlap. If there is possibility of two or more of the same kind of * or deletions) must not overlap. If there is possibility of two or more of the same kind of
* operating occurring at the same point in time, atomic (mutex) locking should be used. * operating occurring at the same point in time, atomic (mutex) locking should be used.
*/ */
/** \ingroup Group_MiscDrivers /** \ingroup Group_MiscDrivers
* \defgroup Group_RingBuff Generic Byte Ring Buffer - LUFA/Drivers/Misc/RingBuffer.h * \defgroup Group_RingBuff Generic Byte Ring Buffer - LUFA/Drivers/Misc/RingBuffer.h
* \brief Lightweight ring buffer, for fast insertion/deletion of bytes. * \brief Lightweight ring buffer, for fast insertion/deletion of bytes.
@ -134,7 +134,7 @@
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
Buffer->In = DataPtr; Buffer->In = DataPtr;
Buffer->Out = DataPtr; Buffer->Out = DataPtr;
Buffer->Start = &DataPtr[0]; Buffer->Start = &DataPtr[0];
@ -166,7 +166,7 @@
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
Count = Buffer->Count; Count = Buffer->Count;
SetGlobalInterruptMask(CurrentGlobalInt); SetGlobalInterruptMask(CurrentGlobalInt);
@ -244,7 +244,7 @@
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
Buffer->Count++; Buffer->Count++;
SetGlobalInterruptMask(CurrentGlobalInt); SetGlobalInterruptMask(CurrentGlobalInt);
@ -264,7 +264,7 @@
static inline uint8_t RingBuffer_Remove(RingBuffer_t* Buffer) static inline uint8_t RingBuffer_Remove(RingBuffer_t* Buffer)
{ {
GCC_FORCE_POINTER_ACCESS(Buffer); GCC_FORCE_POINTER_ACCESS(Buffer);
uint8_t Data = *Buffer->Out; uint8_t Data = *Buffer->Out;
if (++Buffer->Out == Buffer->End) if (++Buffer->Out == Buffer->End)
@ -272,7 +272,7 @@
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
Buffer->Count--; Buffer->Count--;
SetGlobalInterruptMask(CurrentGlobalInt); SetGlobalInterruptMask(CurrentGlobalInt);

@ -115,7 +115,7 @@
*/ */
#define ESC_STRIKETHROUGH_OFF ANSI_ESCAPE_SEQUENCE("29m") #define ESC_STRIKETHROUGH_OFF ANSI_ESCAPE_SEQUENCE("29m")
//@} //@}
/** \name Text Colour Control Sequences */ /** \name Text Colour Control Sequences */
//@{ //@{
/** Sets the foreground (text) colour to black. */ /** Sets the foreground (text) colour to black. */

@ -104,7 +104,7 @@
#define _ADC_GET_MUX_MASK2(y) ADC_CHANNEL ## y #define _ADC_GET_MUX_MASK2(y) ADC_CHANNEL ## y
#define _ADC_GET_MUX_MASK(y) _ADC_GET_MUX_MASK2(y) #define _ADC_GET_MUX_MASK(y) _ADC_GET_MUX_MASK2(y)
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** \name ADC Reference Configuration Masks */ /** \name ADC Reference Configuration Masks */
@ -118,7 +118,7 @@
/** Reference mask, for using the internally generated 2.56V reference voltage as the ADC reference. */ /** Reference mask, for using the internally generated 2.56V reference voltage as the ADC reference. */
#define ADC_REFERENCE_INT2560MV ((1 << REFS1) | (1 << REFS0)) #define ADC_REFERENCE_INT2560MV ((1 << REFS1) | (1 << REFS0))
//@} //@}
/** \name ADC Result Adjustment Configuration Masks */ /** \name ADC Result Adjustment Configuration Masks */
//@{ //@{
/** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the /** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the
@ -144,7 +144,7 @@
*/ */
#define ADC_SINGLE_CONVERSION (0 << ADATE) #define ADC_SINGLE_CONVERSION (0 << ADATE)
//@} //@}
/** \name ADC Prescaler Configuration Masks */ /** \name ADC Prescaler Configuration Masks */
//@{ //@{
/** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */ /** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */

@ -70,7 +70,7 @@
* // Send a byte, and store the received byte from the same transaction * // Send a byte, and store the received byte from the same transaction
* uint8_t ResponseByte = SPI_TransferByte(0xDC); * uint8_t ResponseByte = SPI_TransferByte(0xDC);
* \endcode * \endcode
* *
* @{ * @{
*/ */
@ -139,7 +139,7 @@
/** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */ /** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */
#define SPI_SAMPLE_TRAILING (1 << CPHA) #define SPI_SAMPLE_TRAILING (1 << CPHA)
//@} //@}
/** \name SPI Data Ordering Configuration Masks */ /** \name SPI Data Ordering Configuration Masks */
//@{ //@{
/** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */
@ -148,7 +148,7 @@
/** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */
#define SPI_ORDER_LSB_FIRST (1 << DORD) #define SPI_ORDER_LSB_FIRST (1 << DORD)
//@} //@}
/** \name SPI Mode Configuration Masks */ /** \name SPI Mode Configuration Masks */
//@{ //@{
/** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */
@ -157,7 +157,7 @@
/** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */
#define SPI_MODE_MASTER (1 << MSTR) #define SPI_MODE_MASTER (1 << MSTR)
//@} //@}
/* Inline Functions: */ /* Inline Functions: */
/** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other /** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other
* SPI routines. * SPI routines.
@ -195,7 +195,7 @@
SPCR = 0; SPCR = 0;
SPSR = 0; SPSR = 0;
} }
/** Retrieves the currently selected SPI mode, once the SPI interface has been configured. /** Retrieves the currently selected SPI mode, once the SPI interface has been configured.
* *
* \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise * \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise

@ -87,3 +87,4 @@ void Serial_SendData(const uint8_t* Buffer, uint16_t Length)
while (Length--) while (Length--)
Serial_SendByte(*(Buffer++)); Serial_SendByte(*(Buffer++));
} }

@ -70,7 +70,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "../../Misc/TerminalCodes.h" #include "../../Misc/TerminalCodes.h"
#include <stdio.h> #include <stdio.h>
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
@ -87,7 +87,7 @@
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* External Variables: */ /* External Variables: */
extern FILE USARTSerialStream; extern FILE USARTSerialStream;
/* Function Prototypes: */ /* Function Prototypes: */
int Serial_putchar(char DataByte, int Serial_putchar(char DataByte,
FILE *Stream); FILE *Stream);
@ -127,7 +127,7 @@
* \param[in] StringPtr Pointer to a string located in SRAM space. * \param[in] StringPtr Pointer to a string located in SRAM space.
*/ */
void Serial_SendString(const char* StringPtr) ATTR_NON_NULL_PTR_ARG(1); void Serial_SendString(const char* StringPtr) ATTR_NON_NULL_PTR_ARG(1);
/** Transmits a given buffer located in SRAM memory through the USART. /** Transmits a given buffer located in SRAM memory through the USART.
* *
* \param[in] Buffer Pointer to a buffer containing the data to send. * \param[in] Buffer Pointer to a buffer containing the data to send.
@ -190,7 +190,7 @@
stdin = Stream; stdin = Stream;
stdout = Stream; stdout = Stream;
} }
*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW); *Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
} }
@ -244,7 +244,7 @@
{ {
if (!(Serial_IsCharReceived())) if (!(Serial_IsCharReceived()))
return -1; return -1;
return UDR1; return UDR1;
} }

@ -119,9 +119,9 @@ bool TWI_ReceiveByte(uint8_t* const Byte,
TWCR = TWCRMask; TWCR = TWCRMask;
while (!(TWCR & (1 << TWINT))); while (!(TWCR & (1 << TWINT)));
*Byte = TWDR; *Byte = TWDR;
uint8_t Status = (TWSR & TW_STATUS_MASK); uint8_t Status = (TWSR & TW_STATUS_MASK);
return ((LastByte) ? (Status == TW_MR_DATA_NACK) : (Status == TW_MR_DATA_ACK)); return ((LastByte) ? (Status == TW_MR_DATA_NACK) : (Status == TW_MR_DATA_ACK));
} }
@ -133,19 +133,19 @@ uint8_t TWI_ReadPacket(const uint8_t SlaveAddress,
uint8_t Length) uint8_t Length)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE, if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE,
TimeoutMS)) == TWI_ERROR_NoError) TimeoutMS)) == TWI_ERROR_NoError)
{ {
while (InternalAddressLen--) while (InternalAddressLen--)
{ {
if (!(TWI_SendByte(*(InternalAddress++)))) if (!(TWI_SendByte(*(InternalAddress++))))
{ {
ErrorCode = TWI_ERROR_SlaveNAK; ErrorCode = TWI_ERROR_SlaveNAK;
break; break;
} }
} }
if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_READ, if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_READ,
TimeoutMS)) == TWI_ERROR_NoError) TimeoutMS)) == TWI_ERROR_NoError)
{ {
@ -157,11 +157,11 @@ uint8_t TWI_ReadPacket(const uint8_t SlaveAddress,
break; break;
} }
} }
TWI_StopTransmission(); TWI_StopTransmission();
} }
} }
return ErrorCode; return ErrorCode;
} }
@ -180,7 +180,7 @@ uint8_t TWI_WritePacket(const uint8_t SlaveAddress,
while (InternalAddressLen--) while (InternalAddressLen--)
{ {
if (!(TWI_SendByte(*(InternalAddress++)))) if (!(TWI_SendByte(*(InternalAddress++))))
{ {
ErrorCode = TWI_ERROR_SlaveNAK; ErrorCode = TWI_ERROR_SlaveNAK;
break; break;
} }
@ -194,9 +194,10 @@ uint8_t TWI_WritePacket(const uint8_t SlaveAddress,
break; break;
} }
} }
TWI_StopTransmission(); TWI_StopTransmission();
} }
return ErrorCode; return ErrorCode;
} }

@ -88,7 +88,7 @@
* } * }
* } * }
* \endcode * \endcode
* *
* <b>High Level API Example:</b> * <b>High Level API Example:</b>
* \code * \code
* // Initialize the TWI driver before first use at 200KHz * // Initialize the TWI driver before first use at 200KHz
@ -154,10 +154,10 @@
* or \ref TWI_ADDRESS_WRITE to obtain the device's read and write address respectively. * or \ref TWI_ADDRESS_WRITE to obtain the device's read and write address respectively.
*/ */
#define TWI_DEVICE_ADDRESS_MASK 0xFE #define TWI_DEVICE_ADDRESS_MASK 0xFE
/** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 1. */ /** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 1. */
#define TWI_BIT_PRESCALE_1 ((0 << TWPS1) | (0 << TWPS0)) #define TWI_BIT_PRESCALE_1 ((0 << TWPS1) | (0 << TWPS0))
/** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 4. */ /** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 4. */
#define TWI_BIT_PRESCALE_4 ((0 << TWPS1) | (1 << TWPS0)) #define TWI_BIT_PRESCALE_4 ((0 << TWPS1) | (1 << TWPS0))
@ -166,7 +166,7 @@
/** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 64. */ /** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 64. */
#define TWI_BIT_PRESCALE_64 ((1 << TWPS1) | (1 << TWPS0)) #define TWI_BIT_PRESCALE_64 ((1 << TWPS1) | (1 << TWPS0))
/** Calculates the length of each bit on the TWI bus for a given target frequency. This may be used with /** Calculates the length of each bit on the TWI bus for a given target frequency. This may be used with
* the \ref TWI_Init() function to convert a bus frequency to a number of clocks for the \c BitLength * the \ref TWI_Init() function to convert a bus frequency to a number of clocks for the \c BitLength
* parameter. * parameter.
@ -189,7 +189,7 @@
TWI_ERROR_SlaveNotReady = 4, /**< Slave NAKed the TWI bus START condition. */ TWI_ERROR_SlaveNotReady = 4, /**< Slave NAKed the TWI bus START condition. */
TWI_ERROR_SlaveNAK = 5, /**< Slave NAKed whilst attempting to send data to the device. */ TWI_ERROR_SlaveNAK = 5, /**< Slave NAKed whilst attempting to send data to the device. */
}; };
/* Inline Functions: */ /* Inline Functions: */
/** Initializes the TWI hardware into master mode, ready for data transmission and reception. This must be /** Initializes the TWI hardware into master mode, ready for data transmission and reception. This must be
* before any other TWI operations. * before any other TWI operations.
@ -256,7 +256,7 @@
const bool LastByte) ATTR_NON_NULL_PTR_ARG(1); const bool LastByte) ATTR_NON_NULL_PTR_ARG(1);
bool TWI_ReceiveByte(uint8_t* const Byte, bool TWI_ReceiveByte(uint8_t* const Byte,
const bool LastByte); const bool LastByte);
/** High level function to perform a complete packet transfer over the TWI bus to the specified /** High level function to perform a complete packet transfer over the TWI bus to the specified
* device. * device.
* *

@ -67,9 +67,10 @@
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/SPI_AVR8.h" #include "AVR8/SPI_AVR8.h"
#elif (ARCH == ARCH_XMEGA) #elif (ARCH == ARCH_XMEGA)
#include "XMEGA/SPI_XMEGA.h" #include "XMEGA/SPI_XMEGA.h"
#else #else
#error The SPI peripheral driver is not currently available for your selected architecture. #error The SPI peripheral driver is not currently available for your selected architecture.
#endif #endif
#endif #endif

@ -71,3 +71,4 @@
#endif #endif
#endif #endif

@ -67,7 +67,7 @@
* // Send a byte, and store the received byte from the same transaction * // Send a byte, and store the received byte from the same transaction
* uint8_t ResponseByte = SPI_TransferByte(&SPIC, 0xDC); * uint8_t ResponseByte = SPI_TransferByte(&SPIC, 0xDC);
* \endcode * \endcode
* *
* @{ * @{
*/ */
@ -136,7 +136,7 @@
/** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */ /** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */
#define SPI_SAMPLE_TRAILING SPI_MODE0_bm #define SPI_SAMPLE_TRAILING SPI_MODE0_bm
//@} //@}
/** \name SPI Data Ordering Configuration Masks */ /** \name SPI Data Ordering Configuration Masks */
//@{ //@{
/** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */
@ -145,7 +145,7 @@
/** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */
#define SPI_ORDER_LSB_FIRST SPI_DORD_bm #define SPI_ORDER_LSB_FIRST SPI_DORD_bm
//@} //@}
/** \name SPI Mode Configuration Masks */ /** \name SPI Mode Configuration Masks */
//@{ //@{
/** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */
@ -154,7 +154,7 @@
/** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */
#define SPI_MODE_MASTER SPI_MASTER_bm #define SPI_MODE_MASTER SPI_MASTER_bm
//@} //@}
/* Inline Functions: */ /* Inline Functions: */
/** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other /** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other
* SPI routines. * SPI routines.
@ -177,7 +177,7 @@
{ {
SPI->CTRL &= ~SPI_ENABLE_bm; SPI->CTRL &= ~SPI_ENABLE_bm;
} }
/** Retrieves the currently selected SPI mode, once the SPI interface has been configured. /** Retrieves the currently selected SPI mode, once the SPI interface has been configured.
* *
* \param[in, out] SPI Pointer to the base of the SPI peripheral within the device. * \param[in, out] SPI Pointer to the base of the SPI peripheral within the device.

@ -218,7 +218,7 @@
* allows for pitch adjustments to be made via control requests directed at the endpoint. * allows for pitch adjustments to be made via control requests directed at the endpoint.
*/ */
#define AUDIO_EP_PITCH_CONTROL (1 << 1) #define AUDIO_EP_PITCH_CONTROL (1 << 1)
/* Enums: */ /* Enums: */
/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Audio /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Audio
* device class. * device class.
@ -244,7 +244,7 @@
* interface belongs to the Streaming Audio protocol. * interface belongs to the Streaming Audio protocol.
*/ */
}; };
/** Audio class specific interface description subtypes, for the Audio Control interface. */ /** Audio class specific interface description subtypes, for the Audio Control interface. */
enum Audio_CSInterface_AC_SubTypes_t enum Audio_CSInterface_AC_SubTypes_t
{ {
@ -287,7 +287,7 @@
AUDIO_REQ_GetMemory = 0x85, /**< Audio class-specific request to get the memory value of a parameter within the device. */ AUDIO_REQ_GetMemory = 0x85, /**< Audio class-specific request to get the memory value of a parameter within the device. */
AUDIO_REQ_GetStatus = 0xFF, /**< Audio class-specific request to get the device status. */ AUDIO_REQ_GetStatus = 0xFF, /**< Audio class-specific request to get the device status. */
}; };
/** Enum for Audio class specific Endpoint control modifiers which can be set and retrieved by a USB host, if the corresponding /** Enum for Audio class specific Endpoint control modifiers which can be set and retrieved by a USB host, if the corresponding
* endpoint control is indicated to be supported in the Endpoint's Audio-class specific endpoint descriptor. * endpoint control is indicated to be supported in the Endpoint's Audio-class specific endpoint descriptor.
*/ */

@ -111,7 +111,7 @@
*/ */
#define CDC_CONTROL_LINE_IN_OVERRUNERROR (1 << 6) #define CDC_CONTROL_LINE_IN_OVERRUNERROR (1 << 6)
//@} //@}
/** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a /** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a
* uniform structure but variable sized data payloads, thus cannot be represented accurately by * uniform structure but variable sized data payloads, thus cannot be represented accurately by
* a single typedef struct. A macro is used instead so that functional descriptors can be created * a single typedef struct. A macro is used instead so that functional descriptors can be created
@ -161,7 +161,7 @@
* belongs to no specific protocol of the CDC data class. * belongs to no specific protocol of the CDC data class.
*/ */
}; };
/** Enum for the CDC class specific control requests that can be issued by the USB bus host. */ /** Enum for the CDC class specific control requests that can be issued by the USB bus host. */
enum CDC_ClassRequests_t enum CDC_ClassRequests_t
{ {
@ -355,7 +355,7 @@
uint8_t bMasterInterface; /**< Interface number of the CDC Control interface. */ uint8_t bMasterInterface; /**< Interface number of the CDC Control interface. */
uint8_t bSlaveInterface0; /**< Interface number of the CDC Data interface. */ uint8_t bSlaveInterface0; /**< Interface number of the CDC Data interface. */
} ATTR_PACKED USB_CDC_StdDescriptor_FunctionalUnion_t; } ATTR_PACKED USB_CDC_StdDescriptor_FunctionalUnion_t;
/** \brief CDC Virtual Serial Port Line Encoding Settings Structure. /** \brief CDC Virtual Serial Port Line Encoding Settings Structure.
* *
* Type define for a CDC Line Encoding structure, used to hold the various encoding parameters for a virtual * Type define for a CDC Line Encoding structure, used to hold the various encoding parameters for a virtual

@ -91,7 +91,7 @@
/** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */
#define HID_KEYBOARD_MODIFIER_RIGHTGUI (1 << 7) #define HID_KEYBOARD_MODIFIER_RIGHTGUI (1 << 7)
//@} //@}
/** \name Keyboard Standard Report LED Masks */ /** \name Keyboard Standard Report LED Masks */
//@{ //@{
/** Constant for a keyboard output report LED byte, indicating that the host's NUM LOCK mode is currently set. */ /** Constant for a keyboard output report LED byte, indicating that the host's NUM LOCK mode is currently set. */
@ -108,7 +108,7 @@
//@} //@}
/** \name Keyboard Standard Report Key Scan-codes */ /** \name Keyboard Standard Report Key Scan-codes */
//@{ //@{
#define HID_KEYBOARD_SC_ERROR_ROLLOVER 0x01 #define HID_KEYBOARD_SC_ERROR_ROLLOVER 0x01
#define HID_KEYBOARD_SC_POST_FAIL 0x02 #define HID_KEYBOARD_SC_POST_FAIL 0x02
#define HID_KEYBOARD_SC_ERROR_UNDEFINED 0x03 #define HID_KEYBOARD_SC_ERROR_UNDEFINED 0x03
@ -208,7 +208,7 @@
#define HID_KEYBOARD_SC_KEYPAD_9_AND_PAGE_UP 0x61 #define HID_KEYBOARD_SC_KEYPAD_9_AND_PAGE_UP 0x61
#define HID_KEYBOARD_SC_KEYPAD_0_AND_INSERT 0x62 #define HID_KEYBOARD_SC_KEYPAD_0_AND_INSERT 0x62
#define HID_KEYBOARD_SC_KEYPAD_DOT_AND_DELETE 0x63 #define HID_KEYBOARD_SC_KEYPAD_DOT_AND_DELETE 0x63
#define HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE 0x64 #define HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE 0x64
#define HID_KEYBOARD_SC_POWER 0x66 #define HID_KEYBOARD_SC_POWER 0x66
#define HID_KEYBOARD_SC_EQUAL_SIGN 0x67 #define HID_KEYBOARD_SC_EQUAL_SIGN 0x67
#define HID_KEYBOARD_SC_F13 0x68 #define HID_KEYBOARD_SC_F13 0x68
@ -496,7 +496,7 @@
* \param[in] VendorPageNum Vendor Defined HID Usage Page index, ranging from 0x00 to 0xFF. * \param[in] VendorPageNum Vendor Defined HID Usage Page index, ranging from 0x00 to 0xFF.
* \param[in] CollectionUsage Vendor Usage for the encompassing report IN and OUT collection, ranging from 0x00 to 0xFF. * \param[in] CollectionUsage Vendor Usage for the encompassing report IN and OUT collection, ranging from 0x00 to 0xFF.
* \param[in] DataINUsage Vendor Usage for the IN report data, ranging from 0x00 to 0xFF. * \param[in] DataINUsage Vendor Usage for the IN report data, ranging from 0x00 to 0xFF.
* \param[in] DataOUTUsage Vendor Usage for the OUT report data, ranging from 0x00 to 0xFF. * \param[in] DataOUTUsage Vendor Usage for the OUT report data, ranging from 0x00 to 0xFF.
* \param[in] NumBytes Length of the data IN and OUT reports. * \param[in] NumBytes Length of the data IN and OUT reports.
*/ */
#define HID_DESCRIPTOR_VENDOR(VendorPageNum, CollectionUsage, DataINUsage, DataOUTUsage, NumBytes) \ #define HID_DESCRIPTOR_VENDOR(VendorPageNum, CollectionUsage, DataINUsage, DataOUTUsage, NumBytes) \
@ -517,7 +517,7 @@
HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \ HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
HID_RI_END_COLLECTION(0) HID_RI_END_COLLECTION(0)
//@} //@}
/* Type Defines: */ /* Type Defines: */
/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the HID /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the HID
* device class. * device class.
@ -543,7 +543,7 @@
* belongs to the Mouse HID boot protocol. * belongs to the Mouse HID boot protocol.
*/ */
}; };
/** Enum for the HID class specific control requests that can be issued by the USB bus host. */ /** Enum for the HID class specific control requests that can be issued by the USB bus host. */
enum HID_ClassRequests_t enum HID_ClassRequests_t
{ {

@ -98,7 +98,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
case HID_RI_USAGE_PAGE(0): case HID_RI_USAGE_PAGE(0):
if ((HIDReportItem & HID_RI_DATA_SIZE_MASK) == HID_RI_DATA_BITS_32) if ((HIDReportItem & HID_RI_DATA_SIZE_MASK) == HID_RI_DATA_BITS_32)
CurrStateTable->Attributes.Usage.Page = (ReportItemData >> 16); CurrStateTable->Attributes.Usage.Page = (ReportItemData >> 16);
CurrStateTable->Attributes.Usage.Page = ReportItemData; CurrStateTable->Attributes.Usage.Page = ReportItemData;
break; break;
case HID_RI_LOGICAL_MINIMUM(0): case HID_RI_LOGICAL_MINIMUM(0):
@ -359,3 +359,4 @@ uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData,
return 0; return 0;
} }

@ -71,7 +71,7 @@
#include "HIDReportData.h" #include "HIDReportData.h"
#include "HIDClassCommon.h" #include "HIDClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {

@ -63,15 +63,15 @@
#define HID_RI_DATA_BITS_32 0x03 #define HID_RI_DATA_BITS_32 0x03
#define HID_RI_DATA_BITS(DataBits) HID_RI_DATA_BITS_ ## DataBits #define HID_RI_DATA_BITS(DataBits) HID_RI_DATA_BITS_ ## DataBits
#define _HID_RI_ENCODE_0(Data) #define _HID_RI_ENCODE_0(Data)
#define _HID_RI_ENCODE_8(Data) , (Data & 0xFF) #define _HID_RI_ENCODE_8(Data) , (Data & 0xFF)
#define _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_8(Data) _HID_RI_ENCODE_8(Data >> 8) #define _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_8(Data) _HID_RI_ENCODE_8(Data >> 8)
#define _HID_RI_ENCODE_32(Data) _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_16(Data >> 16) #define _HID_RI_ENCODE_32(Data) _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_16(Data >> 16)
#define _HID_RI_ENCODE(DataBits, ...) _HID_RI_ENCODE_ ## DataBits(__VA_ARGS__) #define _HID_RI_ENCODE(DataBits, ...) _HID_RI_ENCODE_ ## DataBits(__VA_ARGS__)
#define _HID_RI_ENTRY(Type, Tag, DataBits, ...) (Type | Tag | HID_RI_DATA_BITS(DataBits)) _HID_RI_ENCODE(DataBits, (__VA_ARGS__)) #define _HID_RI_ENTRY(Type, Tag, DataBits, ...) (Type | Tag | HID_RI_DATA_BITS(DataBits)) _HID_RI_ENCODE(DataBits, (__VA_ARGS__))
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** \name HID Input, Output and Feature Report Descriptor Item Flags */ /** \name HID Input, Output and Feature Report Descriptor Item Flags */
@ -95,7 +95,7 @@
#define HID_IOF_BUFFERED_BYTES (1 << 8) #define HID_IOF_BUFFERED_BYTES (1 << 8)
#define HID_IOF_BITFIELD (0 << 8) #define HID_IOF_BITFIELD (0 << 8)
//@} //@}
/** \name HID Report Descriptor Item Macros */ /** \name HID Report Descriptor Item Macros */
//@{ //@{
#define HID_RI_INPUT(DataBits, ...) _HID_RI_ENTRY(HID_RI_TYPE_MAIN , 0x80, DataBits, __VA_ARGS__) #define HID_RI_INPUT(DataBits, ...) _HID_RI_ENTRY(HID_RI_TYPE_MAIN , 0x80, DataBits, __VA_ARGS__)

@ -117,7 +117,7 @@
/** SCSI Command Code for a MODE SENSE (10) command. */ /** SCSI Command Code for a MODE SENSE (10) command. */
#define SCSI_CMD_MODE_SENSE_10 0x5A #define SCSI_CMD_MODE_SENSE_10 0x5A
//@} //@}
/** \name SCSI Sense Key Values */ /** \name SCSI Sense Key Values */
//@{ //@{
/** SCSI Sense Code to indicate no error has occurred. */ /** SCSI Sense Code to indicate no error has occurred. */
@ -164,7 +164,7 @@
/** SCSI Sense Code to indicate that the source data did not match the data read from the medium. */ /** SCSI Sense Code to indicate that the source data did not match the data read from the medium. */
#define SCSI_SENSE_KEY_MISCOMPARE 0x0E #define SCSI_SENSE_KEY_MISCOMPARE 0x0E
//@} //@}
/** \name SCSI Additional Sense Codes */ /** \name SCSI Additional Sense Codes */
//@{ //@{
/** SCSI Additional Sense Code to indicate no additional sense information is available. */ /** SCSI Additional Sense Code to indicate no additional sense information is available. */
@ -196,7 +196,7 @@
/** SCSI Additional Sense Code to indicate that no removable medium is inserted into the device. */ /** SCSI Additional Sense Code to indicate that no removable medium is inserted into the device. */
#define SCSI_ASENSE_MEDIUM_NOT_PRESENT 0x3A #define SCSI_ASENSE_MEDIUM_NOT_PRESENT 0x3A
//@} //@}
/** \name SCSI Additional Sense Key Code Qualifiers */ /** \name SCSI Additional Sense Key Code Qualifiers */
//@{ //@{
/** SCSI Additional Sense Qualifier Code to indicate no additional sense qualifier information is available. */ /** SCSI Additional Sense Qualifier Code to indicate no additional sense qualifier information is available. */
@ -213,7 +213,7 @@
/** SCSI Additional Sense Qualifier Code to indicate that an operation is currently in progress. */ /** SCSI Additional Sense Qualifier Code to indicate that an operation is currently in progress. */
#define SCSI_ASENSEQ_OPERATION_IN_PROGRESS 0x07 #define SCSI_ASENSEQ_OPERATION_IN_PROGRESS 0x07
//@} //@}
/* Enums: */ /* Enums: */
/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Mass /** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Mass
* Storage device class. * Storage device class.
@ -231,7 +231,7 @@
* belongs to the Bulk Only Transport protocol of the Mass Storage class. * belongs to the Bulk Only Transport protocol of the Mass Storage class.
*/ */
}; };
/** Enum for the Mass Storage class specific control requests that can be issued by the USB bus host. */ /** Enum for the Mass Storage class specific control requests that can be issued by the USB bus host. */
enum MS_ClassRequests_t enum MS_ClassRequests_t
{ {

@ -92,7 +92,7 @@
* belongs to the Bidirectional protocol of the Printer class. * belongs to the Bidirectional protocol of the Printer class.
*/ */
}; };
/** Enum for the Printer class specific control requests that can be issued by the USB bus host. */ /** Enum for the Printer class specific control requests that can be issued by the USB bus host. */
enum PRNT_ClassRequests_t enum PRNT_ClassRequests_t
{ {
@ -106,7 +106,7 @@
PRNT_REQ_SoftReset = 0x02, /**< Printer class-specific request to reset the device, ready for new PRNT_REQ_SoftReset = 0x02, /**< Printer class-specific request to reset the device, ready for new
* printer commands. * printer commands.
*/ */
}; };
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

@ -113,7 +113,7 @@
#define REMOTE_NDIS_MEDIA_STATE_CONNECTED 0x00000000UL #define REMOTE_NDIS_MEDIA_STATE_CONNECTED 0x00000000UL
#define REMOTE_NDIS_MEDIA_STATE_DISCONNECTED 0x00000001UL #define REMOTE_NDIS_MEDIA_STATE_DISCONNECTED 0x00000001UL
//@} //@}
/** \name RNDIS Media Types */ /** \name RNDIS Media Types */
//@{ //@{
#define REMOTE_NDIS_MEDIUM_802_3 0x00000000UL #define REMOTE_NDIS_MEDIUM_802_3 0x00000000UL
@ -124,7 +124,7 @@
#define REMOTE_NDIS_DF_CONNECTIONLESS 0x00000001UL #define REMOTE_NDIS_DF_CONNECTIONLESS 0x00000001UL
#define REMOTE_NDIS_DF_CONNECTION_ORIENTED 0x00000002UL #define REMOTE_NDIS_DF_CONNECTION_ORIENTED 0x00000002UL
//@} //@}
/** \name RNDIS Packet Types */ /** \name RNDIS Packet Types */
//@{ //@{
#define REMOTE_NDIS_PACKET_DIRECTED 0x00000001UL #define REMOTE_NDIS_PACKET_DIRECTED 0x00000001UL
@ -140,7 +140,7 @@
#define REMOTE_NDIS_PACKET_FUNCTIONAL 0x00004000UL #define REMOTE_NDIS_PACKET_FUNCTIONAL 0x00004000UL
#define REMOTE_NDIS_PACKET_MAC_FRAME 0x00008000UL #define REMOTE_NDIS_PACKET_MAC_FRAME 0x00008000UL
//@} //@}
/** \name RNDIS OID Values */ /** \name RNDIS OID Values */
//@{ //@{
#define OID_GEN_SUPPORTED_LIST 0x00010101UL #define OID_GEN_SUPPORTED_LIST 0x00010101UL

@ -50,16 +50,16 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT) else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
{ {
bool EndpointFilterMatch = false; bool EndpointFilterMatch = false;
EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataINEndpointNumber && EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataINEndpointNumber &&
((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_IN | AudioInterfaceInfo->Config.DataINEndpointNumber))); ((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_IN | AudioInterfaceInfo->Config.DataINEndpointNumber)));
EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataOUTEndpointNumber && EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataOUTEndpointNumber &&
((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_OUT | AudioInterfaceInfo->Config.DataOUTEndpointNumber))); ((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_OUT | AudioInterfaceInfo->Config.DataOUTEndpointNumber)));
if (!(EndpointFilterMatch)) if (!(EndpointFilterMatch))
return; return;
} }
switch (USB_ControlRequest.bRequest) switch (USB_ControlRequest.bRequest)
{ {
@ -92,20 +92,20 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
uint8_t EndpointProperty = USB_ControlRequest.bRequest; uint8_t EndpointProperty = USB_ControlRequest.bRequest;
uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex; uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex;
uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8); uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8);
if (CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress, if (CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
EndpointControl, NULL, NULL)) EndpointControl, NULL, NULL))
{ {
uint16_t ValueLength = USB_ControlRequest.wLength; uint16_t ValueLength = USB_ControlRequest.wLength;
uint8_t Value[ValueLength]; uint8_t Value[ValueLength];
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
Endpoint_Read_Control_Stream_LE(Value, ValueLength); Endpoint_Read_Control_Stream_LE(Value, ValueLength);
Endpoint_ClearIN(); Endpoint_ClearIN();
CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress, CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
EndpointControl, &ValueLength, Value); EndpointControl, &ValueLength, Value);
} }
} }
break; break;
@ -126,7 +126,7 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
{ {
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
Endpoint_Write_Control_Stream_LE(Value, ValueLength); Endpoint_Write_Control_Stream_LE(Value, ValueLength);
Endpoint_ClearOUT(); Endpoint_ClearOUT();
} }
} }
@ -180,3 +180,4 @@ void Audio_Device_Event_Stub(void)
} }
#endif #endif

@ -126,7 +126,7 @@
* \param[in,out] AudioInterfaceInfo Pointer to a structure containing an Audio Class configuration and state. * \param[in,out] AudioInterfaceInfo Pointer to a structure containing an Audio Class configuration and state.
*/ */
void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
/** Audio class driver callback for the setting and retrieval of streaming endpoint properties. This callback must be implemented /** Audio class driver callback for the setting and retrieval of streaming endpoint properties. This callback must be implemented
* in the user application to handle property manipulations on streaming audio endpoints. * in the user application to handle property manipulations on streaming audio endpoints.
* *
@ -357,12 +357,12 @@
/* Function Prototypes: */ /* Function Prototypes: */
#if defined(__INCLUDE_FROM_AUDIO_DEVICE_C) #if defined(__INCLUDE_FROM_AUDIO_DEVICE_C)
void Audio_Device_Event_Stub(void) ATTR_CONST; void Audio_Device_Event_Stub(void) ATTR_CONST;
void EVENT_Audio_Device_StreamStartStop(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) void EVENT_Audio_Device_StreamStartStop(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(Audio_Device_Event_Stub); ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(Audio_Device_Event_Stub);
#endif #endif
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

@ -78,7 +78,7 @@ void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInter
Endpoint_ClearOUT(); Endpoint_ClearOUT();
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo); EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo);
} }

@ -334,7 +334,7 @@
#endif #endif
void CDC_Device_Event_Stub(void) ATTR_CONST; void CDC_Device_Event_Stub(void) ATTR_CONST;
void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub); ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub);
void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)

@ -64,7 +64,7 @@ void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInter
memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportData, memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportData,
HIDInterfaceInfo->Config.PrevReportINBufferSize); HIDInterfaceInfo->Config.PrevReportINBufferSize);
} }
Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP); Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
@ -84,7 +84,7 @@ void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInter
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
Endpoint_Read_Control_Stream_LE(ReportData, ReportSize); Endpoint_Read_Control_Stream_LE(ReportData, ReportSize);
Endpoint_ClearIN(); Endpoint_ClearIN();
CALLBACK_HID_Device_ProcessHIDReport(HIDInterfaceInfo, ReportID, ReportType, CALLBACK_HID_Device_ProcessHIDReport(HIDInterfaceInfo, ReportID, ReportType,
&ReportData[ReportID ? 1 : 0], ReportSize - (ReportID ? 1 : 0)); &ReportData[ReportID ? 1 : 0], ReportSize - (ReportID ? 1 : 0));
} }

@ -91,7 +91,7 @@
} Config; /**< Config data for the USB class interface within the device. All elements in this section } Config; /**< Config data for the USB class interface within the device. All elements in this section
* <b>must</b> be set or the interface will fail to enumerate and operate correctly. * <b>must</b> be set or the interface will fail to enumerate and operate correctly.
*/ */
struct struct
{ {
// No state information for this class // No state information for this class

@ -160,7 +160,7 @@ static bool MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInte
uint16_t BytesProcessed; uint16_t BytesProcessed;
Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber); Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpointNumber);
BytesProcessed = 0; BytesProcessed = 0;
while (Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock, while (Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock,
(sizeof(MS_CommandBlockWrapper_t) - 16), &BytesProcessed) == (sizeof(MS_CommandBlockWrapper_t) - 16), &BytesProcessed) ==
@ -231,8 +231,9 @@ static void MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_Device_t* const MSInt
if (MSInterfaceInfo->State.IsMassStoreReset) if (MSInterfaceInfo->State.IsMassStoreReset)
return; return;
} }
Endpoint_ClearIN(); Endpoint_ClearIN();
} }
#endif #endif

@ -238,7 +238,7 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* const
uint16_t ResponseSize; uint16_t ResponseSize;
QUERY_Response->MessageType = CPU_TO_LE32(REMOTE_NDIS_QUERY_CMPLT); QUERY_Response->MessageType = CPU_TO_LE32(REMOTE_NDIS_QUERY_CMPLT);
if (RNDIS_Device_ProcessNDISQuery(RNDISInterfaceInfo, Query_Oid, QueryData, le32_to_cpu(QUERY_Message->InformationBufferLength), if (RNDIS_Device_ProcessNDISQuery(RNDISInterfaceInfo, Query_Oid, QueryData, le32_to_cpu(QUERY_Message->InformationBufferLength),
ResponseData, &ResponseSize)) ResponseData, &ResponseSize))
{ {
@ -453,7 +453,7 @@ bool RNDIS_Device_IsPacketReceived(USB_ClassInfo_RNDIS_Device_t* const RNDISInte
{ {
return false; return false;
} }
Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpointNumber); Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpointNumber);
return Endpoint_IsOUTReceived(); return Endpoint_IsOUTReceived();
} }
@ -467,15 +467,15 @@ uint8_t RNDIS_Device_ReadPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfa
{ {
return ENDPOINT_RWSTREAM_DeviceDisconnected; return ENDPOINT_RWSTREAM_DeviceDisconnected;
} }
Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpointNumber); Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpointNumber);
*PacketLength = 0; *PacketLength = 0;
if (!(Endpoint_IsOUTReceived())) if (!(Endpoint_IsOUTReceived()))
return ENDPOINT_RWSTREAM_NoError; return ENDPOINT_RWSTREAM_NoError;
RNDIS_Packet_Message_t RNDISPacketHeader; RNDIS_Packet_Message_t RNDISPacketHeader;
Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t), NULL); Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t), NULL);
if (le32_to_cpu(RNDISPacketHeader.DataLength) > ETHERNET_FRAME_SIZE_MAX) if (le32_to_cpu(RNDISPacketHeader.DataLength) > ETHERNET_FRAME_SIZE_MAX)
@ -484,12 +484,12 @@ uint8_t RNDIS_Device_ReadPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfa
return RNDIS_ERROR_LOGICAL_CMD_FAILED; return RNDIS_ERROR_LOGICAL_CMD_FAILED;
} }
*PacketLength = (uint16_t)le32_to_cpu(RNDISPacketHeader.DataLength); *PacketLength = (uint16_t)le32_to_cpu(RNDISPacketHeader.DataLength);
Endpoint_Read_Stream_LE(Buffer, *PacketLength, NULL); Endpoint_Read_Stream_LE(Buffer, *PacketLength, NULL);
Endpoint_ClearOUT(); Endpoint_ClearOUT();
return ENDPOINT_RWSTREAM_NoError; return ENDPOINT_RWSTREAM_NoError;
} }
@ -504,7 +504,7 @@ uint8_t RNDIS_Device_SendPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfa
{ {
return ENDPOINT_RWSTREAM_DeviceDisconnected; return ENDPOINT_RWSTREAM_DeviceDisconnected;
} }
Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataINEndpointNumber); Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataINEndpointNumber);
if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError) if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)

@ -443,3 +443,4 @@ static int AOA_Host_getchar_Blocking(FILE* Stream)
#endif #endif

@ -68,7 +68,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
return AUDIO_ENUMERROR_NoCompatibleInterfaceFound; return AUDIO_ENUMERROR_NoCompatibleInterfaceFound;
} }
AudioControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t); AudioControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found) DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found)
@ -78,7 +78,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
} }
AudioStreamingInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t); AudioStreamingInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
DataINEndpoint = NULL; DataINEndpoint = NULL;
DataOUTEndpoint = NULL; DataOUTEndpoint = NULL;
@ -125,7 +125,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
{ {
continue; continue;
} }
if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size, if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size,
DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE))) DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE)))
{ {
@ -137,7 +137,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
AudioInterfaceInfo->State.StreamingInterfaceNumber = AudioStreamingInterface->InterfaceNumber; AudioInterfaceInfo->State.StreamingInterfaceNumber = AudioStreamingInterface->InterfaceNumber;
AudioInterfaceInfo->State.EnabledStreamingAltIndex = AudioStreamingInterface->AlternateSetting; AudioInterfaceInfo->State.EnabledStreamingAltIndex = AudioStreamingInterface->AlternateSetting;
AudioInterfaceInfo->State.IsActive = true; AudioInterfaceInfo->State.IsActive = true;
return AUDIO_ENUMERROR_NoError; return AUDIO_ENUMERROR_NoError;
} }
@ -225,7 +225,7 @@ uint8_t Audio_Host_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const Audi
RequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT); RequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT);
else else
RequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT); RequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT);
Pipe_SelectPipe(DataPipeIndex); Pipe_SelectPipe(DataPipeIndex);
EndpointAddress = Pipe_GetBoundEndpointAddress(); EndpointAddress = Pipe_GetBoundEndpointAddress();

@ -98,7 +98,7 @@
*/ */
uint8_t ControlInterfaceNumber; /**< Interface index of the Audio Control interface within the attached device. */ uint8_t ControlInterfaceNumber; /**< Interface index of the Audio Control interface within the attached device. */
uint8_t StreamingInterfaceNumber; /**< Interface index of the Audio Streaming interface within the attached device. */ uint8_t StreamingInterfaceNumber; /**< Interface index of the Audio Streaming interface within the attached device. */
uint8_t EnabledStreamingAltIndex; /**< Alternative setting index of the Audio Streaming interface when the stream is enabled. */ uint8_t EnabledStreamingAltIndex; /**< Alternative setting index of the Audio Streaming interface when the stream is enabled. */
uint16_t DataINPipeSize; /**< Size in bytes of the Audio interface's IN data pipe. */ uint16_t DataINPipeSize; /**< Size in bytes of the Audio interface's IN data pipe. */
@ -331,7 +331,7 @@
const int8_t Sample) const int8_t Sample)
{ {
(void)AudioInterfaceInfo; (void)AudioInterfaceInfo;
Pipe_Write_8(Sample); Pipe_Write_8(Sample);
if (!(Pipe_IsReadWriteAllowed())) if (!(Pipe_IsReadWriteAllowed()))
@ -357,7 +357,7 @@
const int16_t Sample) const int16_t Sample)
{ {
(void)AudioInterfaceInfo; (void)AudioInterfaceInfo;
Pipe_Write_16_LE(Sample); Pipe_Write_16_LE(Sample);
if (!(Pipe_IsReadWriteAllowed())) if (!(Pipe_IsReadWriteAllowed()))
@ -395,7 +395,7 @@
Pipe_Freeze(); Pipe_Freeze();
} }
} }
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Function Prototypes: */ /* Function Prototypes: */

@ -145,13 +145,13 @@ uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo
{ {
continue; continue;
} }
if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size, if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size,
DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE))) DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE)))
{ {
return CDC_ENUMERROR_PipeConfigurationFailed; return CDC_ENUMERROR_PipeConfigurationFailed;
} }
if (InterruptPeriod) if (InterruptPeriod)
Pipe_SetInterruptPeriod(InterruptPeriod); Pipe_SetInterruptPeriod(InterruptPeriod);
} }

@ -334,7 +334,7 @@
#endif #endif
void CDC_Host_Event_Stub(void) ATTR_CONST; void CDC_Host_Event_Stub(void) ATTR_CONST;
void EVENT_CDC_Host_ControLineStateChanged(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) void EVENT_CDC_Host_ControLineStateChanged(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Host_Event_Stub); ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Host_Event_Stub);

@ -118,7 +118,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
{ {
if (DataOUTEndpoint == NULL) if (DataOUTEndpoint == NULL)
continue; continue;
Size = le16_to_cpu(DataOUTEndpoint->EndpointSize); Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
EndpointAddress = DataOUTEndpoint->EndpointAddress; EndpointAddress = DataOUTEndpoint->EndpointAddress;
Token = PIPE_TOKEN_OUT; Token = PIPE_TOKEN_OUT;
@ -139,7 +139,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
{ {
return HID_ENUMERROR_PipeConfigurationFailed; return HID_ENUMERROR_PipeConfigurationFailed;
} }
if (InterruptPeriod) if (InterruptPeriod)
Pipe_SetInterruptPeriod(InterruptPeriod); Pipe_SetInterruptPeriod(InterruptPeriod);
} }

@ -171,7 +171,7 @@ void MIDI_Host_USBTask(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)
#if !defined(NO_CLASS_DRIVER_AUTOFLUSH) #if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
MIDI_Host_Flush(MIDIInterfaceInfo); MIDI_Host_Flush(MIDIInterfaceInfo);
#endif #endif
} }
uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo) uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)

@ -103,7 +103,7 @@ uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
Token = PIPE_TOKEN_OUT; Token = PIPE_TOKEN_OUT;
Type = EP_TYPE_BULK; Type = EP_TYPE_BULK;
DoubleBanked = MSInterfaceInfo->Config.DataOUTPipeDoubleBank; DoubleBanked = MSInterfaceInfo->Config.DataOUTPipeDoubleBank;
MSInterfaceInfo->State.DataOUTPipeSize = DataOUTEndpoint->EndpointSize; MSInterfaceInfo->State.DataOUTPipeSize = DataOUTEndpoint->EndpointSize;
} }
else else
@ -186,7 +186,7 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
{ {
return ErrorCode; return ErrorCode;
} }
Pipe_ClearOUT(); Pipe_ClearOUT();
Pipe_WaitUntilReady(); Pipe_WaitUntilReady();
@ -195,14 +195,14 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
if (BufferPtr != NULL) if (BufferPtr != NULL)
{ {
ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, (void*)BufferPtr); ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, (void*)BufferPtr);
if ((ErrorCode != PIPE_RWSTREAM_NoError) && (ErrorCode != PIPE_RWSTREAM_PipeStalled)) if ((ErrorCode != PIPE_RWSTREAM_NoError) && (ErrorCode != PIPE_RWSTREAM_PipeStalled))
{ {
Pipe_Freeze(); Pipe_Freeze();
return ErrorCode; return ErrorCode;
} }
} }
MS_CommandStatusWrapper_t SCSIStatusBlock; MS_CommandStatusWrapper_t SCSIStatusBlock;
return MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSIStatusBlock); return MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSIStatusBlock);
} }
@ -348,9 +348,9 @@ uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)
if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
return ErrorCode; return ErrorCode;
Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber); Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber);
if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful)
return ErrorCode; return ErrorCode;

@ -149,7 +149,7 @@
void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3); void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
/** Sends a MASS STORAGE RESET control request to the attached device, resetting the Mass Storage Interface /** Sends a MASS STORAGE RESET control request to the attached device, resetting the Mass Storage Interface
* and readying it for the next Mass Storage command. This should be called after a failed SCSI request to * and readying it for the next Mass Storage command. This should be called after a failed SCSI request to
* ensure the attached Mass Storage device is ready to receive the next command. * ensure the attached Mass Storage device is ready to receive the next command.
* *
* \param[in,out] MSInterfaceInfo Pointer to a structure containing a MS Class host configuration and state. * \param[in,out] MSInterfaceInfo Pointer to a structure containing a MS Class host configuration and state.

@ -147,13 +147,13 @@ uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfa
{ {
continue; continue;
} }
if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size, if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size,
DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE))) DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE)))
{ {
return CDC_ENUMERROR_PipeConfigurationFailed; return CDC_ENUMERROR_PipeConfigurationFailed;
} }
if (InterruptPeriod) if (InterruptPeriod)
Pipe_SetInterruptPeriod(InterruptPeriod); Pipe_SetInterruptPeriod(InterruptPeriod);
} }
@ -241,7 +241,7 @@ static uint8_t RNDIS_SendEncapsulatedCommand(USB_ClassInfo_RNDIS_Host_t* const R
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
return USB_Host_SendControlRequest(Buffer); return USB_Host_SendControlRequest(Buffer);
} }
@ -259,7 +259,7 @@ static uint8_t RNDIS_GetEncapsulatedResponse(USB_ClassInfo_RNDIS_Host_t* const R
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
return USB_Host_SendControlRequest(Buffer); return USB_Host_SendControlRequest(Buffer);
} }

@ -133,13 +133,13 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
{ {
continue; continue;
} }
if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size, if (!(Pipe_ConfigurePipe(PipeNum, Type, Token, EndpointAddress, Size,
DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE))) DoubleBanked ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE)))
{ {
return SI_ENUMERROR_PipeConfigurationFailed; return SI_ENUMERROR_PipeConfigurationFailed;
} }
if (InterruptPeriod) if (InterruptPeriod)
Pipe_SetInterruptPeriod(InterruptPeriod); Pipe_SetInterruptPeriod(InterruptPeriod);
} }

@ -54,7 +54,7 @@
#include "../StdDescriptors.h" #include "../StdDescriptors.h"
#include "../USBInterrupt.h" #include "../USBInterrupt.h"
#include "../Endpoint.h" #include "../Endpoint.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -99,7 +99,7 @@
*/ */
#define USB_DEVICE_OPT_FULLSPEED (0 << 0) #define USB_DEVICE_OPT_FULLSPEED (0 << 0)
//@} //@}
#if (!defined(NO_INTERNAL_SERIAL) && \ #if (!defined(NO_INTERNAL_SERIAL) && \
(defined(USB_SERIES_7_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_4_AVR) || \ (defined(USB_SERIES_7_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_4_AVR) || \
(defined(USB_SERIES_2_AVR) && (!defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__))) || \ (defined(USB_SERIES_2_AVR) && (!defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__))) || \
@ -119,7 +119,7 @@
* model. * model.
*/ */
#define INTERNAL_SERIAL_LENGTH_BITS 80 #define INTERNAL_SERIAL_LENGTH_BITS 80
/** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller /** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller
* model. * model.
*/ */
@ -129,8 +129,8 @@
#define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_LENGTH_BITS 0
#define INTERNAL_SERIAL_START_ADDRESS 0 #define INTERNAL_SERIAL_START_ADDRESS 0
#endif #endif
/* Function Prototypes: */ /* Function Prototypes: */
/** Sends a Remote Wakeup request to the host. This signals to the host that the device should /** Sends a Remote Wakeup request to the host. This signals to the host that the device should
* be taken out of suspended mode, and communications should resume. * be taken out of suspended mode, and communications should resume.
@ -221,14 +221,14 @@
{ {
return (UDADDR & (1 << ADDEN)); return (UDADDR & (1 << ADDEN));
} }
#if (USE_INTERNAL_SERIAL != NO_DESCRIPTOR) #if (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1); static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1);
static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString)
{ {
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
uint8_t SigReadAddress = INTERNAL_SERIAL_START_ADDRESS; uint8_t SigReadAddress = INTERNAL_SERIAL_START_ADDRESS;
for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++) for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++)
@ -246,7 +246,7 @@
UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ? UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ?
(('A' - 10) + SerialByte) : ('0' + SerialByte)); (('A' - 10) + SerialByte) : ('0' + SerialByte));
} }
SetGlobalInterruptMask(CurrentGlobalInt); SetGlobalInterruptMask(CurrentGlobalInt);
} }
#endif #endif

@ -268,3 +268,4 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
#endif #endif
#endif #endif

@ -52,7 +52,7 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
UECFG1X = UECFG1XData; UECFG1X = UECFG1XData;
return Endpoint_IsConfigured(); return Endpoint_IsConfigured();
#else #else
for (uint8_t EPNum = Number; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++) for (uint8_t EPNum = Number; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++)
{ {
uint8_t UECFG0XTemp; uint8_t UECFG0XTemp;
@ -60,7 +60,7 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
uint8_t UEIENXTemp; uint8_t UEIENXTemp;
Endpoint_SelectEndpoint(EPNum); Endpoint_SelectEndpoint(EPNum);
if (EPNum == Number) if (EPNum == Number)
{ {
UECFG0XTemp = UECFG0XData; UECFG0XTemp = UECFG0XData;
@ -84,11 +84,11 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
UECFG0X = UECFG0XTemp; UECFG0X = UECFG0XTemp;
UECFG1X = UECFG1XTemp; UECFG1X = UECFG1XTemp;
UEIENX = UEIENXTemp; UEIENX = UEIENXTemp;
if (!(Endpoint_IsConfigured())) if (!(Endpoint_IsConfigured()))
return false; return false;
} }
Endpoint_SelectEndpoint(Number); Endpoint_SelectEndpoint(Number);
return true; return true;
#endif #endif
@ -155,7 +155,7 @@ uint8_t Endpoint_WaitUntilReady(void)
if (Endpoint_IsOUTReceived()) if (Endpoint_IsOUTReceived())
return ENDPOINT_READYWAIT_NoError; return ENDPOINT_READYWAIT_NoError;
} }
uint8_t USB_DeviceState_LCL = USB_DeviceState; uint8_t USB_DeviceState_LCL = USB_DeviceState;
if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)

@ -144,7 +144,7 @@
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** \name Endpoint Bank Mode Masks */ /** \name Endpoint Bank Mode Masks */
//@{ //@{
/** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates /** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates

@ -254,7 +254,7 @@ static void USB_Host_ResetDevice(void)
USB_Host_ResetBus(); USB_Host_ResetBus();
while (!(USB_Host_IsBusResetComplete())); while (!(USB_Host_IsBusResetComplete()));
USB_Host_ResumeBus(); USB_Host_ResumeBus();
USB_Host_ConfigurationNumber = 0; USB_Host_ConfigurationNumber = 0;
bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI); bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);

@ -56,7 +56,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
Pipe_SetInfiniteINRequests(); Pipe_SetInfiniteINRequests();
return Pipe_IsConfigured(); return Pipe_IsConfigured();
#else #else
for (uint8_t PNum = Number; PNum < PIPE_TOTAL_PIPES; PNum++) for (uint8_t PNum = Number; PNum < PIPE_TOTAL_PIPES; PNum++)
{ {
uint8_t UPCFG0XTemp; uint8_t UPCFG0XTemp;
@ -65,7 +65,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
uint8_t UPIENXTemp; uint8_t UPIENXTemp;
Pipe_SelectPipe(PNum); Pipe_SelectPipe(PNum);
if (PNum == Number) if (PNum == Number)
{ {
UPCFG0XTemp = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0)); UPCFG0XTemp = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0));
@ -83,7 +83,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
if (!(UPCFG1XTemp & (1 << ALLOC))) if (!(UPCFG1XTemp & (1 << ALLOC)))
continue; continue;
Pipe_DisablePipe(); Pipe_DisablePipe();
UPCFG1X &= ~(1 << ALLOC); UPCFG1X &= ~(1 << ALLOC);
@ -94,12 +94,12 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
UPIENX = UPIENXTemp; UPIENX = UPIENXTemp;
Pipe_SetInfiniteINRequests(); Pipe_SetInfiniteINRequests();
if (!(Pipe_IsConfigured())) if (!(Pipe_IsConfigured()))
return false; return false;
} }
Pipe_SelectPipe(Number); Pipe_SelectPipe(Number);
return true; return true;
#endif #endif
} }

@ -139,7 +139,7 @@
*/ */
#define PIPE_TOKEN_OUT (2 << PTOKEN0) #define PIPE_TOKEN_OUT (2 << PTOKEN0)
//@} //@}
/** \name Pipe Bank Mode Masks */ /** \name Pipe Bank Mode Masks */
//@{ //@{
/** Mask for the bank mode selection for the \ref Pipe_ConfigurePipe() macro. This indicates that the pipe /** Mask for the bank mode selection for the \ref Pipe_ConfigurePipe() macro. This indicates that the pipe
@ -425,7 +425,7 @@
PIPE_ERRORFLAG_DATATGL)) | PIPE_ERRORFLAG_DATATGL)) |
(UPSTAX & (PIPE_ERRORFLAG_OVERFLOW | PIPE_ERRORFLAG_UNDERFLOW))); (UPSTAX & (PIPE_ERRORFLAG_OVERFLOW | PIPE_ERRORFLAG_UNDERFLOW)));
} }
/** Retrieves the number of busy banks in the currently selected pipe, which have been queued for /** Retrieves the number of busy banks in the currently selected pipe, which have been queued for
* transmission via the \ref Pipe_ClearOUT() command, or are awaiting acknowledgement via the * transmission via the \ref Pipe_ClearOUT() command, or are awaiting acknowledgement via the
* \ref Pipe_ClearIN() command. * \ref Pipe_ClearIN() command.

@ -81,3 +81,4 @@ uint8_t TEMPLATE_FUNC_NAME (void* const Buffer,
#undef TEMPLATE_TRANSFER_BYTE #undef TEMPLATE_TRANSFER_BYTE
#endif #endif

@ -90,3 +90,4 @@ uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer,
#undef TEMPLATE_TRANSFER_BYTE #undef TEMPLATE_TRANSFER_BYTE
#endif #endif

@ -86,3 +86,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
#undef TEMPLATE_BUFFER_MOVE #undef TEMPLATE_BUFFER_MOVE
#endif #endif

@ -48,7 +48,7 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
Length -= *BytesProcessed; Length -= *BytesProcessed;
TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed); TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed);
} }
while (Length) while (Length)
{ {
if (!(Pipe_IsReadWriteAllowed())) if (!(Pipe_IsReadWriteAllowed()))
@ -85,3 +85,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
#undef TEMPLATE_BUFFER_MOVE #undef TEMPLATE_BUFFER_MOVE
#endif #endif

@ -162,7 +162,7 @@ void USB_ResetInterface(void)
{ {
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
USB_PLL_On(); USB_PLL_On();
while (!(USB_PLL_IsReady())); while (!(USB_PLL_IsReady()));
#endif #endif
} }
@ -191,7 +191,7 @@ static void USB_Init_Device(void)
#if !defined(FIXED_CONTROL_ENDPOINT_SIZE) #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
USB_Descriptor_Device_t* DeviceDescriptorPtr; USB_Descriptor_Device_t* DeviceDescriptorPtr;
#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \ #if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
!(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS)) !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
uint8_t DescriptorAddressSpace; uint8_t DescriptorAddressSpace;
@ -215,7 +215,7 @@ static void USB_Init_Device(void)
#else #else
USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size); USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
#endif #endif
} }
#endif #endif
#endif #endif
@ -255,7 +255,7 @@ static void USB_Init_Host(void)
USB_INT_Enable(USB_INT_SRPI); USB_INT_Enable(USB_INT_SRPI);
USB_INT_Enable(USB_INT_BCERRI); USB_INT_Enable(USB_INT_BCERRI);
USB_Attach(); USB_Attach();
} }
#endif #endif

@ -136,7 +136,7 @@
OTGIEN |= (1 << VBERRE); OTGIEN |= (1 << VBERRE);
break; break;
case USB_INT_SRPI: case USB_INT_SRPI:
OTGIEN |= (1 << SRPE); OTGIEN |= (1 << SRPE);
break; break;
#endif #endif
} }
@ -194,12 +194,12 @@
OTGIEN &= ~(1 << VBERRE); OTGIEN &= ~(1 << VBERRE);
break; break;
case USB_INT_SRPI: case USB_INT_SRPI:
OTGIEN &= ~(1 << SRPE); OTGIEN &= ~(1 << SRPE);
break; break;
#endif #endif
} }
} }
static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE; static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
static inline void USB_INT_Clear(const uint8_t Interrupt) static inline void USB_INT_Clear(const uint8_t Interrupt)
{ {
@ -257,7 +257,7 @@
#endif #endif
} }
} }
static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) static inline bool USB_INT_IsEnabled(const uint8_t Interrupt)
{ {
@ -300,10 +300,10 @@
return (OTGIEN & (1 << SRPE)); return (OTGIEN & (1 << SRPE));
#endif #endif
} }
return false; return false;
} }
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
{ {

@ -52,7 +52,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
#include "HostStandardReq.h" #include "HostStandardReq.h"
#include "StdDescriptors.h" #include "StdDescriptors.h"
@ -266,7 +266,7 @@
void** CurrConfigLoc) void** CurrConfigLoc)
{ {
uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size; uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size;
if (*BytesRem < CurrDescriptorSize) if (*BytesRem < CurrDescriptorSize)
CurrDescriptorSize = *BytesRem; CurrDescriptorSize = *BytesRem;

@ -51,7 +51,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
#include "StdDescriptors.h" #include "StdDescriptors.h"
#include "USBInterrupt.h" #include "USBInterrupt.h"
#include "Endpoint.h" #include "Endpoint.h"
@ -145,7 +145,7 @@
#elif (ARCH == ARCH_UC3) #elif (ARCH == ARCH_UC3)
#include "UC3/Device_UC3.h" #include "UC3/Device_UC3.h"
#elif (ARCH == ARCH_XMEGA) #elif (ARCH == ARCH_XMEGA)
#include "XMEGA/Device_XMEGA.h" #include "XMEGA/Device_XMEGA.h"
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

@ -124,7 +124,7 @@ static void USB_Device_SetAddress(void)
uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F); uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();
Endpoint_ClearStatusStage(); Endpoint_ClearStatusStage();
@ -133,7 +133,7 @@ static void USB_Device_SetAddress(void)
USB_Device_SetDeviceAddress(DeviceAddress); USB_Device_SetDeviceAddress(DeviceAddress);
USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default; USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
SetGlobalInterruptMask(CurrentGlobalInt); SetGlobalInterruptMask(CurrentGlobalInt);
} }
@ -156,7 +156,7 @@ static void USB_Device_SetConfiguration(void)
uint8_t MemoryAddressSpace; uint8_t MemoryAddressSpace;
#endif #endif
#endif #endif
if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr
#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \ #if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
!(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS)) !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
@ -185,7 +185,7 @@ static void USB_Device_SetConfiguration(void)
} }
#else #else
if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations) if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)
return; return;
#endif #endif
#endif #endif
@ -224,7 +224,7 @@ static void USB_Device_GetInternalSerialDescriptor(void)
SignatureDescriptor.Header.Type = DTYPE_String; SignatureDescriptor.Header.Type = DTYPE_String;
SignatureDescriptor.Header.Size = USB_STRING_LEN(INTERNAL_SERIAL_LENGTH_BITS / 4); SignatureDescriptor.Header.Size = USB_STRING_LEN(INTERNAL_SERIAL_LENGTH_BITS / 4);
USB_Device_GetSerialString(SignatureDescriptor.UnicodeString); USB_Device_GetSerialString(SignatureDescriptor.UnicodeString);
Endpoint_ClearSETUP(); Endpoint_ClearSETUP();

@ -43,7 +43,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
#include "StdDescriptors.h" #include "StdDescriptors.h"
#include "Events.h" #include "Events.h"
#include "StdRequestType.h" #include "StdRequestType.h"

@ -74,7 +74,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org www.lufa-lib.org
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -36,7 +36,7 @@
* dispatch header located in LUFA/Drivers/USB/USB.h. * dispatch header located in LUFA/Drivers/USB/USB.h.
*/ */
/** \ingroup Group_EndpointRW /** \ingroup Group_EndpointRW
* \defgroup Group_EndpointStreamRW Read/Write of Multi-Byte Streams * \defgroup Group_EndpointStreamRW Read/Write of Multi-Byte Streams
* \brief Endpoint data stream transmission and reception management. * \brief Endpoint data stream transmission and reception management.
* *
@ -44,7 +44,7 @@
* and to endpoints. * and to endpoints.
* *
* @{ * @{
*/ */
#ifndef __ENDPOINT_STREAM_H__ #ifndef __ENDPOINT_STREAM_H__
#define __ENDPOINT_STREAM_H__ #define __ENDPOINT_STREAM_H__
@ -89,7 +89,7 @@
* again to process the next chunk of data in the transfer. * again to process the next chunk of data in the transfer.
*/ */
}; };
/** Enum for the possible error return codes of the \c Endpoint_*_Control_Stream_* functions. */ /** Enum for the possible error return codes of the \c Endpoint_*_Control_Stream_* functions. */
enum Endpoint_ControlStream_RW_ErrorCodes_t enum Endpoint_ControlStream_RW_ErrorCodes_t
{ {
@ -110,7 +110,7 @@
#elif (ARCH == ARCH_UC3) #elif (ARCH == ARCH_UC3)
#include "UC3/EndpointStream_UC3.h" #include "UC3/EndpointStream_UC3.h"
#elif (ARCH == ARCH_XMEGA) #elif (ARCH == ARCH_XMEGA)
#include "XMEGA/EndpointStream_XMEGA.h" #include "XMEGA/EndpointStream_XMEGA.h"
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

@ -217,7 +217,7 @@
void EVENT_USB_Device_Disconnect(void); void EVENT_USB_Device_Disconnect(void);
/** Event for control requests. This event fires when a the USB host issues a control request /** Event for control requests. This event fires when a the USB host issues a control request
* to the mandatory device control endpoint (of address 0). This may either be a standard * to the mandatory device control endpoint (of address 0). This may either be a standard
* request that the library may have a handler code for internally, or a class specific request * request that the library may have a handler code for internally, or a class specific request
* issued to the device which must be handled appropriately. If a request is not processed in the * issued to the device which must be handled appropriately. If a request is not processed in the
* user application via this event, it will be passed to the library for processing internally * user application via this event, it will be passed to the library for processing internally

@ -51,7 +51,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
@ -108,16 +108,16 @@
* bus address is being set. * bus address is being set.
*/ */
HOST_STATE_Default_PostAddressSet = 9, /**< This state indicates that the device's address has now been set, and the HOST_STATE_Default_PostAddressSet = 9, /**< This state indicates that the device's address has now been set, and the
* stack is has now completed the device enumeration process. This state causes * stack is has now completed the device enumeration process. This state causes
* the stack to change the current USB device address to that set for the * the stack to change the current USB device address to that set for the
* connected device, before progressing to the \ref HOST_STATE_Addressed state * connected device, before progressing to the \ref HOST_STATE_Addressed state
* ready for use in the user application. * ready for use in the user application.
*/ */
HOST_STATE_Addressed = 10, /**< Indicates that the device has been enumerated and addressed, and is now waiting HOST_STATE_Addressed = 10, /**< Indicates that the device has been enumerated and addressed, and is now waiting
* for the user application to configure the device ready for use. * for the user application to configure the device ready for use.
*/ */
HOST_STATE_Configured = 11, /**< Indicates that the device has been configured into a valid device configuration, HOST_STATE_Configured = 11, /**< Indicates that the device has been configured into a valid device configuration,
* ready for general use by the user application. * ready for general use by the user application.
*/ */
}; };

@ -65,9 +65,9 @@ uint8_t USB_Host_SendControlRequest(void* const BufferPtr)
uint8_t* HeaderStream = (uint8_t*)&USB_ControlRequest; uint8_t* HeaderStream = (uint8_t*)&USB_ControlRequest;
for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Request_Header_t); HeaderByte++) for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Request_Header_t); HeaderByte++)
Pipe_Write_8(*(HeaderStream++)); Pipe_Write_8(*(HeaderStream++));
#endif #endif
Pipe_ClearSETUP(); Pipe_ClearSETUP();
if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful) if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful)
@ -201,7 +201,7 @@ uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber)
}; };
Pipe_SelectPipe(PIPE_CONTROLPIPE); Pipe_SelectPipe(PIPE_CONTROLPIPE);
if ((ErrorCode = USB_Host_SendControlRequest(NULL)) == HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SendControlRequest(NULL)) == HOST_SENDCONTROL_Successful)
{ {
USB_Host_ConfigurationNumber = ConfigNumber; USB_Host_ConfigurationNumber = ConfigNumber;

@ -69,7 +69,7 @@
*/ */
#define USB_HOST_TIMEOUT_MS 1000 #define USB_HOST_TIMEOUT_MS 1000
#endif #endif
/* Enums: */ /* Enums: */
/** Enum for the \ref USB_Host_SendControlRequest() return code, indicating the reason for the error /** Enum for the \ref USB_Host_SendControlRequest() return code, indicating the reason for the error
* if the transfer of the request is unsuccessful. * if the transfer of the request is unsuccessful.
@ -101,7 +101,7 @@
* \ingroup Group_Host * \ingroup Group_Host
*/ */
extern uint8_t USB_Host_ConfigurationNumber; extern uint8_t USB_Host_ConfigurationNumber;
/* Function Prototypes: */ /* Function Prototypes: */
/** Sends the request stored in the \ref USB_ControlRequest global structure to the attached device, /** Sends the request stored in the \ref USB_ControlRequest global structure to the attached device,
* and transfers the data stored in the buffer to the device, or from the device to the buffer * and transfers the data stored in the buffer to the device, or from the device to the buffer
@ -130,7 +130,7 @@
* \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result. * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
*/ */
uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber); uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber);
/** Sends a GET CONFIGURATION standard request to the attached device, to retrieve the currently selected /** Sends a GET CONFIGURATION standard request to the attached device, to retrieve the currently selected
* device configuration index. * device configuration index.
* *
@ -239,7 +239,7 @@
{ {
return USB_Host_GetDescriptor(DTYPE_Device, 0, DeviceDescriptorPtr, sizeof(USB_Descriptor_Device_t)); return USB_Host_GetDescriptor(DTYPE_Device, 0, DeviceDescriptorPtr, sizeof(USB_Descriptor_Device_t));
} }
/** Sends a GET DESCRIPTOR standard request to the attached device, requesting the string descriptor /** Sends a GET DESCRIPTOR standard request to the attached device, requesting the string descriptor
* of the specified index. This can be used to easily retrieve string descriptors from the device by * of the specified index. This can be used to easily retrieve string descriptors from the device by
* index, after the index is obtained from the Device or Configuration descriptors. This is a convenience * index, after the index is obtained from the Device or Configuration descriptors. This is a convenience

@ -52,8 +52,8 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org www.lufa-lib.org
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -27,7 +27,7 @@
arising out of or in connection with the use or performance of arising out of or in connection with the use or performance of
this software. this software.
*/ */
/** \file /** \file
* \brief Pipe data stream transmission and reception management. * \brief Pipe data stream transmission and reception management.
* \copydetails Group_PipeStreamRW * \copydetails Group_PipeStreamRW
@ -36,7 +36,7 @@
* dispatch header located in LUFA/Drivers/USB/USB.h. * dispatch header located in LUFA/Drivers/USB/USB.h.
*/ */
/** \ingroup Group_PipeRW /** \ingroup Group_PipeRW
* \defgroup Group_PipeStreamRW Read/Write of Multi-Byte Streams * \defgroup Group_PipeStreamRW Read/Write of Multi-Byte Streams
* \brief Pipe data stream transmission and reception management. * \brief Pipe data stream transmission and reception management.
* *
@ -52,7 +52,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -62,17 +62,17 @@
#if !defined(__INCLUDE_FROM_USB_DRIVER) #if !defined(__INCLUDE_FROM_USB_DRIVER)
#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead. #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Enums: */ /* Enums: */
/** Enum for the possible error return codes of the Pipe_*_Stream_* functions. */ /** Enum for the possible error return codes of the Pipe_*_Stream_* functions. */
enum Pipe_Stream_RW_ErrorCodes_t enum Pipe_Stream_RW_ErrorCodes_t
{ {
PIPE_RWSTREAM_NoError = 0, /**< Command completed successfully, no error. */ PIPE_RWSTREAM_NoError = 0, /**< Command completed successfully, no error. */
PIPE_RWSTREAM_PipeStalled = 1, /**< The device stalled the pipe during the transfer. */ PIPE_RWSTREAM_PipeStalled = 1, /**< The device stalled the pipe during the transfer. */
PIPE_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during PIPE_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during
* the transfer. * the transfer.
*/ */
PIPE_RWSTREAM_Timeout = 3, /**< The device failed to accept or send the next packet PIPE_RWSTREAM_Timeout = 3, /**< The device failed to accept or send the next packet
* within the software timeout period set by the * within the software timeout period set by the
* \ref USB_STREAM_TIMEOUT_MS macro. * \ref USB_STREAM_TIMEOUT_MS macro.
@ -93,7 +93,7 @@
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif
#endif #endif
/** @} */ /** @} */

@ -123,7 +123,7 @@
*/ */
#define USB_CONFIG_ATTR_REMOTEWAKEUP 0x20 #define USB_CONFIG_ATTR_REMOTEWAKEUP 0x20
//@} //@}
/** \name Endpoint Descriptor Attribute Masks */ /** \name Endpoint Descriptor Attribute Masks */
//@{ //@{
/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's /** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
@ -154,7 +154,7 @@
*/ */
#define ENDPOINT_ATTR_SYNC (3 << 2) #define ENDPOINT_ATTR_SYNC (3 << 2)
//@} //@}
/** \name Endpoint Descriptor Usage Masks */ /** \name Endpoint Descriptor Usage Masks */
//@{ //@{
/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's /** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
@ -178,7 +178,7 @@
*/ */
#define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (2 << 4) #define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (2 << 4)
//@} //@}
/* Enums: */ /* Enums: */
/** Enum for the possible standard descriptor types, as given in each descriptor's header. */ /** Enum for the possible standard descriptor types, as given in each descriptor's header. */
enum USB_DescriptorTypes_t enum USB_DescriptorTypes_t

@ -51,7 +51,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
@ -219,7 +219,7 @@
* via the \ref EVENT_USB_Device_ControlRequest() event when received in * via the \ref EVENT_USB_Device_ControlRequest() event when received in
* device mode. */ * device mode. */
}; };
/** Feature Selector values for Set Feature and Clear Feature standard control requests directed to the device, interface /** Feature Selector values for Set Feature and Clear Feature standard control requests directed to the device, interface
* and endpoint recipients. * and endpoint recipients.
*/ */

@ -54,7 +54,7 @@
#include "../StdDescriptors.h" #include "../StdDescriptors.h"
#include "../USBInterrupt.h" #include "../USBInterrupt.h"
#include "../Endpoint.h" #include "../Endpoint.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -81,15 +81,15 @@
* USB interface should be initialized in full speed (12Mb/s) mode. * USB interface should be initialized in full speed (12Mb/s) mode.
*/ */
#define USB_DEVICE_OPT_FULLSPEED (0 << 0) #define USB_DEVICE_OPT_FULLSPEED (0 << 0)
#if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || defined(__DOXYGEN__) #if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || defined(__DOXYGEN__)
/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the /** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
* USB interface should be initialized in high speed (480Mb/s) mode. * USB interface should be initialized in high speed (480Mb/s) mode.
*/ */
#define USB_DEVICE_OPT_HIGHSPEED (1 << 1) #define USB_DEVICE_OPT_HIGHSPEED (1 << 1)
#endif #endif
//@} //@}
#if (!defined(NO_INTERNAL_SERIAL) && \ #if (!defined(NO_INTERNAL_SERIAL) && \
(defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || \ (defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || \
defined(__DOXYGEN__))) defined(__DOXYGEN__)))
@ -103,7 +103,7 @@
* number for the device. * number for the device.
*/ */
#define USE_INTERNAL_SERIAL 0xDC #define USE_INTERNAL_SERIAL 0xDC
/** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller /** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller
* model. * model.
*/ */
@ -119,7 +119,7 @@
#define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_LENGTH_BITS 0
#define INTERNAL_SERIAL_START_ADDRESS 0 #define INTERNAL_SERIAL_START_ADDRESS 0
#endif #endif
/* Function Prototypes: */ /* Function Prototypes: */
/** Sends a Remote Wakeup request to the host. This signals to the host that the device should /** Sends a Remote Wakeup request to the host. This signals to the host that the device should
* be taken out of suspended mode, and communications should resume. * be taken out of suspended mode, and communications should resume.
@ -225,7 +225,7 @@
{ {
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
uint8_t* SigReadAddress = (uint8_t*)INTERNAL_SERIAL_START_ADDRESS; uint8_t* SigReadAddress = (uint8_t*)INTERNAL_SERIAL_START_ADDRESS;
for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++) for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++)
@ -243,7 +243,7 @@
UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ? UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ?
(('A' - 10) + SerialByte) : ('0' + SerialByte)); (('A' - 10) + SerialByte) : ('0' + SerialByte));
} }
SetGlobalInterruptMask(CurrentGlobalInt); SetGlobalInterruptMask(CurrentGlobalInt);
} }
#endif #endif

@ -228,3 +228,4 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
#include "Template/Template_Endpoint_Control_R.c" #include "Template/Template_Endpoint_Control_R.c"
#endif #endif

@ -61,7 +61,7 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
uint32_t UECFG0Temp; uint32_t UECFG0Temp;
Endpoint_SelectEndpoint(EPNum); Endpoint_SelectEndpoint(EPNum);
if (EPNum == Number) if (EPNum == Number)
{ {
UECFG0Temp = UECFG0Data; UECFG0Temp = UECFG0Data;
@ -79,11 +79,11 @@ bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
Endpoint_EnableEndpoint(); Endpoint_EnableEndpoint();
(&AVR32_USBB.uecfg0)[EPNum] = UECFG0Temp; (&AVR32_USBB.uecfg0)[EPNum] = UECFG0Temp;
if (!(Endpoint_IsConfigured())) if (!(Endpoint_IsConfigured()))
return false; return false;
} }
Endpoint_SelectEndpoint(Number); Endpoint_SelectEndpoint(Number);
return true; return true;
#endif #endif
@ -148,7 +148,7 @@ uint8_t Endpoint_WaitUntilReady(void)
if (Endpoint_IsOUTReceived()) if (Endpoint_IsOUTReceived())
return ENDPOINT_READYWAIT_NoError; return ENDPOINT_READYWAIT_NoError;
} }
uint8_t USB_DeviceState_LCL = USB_DeviceState; uint8_t USB_DeviceState_LCL = USB_DeviceState;
if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)

@ -119,7 +119,7 @@
#define ENDPOINT_DETAILS_EP5 512, 3 #define ENDPOINT_DETAILS_EP5 512, 3
#define ENDPOINT_DETAILS_EP6 512, 3 #define ENDPOINT_DETAILS_EP6 512, 3
#define ENDPOINT_DETAILS_EP7 512, 3 #define ENDPOINT_DETAILS_EP7 512, 3
#elif defined(USB_SERIES_UC3B0_AVR32) || defined(USB_SERIES_UC3B1_AVR32) #elif defined(USB_SERIES_UC3B0_AVR32) || defined(USB_SERIES_UC3B1_AVR32)
#define ENDPOINT_DETAILS_MAXEP 7 #define ENDPOINT_DETAILS_MAXEP 7
#define ENDPOINT_DETAILS_EP0 64, 1 #define ENDPOINT_DETAILS_EP0 64, 1
@ -154,14 +154,14 @@
void Endpoint_ClearEndpoints(void); void Endpoint_ClearEndpoints(void);
bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
const uint32_t UECFGXData); const uint32_t UECFGXData);
/* External Variables: */ /* External Variables: */
extern volatile uint32_t USB_Endpoint_SelectedEndpoint; extern volatile uint32_t USB_Endpoint_SelectedEndpoint;
extern volatile uint8_t* USB_Endpoint_FIFOPos[]; extern volatile uint8_t* USB_Endpoint_FIFOPos[];
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** \name Endpoint Bank Mode Masks */ /** \name Endpoint Bank Mode Masks */
//@{ //@{
/** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates /** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates
@ -302,7 +302,7 @@
const uint8_t Banks) const uint8_t Banks)
{ {
return Endpoint_ConfigureEndpoint_Prv(Number, (AVR32_USBB_ALLOC_MASK | return Endpoint_ConfigureEndpoint_Prv(Number, (AVR32_USBB_ALLOC_MASK |
((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) | ((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) |
((uint32_t)(Direction ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) | ((uint32_t)(Direction ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) |
((uint32_t)Banks << AVR32_USBB_EPBK_OFFSET) | ((uint32_t)Banks << AVR32_USBB_EPBK_OFFSET) |
Endpoint_BytesToEPSizeMask(Size)))); Endpoint_BytesToEPSizeMask(Size))));
@ -422,7 +422,7 @@
while ((&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].killbk); while ((&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].killbk);
} }
} }
/** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint /** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint
* bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an IN * bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an IN
* direction). This function will return false if an error has occurred in the endpoint, if the endpoint * direction). This function will return false if an error has occurred in the endpoint, if the endpoint

@ -254,7 +254,7 @@ static void USB_Host_ResetDevice(void)
USB_Host_ResetBus(); USB_Host_ResetBus();
while (!(USB_Host_IsBusResetComplete())); while (!(USB_Host_IsBusResetComplete()));
USB_Host_ResumeBus(); USB_Host_ResumeBus();
USB_Host_ConfigurationNumber = 0; USB_Host_ConfigurationNumber = 0;
bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI); bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);

@ -69,7 +69,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
uint32_t UPCFG0Temp; uint32_t UPCFG0Temp;
Pipe_SelectPipe(PNum); Pipe_SelectPipe(PNum);
if (PNum == Number) if (PNum == Number)
{ {
UPCFG0Temp = (AVR32_USBB_ALLOC_MASK | UPCFG0Temp = (AVR32_USBB_ALLOC_MASK |
@ -85,7 +85,7 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
if (!(UPCFG0Temp & AVR32_USBB_ALLOC_MASK)) if (!(UPCFG0Temp & AVR32_USBB_ALLOC_MASK))
continue; continue;
Pipe_DisablePipe(); Pipe_DisablePipe();
(&AVR32_USBB.upcfg0)[PNum] &= ~AVR32_USBB_ALLOC_MASK; (&AVR32_USBB.upcfg0)[PNum] &= ~AVR32_USBB_ALLOC_MASK;
@ -93,12 +93,12 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
(&AVR32_USBB.upcfg0)[PNum] = UPCFG0Temp; (&AVR32_USBB.upcfg0)[PNum] = UPCFG0Temp;
Pipe_SetInfiniteINRequests(); Pipe_SetInfiniteINRequests();
if (!(Pipe_IsConfigured())) if (!(Pipe_IsConfigured()))
return false; return false;
} }
Pipe_SelectPipe(Number); Pipe_SelectPipe(Number);
return true; return true;
#endif #endif
} }

@ -100,7 +100,7 @@
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Macros: */ /* Macros: */
#define PIPE_HSB_ADDRESS_SPACE_SIZE (64 * 1024UL) #define PIPE_HSB_ADDRESS_SPACE_SIZE (64 * 1024UL)
/* External Variables: */ /* External Variables: */
extern volatile uint32_t USB_Pipe_SelectedPipe; extern volatile uint32_t USB_Pipe_SelectedPipe;
extern volatile uint8_t* USB_Pipe_FIFOPos[]; extern volatile uint8_t* USB_Pipe_FIFOPos[];
@ -146,7 +146,7 @@
*/ */
#define PIPE_TOKEN_OUT AVR32_USBB_UPCFG0_PTOKEN_OUT #define PIPE_TOKEN_OUT AVR32_USBB_UPCFG0_PTOKEN_OUT
//@} //@}
/** \name Pipe Bank Mode Masks */ /** \name Pipe Bank Mode Masks */
//@{ //@{
/** Mask for the bank mode selection for the \ref Pipe_ConfigurePipe() macro. This indicates that the pipe /** Mask for the bank mode selection for the \ref Pipe_ConfigurePipe() macro. This indicates that the pipe
@ -185,7 +185,7 @@
*/ */
#define PIPE_TOTAL_PIPES 8 #define PIPE_TOTAL_PIPES 8
#else #else
#define PIPE_TOTAL_PIPES 7 #define PIPE_TOTAL_PIPES 7
#endif #endif
/** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR /** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR
@ -446,7 +446,7 @@
static inline uint8_t Pipe_GetErrorFlags(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; static inline uint8_t Pipe_GetErrorFlags(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
static inline uint8_t Pipe_GetErrorFlags(void) static inline uint8_t Pipe_GetErrorFlags(void)
{ {
return (((&AVR32_USBB.uperr0)[USB_Pipe_SelectedPipe] & return (((&AVR32_USBB.uperr0)[USB_Pipe_SelectedPipe] &
(PIPE_ERRORFLAG_CRC16 | PIPE_ERRORFLAG_TIMEOUT | (PIPE_ERRORFLAG_CRC16 | PIPE_ERRORFLAG_TIMEOUT |
PIPE_ERRORFLAG_PID | PIPE_ERRORFLAG_DATAPID | PIPE_ERRORFLAG_PID | PIPE_ERRORFLAG_DATAPID |
@ -454,7 +454,7 @@
(((&AVR32_USBB.upsta0)[USB_Pipe_SelectedPipe] << 8) & (((&AVR32_USBB.upsta0)[USB_Pipe_SelectedPipe] << 8) &
PIPE_ERRORFLAG_OVERFLOW)); PIPE_ERRORFLAG_OVERFLOW));
} }
/** Retrieves the number of busy banks in the currently selected pipe, which have been queued for /** Retrieves the number of busy banks in the currently selected pipe, which have been queued for
* transmission via the \ref Pipe_ClearOUT() command, or are awaiting acknowledgement via the * transmission via the \ref Pipe_ClearOUT() command, or are awaiting acknowledgement via the
* \ref Pipe_ClearIN() command. * \ref Pipe_ClearIN() command.
@ -902,7 +902,7 @@
#if !defined(ENDPOINT_CONTROLEP) #if !defined(ENDPOINT_CONTROLEP)
#define ENDPOINT_CONTROLEP 0 #define ENDPOINT_CONTROLEP 0
#endif #endif
/* Inline Functions: */ /* Inline Functions: */
static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST ATTR_ALWAYS_INLINE; static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST ATTR_ALWAYS_INLINE;
static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes) static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes)

@ -81,3 +81,4 @@ uint8_t TEMPLATE_FUNC_NAME (void* const Buffer,
#undef TEMPLATE_TRANSFER_BYTE #undef TEMPLATE_TRANSFER_BYTE
#endif #endif

@ -90,3 +90,4 @@ uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer,
#undef TEMPLATE_TRANSFER_BYTE #undef TEMPLATE_TRANSFER_BYTE
#endif #endif

@ -86,3 +86,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
#undef TEMPLATE_BUFFER_MOVE #undef TEMPLATE_BUFFER_MOVE
#endif #endif

@ -48,7 +48,7 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
Length -= *BytesProcessed; Length -= *BytesProcessed;
TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed); TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed);
} }
while (Length) while (Length)
{ {
if (!(Pipe_IsReadWriteAllowed())) if (!(Pipe_IsReadWriteAllowed()))
@ -85,3 +85,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
#undef TEMPLATE_BUFFER_MOVE #undef TEMPLATE_BUFFER_MOVE
#endif #endif

@ -59,7 +59,7 @@ void USB_Init(
#if !defined(USE_STATIC_OPTIONS) #if !defined(USE_STATIC_OPTIONS)
USB_Options = Options; USB_Options = Options;
#endif #endif
#if defined(USB_CAN_BE_BOTH) #if defined(USB_CAN_BE_BOTH)
if (Mode == USB_MODE_UID) if (Mode == USB_MODE_UID)
{ {
@ -73,7 +73,7 @@ void USB_Init(
USB_CurrentMode = Mode; USB_CurrentMode = Mode;
} }
#else #else
AVR32_USBB.USBCON.uide = false; AVR32_USBB.USBCON.uide = false;
#endif #endif
USB_IsInitialized = true; USB_IsInitialized = true;
@ -172,13 +172,13 @@ static void USB_Init_Device(void)
else else
{ {
#if defined(USB_DEVICE_OPT_HIGHSPEED) #if defined(USB_DEVICE_OPT_HIGHSPEED)
if (USB_Options & USB_DEVICE_OPT_HIGHSPEED) if (USB_Options & USB_DEVICE_OPT_HIGHSPEED)
USB_Device_SetHighSpeed(); USB_Device_SetHighSpeed();
else else
USB_Device_SetFullSpeed(); USB_Device_SetFullSpeed();
#else #else
USB_Device_SetFullSpeed(); USB_Device_SetFullSpeed();
#endif #endif
} }
USB_INT_Enable(USB_INT_VBUSTI); USB_INT_Enable(USB_INT_VBUSTI);

@ -270,13 +270,13 @@
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Macros: */ /* Macros: */
#if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) #if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32)
#define USB_CLOCK_REQUIRED_FREQ 12000000UL #define USB_CLOCK_REQUIRED_FREQ 12000000UL
#else #else
#define USB_CLOCK_REQUIRED_FREQ 48000000UL #define USB_CLOCK_REQUIRED_FREQ 48000000UL
#endif #endif
/* Function Prototypes: */ /* Function Prototypes: */
#if defined(__INCLUDE_FROM_USB_CONTROLLER_C) #if defined(__INCLUDE_FROM_USB_CONTROLLER_C)
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)

@ -58,7 +58,7 @@
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* External Variables: */ /* External Variables: */
extern volatile uint32_t USB_Endpoint_SelectedEndpoint; extern volatile uint32_t USB_Endpoint_SelectedEndpoint;
/* Enums: */ /* Enums: */
enum USB_Interrupts_t enum USB_Interrupts_t
{ {
@ -73,7 +73,7 @@
USB_INT_SOFI = 5, USB_INT_SOFI = 5,
USB_INT_RXSTPI = 6, USB_INT_RXSTPI = 6,
#endif #endif
#if (defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)) #if (defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__))
USB_INT_HSOFI = 7, USB_INT_HSOFI = 7,
USB_INT_DCONNI = 8, USB_INT_DCONNI = 8,
USB_INT_DDISCI = 9, USB_INT_DDISCI = 9,
@ -82,11 +82,11 @@
USB_INT_VBERRI = 12, USB_INT_VBERRI = 12,
#endif #endif
}; };
/* Inline Functions: */ /* Inline Functions: */
static inline void USB_INT_Enable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE; static inline void USB_INT_Enable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
static inline void USB_INT_Enable(const uint8_t Interrupt) static inline void USB_INT_Enable(const uint8_t Interrupt)
{ {
switch (Interrupt) switch (Interrupt)
{ {
case USB_INT_VBUSTI: case USB_INT_VBUSTI:
@ -189,7 +189,7 @@
#endif #endif
} }
} }
static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE; static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
static inline void USB_INT_Clear(const uint8_t Interrupt) static inline void USB_INT_Clear(const uint8_t Interrupt)
{ {
@ -254,7 +254,7 @@
#endif #endif
} }
} }
static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) static inline bool USB_INT_IsEnabled(const uint8_t Interrupt)
{ {
@ -278,7 +278,7 @@
case USB_INT_RXSTPI: case USB_INT_RXSTPI:
return (&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].rxstpe; return (&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].rxstpe;
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
case USB_INT_HSOFI: case USB_INT_HSOFI:
return AVR32_USBB.UHINTE.hsofie; return AVR32_USBB.UHINTE.hsofie;
case USB_INT_DCONNI: case USB_INT_DCONNI:
@ -293,10 +293,10 @@
return AVR32_USBB.USBCON.vberre; return AVR32_USBB.USBCON.vberre;
#endif #endif
} }
return false; return false;
} }
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
{ {
@ -360,7 +360,7 @@
#else #else
ISR(USB_GEN_vect); ISR(USB_GEN_vect);
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
} }

@ -50,7 +50,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
@ -119,7 +119,7 @@
#elif (ARCH == ARCH_UC3) #elif (ARCH == ARCH_UC3)
#include "UC3/USBController_UC3.h" #include "UC3/USBController_UC3.h"
#elif (ARCH == ARCH_XMEGA) #elif (ARCH == ARCH_XMEGA)
#include "XMEGA/USBController_XMEGA.h" #include "XMEGA/USBController_XMEGA.h"
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

@ -43,7 +43,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
@ -61,7 +61,7 @@
#elif (ARCH == ARCH_UC3) #elif (ARCH == ARCH_UC3)
#include "UC3/USBInterrupt_UC3.h" #include "UC3/USBInterrupt_UC3.h"
#elif (ARCH == ARCH_XMEGA) #elif (ARCH == ARCH_XMEGA)
#include "XMEGA/USBInterrupt_XMEGA.h" #include "XMEGA/USBInterrupt_XMEGA.h"
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

@ -91,7 +91,7 @@
* (i.e. AT32UC3A0*) when defined. * (i.e. AT32UC3A0*) when defined.
*/ */
#define USB_SERIES_UC3A0_AVR #define USB_SERIES_UC3A0_AVR
/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A1 Series USB controller /** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A1 Series USB controller
* (i.e. AT32UC3A1*) when defined. * (i.e. AT32UC3A1*) when defined.
*/ */
@ -111,7 +111,7 @@
* (i.e. AT32UC3B1*) when defined. * (i.e. AT32UC3B1*) when defined.
*/ */
#define USB_SERIES_UC3B1_AVR #define USB_SERIES_UC3B1_AVR
/** Indicates that the target AVR microcontroller belongs to the XMEGA A1U Series USB controller /** Indicates that the target AVR microcontroller belongs to the XMEGA A1U Series USB controller
* (i.e. ATXMEGA*A1U) when defined. * (i.e. ATXMEGA*A1U) when defined.
*/ */
@ -219,7 +219,7 @@
#define USB_SERIES_B3_XMEGA #define USB_SERIES_B3_XMEGA
#define USB_CAN_BE_DEVICE #define USB_CAN_BE_DEVICE
#endif #endif
#if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST)) #if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
#define USB_CAN_BE_BOTH #define USB_CAN_BE_BOTH
#endif #endif
@ -241,7 +241,7 @@
#undef USB_CAN_BE_BOTH #undef USB_CAN_BE_BOTH
#endif #endif
#endif #endif
#if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY)) #if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
#error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive. #error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
#endif #endif
@ -259,3 +259,4 @@
#endif #endif
/** @} */ /** @} */

@ -43,7 +43,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
#include "USBController.h" #include "USBController.h"
#include "Events.h" #include "Events.h"
#include "StdRequestType.h" #include "StdRequestType.h"
@ -81,7 +81,7 @@
extern volatile bool USB_IsInitialized; extern volatile bool USB_IsInitialized;
/** Structure containing the last received Control request when in Device mode (for use in user-applications /** Structure containing the last received Control request when in Device mode (for use in user-applications
* inside of the \ref EVENT_USB_Device_ControlRequest() event, or for filling up with a control request to * inside of the \ref EVENT_USB_Device_ControlRequest() event, or for filling up with a control request to
* issue when in Host mode before calling \ref USB_Host_SendControlRequest(). * issue when in Host mode before calling \ref USB_Host_SendControlRequest().
* *
* \note The contents of this structure is automatically endian-corrected for the current CPU architecture. * \note The contents of this structure is automatically endian-corrected for the current CPU architecture.

@ -54,7 +54,7 @@
#include "../StdDescriptors.h" #include "../StdDescriptors.h"
#include "../USBInterrupt.h" #include "../USBInterrupt.h"
#include "../Endpoint.h" #include "../Endpoint.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
@ -97,7 +97,7 @@
*/ */
#define USB_DEVICE_OPT_FULLSPEED (0 << 0) #define USB_DEVICE_OPT_FULLSPEED (0 << 0)
//@} //@}
#if (!defined(NO_INTERNAL_SERIAL) || defined(__DOXYGEN__)) #if (!defined(NO_INTERNAL_SERIAL) || defined(__DOXYGEN__))
/** String descriptor index for the device's unique serial number string descriptor within the device. /** String descriptor index for the device's unique serial number string descriptor within the device.
* This unique serial number is used by the host to associate resources to the device (such as drivers or COM port * This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
@ -114,7 +114,7 @@
* model. * model.
*/ */
#define INTERNAL_SERIAL_LENGTH_BITS (8 * (1 + (offsetof(NVM_PROD_SIGNATURES_t, COORDY1) - offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0)))) #define INTERNAL_SERIAL_LENGTH_BITS (8 * (1 + (offsetof(NVM_PROD_SIGNATURES_t, COORDY1) - offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0))))
/** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller /** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller
* model. * model.
*/ */
@ -125,7 +125,7 @@
#define INTERNAL_SERIAL_LENGTH_BITS 0 #define INTERNAL_SERIAL_LENGTH_BITS 0
#define INTERNAL_SERIAL_START_ADDRESS 0 #define INTERNAL_SERIAL_START_ADDRESS 0
#endif #endif
/* Function Prototypes: */ /* Function Prototypes: */
/** Sends a Remote Wakeup request to the host. This signals to the host that the device should /** Sends a Remote Wakeup request to the host. This signals to the host that the device should
* be taken out of suspended mode, and communications should resume. * be taken out of suspended mode, and communications should resume.
@ -211,17 +211,17 @@
{ {
return ((USB.ADDR != 0) ? true : false); return ((USB.ADDR != 0) ? true : false);
} }
static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1); static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1);
static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString)
{ {
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
uint8_t SigReadAddress = INTERNAL_SERIAL_START_ADDRESS; uint8_t SigReadAddress = INTERNAL_SERIAL_START_ADDRESS;
for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++) for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++)
{ {
uint8_t SerialByte; uint8_t SerialByte;
NVM.CMD = NVM_CMD_READ_CALIB_ROW_gc; NVM.CMD = NVM_CMD_READ_CALIB_ROW_gc;
@ -239,7 +239,7 @@
UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ? UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ?
(('A' - 10) + SerialByte) : ('0' + SerialByte)); (('A' - 10) + SerialByte) : ('0' + SerialByte));
} }
SetGlobalInterruptMask(CurrentGlobalInt); SetGlobalInterruptMask(CurrentGlobalInt);
} }

@ -268,3 +268,4 @@ uint8_t Endpoint_Null_Stream(uint16_t Length,
#endif #endif
#endif #endif

@ -51,13 +51,13 @@ bool Endpoint_ConfigureEndpoint_PRV(const uint8_t Number,
const uint8_t Size) const uint8_t Size)
{ {
Endpoint_SelectEndpoint(Number | Direction); Endpoint_SelectEndpoint(Number | Direction);
USB_Endpoint_SelectedHandle->CTRL = 0; USB_Endpoint_SelectedHandle->CTRL = 0;
USB_Endpoint_SelectedHandle->STATUS = (Direction == ENDPOINT_DIR_IN) ? USB_EP_BUSNACK0_bm : 0; USB_Endpoint_SelectedHandle->STATUS = (Direction == ENDPOINT_DIR_IN) ? USB_EP_BUSNACK0_bm : 0;
USB_Endpoint_SelectedHandle->CTRL = Config; USB_Endpoint_SelectedHandle->CTRL = Config;
USB_Endpoint_SelectedHandle->CNT = 0; USB_Endpoint_SelectedHandle->CNT = 0;
USB_Endpoint_SelectedHandle->DATAPTR = (intptr_t)USB_Endpoint_SelectedFIFO->Data; USB_Endpoint_SelectedHandle->DATAPTR = (intptr_t)USB_Endpoint_SelectedFIFO->Data;
USB_Endpoint_SelectedFIFO->Length = (Direction == ENDPOINT_DIR_IN) ? Size : 0; USB_Endpoint_SelectedFIFO->Length = (Direction == ENDPOINT_DIR_IN) ? Size : 0;
USB_Endpoint_SelectedFIFO->Position = 0; USB_Endpoint_SelectedFIFO->Position = 0;
@ -117,7 +117,7 @@ uint8_t Endpoint_WaitUntilReady(void)
if (Endpoint_IsOUTReceived()) if (Endpoint_IsOUTReceived())
return ENDPOINT_READYWAIT_NoError; return ENDPOINT_READYWAIT_NoError;
} }
uint8_t USB_DeviceState_LCL = USB_DeviceState; uint8_t USB_DeviceState_LCL = USB_DeviceState;
if (USB_DeviceState_LCL == DEVICE_STATE_Unattached) if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)

@ -104,7 +104,7 @@
uint8_t Length; uint8_t Length;
uint8_t Position; uint8_t Position;
} Endpoint_FIFO_t; } Endpoint_FIFO_t;
typedef struct typedef struct
{ {
Endpoint_FIFO_t OUT; Endpoint_FIFO_t OUT;
@ -143,7 +143,7 @@
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** \name Endpoint Bank Mode Masks */ /** \name Endpoint Bank Mode Masks */
//@{ //@{
/** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates /** Mask for the bank mode selection for the \ref Endpoint_ConfigureEndpoint() macro. This indicates
@ -234,7 +234,7 @@
static inline void Endpoint_SelectEndpoint(const uint8_t EndpointNumber) static inline void Endpoint_SelectEndpoint(const uint8_t EndpointNumber)
{ {
USB_Endpoint_SelectedEndpoint = EndpointNumber; USB_Endpoint_SelectedEndpoint = EndpointNumber;
if (EndpointNumber & ENDPOINT_DIR_IN) if (EndpointNumber & ENDPOINT_DIR_IN)
{ {
USB_Endpoint_SelectedFIFO = &USB_Endpoint_FIFOs[EndpointNumber & ENDPOINT_EPNUM_MASK].IN; USB_Endpoint_SelectedFIFO = &USB_Endpoint_FIFOs[EndpointNumber & ENDPOINT_EPNUM_MASK].IN;
@ -290,7 +290,7 @@
const uint8_t Banks) const uint8_t Banks)
{ {
uint8_t EPConfigMask = (USB_EP_INTDSBL_bm | Banks | Endpoint_BytesToEPSizeMask(Size)); uint8_t EPConfigMask = (USB_EP_INTDSBL_bm | Banks | Endpoint_BytesToEPSizeMask(Size));
// TODO - Fix once limitations are lifted // TODO - Fix once limitations are lifted
if ((Banks != ENDPOINT_BANK_SINGLE) || (Size > 64)) if ((Banks != ENDPOINT_BANK_SINGLE) || (Size > 64))
return false; return false;
@ -307,10 +307,10 @@
EPConfigMask |= USB_EP_TYPE_BULK_gc; EPConfigMask |= USB_EP_TYPE_BULK_gc;
break; break;
} }
if (Type == EP_TYPE_CONTROL) if (Type == EP_TYPE_CONTROL)
Endpoint_ConfigureEndpoint_PRV(Number, (Direction ^ ENDPOINT_DIR_IN), EPConfigMask, Size); Endpoint_ConfigureEndpoint_PRV(Number, (Direction ^ ENDPOINT_DIR_IN), EPConfigMask, Size);
return Endpoint_ConfigureEndpoint_PRV(Number, Direction, EPConfigMask, Size); return Endpoint_ConfigureEndpoint_PRV(Number, Direction, EPConfigMask, Size);
} }
@ -439,7 +439,7 @@
static inline bool Endpoint_IsINReady(void) static inline bool Endpoint_IsINReady(void)
{ {
Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint | ENDPOINT_DIR_IN); Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint | ENDPOINT_DIR_IN);
return ((USB_Endpoint_SelectedHandle->STATUS & USB_EP_BUSNACK0_bm) ? true : false); return ((USB_Endpoint_SelectedHandle->STATUS & USB_EP_BUSNACK0_bm) ? true : false);
} }
@ -459,7 +459,7 @@
USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT; USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT;
return true; return true;
} }
return false; return false;
} }
@ -479,7 +479,7 @@
USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT; USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT;
return true; return true;
} }
return false; return false;
} }
@ -523,7 +523,7 @@
*/ */
static inline void Endpoint_ClearOUT(void) ATTR_ALWAYS_INLINE; static inline void Endpoint_ClearOUT(void) ATTR_ALWAYS_INLINE;
static inline void Endpoint_ClearOUT(void) static inline void Endpoint_ClearOUT(void)
{ {
USB_Endpoint_SelectedHandle->STATUS &= ~(USB_EP_TRNCOMPL0_bm | USB_EP_BUSNACK0_bm | USB_EP_OVF_bm); USB_Endpoint_SelectedHandle->STATUS &= ~(USB_EP_TRNCOMPL0_bm | USB_EP_BUSNACK0_bm | USB_EP_OVF_bm);
USB_Endpoint_SelectedFIFO->Position = 0; USB_Endpoint_SelectedFIFO->Position = 0;
} }
@ -543,7 +543,7 @@
static inline void Endpoint_StallTransaction(void) static inline void Endpoint_StallTransaction(void)
{ {
USB_Endpoint_SelectedHandle->CTRL |= USB_EP_STALL_bm; USB_Endpoint_SelectedHandle->CTRL |= USB_EP_STALL_bm;
if ((USB_Endpoint_SelectedHandle->CTRL & USB_EP_TYPE_gm) == USB_EP_TYPE_CONTROL_gc) if ((USB_Endpoint_SelectedHandle->CTRL & USB_EP_TYPE_gm) == USB_EP_TYPE_CONTROL_gc)
{ {
Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint ^ ENDPOINT_DIR_IN); Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint ^ ENDPOINT_DIR_IN);
@ -636,7 +636,7 @@
{ {
uint16_t Byte0 = Endpoint_Read_8(); uint16_t Byte0 = Endpoint_Read_8();
uint16_t Byte1 = Endpoint_Read_8(); uint16_t Byte1 = Endpoint_Read_8();
return ((Byte1 << 8) | Byte0); return ((Byte1 << 8) | Byte0);
} }
@ -652,7 +652,7 @@
{ {
uint16_t Byte0 = Endpoint_Read_8(); uint16_t Byte0 = Endpoint_Read_8();
uint16_t Byte1 = Endpoint_Read_8(); uint16_t Byte1 = Endpoint_Read_8();
return ((Byte0 << 8) | Byte1); return ((Byte0 << 8) | Byte1);
} }
@ -709,7 +709,7 @@
uint32_t Byte1 = Endpoint_Read_8(); uint32_t Byte1 = Endpoint_Read_8();
uint32_t Byte2 = Endpoint_Read_8(); uint32_t Byte2 = Endpoint_Read_8();
uint32_t Byte3 = Endpoint_Read_8(); uint32_t Byte3 = Endpoint_Read_8();
return ((Byte3 << 24) | (Byte2 << 16) | (Byte1 << 8) | Byte0); return ((Byte3 << 24) | (Byte2 << 16) | (Byte1 << 8) | Byte0);
} }
@ -727,7 +727,7 @@
uint32_t Byte1 = Endpoint_Read_8(); uint32_t Byte1 = Endpoint_Read_8();
uint32_t Byte2 = Endpoint_Read_8(); uint32_t Byte2 = Endpoint_Read_8();
uint32_t Byte3 = Endpoint_Read_8(); uint32_t Byte3 = Endpoint_Read_8();
return ((Byte0 << 24) | (Byte1 << 16) | (Byte2 << 8) | Byte3); return ((Byte0 << 24) | (Byte1 << 16) | (Byte2 << 8) | Byte3);
} }

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org www.lufa-lib.org
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this

@ -81,3 +81,4 @@ uint8_t TEMPLATE_FUNC_NAME (void* const Buffer,
#undef TEMPLATE_TRANSFER_BYTE #undef TEMPLATE_TRANSFER_BYTE
#endif #endif

@ -90,3 +90,4 @@ uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer,
#undef TEMPLATE_TRANSFER_BYTE #undef TEMPLATE_TRANSFER_BYTE
#endif #endif

@ -86,3 +86,4 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
#undef TEMPLATE_BUFFER_MOVE #undef TEMPLATE_BUFFER_MOVE
#endif #endif

@ -61,9 +61,9 @@ void USB_Init(
#if !defined(USE_STATIC_OPTIONS) #if !defined(USE_STATIC_OPTIONS)
USB_Options = Options; USB_Options = Options;
#endif #endif
USB_IsInitialized = true; USB_IsInitialized = true;
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
@ -71,7 +71,7 @@ void USB_Init(
USB.CAL0 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL0)); USB.CAL0 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL0));
USB.CAL1 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL1)); USB.CAL1 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL1));
NVM.CMD = 0; NVM.CMD = 0;
USB.EPPTR = (intptr_t)&USB_EndpointTable; USB.EPPTR = (intptr_t)&USB_EndpointTable;
USB.CTRLA = (USB_STFRNUM_bm | USB_MAXEP_gm); USB.CTRLA = (USB_STFRNUM_bm | USB_MAXEP_gm);
@ -95,7 +95,7 @@ void USB_Disable(void)
USB_Detach(); USB_Detach();
USB_Controller_Disable(); USB_Controller_Disable();
USB_IsInitialized = false; USB_IsInitialized = false;
} }
void USB_ResetInterface(void) void USB_ResetInterface(void)
@ -104,14 +104,14 @@ void USB_ResetInterface(void)
CLK.USBCTRL = (((F_USB / 6000000) - 1) << CLK_USBPSDIV_gp); CLK.USBCTRL = (((F_USB / 6000000) - 1) << CLK_USBPSDIV_gp);
else else
CLK.USBCTRL = (((F_USB / 48000000) - 1) << CLK_USBPSDIV_gp); CLK.USBCTRL = (((F_USB / 48000000) - 1) << CLK_USBPSDIV_gp);
if (USB_Options & USB_OPT_PLLCLKSRC) if (USB_Options & USB_OPT_PLLCLKSRC)
CLK.USBCTRL |= (CLK_USBSRC_PLL_gc | CLK_USBSEN_bm); CLK.USBCTRL |= (CLK_USBSRC_PLL_gc | CLK_USBSEN_bm);
else else
CLK.USBCTRL |= (CLK_USBSRC_RC32M_gc | CLK_USBSEN_bm); CLK.USBCTRL |= (CLK_USBSRC_RC32M_gc | CLK_USBSEN_bm);
USB_Device_SetDeviceAddress(0); USB_Device_SetDeviceAddress(0);
USB_INT_DisableAllInterrupts(); USB_INT_DisableAllInterrupts();
USB_INT_ClearAllInterrupts(); USB_INT_ClearAllInterrupts();
@ -135,7 +135,7 @@ static void USB_Init_Device(void)
#if !defined(FIXED_CONTROL_ENDPOINT_SIZE) #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
USB_Descriptor_Device_t* DeviceDescriptorPtr; USB_Descriptor_Device_t* DeviceDescriptorPtr;
#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \ #if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
!(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS)) !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
uint8_t DescriptorAddressSpace; uint8_t DescriptorAddressSpace;
@ -159,7 +159,7 @@ static void USB_Init_Device(void)
#else #else
USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size); USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
#endif #endif
} }
#endif #endif
#endif #endif
@ -177,3 +177,4 @@ static void USB_Init_Device(void)
USB_Attach(); USB_Attach();
} }
#endif #endif

@ -67,12 +67,12 @@
} Endpoints[16]; } Endpoints[16];
uint16_t FrameNum; uint16_t FrameNum;
} ATTR_PACKED USB_EndpointTable_t; } ATTR_PACKED USB_EndpointTable_t;
/* External Variables: */ /* External Variables: */
extern USB_EndpointTable_t USB_EndpointTable; extern USB_EndpointTable_t USB_EndpointTable;
#endif #endif
/* Includes: */ /* Includes: */
#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__) #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
#include "../Device.h" #include "../Device.h"
@ -94,7 +94,7 @@
#if !defined(F_USB) #if !defined(F_USB)
#error F_USB is not defined. You must define F_USB to the frequency of the unprescaled USB controller clock in your project makefile. #error F_USB is not defined. You must define F_USB to the frequency of the unprescaled USB controller clock in your project makefile.
#endif #endif
#if (F_USB % 6000000) #if (F_USB % 6000000)
#error Invalid F_USB specified. F_USB must be a multiple of 6MHz for USB Low Speed operation, and a multiple of 48MHz for Full Speed operation. #error Invalid F_USB specified. F_USB must be a multiple of 6MHz for USB Low Speed operation, and a multiple of 48MHz for Full Speed operation.
#endif #endif

@ -70,7 +70,7 @@ ISR(USB_BUSEVENT_vect)
if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Resume)) if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Resume))
{ {
USB_INT_Clear(USB_INT_BUSEVENTI_Resume); USB_INT_Clear(USB_INT_BUSEVENTI_Resume);
if (USB_Device_ConfigurationNumber) if (USB_Device_ConfigurationNumber)
USB_DeviceState = DEVICE_STATE_Configured; USB_DeviceState = DEVICE_STATE_Configured;
else else
@ -86,7 +86,7 @@ ISR(USB_BUSEVENT_vect)
if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Reset)) if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Reset))
{ {
USB_INT_Clear(USB_INT_BUSEVENTI_Reset); USB_INT_Clear(USB_INT_BUSEVENTI_Reset);
USB_DeviceState = DEVICE_STATE_Default; USB_DeviceState = DEVICE_STATE_Default;
USB_Device_ConfigurationNumber = 0; USB_Device_ConfigurationNumber = 0;

@ -76,8 +76,8 @@
USB.INTCTRLA |= USB_BUSEVIE_bm; USB.INTCTRLA |= USB_BUSEVIE_bm;
return; return;
case USB_INT_SOFI: case USB_INT_SOFI:
USB.INTCTRLA |= USB_SOFIE_bm; USB.INTCTRLA |= USB_SOFIE_bm;
return; return;
} }
} }
@ -90,11 +90,11 @@
USB.INTCTRLA &= ~USB_BUSEVIE_bm; USB.INTCTRLA &= ~USB_BUSEVIE_bm;
return; return;
case USB_INT_SOFI: case USB_INT_SOFI:
USB.INTCTRLA &= ~USB_SOFIE_bm; USB.INTCTRLA &= ~USB_SOFIE_bm;
return; return;
} }
} }
static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE; static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
static inline void USB_INT_Clear(const uint8_t Interrupt) static inline void USB_INT_Clear(const uint8_t Interrupt)
{ {
@ -110,11 +110,11 @@
USB.INTFLAGSACLR = USB_RSTIF_bm; USB.INTFLAGSACLR = USB_RSTIF_bm;
return; return;
case USB_INT_SOFI: case USB_INT_SOFI:
USB.INTFLAGSACLR = USB_SOFIF_bm; USB.INTFLAGSACLR = USB_SOFIF_bm;
return; return;
} }
} }
static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) static inline bool USB_INT_IsEnabled(const uint8_t Interrupt)
{ {
@ -125,10 +125,10 @@
case USB_INT_SOFI: case USB_INT_SOFI:
return ((USB.INTCTRLA & USB_SOFIE_bm) ? true : false); return ((USB.INTCTRLA & USB_SOFIE_bm) ? true : false);
} }
return false; return false;
} }
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
{ {
@ -143,7 +143,7 @@
case USB_INT_SOFI: case USB_INT_SOFI:
return ((USB.INTFLAGSACLR & USB_SOFIF_bm) ? true : false); return ((USB.INTFLAGSACLR & USB_SOFIF_bm) ? true : false);
} }
return false; return false;
} }

@ -392,7 +392,7 @@
#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__) #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
#include "Core/OTG.h" #include "Core/OTG.h"
#endif #endif
#include "Class/AndroidAccessoryClass.h" #include "Class/AndroidAccessoryClass.h"
#include "Class/AudioClass.h" #include "Class/AudioClass.h"
#include "Class/CDCClass.h" #include "Class/CDCClass.h"

@ -55,7 +55,7 @@
* { * {
* // Start the master external oscillator which will be used as the main clock reference * // Start the master external oscillator which will be used as the main clock reference
* AVR32CLK_StartExternalOscillator(0, EXOSC_MODE_8MHZ_OR_MORE, EXOSC_START_0CLK); * AVR32CLK_StartExternalOscillator(0, EXOSC_MODE_8MHZ_OR_MORE, EXOSC_START_0CLK);
* *
* // Start the PLL for the CPU clock, switch CPU to it * // Start the PLL for the CPU clock, switch CPU to it
* AVR32CLK_StartPLL(0, CLOCK_SRC_OSC0, 12000000, F_CPU); * AVR32CLK_StartPLL(0, CLOCK_SRC_OSC0, 12000000, F_CPU);
* AVR32CLK_SetCPUClockSource(CLOCK_SRC_PLL0, F_CPU); * AVR32CLK_SetCPUClockSource(CLOCK_SRC_PLL0, F_CPU);
@ -88,7 +88,7 @@
EXOSC_MODE_900KHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G0, /**< External crystal oscillator equal to or slower than 900KHz. */ EXOSC_MODE_900KHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G0, /**< External crystal oscillator equal to or slower than 900KHz. */
EXOSC_MODE_3MHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G1, /**< External crystal oscillator equal to or slower than 3MHz. */ EXOSC_MODE_3MHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G1, /**< External crystal oscillator equal to or slower than 3MHz. */
EXOSC_MODE_8MHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G2, /**< External crystal oscillator equal to or slower than 8MHz. */ EXOSC_MODE_8MHZ_MAX = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G2, /**< External crystal oscillator equal to or slower than 8MHz. */
EXOSC_MODE_8MHZ_OR_MORE = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G3, /**< External crystal oscillator equal to or faster than 8MHz. */ EXOSC_MODE_8MHZ_OR_MORE = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G3, /**< External crystal oscillator equal to or faster than 8MHz. */
}; };
/** Enum for the possible external oscillator statup times. */ /** Enum for the possible external oscillator statup times. */
@ -102,7 +102,7 @@
EXOSC_START_8192CLK = AVR32_PM_OSCCTRL0_STARTUP_8192_RCOSC, /**< Wait 8192 clock cyles before startup for stability. */ EXOSC_START_8192CLK = AVR32_PM_OSCCTRL0_STARTUP_8192_RCOSC, /**< Wait 8192 clock cyles before startup for stability. */
EXOSC_START_16384CLK = AVR32_PM_OSCCTRL0_STARTUP_16384_RCOSC, /**< Wait 16384 clock cyles before startup for stability. */ EXOSC_START_16384CLK = AVR32_PM_OSCCTRL0_STARTUP_16384_RCOSC, /**< Wait 16384 clock cyles before startup for stability. */
}; };
/** Enum for the possible module clock sources. */ /** Enum for the possible module clock sources. */
enum UC3_System_ClockSource_t enum UC3_System_ClockSource_t
{ {
@ -182,7 +182,7 @@
{ {
if (SourceFreq > Frequency) if (SourceFreq > Frequency)
return false; return false;
switch (Source) switch (Source)
{ {
case CLOCK_SRC_OSC0: case CLOCK_SRC_OSC0:
@ -212,7 +212,7 @@
{ {
AVR32_PM.PLL[Channel].pllen = false; AVR32_PM.PLL[Channel].pllen = false;
} }
/** Starts the given Generic Clock of the UC3 microcontroller, with the given options. /** Starts the given Generic Clock of the UC3 microcontroller, with the given options.
* *
* \param[in] Channel Index of the Generic Clock to start. * \param[in] Channel Index of the Generic Clock to start.
@ -252,17 +252,17 @@
default: default:
return false; return false;
} }
if (SourceFreq < Frequency) if (SourceFreq < Frequency)
return false; return false;
AVR32_PM.GCCTRL[Channel].diven = (SourceFreq > Frequency) ? true : false; AVR32_PM.GCCTRL[Channel].diven = (SourceFreq > Frequency) ? true : false;
AVR32_PM.GCCTRL[Channel].div = (((SourceFreq / Frequency) - 1) / 2); AVR32_PM.GCCTRL[Channel].div = (((SourceFreq / Frequency) - 1) / 2);
AVR32_PM.GCCTRL[Channel].cen = true; AVR32_PM.GCCTRL[Channel].cen = true;
return true; return true;
} }
/** Stops the given generic clock of the UC3 microcontroller. /** Stops the given generic clock of the UC3 microcontroller.
* *
* \param[in] Channel Index of the generic clock to stop. * \param[in] Channel Index of the generic clock to stop.
@ -272,7 +272,7 @@
{ {
AVR32_PM.GCCTRL[Channel].cen = false; AVR32_PM.GCCTRL[Channel].cen = false;
} }
/** Sets the clock source for the main microcontroller core. The given clock source should be configured /** Sets the clock source for the main microcontroller core. The given clock source should be configured
* and ready for use before this function is called. * and ready for use before this function is called.
* *
@ -310,7 +310,7 @@
default: default:
return false; return false;
} }
return true; return true;
} }
@ -322,3 +322,4 @@
#endif #endif
/** @} */ /** @} */

@ -60,3 +60,4 @@ void INTC_Init(void)
__builtin_mtsr(AVR32_EVBA, (uintptr_t)&EVBA_Table); __builtin_mtsr(AVR32_EVBA, (uintptr_t)&EVBA_Table);
} }

@ -137,7 +137,7 @@
InterruptHandlers[GroupNumber] = Handler; InterruptHandlers[GroupNumber] = Handler;
AVR32_INTC.ipr[GroupNumber] = Autovector_Table[InterruptLevel]; AVR32_INTC.ipr[GroupNumber] = Autovector_Table[InterruptLevel];
} }
/** Retrieves the pending interrupts for a given interrupt group. The result of this function should be masked /** Retrieves the pending interrupts for a given interrupt group. The result of this function should be masked
* against interrupt request indexes converted to a request line number via the \ref INTC_IRQ_LINE() macro. To * against interrupt request indexes converted to a request line number via the \ref INTC_IRQ_LINE() macro. To
* obtain the group number of a given interrupt request, use the \ref INTC_IRQ_GROUP() macro. * obtain the group number of a given interrupt request, use the \ref INTC_IRQ_GROUP() macro.
@ -151,7 +151,7 @@
{ {
return AVR32_INTC.irr[GroupNumber]; return AVR32_INTC.irr[GroupNumber];
} }
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)
} }
@ -160,3 +160,4 @@
#endif #endif
/** @} */ /** @} */

@ -50,13 +50,13 @@
* Usage Example: * Usage Example:
* \code * \code
* #include <LUFA/Platform/XMEGA/ClockManagement.h> * #include <LUFA/Platform/XMEGA/ClockManagement.h>
* *
* void main(void) * void main(void)
* { * {
* // Start the PLL to multiply the 2MHz RC oscillator to 32MHz and switch the CPU core to run from it * // Start the PLL to multiply the 2MHz RC oscillator to 32MHz and switch the CPU core to run from it
* XMEGACLK_StartPLL(CLOCK_SRC_INT_RC2MHZ, 2000000, 32000000); * XMEGACLK_StartPLL(CLOCK_SRC_INT_RC2MHZ, 2000000, 32000000);
* XMEGACLK_SetCPUClockSource(CLOCK_SRC_PLL, F_CPU); * XMEGACLK_SetCPUClockSource(CLOCK_SRC_PLL, F_CPU);
* *
* // Start the 32MHz internal RC oscillator and start the DFLL to increase it to 48MHz using the USB SOF as a reference * // Start the 32MHz internal RC oscillator and start the DFLL to increase it to 48MHz using the USB SOF as a reference
* XMEGACLK_StartInternalOscillator(CLOCK_SRC_INT_RC32MHZ); * XMEGACLK_StartInternalOscillator(CLOCK_SRC_INT_RC32MHZ);
* XMEGACLK_StartDFLL(CLOCK_SRC_INT_RC32MHZ, DFLL_REF_INT_USBSOF, 48000000); * XMEGACLK_StartDFLL(CLOCK_SRC_INT_RC32MHZ, DFLL_REF_INT_USBSOF, 48000000);
@ -85,7 +85,7 @@
EXOSC_FREQ_2MHZ_MAX = OSC_FRQRANGE_04TO2_gc, /**< External crystal oscillator equal to or slower than 2MHz. */ EXOSC_FREQ_2MHZ_MAX = OSC_FRQRANGE_04TO2_gc, /**< External crystal oscillator equal to or slower than 2MHz. */
EXOSC_FREQ_9MHZ_MAX = OSC_FRQRANGE_2TO9_gc, /**< External crystal oscillator equal to or slower than 9MHz. */ EXOSC_FREQ_9MHZ_MAX = OSC_FRQRANGE_2TO9_gc, /**< External crystal oscillator equal to or slower than 9MHz. */
EXOSC_FREQ_12MHZ_MAX = OSC_FRQRANGE_9TO12_gc, /**< External crystal oscillator equal to or slower than 12MHz. */ EXOSC_FREQ_12MHZ_MAX = OSC_FRQRANGE_9TO12_gc, /**< External crystal oscillator equal to or slower than 12MHz. */
EXOSC_FREQ_16MHZ_MAX = OSC_FRQRANGE_12TO16_gc, /**< External crystal oscillator equal to or slower than 16MHz. */ EXOSC_FREQ_16MHZ_MAX = OSC_FRQRANGE_12TO16_gc, /**< External crystal oscillator equal to or slower than 16MHz. */
}; };
/** Enum for the possible external oscillator statup times. */ /** Enum for the possible external oscillator statup times. */
@ -97,7 +97,7 @@
EXOSC_START_1KCLK = OSC_XOSCSEL_XTAL_1KCLK_gc, /**< Wait 1K clock cycles before startup. */ EXOSC_START_1KCLK = OSC_XOSCSEL_XTAL_1KCLK_gc, /**< Wait 1K clock cycles before startup. */
EXOSC_START_16KCLK = OSC_XOSCSEL_XTAL_16KCLK_gc, /**< Wait 16K clock cycles before startup. */ EXOSC_START_16KCLK = OSC_XOSCSEL_XTAL_16KCLK_gc, /**< Wait 16K clock cycles before startup. */
}; };
/** Enum for the possible module clock sources. */ /** Enum for the possible module clock sources. */
enum XMEGA_System_ClockSource_t enum XMEGA_System_ClockSource_t
{ {
@ -132,8 +132,8 @@
{ {
OSC.XOSCCTRL = (FreqRange | ((Startup == EXOSC_START_32KCLK) ? OSC_X32KLPM_bm : 0) | Startup); OSC.XOSCCTRL = (FreqRange | ((Startup == EXOSC_START_32KCLK) ? OSC_X32KLPM_bm : 0) | Startup);
OSC.CTRL |= OSC_XOSCEN_bm; OSC.CTRL |= OSC_XOSCEN_bm;
while (!(OSC.STATUS & OSC_XOSCRDY_bm)); while (!(OSC.STATUS & OSC_XOSCRDY_bm));
return true; return true;
} }
@ -162,14 +162,14 @@
return true; return true;
case CLOCK_SRC_INT_RC32MHZ: case CLOCK_SRC_INT_RC32MHZ:
OSC.CTRL |= OSC_RC32MEN_bm; OSC.CTRL |= OSC_RC32MEN_bm;
while (!(OSC.STATUS & OSC_RC32MRDY_bm)); while (!(OSC.STATUS & OSC_RC32MRDY_bm));
return true; return true;
case CLOCK_SRC_INT_RC32KHZ: case CLOCK_SRC_INT_RC32KHZ:
OSC.CTRL |= OSC_RC32KEN_bm; OSC.CTRL |= OSC_RC32KEN_bm;
while (!(OSC.STATUS & OSC_RC32KRDY_bm)); while (!(OSC.STATUS & OSC_RC32KRDY_bm));
return true; return true;
} }
return false; return false;
} }
@ -178,7 +178,7 @@
* \param[in] Source Internal oscillator to stop, a value from \ref XMEGA_System_ClockSource_t. * \param[in] Source Internal oscillator to stop, a value from \ref XMEGA_System_ClockSource_t.
* *
* \return Boolean \c true if the internal oscillator was successfully stopped, \c false if invalid parameters specified. * \return Boolean \c true if the internal oscillator was successfully stopped, \c false if invalid parameters specified.
*/ */
static inline bool XMEGACLK_StopInternalOscillator(const uint8_t Source) ATTR_ALWAYS_INLINE; static inline bool XMEGACLK_StopInternalOscillator(const uint8_t Source) ATTR_ALWAYS_INLINE;
static inline bool XMEGACLK_StopInternalOscillator(const uint8_t Source) static inline bool XMEGACLK_StopInternalOscillator(const uint8_t Source)
{ {
@ -194,7 +194,7 @@
OSC.CTRL &= ~OSC_RC32KEN_bm; OSC.CTRL &= ~OSC_RC32KEN_bm;
return true; return true;
} }
return false; return false;
} }
@ -216,10 +216,10 @@
const uint32_t Frequency) const uint32_t Frequency)
{ {
uint8_t MulFactor = (Frequency / SourceFreq); uint8_t MulFactor = (Frequency / SourceFreq);
if (SourceFreq > Frequency) if (SourceFreq > Frequency)
return false; return false;
switch (Source) switch (Source)
{ {
case CLOCK_SRC_INT_RC2MHZ: case CLOCK_SRC_INT_RC2MHZ:
@ -236,7 +236,7 @@
} }
OSC.CTRL |= OSC_PLLEN_bm; OSC.CTRL |= OSC_PLLEN_bm;
while (!(OSC.STATUS & OSC_PLLRDY_bm)); while (!(OSC.STATUS & OSC_PLLRDY_bm));
return true; return true;
} }
@ -247,7 +247,7 @@
{ {
OSC.CTRL &= ~OSC_PLLEN_bm; OSC.CTRL &= ~OSC_PLLEN_bm;
} }
/** Starts the DFLL of the XMEGA microcontroller, with the given options. /** Starts the DFLL of the XMEGA microcontroller, with the given options.
* *
* \param[in] Source RC Clock source for the DFLL, a value from \ref XMEGA_System_ClockSource_t. * \param[in] Source RC Clock source for the DFLL, a value from \ref XMEGA_System_ClockSource_t.
@ -264,7 +264,7 @@
const uint32_t Frequency) const uint32_t Frequency)
{ {
uint16_t DFLLCompare = (Frequency / 1000); uint16_t DFLLCompare = (Frequency / 1000);
switch (Source) switch (Source)
{ {
case CLOCK_SRC_INT_RC2MHZ: case CLOCK_SRC_INT_RC2MHZ:
@ -291,7 +291,7 @@
default: default:
return false; return false;
} }
return true; return true;
} }
@ -315,7 +315,7 @@
default: default:
return false; return false;
} }
return true; return true;
} }
@ -333,7 +333,7 @@
const uint32_t SourceFreq) const uint32_t SourceFreq)
{ {
uint8_t ClockSourceMask = 0; uint8_t ClockSourceMask = 0;
switch (Source) switch (Source)
{ {
case CLOCK_SRC_INT_RC2MHZ: case CLOCK_SRC_INT_RC2MHZ:
@ -354,16 +354,16 @@
default: default:
return false; return false;
} }
uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
GlobalInterruptDisable(); GlobalInterruptDisable();
CCP = CCP_IOREG_gc; CCP = CCP_IOREG_gc;
CLK_CTRL = ClockSourceMask; CLK_CTRL = ClockSourceMask;
SetGlobalInterruptMask(CurrentGlobalInt); SetGlobalInterruptMask(CurrentGlobalInt);
Delay_MS(1); Delay_MS(1);
return (CLK.CTRL == ClockSourceMask); return (CLK.CTRL == ClockSourceMask);
} }
@ -375,3 +375,4 @@
#endif #endif
/** @} */ /** @} */

@ -67,7 +67,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Atmel AVRISP-MKII Interface // Atmel AVRISP-MKII Interface
USB_Descriptor_Interface_t AVRISP_Interface; USB_Descriptor_Interface_t AVRISP_Interface;
USB_Descriptor_Endpoint_t AVRISP_DataInEndpoint; USB_Descriptor_Endpoint_t AVRISP_DataInEndpoint;

@ -150,7 +150,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command)
Endpoint_Read_Stream_LE(&Write_Memory_Params, (sizeof(Write_Memory_Params) - Endpoint_Read_Stream_LE(&Write_Memory_Params, (sizeof(Write_Memory_Params) -
sizeof(Write_Memory_Params.ProgData)), NULL); sizeof(Write_Memory_Params.ProgData)), NULL);
Write_Memory_Params.BytesToWrite = SwapEndian_16(Write_Memory_Params.BytesToWrite); Write_Memory_Params.BytesToWrite = SwapEndian_16(Write_Memory_Params.BytesToWrite);
if (Write_Memory_Params.BytesToWrite > sizeof(Write_Memory_Params.ProgData)) if (Write_Memory_Params.BytesToWrite > sizeof(Write_Memory_Params.ProgData))
{ {
Endpoint_ClearOUT(); Endpoint_ClearOUT();
@ -236,7 +236,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command)
/* Must reset the polling address afterwards, so it is not erroneously used for the next byte */ /* Must reset the polling address afterwards, so it is not erroneously used for the next byte */
PollAddress = 0; PollAddress = 0;
} }
/* EEPROM just increments the address each byte, flash needs to increment on each word and /* EEPROM just increments the address each byte, flash needs to increment on each word and
* also check to ensure that a LOAD EXTENDED ADDRESS command is issued each time the extended * also check to ensure that a LOAD EXTENDED ADDRESS command is issued each time the extended
* address boundary has been crossed during FLASH memory programming */ * address boundary has been crossed during FLASH memory programming */
@ -248,7 +248,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command)
MustLoadExtendedAddress = true; MustLoadExtendedAddress = true;
} }
} }
/* If the current page must be committed, send the PROGRAM PAGE command to the target */ /* If the current page must be committed, send the PROGRAM PAGE command to the target */
if (Write_Memory_Params.ProgrammingMode & PROG_MODE_COMMIT_PAGE_MASK) if (Write_Memory_Params.ProgrammingMode & PROG_MODE_COMMIT_PAGE_MASK)
{ {
@ -271,7 +271,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command)
/* Check to see if the FLASH address has crossed the extended address boundary */ /* Check to see if the FLASH address has crossed the extended address boundary */
if ((V2Command == CMD_PROGRAM_FLASH_ISP) && !(CurrentAddress & 0xFFFF)) if ((V2Command == CMD_PROGRAM_FLASH_ISP) && !(CurrentAddress & 0xFFFF))
MustLoadExtendedAddress = true; MustLoadExtendedAddress = true;
} }
Endpoint_Write_8(V2Command); Endpoint_Write_8(V2Command);
Endpoint_Write_8(ProgrammingStatus); Endpoint_Write_8(ProgrammingStatus);
@ -293,7 +293,7 @@ void ISPProtocol_ReadMemory(uint8_t V2Command)
Endpoint_Read_Stream_LE(&Read_Memory_Params, sizeof(Read_Memory_Params), NULL); Endpoint_Read_Stream_LE(&Read_Memory_Params, sizeof(Read_Memory_Params), NULL);
Read_Memory_Params.BytesToRead = SwapEndian_16(Read_Memory_Params.BytesToRead); Read_Memory_Params.BytesToRead = SwapEndian_16(Read_Memory_Params.BytesToRead);
Endpoint_ClearOUT(); Endpoint_ClearOUT();
Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM); Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);
@ -526,3 +526,4 @@ void ISPProtocol_DelayMS(uint8_t DelayMS)
} }
#endif #endif

@ -178,7 +178,7 @@ void ISPTarget_DisableTargetISP(void)
{ {
DDRB &= ~((1 << 1) | (1 << 2)); DDRB &= ~((1 << 1) | (1 << 2));
PORTB &= ~((1 << 0) | (1 << 3)); PORTB &= ~((1 << 0) | (1 << 3));
/* Must re-enable rescue clock once software ISP has exited, as the timer for the rescue clock is /* Must re-enable rescue clock once software ISP has exited, as the timer for the rescue clock is
* re-purposed for software SPI */ * re-purposed for software SPI */
ISPTarget_ConfigureRescueClock(); ISPTarget_ConfigureRescueClock();
@ -195,7 +195,7 @@ void ISPTarget_ConfigureRescueClock(void)
#if defined(XCK_RESCUE_CLOCK_ENABLE) #if defined(XCK_RESCUE_CLOCK_ENABLE)
/* Configure XCK as an output for the specified AVR model */ /* Configure XCK as an output for the specified AVR model */
DDRD |= (1 << 5); DDRD |= (1 << 5);
/* Start USART to generate a 4MHz clock on the XCK pin */ /* Start USART to generate a 4MHz clock on the XCK pin */
UBRR1 = ((F_CPU / 2 / ISP_RESCUE_CLOCK_SPEED) - 1); UBRR1 = ((F_CPU / 2 / ISP_RESCUE_CLOCK_SPEED) - 1);
UCSR1B = (1 << TXEN1); UCSR1B = (1 << TXEN1);

@ -113,7 +113,7 @@
if (HardwareSPIMode) if (HardwareSPIMode)
return ~SPI_ReceiveByte(); return ~SPI_ReceiveByte();
else else
return ~ISPTarget_TransferSoftSPIByte(0x00); return ~ISPTarget_TransferSoftSPIByte(0x00);
#endif #endif
} }
@ -135,7 +135,7 @@
if (HardwareSPIMode) if (HardwareSPIMode)
return ~SPI_TransferByte(Byte); return ~SPI_TransferByte(Byte);
else else
return ~ISPTarget_TransferSoftSPIByte(Byte); return ~ISPTarget_TransferSoftSPIByte(Byte);
#endif #endif
} }

@ -61,7 +61,7 @@ void V2Protocol_Init(void)
#endif #endif
V2Params_LoadNonVolatileParamValues(); V2Params_LoadNonVolatileParamValues();
#if defined(ENABLE_ISP_PROTOCOL) #if defined(ENABLE_ISP_PROTOCOL)
ISPTarget_ConfigureRescueClock(); ISPTarget_ConfigureRescueClock();
#endif #endif

@ -40,7 +40,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include "../Descriptors.h" #include "../Descriptors.h"
@ -61,11 +61,11 @@
#if defined(USB_SERIES_4_AVR) && ((VTARGET_ADC_CHANNEL == 2) || (VTARGET_ADC_CHANNEL == 3)) && !defined(NO_VTARGET_DETECT) #if defined(USB_SERIES_4_AVR) && ((VTARGET_ADC_CHANNEL == 2) || (VTARGET_ADC_CHANNEL == 3)) && !defined(NO_VTARGET_DETECT)
#error The U4 AVR chips do not contain ADC channels 2 or 3. Please change VTARGET_ADC_CHANNEL or define NO_VTARGET_DETECT in the makefile. #error The U4 AVR chips do not contain ADC channels 2 or 3. Please change VTARGET_ADC_CHANNEL or define NO_VTARGET_DETECT in the makefile.
#endif #endif
#if defined(VTARGET_USE_INTERNAL_REF) #if defined(VTARGET_USE_INTERNAL_REF)
#undef VTARGET_REF_VOLTS #undef VTARGET_REF_VOLTS
#define VTARGET_REF_VOLTS 2.56 #define VTARGET_REF_VOLTS 2.56
#define VTARGET_REF_MASK ADC_REFERENCE_INT2560MV #define VTARGET_REF_MASK ADC_REFERENCE_INT2560MV
#else #else
#define VTARGET_REF_MASK ADC_REFERENCE_AVCC #define VTARGET_REF_MASK ADC_REFERENCE_AVCC

@ -151,7 +151,7 @@ void TINYNVM_DisableTPI(void)
/* Clear the NVMEN bit in the TPI STATUS register to disable TPI mode */ /* Clear the NVMEN bit in the TPI STATUS register to disable TPI mode */
XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_STATUS_REG); XPROGTarget_SendByte(TPI_CMD_SSTCS | TPI_STATUS_REG);
XPROGTarget_SendByte(0x00); XPROGTarget_SendByte(0x00);
/* Read back the STATUS register, check to see if it took effect */ /* Read back the STATUS register, check to see if it took effect */
XPROGTarget_SendByte(TPI_CMD_SLDCS | PDI_RESET_REG); XPROGTarget_SendByte(TPI_CMD_SLDCS | PDI_RESET_REG);
} while (XPROGTarget_ReceiveByte() != 0x00); } while (XPROGTarget_ReceiveByte() != 0x00);

@ -149,7 +149,7 @@ void XMEGANVM_DisablePDI(void)
{ {
XMEGANVM_WaitWhileNVMBusBusy(); XMEGANVM_WaitWhileNVMBusBusy();
/* Clear the RESET key in the RESET PDI register to allow the XMEGA to run - must perform this until the /* Clear the RESET key in the RESET PDI register to allow the XMEGA to run - must perform this until the
* change takes effect, as in some cases it takes multiple writes (silicon bug?). * change takes effect, as in some cases it takes multiple writes (silicon bug?).
*/ */
do do
@ -157,7 +157,7 @@ void XMEGANVM_DisablePDI(void)
/* Clear reset register */ /* Clear reset register */
XPROGTarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG); XPROGTarget_SendByte(PDI_CMD_STCS | PDI_RESET_REG);
XPROGTarget_SendByte(0x00); XPROGTarget_SendByte(0x00);
/* Read back the reset register, check to see if it took effect */ /* Read back the reset register, check to see if it took effect */
XPROGTarget_SendByte(PDI_CMD_LDCS | PDI_RESET_REG); XPROGTarget_SendByte(PDI_CMD_LDCS | PDI_RESET_REG);
} while (XPROGTarget_ReceiveByte() != 0x00); } while (XPROGTarget_ReceiveByte() != 0x00);

@ -143,7 +143,7 @@ static void XPROGProtocol_LeaveXPROGMode(void)
TINYNVM_DisableTPI(); TINYNVM_DisableTPI();
#if defined(XCK_RESCUE_CLOCK_ENABLE) && defined(ENABLE_ISP_PROTOCOL) #if defined(XCK_RESCUE_CLOCK_ENABLE) && defined(ENABLE_ISP_PROTOCOL)
/* If the XCK rescue clock option is enabled, we need to restart it once the /* If the XCK rescue clock option is enabled, we need to restart it once the
* XPROG mode has been exited, since the XPROG protocol stops it after use. */ * XPROG mode has been exited, since the XPROG protocol stops it after use. */
ISPTarget_ConfigureRescueClock(); ISPTarget_ConfigureRescueClock();
#endif #endif
@ -258,7 +258,7 @@ static void XPROGProtocol_WriteMemory(void)
Endpoint_ClearOUT(); Endpoint_ClearOUT();
Endpoint_WaitUntilReady(); Endpoint_WaitUntilReady();
} }
Endpoint_ClearOUT(); Endpoint_ClearOUT();
Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM); Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);

@ -120,7 +120,7 @@ void XPROGTarget_DisableTargetTPI(void)
/* Set all USART lines as inputs, tristate */ /* Set all USART lines as inputs, tristate */
DDRD &= ~((1 << 5) | (1 << 3)); DDRD &= ~((1 << 5) | (1 << 3));
PORTD &= ~((1 << 5) | (1 << 3) | (1 << 2)); PORTD &= ~((1 << 5) | (1 << 3) | (1 << 2));
/* Tristate target /RESET line */ /* Tristate target /RESET line */
AUX_LINE_DDR &= ~AUX_LINE_MASK; AUX_LINE_DDR &= ~AUX_LINE_MASK;
AUX_LINE_PORT &= ~AUX_LINE_MASK; AUX_LINE_PORT &= ~AUX_LINE_MASK;
@ -164,7 +164,7 @@ void XPROGTarget_SendIdle(void)
/* Switch to Tx mode if currently in Rx mode */ /* Switch to Tx mode if currently in Rx mode */
if (!(IsSending)) if (!(IsSending))
XPROGTarget_SetTxMode(); XPROGTarget_SetTxMode();
/* Need to do nothing for a full frame to send an IDLE */ /* Need to do nothing for a full frame to send an IDLE */
for (uint8_t i = 0; i < BITS_IN_USART_FRAME; i++) for (uint8_t i = 0; i < BITS_IN_USART_FRAME; i++)
{ {

@ -150,7 +150,7 @@ int main(void)
{ {
break; break;
} }
/* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */ /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */
RingBuffer_Remove(&USARTtoUSB_Buffer); RingBuffer_Remove(&USARTtoUSB_Buffer);
} }

@ -33,7 +33,7 @@
* Main source file for the HIDReportViewer project. This file contains the main tasks of * Main source file for the HIDReportViewer project. This file contains the main tasks of
* the project and is responsible for the initial application hardware configuration. * the project and is responsible for the initial application hardware configuration.
*/ */
#include "HIDReportViewer.h" #include "HIDReportViewer.h"
/** Processed HID report descriptor items structure, containing information on each HID report element */ /** Processed HID report descriptor items structure, containing information on each HID report element */
@ -75,7 +75,7 @@ int main(void)
for (;;) for (;;)
{ {
RetrieveDeviceData(); RetrieveDeviceData();
HID_Host_USBTask(&Device_HID_Interface); HID_Host_USBTask(&Device_HID_Interface);
USB_USBTask(); USB_USBTask();
} }
@ -88,12 +88,12 @@ void RetrieveDeviceData(void)
{ {
if (USB_CurrentMode != USB_MODE_Host) if (USB_CurrentMode != USB_MODE_Host)
return; return;
LEDs_SetAllLEDs(LEDMASK_USB_BUSY); LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
OutputReportSizes(); OutputReportSizes();
OutputParsedReportItems(); OutputParsedReportItems();
LEDs_SetAllLEDs(LEDMASK_USB_READY); LEDs_SetAllLEDs(LEDMASK_USB_READY);
USB_Host_SetDeviceConfiguration(0); USB_Host_SetDeviceConfiguration(0);
} }
@ -168,7 +168,7 @@ void OutputParsedReportItems(void)
RItem->Attributes.Logical.Maximum, RItem->Attributes.Logical.Maximum,
RItem->Attributes.Physical.Minimum, RItem->Attributes.Physical.Minimum,
RItem->Attributes.Physical.Maximum); RItem->Attributes.Physical.Maximum);
OutputCollectionPath(RItem->CollectionPath); OutputCollectionPath(RItem->CollectionPath);
} }
} }
@ -188,10 +188,10 @@ void OutputCollectionPath(const HID_CollectionPath_t* const CollectionPath)
" - Type: 0x%02" PRIX8 "\r\n" " - Type: 0x%02" PRIX8 "\r\n"
" - Usage: 0x%02" PRIX8 "\r\n"), " - Usage: 0x%02" PRIX8 "\r\n"),
CurrentNode->Type, CurrentNode->Usage); CurrentNode->Type, CurrentNode->Usage);
CurrentNode = CurrentNode->Parent; CurrentNode = CurrentNode->Parent;
} }
printf_P(PSTR(" |\r\n" printf_P(PSTR(" |\r\n"
" END\r\n")); " END\r\n"));
} }

@ -74,7 +74,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Mass Storage Interface // Mass Storage Interface
USB_Descriptor_Interface_t MS_Interface; USB_Descriptor_Interface_t MS_Interface;
USB_Descriptor_Endpoint_t MS_DataInEndpoint; USB_Descriptor_Endpoint_t MS_DataInEndpoint;

@ -66,7 +66,7 @@
/** Indicates if the disk is write protected or not. */ /** Indicates if the disk is write protected or not. */
#define DISK_READ_ONLY false #define DISK_READ_ONLY false
/* Function Prototypes: */ /* Function Prototypes: */
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo,

@ -190,3 +190,4 @@ FRESULT pf_readdir (DIR*, FILINFO*); /* Read a directory item from the open di
#endif /* _FATFS */ #endif /* _FATFS */

@ -288,7 +288,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
SCSI_ASENSE_WRITE_PROTECTED, SCSI_ASENSE_WRITE_PROTECTED,
SCSI_ASENSEQ_NO_QUALIFIER); SCSI_ASENSEQ_NO_QUALIFIER);
return false; return false;
} }
/* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */ /* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */
@ -307,7 +307,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
return false; return false;
} }
/* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */ /* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */
if (IsDataRead == DATA_READ) if (IsDataRead == DATA_READ)
DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks); DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks);
@ -341,4 +341,4 @@ static bool SCSI_Command_ModeSense_6(USB_ClassInfo_MS_Device_t* const MSInterfac
return true; return true;
} }
#endif #endif

@ -65,14 +65,14 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// CDC Command Interface // CDC Command Interface
USB_Descriptor_Interface_t CDC_CCI_Interface; USB_Descriptor_Interface_t CDC_CCI_Interface;
USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header;
USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM;
USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union;
USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint;
// CDC Data Interface // CDC Data Interface
USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Interface_t CDC_DCI_Interface;
USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -90,7 +90,7 @@ int main(void)
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei(); sei();
for (;;) for (;;)
{ {
MIDI_EventPacket_t ReceivedMIDIEvent; MIDI_EventPacket_t ReceivedMIDIEvent;
@ -99,7 +99,7 @@ int main(void)
if ((ReceivedMIDIEvent.Command == (MIDI_COMMAND_NOTE_ON >> 4)) && ((ReceivedMIDIEvent.Data1 & 0x0F) == 0)) if ((ReceivedMIDIEvent.Command == (MIDI_COMMAND_NOTE_ON >> 4)) && ((ReceivedMIDIEvent.Data1 & 0x0F) == 0))
{ {
DDSNoteData* LRUNoteStruct = &NoteData[0]; DDSNoteData* LRUNoteStruct = &NoteData[0];
/* Find a free entry in the note table to use for the note being turned on */ /* Find a free entry in the note table to use for the note being turned on */
for (uint8_t i = 0; i < MAX_SIMULTANEOUS_NOTES; i++) for (uint8_t i = 0; i < MAX_SIMULTANEOUS_NOTES; i++)
{ {
@ -112,13 +112,13 @@ int main(void)
} }
else if (NoteData[i].LRUAge >= LRUNoteStruct->LRUAge) else if (NoteData[i].LRUAge >= LRUNoteStruct->LRUAge)
{ {
/* If an older entry that the current entry has been found, prefer overwriting that one */ /* If an older entry that the current entry has been found, prefer overwriting that one */
LRUNoteStruct = &NoteData[i]; LRUNoteStruct = &NoteData[i];
} }
NoteData[i].LRUAge++; NoteData[i].LRUAge++;
} }
/* Update the oldest note entry with the new note data and reset its age */ /* Update the oldest note entry with the new note data and reset its age */
LRUNoteStruct->Pitch = ReceivedMIDIEvent.Data2; LRUNoteStruct->Pitch = ReceivedMIDIEvent.Data2;
LRUNoteStruct->TableIncrement = (uint32_t)(BASE_INCREMENT * SCALE_FACTOR) + LRUNoteStruct->TableIncrement = (uint32_t)(BASE_INCREMENT * SCALE_FACTOR) +
@ -133,7 +133,7 @@ int main(void)
else if ((ReceivedMIDIEvent.Command == (MIDI_COMMAND_NOTE_OFF >> 4)) && ((ReceivedMIDIEvent.Data1 & 0x0F) == 0)) else if ((ReceivedMIDIEvent.Command == (MIDI_COMMAND_NOTE_OFF >> 4)) && ((ReceivedMIDIEvent.Data1 & 0x0F) == 0))
{ {
bool FoundActiveNote = false; bool FoundActiveNote = false;
/* Find the note in the note table to turn off */ /* Find the note in the note table to turn off */
for (uint8_t i = 0; i < MAX_SIMULTANEOUS_NOTES; i++) for (uint8_t i = 0; i < MAX_SIMULTANEOUS_NOTES; i++)
{ {
@ -142,13 +142,13 @@ int main(void)
else if (NoteData[i].Pitch) else if (NoteData[i].Pitch)
FoundActiveNote = true; FoundActiveNote = true;
} }
/* If all notes off, turn off the indicator LED */ /* If all notes off, turn off the indicator LED */
if (!(FoundActiveNote)) if (!(FoundActiveNote))
LEDs_SetAllLEDs(LEDS_NO_LEDS); LEDs_SetAllLEDs(LEDS_NO_LEDS);
} }
} }
MIDI_Device_USBTask(&Keyboard_MIDI_Interface); MIDI_Device_USBTask(&Keyboard_MIDI_Interface);
USB_USBTask(); USB_USBTask();
} }
@ -158,7 +158,7 @@ int main(void)
ISR(TIMER0_COMPA_vect, ISR_BLOCK) ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{ {
uint16_t MixedSample = 0; uint16_t MixedSample = 0;
/* Sum together all the active notes to form a single sample */ /* Sum together all the active notes to form a single sample */
for (uint8_t i = 0; i < MAX_SIMULTANEOUS_NOTES; i++) for (uint8_t i = 0; i < MAX_SIMULTANEOUS_NOTES; i++)
{ {
@ -167,13 +167,13 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{ {
/* Use the top 8 bits of the table position as the sample table index */ /* Use the top 8 bits of the table position as the sample table index */
uint8_t TableIndex = (NoteData[i].TablePosition >> 24); uint8_t TableIndex = (NoteData[i].TablePosition >> 24);
/* Add the new tone sample to the accumulator and increment the table position */ /* Add the new tone sample to the accumulator and increment the table position */
MixedSample += SineTable[TableIndex]; MixedSample += SineTable[TableIndex];
NoteData[i].TablePosition += NoteData[i].TableIncrement; NoteData[i].TablePosition += NoteData[i].TableIncrement;
} }
} }
/* Output clamped mixed sample value to the PWM */ /* Output clamped mixed sample value to the PWM */
OCR3A = (MixedSample <= 0xFF) ? MixedSample : 0xFF; OCR3A = (MixedSample <= 0xFF) ? MixedSample : 0xFF;
} }
@ -187,7 +187,7 @@ void SetupHardware(void)
/* Disable clock division */ /* Disable clock division */
clock_prescale_set(clock_div_1); clock_prescale_set(clock_div_1);
/* Hardware Initialization */ /* Hardware Initialization */
LEDs_Init(); LEDs_Init();
USB_Init(); USB_Init();
@ -234,7 +234,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
bool ConfigSuccess = true; bool ConfigSuccess = true;
ConfigSuccess &= MIDI_Device_ConfigureEndpoints(&Keyboard_MIDI_Interface); ConfigSuccess &= MIDI_Device_ConfigureEndpoints(&Keyboard_MIDI_Interface);
LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR); LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
} }
@ -243,3 +243,4 @@ void EVENT_USB_Device_ControlRequest(void)
{ {
MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface); MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);
} }

@ -1,7 +1,7 @@
/* /*
LUFA Library LUFA Library
Copyright (C) Dean Camera, 2011. Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com dean [at] fourwalledcubicle [dot] com
www.fourwalledcubicle.com www.fourwalledcubicle.com
*/ */
@ -9,13 +9,13 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in
all copies and that both that the copyright notice and this all copies and that both that the copyright notice and this
permission notice and warranty disclaimer appear in supporting permission notice and warranty disclaimer appear in supporting
documentation, and that the name of the author not be used in documentation, and that the name of the author not be used in
advertising or publicity pertaining to distribution of the advertising or publicity pertaining to distribution of the
software without specific, written prior permission. software without specific, written prior permission.
The author disclaim all warranties with regard to this The author disclaim all warranties with regard to this
@ -32,7 +32,7 @@
* *
* Header file for AudioOutput.c. * Header file for AudioOutput.c.
*/ */
#ifndef _AUDIO_OUTPUT_H_ #ifndef _AUDIO_OUTPUT_H_
#define _AUDIO_OUTPUT_H_ #define _AUDIO_OUTPUT_H_
@ -45,7 +45,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "Descriptors.h" #include "Descriptors.h"
#include <LUFA/Version.h> #include <LUFA/Version.h>
#include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Peripheral/ADC.h> #include <LUFA/Drivers/Peripheral/ADC.h>
@ -63,27 +63,27 @@
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3) #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
/** Scale factor used to convert the floating point frequencies and ratios into a fixed point number */ /** Scale factor used to convert the floating point frequencies and ratios into a fixed point number */
#define SCALE_FACTOR 65536 #define SCALE_FACTOR 65536
/** Base (lowest) allowable MIDI note frequency */ /** Base (lowest) allowable MIDI note frequency */
#define BASE_FREQUENCY 27.5 #define BASE_FREQUENCY 27.5
/** Ratio between each note in an octave */ /** Ratio between each note in an octave */
#define NOTE_OCTIVE_RATIO 1.05946 #define NOTE_OCTIVE_RATIO 1.05946
/** Lowest valid MIDI pitch index */ /** Lowest valid MIDI pitch index */
#define BASE_PITCH_INDEX 21 #define BASE_PITCH_INDEX 21
/** Maximum number of MIDI notes that can be played simultaneously */ /** Maximum number of MIDI notes that can be played simultaneously */
#define MAX_SIMULTANEOUS_NOTES 3 #define MAX_SIMULTANEOUS_NOTES 3
/** Number of samples in the virtual sample table (can be expanded to lower maximum frequency, but allow for /** Number of samples in the virtual sample table (can be expanded to lower maximum frequency, but allow for
* more simultaneous notes due to the reduced amount of processing time needed when the samples are spaced out) * more simultaneous notes due to the reduced amount of processing time needed when the samples are spaced out)
*/ */
#define VIRTUAL_SAMPLE_TABLE_SIZE 512 #define VIRTUAL_SAMPLE_TABLE_SIZE 512
/** Sample table increments per period for the base MIDI note frequency */ /** Sample table increments per period for the base MIDI note frequency */
#define BASE_INCREMENT (((F_CPU / VIRTUAL_SAMPLE_TABLE_SIZE / 2) / BASE_FREQUENCY)) #define BASE_INCREMENT (((F_CPU / VIRTUAL_SAMPLE_TABLE_SIZE / 2) / BASE_FREQUENCY))
@ -98,10 +98,11 @@
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void); void SetupHardware(void);
void EVENT_USB_Device_Connect(void); void EVENT_USB_Device_Connect(void);
void EVENT_USB_Device_Disconnect(void); void EVENT_USB_Device_Disconnect(void);
void EVENT_USB_Device_ConfigurationChanged(void); void EVENT_USB_Device_ConfigurationChanged(void);
void EVENT_USB_Device_UnhandledControlRequest(void); void EVENT_USB_Device_UnhandledControlRequest(void);
#endif #endif

@ -50,7 +50,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */ USB_Descriptor_Configuration_Header_t Config; /**< Configuration descriptor header structure */
// Keyboard HID Interface // Keyboard HID Interface
USB_Descriptor_Interface_t HID_Interface; /**< Keyboard interface descriptor */ USB_Descriptor_Interface_t HID_Interface; /**< Keyboard interface descriptor */
USB_HID_Descriptor_HID_t HID_KeyboardHID; /**< Keyboard HID descriptor */ USB_HID_Descriptor_HID_t HID_KeyboardHID; /**< Keyboard HID descriptor */

@ -49,7 +49,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Media Controller HID Interface // Media Controller HID Interface
USB_Descriptor_Interface_t HID_Interface; USB_Descriptor_Interface_t HID_Interface;
USB_HID_Descriptor_HID_t HID_MediaControlHID; USB_HID_Descriptor_HID_t HID_MediaControlHID;

@ -8,7 +8,7 @@
/* /*
Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted software and its documentation for any purpose is hereby granted
without fee, provided that the above copyright notice appear in without fee, provided that the above copyright notice appear in

@ -104,7 +104,7 @@ int main(void)
{ {
Read_Joystick_Status(); Read_Joystick_Status();
DiscardNextReport(); DiscardNextReport();
USB_USBTask(); USB_USBTask();
} }
} }

@ -49,7 +49,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Relay Board Interface // Relay Board Interface
USB_Descriptor_Interface_t RelayBoardInterface; USB_Descriptor_Interface_t RelayBoardInterface;
} USB_Descriptor_Configuration_t; } USB_Descriptor_Configuration_t;

@ -43,12 +43,12 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Mass Storage Interface // Mass Storage Interface
USB_Descriptor_Interface_t MS_Interface; USB_Descriptor_Interface_t MS_Interface;
USB_Descriptor_Endpoint_t MS_DataInEndpoint; USB_Descriptor_Endpoint_t MS_DataInEndpoint;
USB_Descriptor_Endpoint_t MS_DataOutEndpoint; USB_Descriptor_Endpoint_t MS_DataOutEndpoint;
// Settings Management Generic HID Interface // Settings Management Generic HID Interface
USB_Descriptor_Interface_t HID_Interface; USB_Descriptor_Interface_t HID_Interface;
USB_HID_Descriptor_HID_t HID_GenericHID; USB_HID_Descriptor_HID_t HID_GenericHID;

@ -34,7 +34,7 @@ bool DS1307_SetTimeDate(const TimeDate_t* NewTimeDate)
NewRegValues.Byte6.Fields.Month = (NewTimeDate->Month % 10); NewRegValues.Byte6.Fields.Month = (NewTimeDate->Month % 10);
NewRegValues.Byte7.Fields.TenYear = (NewTimeDate->Year / 10); NewRegValues.Byte7.Fields.TenYear = (NewTimeDate->Year / 10);
NewRegValues.Byte7.Fields.Year = (NewTimeDate->Year % 10); NewRegValues.Byte7.Fields.Year = (NewTimeDate->Year % 10);
// Write the new Time and Date into the DS1307 // Write the new Time and Date into the DS1307
if (TWI_WritePacket(DS1307_ADDRESS, 10, &WriteAddress, sizeof(WriteAddress), if (TWI_WritePacket(DS1307_ADDRESS, 10, &WriteAddress, sizeof(WriteAddress),
(uint8_t*)&NewRegValues, sizeof(DS1307_DateTimeRegs_t)) != TWI_ERROR_NoError) (uint8_t*)&NewRegValues, sizeof(DS1307_DateTimeRegs_t)) != TWI_ERROR_NoError)
@ -51,24 +51,24 @@ bool DS1307_GetTimeDate(TimeDate_t* const TimeDate)
TimeDate->Hour = 1; TimeDate->Hour = 1;
TimeDate->Minute = 1; TimeDate->Minute = 1;
TimeDate->Second = 1; TimeDate->Second = 1;
TimeDate->Day = 1; TimeDate->Day = 1;
TimeDate->Month = 1; TimeDate->Month = 1;
TimeDate->Year = 1; TimeDate->Year = 1;
return true; return true;
#endif #endif
DS1307_DateTimeRegs_t CurrentRegValues; DS1307_DateTimeRegs_t CurrentRegValues;
const uint8_t ReadAddress = 0; const uint8_t ReadAddress = 0;
// Read in the stored Time and Date from the DS1307 // Read in the stored Time and Date from the DS1307
if (TWI_ReadPacket(DS1307_ADDRESS, 10, &ReadAddress, sizeof(ReadAddress), if (TWI_ReadPacket(DS1307_ADDRESS, 10, &ReadAddress, sizeof(ReadAddress),
(uint8_t*)&CurrentRegValues, sizeof(DS1307_DateTimeRegs_t)) != TWI_ERROR_NoError) (uint8_t*)&CurrentRegValues, sizeof(DS1307_DateTimeRegs_t)) != TWI_ERROR_NoError)
{ {
return false; return false;
} }
// Convert stored time value into decimal // Convert stored time value into decimal
TimeDate->Second = (CurrentRegValues.Byte1.Fields.TenSec * 10) + CurrentRegValues.Byte1.Fields.Sec; TimeDate->Second = (CurrentRegValues.Byte1.Fields.TenSec * 10) + CurrentRegValues.Byte1.Fields.Sec;
TimeDate->Minute = (CurrentRegValues.Byte2.Fields.TenMin * 10) + CurrentRegValues.Byte2.Fields.Min; TimeDate->Minute = (CurrentRegValues.Byte2.Fields.TenMin * 10) + CurrentRegValues.Byte2.Fields.Min;

@ -23,7 +23,7 @@
uint8_t Month; uint8_t Month;
uint8_t Year; uint8_t Year;
} TimeDate_t; } TimeDate_t;
typedef struct typedef struct
{ {
union union
@ -73,7 +73,7 @@
uint8_t IntVal; uint8_t IntVal;
} Byte4; } Byte4;
union union
{ {
struct struct

@ -946,7 +946,7 @@ FRESULT remove_chain (
#if _USE_ERASE #if _USE_ERASE
if (ecl + 1 == nxt) { /* Next cluster is contiguous */ if (ecl + 1 == nxt) { /* Next cluster is contiguous */
ecl = nxt; ecl = nxt;
} else { /* End of contiguous clusters */ } else { /* End of contiguous clusters */
resion[0] = clust2sect(fs, scl); /* Start sector */ resion[0] = clust2sect(fs, scl); /* Start sector */
resion[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */ resion[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */
disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, resion); /* Erase the block */ disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, resion); /* Erase the block */
@ -2650,7 +2650,7 @@ FRESULT f_close (
#if _FS_REENTRANT #if _FS_REENTRANT
res = validate(fp->fs, fp->id); res = validate(fp->fs, fp->id);
if (res == FR_OK) { if (res == FR_OK) {
res = dec_lock(fp->lockid); res = dec_lock(fp->lockid);
unlock_fs(fp->fs, FR_OK); unlock_fs(fp->fs, FR_OK);
} }
#else #else
@ -2749,7 +2749,7 @@ FRESULT f_getcwd (
res = dir_read(&dj); res = dir_read(&dj);
if (res != FR_OK) break; if (res != FR_OK) break;
if (ccl == LD_CLUST(dj.dir)) break; /* Found the entry */ if (ccl == LD_CLUST(dj.dir)) break; /* Found the entry */
res = dir_next(&dj, 0); res = dir_next(&dj, 0);
} while (res == FR_OK); } while (res == FR_OK);
if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */ if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */
if (res != FR_OK) break; if (res != FR_OK) break;
@ -3978,3 +3978,4 @@ int f_printf (
#endif /* !_FS_READONLY */ #endif /* !_FS_READONLY */
#endif /* _USE_STRFUNC */ #endif /* _USE_STRFUNC */

@ -333,3 +333,4 @@ int ff_del_syncobj (_SYNC_t); /* Delete a sync object */
#endif #endif
#endif /* _FATFS */ #endif /* _FATFS */

@ -287,7 +287,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
SCSI_ASENSE_WRITE_PROTECTED, SCSI_ASENSE_WRITE_PROTECTED,
SCSI_ASENSEQ_NO_QUALIFIER); SCSI_ASENSEQ_NO_QUALIFIER);
return false; return false;
} }
/* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */ /* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */
@ -306,7 +306,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
return false; return false;
} }
/* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */ /* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */
if (IsDataRead == DATA_READ) if (IsDataRead == DATA_READ)
DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks); DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks);
@ -340,3 +340,4 @@ static bool SCSI_Command_ModeSense_6(USB_ClassInfo_MS_Device_t* const MSInterfac
return true; return true;
} }

@ -304,7 +304,7 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
const uint16_t ReportSize) const uint16_t ReportSize)
{ {
Device_Report_t* ReportParams = (Device_Report_t*)ReportData; Device_Report_t* ReportParams = (Device_Report_t*)ReportData;
DS1307_SetTimeDate(&ReportParams->TimeDate); DS1307_SetTimeDate(&ReportParams->TimeDate);
/* If the logging interval has changed from its current value, write it to EEPROM */ /* If the logging interval has changed from its current value, write it to EEPROM */

@ -65,14 +65,14 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// CDC Command Interface // CDC Command Interface
USB_Descriptor_Interface_t CDC_CCI_Interface; USB_Descriptor_Interface_t CDC_CCI_Interface;
USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header;
USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM;
USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union;
USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint;
// CDC Data Interface // CDC Data Interface
USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Interface_t CDC_DCI_Interface;
USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;

@ -97,7 +97,7 @@ int main(void)
if (!(ReceivedByte < 0)) if (!(ReceivedByte < 0))
RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte); RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);
} }
/* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */ /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */
uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer); uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75))) if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75)))

@ -74,7 +74,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// RNDIS CDC Command Interface // RNDIS CDC Command Interface
USB_Descriptor_Interface_Association_t CDC_IAD; USB_Descriptor_Interface_Association_t CDC_IAD;
USB_Descriptor_Interface_t CDC_CCI_Interface; USB_Descriptor_Interface_t CDC_CCI_Interface;
@ -82,12 +82,12 @@
USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM;
USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union;
USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint;
// RNDIS CDC Data Interface // RNDIS CDC Data Interface
USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Interface_t CDC_DCI_Interface;
USB_Descriptor_Endpoint_t RNDIS_DataOutEndpoint; USB_Descriptor_Endpoint_t RNDIS_DataOutEndpoint;
USB_Descriptor_Endpoint_t RNDIS_DataInEndpoint; USB_Descriptor_Endpoint_t RNDIS_DataInEndpoint;
// Mass Storage Interface // Mass Storage Interface
USB_Descriptor_Interface_t MS_Interface; USB_Descriptor_Interface_t MS_Interface;
USB_Descriptor_Endpoint_t MS_DataInEndpoint; USB_Descriptor_Endpoint_t MS_DataInEndpoint;

@ -100,3 +100,4 @@ bool DHCPCommon_GetOption(const uint8_t* DHCPOptionList,
} }
#endif #endif

@ -40,7 +40,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <uip.h> #include <uip.h>
/* Macros: */ /* Macros: */

@ -42,20 +42,20 @@
struct uip_conn* BroadcastConnection; struct uip_conn* BroadcastConnection;
uint8_t LeasedIPs[255 / 8]; uint8_t LeasedIPs[255 / 8];
/** Initialization function for the DHCP server. */ /** Initialization function for the DHCP server. */
void DHCPServerApp_Init(void) void DHCPServerApp_Init(void)
{ {
/* Listen on port 67 for DHCP server connections from hosts */ /* Listen on port 67 for DHCP server connections from hosts */
uip_listen(HTONS(DHCP_SERVER_PORT)); uip_listen(HTONS(DHCP_SERVER_PORT));
/* Create a new UDP connection to the DHCP server port for the DHCP solicitation */ /* Create a new UDP connection to the DHCP server port for the DHCP solicitation */
struct uip_udp_conn* BroadcastConnection = uip_udp_new(&uip_broadcast_addr, HTONS(DHCP_CLIENT_PORT)); struct uip_udp_conn* BroadcastConnection = uip_udp_new(&uip_broadcast_addr, HTONS(DHCP_CLIENT_PORT));
/* If the connection was successfully created, bind it to the local DHCP client port */ /* If the connection was successfully created, bind it to the local DHCP client port */
if (BroadcastConnection != NULL) if (BroadcastConnection != NULL)
uip_udp_bind(BroadcastConnection, HTONS(DHCP_SERVER_PORT)); uip_udp_bind(BroadcastConnection, HTONS(DHCP_SERVER_PORT));
/* Set all IP addresses as unleased */ /* Set all IP addresses as unleased */
memset(LeasedIPs, 0x00, sizeof(LeasedIPs)); memset(LeasedIPs, 0x00, sizeof(LeasedIPs));
} }
@ -88,8 +88,8 @@ void DHCPServerApp_Callback(void)
/* Try to extract out the client's preferred IP address if it is indicated in the packet */ /* Try to extract out the client's preferred IP address if it is indicated in the packet */
if (!(DHCPCommon_GetOption(AppData->Options, DHCP_OPTION_REQ_IPADDR, &PreferredClientIP))) if (!(DHCPCommon_GetOption(AppData->Options, DHCP_OPTION_REQ_IPADDR, &PreferredClientIP)))
memcpy(&PreferredClientIP, &uip_all_zeroes_addr, sizeof(uip_ipaddr_t)); memcpy(&PreferredClientIP, &uip_all_zeroes_addr, sizeof(uip_ipaddr_t));
switch (DHCPMessageType) switch (DHCPMessageType)
{ {
case DHCP_DISCOVER: case DHCP_DISCOVER:
@ -116,7 +116,7 @@ void DHCPServerApp_Callback(void)
/* Check to see if the requested IP address has already been leased to a client */ /* Check to see if the requested IP address has already been leased to a client */
if (!(DHCPServerApp_CheckIfIPLeased(&PreferredClientIP))) if (!(DHCPServerApp_CheckIfIPLeased(&PreferredClientIP)))
{ {
/* Create a new DHCP ACK packet to accept the IP address lease */ /* Create a new DHCP ACK packet to accept the IP address lease */
AppDataSize += DHCPServerApp_FillDHCPHeader(AppData, DHCP_ACK, &RemoteMACAddress, &PreferredClientIP, TransactionID); AppDataSize += DHCPServerApp_FillDHCPHeader(AppData, DHCP_ACK, &RemoteMACAddress, &PreferredClientIP, TransactionID);
/* Add network mask and router information to the list of DHCP ACK packet options */ /* Add network mask and router information to the list of DHCP ACK packet options */
@ -133,12 +133,12 @@ void DHCPServerApp_Callback(void)
/* Create a new DHCP NAK packet to reject the requested allocation */ /* Create a new DHCP NAK packet to reject the requested allocation */
AppDataSize += DHCPServerApp_FillDHCPHeader(AppData, DHCP_NAK, &RemoteMACAddress, &uip_all_zeroes_addr, TransactionID); AppDataSize += DHCPServerApp_FillDHCPHeader(AppData, DHCP_NAK, &RemoteMACAddress, &uip_all_zeroes_addr, TransactionID);
} }
/* Send the DHCP ACK or NAK packet */ /* Send the DHCP ACK or NAK packet */
uip_poll_conn(BroadcastConnection); uip_poll_conn(BroadcastConnection);
memcpy(&uip_udp_conn->ripaddr, &uip_broadcast_addr, sizeof(uip_ipaddr_t)); memcpy(&uip_udp_conn->ripaddr, &uip_broadcast_addr, sizeof(uip_ipaddr_t));
uip_udp_send(AppDataSize); uip_udp_send(AppDataSize);
break; break;
case DHCP_RELEASE: case DHCP_RELEASE:
/* Mark the IP address as released in the allocation table */ /* Mark the IP address as released in the allocation table */
@ -179,7 +179,7 @@ static uint16_t DHCPServerApp_FillDHCPHeader(DHCP_Header_t* const DHCPHeader,
memcpy(&DHCPHeader->YourIP, PreferredClientIP, sizeof(uip_ipaddr_t)); memcpy(&DHCPHeader->YourIP, PreferredClientIP, sizeof(uip_ipaddr_t));
memcpy(&DHCPHeader->ClientHardwareAddress, ClientHardwareAddress, sizeof(struct uip_eth_addr)); memcpy(&DHCPHeader->ClientHardwareAddress, ClientHardwareAddress, sizeof(struct uip_eth_addr));
DHCPHeader->Cookie = DHCP_MAGIC_COOKIE; DHCPHeader->Cookie = DHCP_MAGIC_COOKIE;
/* Add a DHCP message type and terminator options to the start of the DHCP options field */ /* Add a DHCP message type and terminator options to the start of the DHCP options field */
DHCPHeader->Options[0] = DHCP_OPTION_MSG_TYPE; DHCPHeader->Options[0] = DHCP_OPTION_MSG_TYPE;
DHCPHeader->Options[1] = 1; DHCPHeader->Options[1] = 1;
@ -202,7 +202,7 @@ static bool DHCPServerApp_CheckIfIPLeased(const uip_ipaddr_t* const IPAddress)
{ {
uint8_t Byte = (IPAddress->u8[3] / 8); uint8_t Byte = (IPAddress->u8[3] / 8);
uint8_t Mask = (1 << (IPAddress->u8[3] % 8)); uint8_t Mask = (1 << (IPAddress->u8[3] % 8));
/* Make sure that the requested IP address isn't already leased to the virtual server or another client */ /* Make sure that the requested IP address isn't already leased to the virtual server or another client */
if (IPAddress->u8[3] && !(IPAddress->u8[3] == uip_hostaddr.u8[3]) && !(LeasedIPs[Byte] & Mask)) if (IPAddress->u8[3] && !(IPAddress->u8[3] == uip_hostaddr.u8[3]) && !(LeasedIPs[Byte] & Mask))
return false; return false;
@ -217,13 +217,13 @@ static bool DHCPServerApp_CheckIfIPLeased(const uip_ipaddr_t* const IPAddress)
static void DHCPServerApp_GetUnleasedIP(uip_ipaddr_t* const NewIPAddress) static void DHCPServerApp_GetUnleasedIP(uip_ipaddr_t* const NewIPAddress)
{ {
uip_ipaddr_copy(NewIPAddress, &uip_hostaddr); uip_ipaddr_copy(NewIPAddress, &uip_hostaddr);
/** Look through the current subnet, skipping the broadcast and zero IP addresses */ /** Look through the current subnet, skipping the broadcast and zero IP addresses */
for (uint8_t IP = 1; IP < 254; IP++) for (uint8_t IP = 1; IP < 254; IP++)
{ {
/* Update new IP address to lease with the current IP address to test */ /* Update new IP address to lease with the current IP address to test */
NewIPAddress->u8[3] = IP; NewIPAddress->u8[3] = IP;
/* If we've found an unleased IP, abort with the updated IP stored for the called */ /* If we've found an unleased IP, abort with the updated IP stored for the called */
if (!(DHCPServerApp_CheckIfIPLeased(NewIPAddress))) if (!(DHCPServerApp_CheckIfIPLeased(NewIPAddress)))
return; return;
@ -241,7 +241,7 @@ static void DHCPServerApp_LeaseIP(const uip_ipaddr_t* const IPAddress)
{ {
uint8_t Byte = (IPAddress->u8[3] / 8); uint8_t Byte = (IPAddress->u8[3] / 8);
uint8_t Mask = (1 << (IPAddress->u8[3] % 8)); uint8_t Mask = (1 << (IPAddress->u8[3] % 8));
/* Mark the IP address as leased in the allocation table */ /* Mark the IP address as leased in the allocation table */
LeasedIPs[Byte] |= Mask; LeasedIPs[Byte] |= Mask;
} }
@ -257,7 +257,7 @@ static void DHCPServerApp_UnleaseIP(const uip_ipaddr_t* const IPAddress)
{ {
uint8_t Byte = (IPAddress->u8[3] / 8); uint8_t Byte = (IPAddress->u8[3] / 8);
uint8_t Mask = (1 << (IPAddress->u8[3] % 8)); uint8_t Mask = (1 << (IPAddress->u8[3] % 8));
/* Mark the IP address as unleased in the allocation table */ /* Mark the IP address as unleased in the allocation table */
LeasedIPs[Byte] &= ~Mask; LeasedIPs[Byte] &= ~Mask;
} }

@ -946,7 +946,7 @@ FRESULT remove_chain (
#if _USE_ERASE #if _USE_ERASE
if (ecl + 1 == nxt) { /* Next cluster is contiguous */ if (ecl + 1 == nxt) { /* Next cluster is contiguous */
ecl = nxt; ecl = nxt;
} else { /* End of contiguous clusters */ } else { /* End of contiguous clusters */
resion[0] = clust2sect(fs, scl); /* Start sector */ resion[0] = clust2sect(fs, scl); /* Start sector */
resion[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */ resion[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */
disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, resion); /* Erase the block */ disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, resion); /* Erase the block */
@ -2650,7 +2650,7 @@ FRESULT f_close (
#if _FS_REENTRANT #if _FS_REENTRANT
res = validate(fp->fs, fp->id); res = validate(fp->fs, fp->id);
if (res == FR_OK) { if (res == FR_OK) {
res = dec_lock(fp->lockid); res = dec_lock(fp->lockid);
unlock_fs(fp->fs, FR_OK); unlock_fs(fp->fs, FR_OK);
} }
#else #else
@ -2749,7 +2749,7 @@ FRESULT f_getcwd (
res = dir_read(&dj); res = dir_read(&dj);
if (res != FR_OK) break; if (res != FR_OK) break;
if (ccl == LD_CLUST(dj.dir)) break; /* Found the entry */ if (ccl == LD_CLUST(dj.dir)) break; /* Found the entry */
res = dir_next(&dj, 0); res = dir_next(&dj, 0);
} while (res == FR_OK); } while (res == FR_OK);
if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */ if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */
if (res != FR_OK) break; if (res != FR_OK) break;
@ -3978,3 +3978,4 @@ int f_printf (
#endif /* !_FS_READONLY */ #endif /* !_FS_READONLY */
#endif /* _USE_STRFUNC */ #endif /* _USE_STRFUNC */

@ -333,3 +333,4 @@ int ff_del_syncobj (_SYNC_t); /* Delete a sync object */
#endif #endif
#endif /* _FATFS */ #endif /* _FATFS */

@ -287,7 +287,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
SCSI_ASENSE_WRITE_PROTECTED, SCSI_ASENSE_WRITE_PROTECTED,
SCSI_ASENSEQ_NO_QUALIFIER); SCSI_ASENSEQ_NO_QUALIFIER);
return false; return false;
} }
/* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */ /* Load in the 32-bit block address (SCSI uses big-endian, so have to reverse the byte order) */
@ -306,7 +306,7 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
return false; return false;
} }
/* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */ /* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */
if (IsDataRead == DATA_READ) if (IsDataRead == DATA_READ)
DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks); DataflashManager_ReadBlocks(MSInterfaceInfo, BlockAddress, TotalBlocks);
@ -340,3 +340,4 @@ static bool SCSI_Command_ModeSense_6(USB_ClassInfo_MS_Device_t* const MSInterfac
return true; return true;
} }

@ -41,7 +41,7 @@
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include "../Descriptors.h" #include "../Descriptors.h"
#include "DataflashManager.h" #include "DataflashManager.h"

@ -70,7 +70,7 @@ void uIPManagement_Init(void)
MACAddress.addr[5] = SERVER_MAC_ADDRESS[5]; MACAddress.addr[5] = SERVER_MAC_ADDRESS[5];
#if defined(ENABLE_DHCP_SERVER) #if defined(ENABLE_DHCP_SERVER)
DHCPServerApp_Init(); DHCPServerApp_Init();
#endif #endif
uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress; uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress;
@ -84,7 +84,7 @@ void uIPManagement_Init(void)
else else
{ {
#if defined(ENABLE_DHCP_CLIENT) #if defined(ENABLE_DHCP_CLIENT)
DHCPClientApp_Init(); DHCPClientApp_Init();
#else #else
uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress; uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress;
uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS[0], DEVICE_IP_ADDRESS[1], DEVICE_IP_ADDRESS[2], DEVICE_IP_ADDRESS[3]); uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS[0], DEVICE_IP_ADDRESS[1], DEVICE_IP_ADDRESS[2], DEVICE_IP_ADDRESS[3]);
@ -170,7 +170,7 @@ static void uIPManagement_ProcessIncomingPacket(void)
/* If no packet received, exit processing routine */ /* If no packet received, exit processing routine */
if (!(RNDIS_Device_IsPacketReceived(&Ethernet_RNDIS_Interface_Device))) if (!(RNDIS_Device_IsPacketReceived(&Ethernet_RNDIS_Interface_Device)))
return; return;
LEDs_SetAllLEDs(LEDMASK_USB_BUSY); LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
/* Read the Incoming packet straight into the UIP packet buffer */ /* Read the Incoming packet straight into the UIP packet buffer */
@ -181,13 +181,13 @@ static void uIPManagement_ProcessIncomingPacket(void)
/* If no packet received, exit processing routine */ /* If no packet received, exit processing routine */
if (!(RNDIS_Host_IsPacketReceived(&Ethernet_RNDIS_Interface_Host))) if (!(RNDIS_Host_IsPacketReceived(&Ethernet_RNDIS_Interface_Host)))
return; return;
LEDs_SetAllLEDs(LEDMASK_USB_BUSY); LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
/* Read the Incoming packet straight into the UIP packet buffer */ /* Read the Incoming packet straight into the UIP packet buffer */
RNDIS_Host_ReadPacket(&Ethernet_RNDIS_Interface_Host, uip_buf, &uip_len); RNDIS_Host_ReadPacket(&Ethernet_RNDIS_Interface_Host, uip_buf, &uip_len);
} }
/* If the packet contains an Ethernet frame, process it */ /* If the packet contains an Ethernet frame, process it */
if (uip_len > 0) if (uip_len > 0)
{ {

@ -60,7 +60,7 @@
* (when DHCP is disabled). * (when DHCP is disabled).
*/ */
#define DEVICE_GATEWAY (uint8_t[]){10, 0, 0, 1} #define DEVICE_GATEWAY (uint8_t[]){10, 0, 0, 1}
/** Ethernet MAC address of the virtual webserver. When in device RNDIS mode, the virtual webserver requires /** Ethernet MAC address of the virtual webserver. When in device RNDIS mode, the virtual webserver requires
* a unique MAC address that it can use when sending packets to the RNDIS adapter, which contains a seperate * a unique MAC address that it can use when sending packets to the RNDIS adapter, which contains a seperate
* MAC address as set in the RNDIS class driver configuration structure. * MAC address as set in the RNDIS class driver configuration structure.

@ -62,7 +62,7 @@ USB_ClassInfo_RNDIS_Device_t Ethernet_RNDIS_Interface_Device =
.AdapterMACAddress = {{0x02, 0x00, 0x02, 0x00, 0x02, 0x00}}, .AdapterMACAddress = {{0x02, 0x00, 0x02, 0x00, 0x02, 0x00}},
}, },
}; };
/** LUFA Mass Storage Class driver interface configuration and state information. This structure is /** LUFA Mass Storage Class driver interface configuration and state information. This structure is
* passed to all Mass Storage Class driver functions, so that multiple instances of the same class * passed to all Mass Storage Class driver functions, so that multiple instances of the same class
* within a device can be differentiated from one another. * within a device can be differentiated from one another.

@ -67,7 +67,7 @@ void USBHostMode_USBTask(void)
return; return;
uIPManagement_ManageNetwork(); uIPManagement_ManageNetwork();
RNDIS_Host_USBTask(&Ethernet_RNDIS_Interface_Host); RNDIS_Host_USBTask(&Ethernet_RNDIS_Interface_Host);
} }

@ -67,7 +67,7 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// Atmel AVRISP-MKII Interface // Atmel AVRISP-MKII Interface
USB_Descriptor_Interface_t AVRISP_Interface; USB_Descriptor_Interface_t AVRISP_Interface;
USB_Descriptor_Endpoint_t AVRISP_DataInEndpoint; USB_Descriptor_Endpoint_t AVRISP_DataInEndpoint;

@ -67,3 +67,4 @@
void SoftUART_Init(void); void SoftUART_Init(void);
#endif #endif

@ -65,14 +65,14 @@
typedef struct typedef struct
{ {
USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Configuration_Header_t Config;
// CDC Control Interface // CDC Control Interface
USB_Descriptor_Interface_t CDC_CCI_Interface; USB_Descriptor_Interface_t CDC_CCI_Interface;
USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header; USB_CDC_Descriptor_FunctionalHeader_t CDC_Functional_Header;
USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM; USB_CDC_Descriptor_FunctionalACM_t CDC_Functional_ACM;
USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union; USB_CDC_Descriptor_FunctionalUnion_t CDC_Functional_Union;
USB_Descriptor_Endpoint_t CDC_NotificationEndpoint; USB_Descriptor_Endpoint_t CDC_NotificationEndpoint;
// CDC Data Interface // CDC Data Interface
USB_Descriptor_Interface_t CDC_DCI_Interface; USB_Descriptor_Interface_t CDC_DCI_Interface;
USB_Descriptor_Endpoint_t CDC_DataOutEndpoint; USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;

@ -134,7 +134,7 @@ void UARTBridge_Task(void)
if (!(ReceivedByte < 0)) if (!(ReceivedByte < 0))
RingBuffer_Insert(&USBtoUART_Buffer, ReceivedByte); RingBuffer_Insert(&USBtoUART_Buffer, ReceivedByte);
} }
/* Check if the UART receive buffer flush timer has expired or buffer is nearly full */ /* Check if the UART receive buffer flush timer has expired or buffer is nearly full */
uint16_t BufferCount = RingBuffer_GetCount(&UARTtoUSB_Buffer); uint16_t BufferCount = RingBuffer_GetCount(&UARTtoUSB_Buffer);
if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200)) if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200))

Loading…
Cancel
Save