forked from mfulz_github/qmk_firmware
Added CDC_Device_Flush() command to the CDC Device mode class driver.
Minor updates to the unfinished SideShow demo for clarity. Added unfinished MassStorageHost class driver demo.
This commit is contained in:
Dean Camera
parent
df29aa37c0
commit
df5500e81c
|
|
@ -33,19 +33,6 @@
|
||||||
SideShow_Application_t InstalledApplications[MAX_APPLICATIONS];
|
SideShow_Application_t InstalledApplications[MAX_APPLICATIONS];
|
||||||
|
|
||||||
|
|
||||||
uint8_t SideShow_GetTotalApplications(void)
|
|
||||||
{
|
|
||||||
uint8_t TotalInstalledApps = 0;
|
|
||||||
|
|
||||||
for (uint8_t App = 0; App < ARRAY_ELEMENTS(InstalledApplications); App++)
|
|
||||||
{
|
|
||||||
if (InstalledApplications[App].InUse)
|
|
||||||
TotalInstalledApps++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return TotalInstalledApps;
|
|
||||||
}
|
|
||||||
|
|
||||||
SideShow_Application_t* SideShow_GetFreeApplication(void)
|
SideShow_Application_t* SideShow_GetFreeApplication(void)
|
||||||
{
|
{
|
||||||
for (uint8_t App = 0; App < ARRAY_ELEMENTS(InstalledApplications); App++)
|
for (uint8_t App = 0; App < ARRAY_ELEMENTS(InstalledApplications); App++)
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,6 @@
|
||||||
extern SideShow_Application_t InstalledApplications[MAX_APPLICATIONS];
|
extern SideShow_Application_t InstalledApplications[MAX_APPLICATIONS];
|
||||||
|
|
||||||
/* Function Prototypes: */
|
/* Function Prototypes: */
|
||||||
uint8_t SideShow_GetTotalApplications(void);
|
|
||||||
SideShow_Application_t* SideShow_GetFreeApplication(void);
|
SideShow_Application_t* SideShow_GetFreeApplication(void);
|
||||||
SideShow_Application_t* SideShow_GetApplicationFromGUID(GUID_t* GUID);
|
SideShow_Application_t* SideShow_GetApplicationFromGUID(GUID_t* GUID);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -295,21 +295,26 @@ static void SideShow_GetString(SideShow_PacketHeader_t* PacketHeader, void* Unic
|
||||||
|
|
||||||
static void SideShow_GetApplicationOrder(SideShow_PacketHeader_t* PacketHeader)
|
static void SideShow_GetApplicationOrder(SideShow_PacketHeader_t* PacketHeader)
|
||||||
{
|
{
|
||||||
uint8_t TotalInstalledApplications = SideShow_GetTotalApplications();
|
uint8_t TotalApplications = 0;
|
||||||
uint16_t GadgetGUIDBytes = (TotalInstalledApplications * sizeof(GUID_t));
|
|
||||||
|
|
||||||
Endpoint_ClearOUT();
|
Endpoint_ClearOUT();
|
||||||
|
|
||||||
|
for (uint8_t App = 0; App < MAX_APPLICATIONS; App++)
|
||||||
|
{
|
||||||
|
if (InstalledApplications[App].InUse)
|
||||||
|
TotalApplications++;
|
||||||
|
}
|
||||||
|
|
||||||
PacketHeader->Length = sizeof(SideShow_PacketHeader_t) +
|
PacketHeader->Length = sizeof(SideShow_PacketHeader_t) +
|
||||||
sizeof(uint32_t) + GadgetGUIDBytes;
|
sizeof(uint32_t) + (TotalApplications * sizeof(GUID_t));
|
||||||
|
|
||||||
Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
|
Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
|
||||||
Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t));
|
Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t));
|
||||||
Endpoint_Write_DWord_LE(TotalInstalledApplications);
|
Endpoint_Write_DWord_LE(TotalApplications);
|
||||||
|
|
||||||
for (uint8_t App = 0; App < MAX_APPLICATIONS; App++)
|
for (uint8_t App = 0; App < MAX_APPLICATIONS; App++)
|
||||||
{
|
{
|
||||||
if (InstalledApplications[App].InUse == true)
|
if (InstalledApplications[App].InUse)
|
||||||
Endpoint_Write_Stream_LE(&InstalledApplications[App].ApplicationID, sizeof(GUID_t));
|
Endpoint_Write_Stream_LE(&InstalledApplications[App].ApplicationID, sizeof(GUID_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -386,9 +391,7 @@ static void SideShow_DeleteApplication(SideShow_PacketHeader_t* PacketHeader)
|
||||||
SideShow_Application_t* AppToDelete = SideShow_GetApplicationFromGUID(&ApplicationGUID);
|
SideShow_Application_t* AppToDelete = SideShow_GetApplicationFromGUID(&ApplicationGUID);
|
||||||
|
|
||||||
if (AppToDelete != NULL)
|
if (AppToDelete != NULL)
|
||||||
{
|
|
||||||
AppToDelete->InUse = false;
|
AppToDelete->InUse = false;
|
||||||
}
|
|
||||||
else
|
else
|
||||||
PacketHeader->Type.NAK = true;
|
PacketHeader->Type.NAK = true;
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,241 @@
|
||||||
|
/*
|
||||||
|
LUFA Library
|
||||||
|
Copyright (C) Dean Camera, 2009.
|
||||||
|
|
||||||
|
dean [at] fourwalledcubicle [dot] com
|
||||||
|
www.fourwalledcubicle.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software
|
||||||
|
and its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in all
|
||||||
|
copies and that both that the copyright notice and this
|
||||||
|
permission notice and warranty disclaimer appear in supporting
|
||||||
|
documentation, and that the name of the author not be used in
|
||||||
|
advertising or publicity pertaining to distribution of the
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
The author disclaim all warranties with regard to this
|
||||||
|
software, including all implied warranties of merchantability
|
||||||
|
and fitness. In no event shall the author be liable for any
|
||||||
|
special, indirect or consequential damages or any damages
|
||||||
|
whatsoever resulting from loss of use, data or profits, whether
|
||||||
|
in an action of contract, negligence or other tortious action,
|
||||||
|
arising out of or in connection with the use or performance of
|
||||||
|
this software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** \file
|
||||||
|
*
|
||||||
|
* Main source file for the MassStorageHost demo. This file contains the main tasks of
|
||||||
|
* the demo and is responsible for the initial application hardware configuration.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "MassStorageHost.h"
|
||||||
|
|
||||||
|
/** 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
|
||||||
|
* within a device can be differentiated from one another.
|
||||||
|
*/
|
||||||
|
USB_ClassInfo_MS_Host_t FlashDisk_MS_Interface =
|
||||||
|
{
|
||||||
|
.Config =
|
||||||
|
{
|
||||||
|
.DataINPipeNumber = 1,
|
||||||
|
.DataOUTPipeNumber = 2,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/** Main program entry point. This routine configures the hardware required by the application, then
|
||||||
|
* starts the scheduler to run the application tasks.
|
||||||
|
*/
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
SetupHardware();
|
||||||
|
|
||||||
|
puts_P(PSTR(ESC_FG_CYAN "Mass Storage Host Demo running.\r\n" ESC_FG_WHITE));
|
||||||
|
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
|
||||||
|
|
||||||
|
for (;;)
|
||||||
|
{
|
||||||
|
switch (USB_HostState)
|
||||||
|
{
|
||||||
|
case HOST_STATE_Addressed:
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
|
||||||
|
|
||||||
|
uint16_t ConfigDescriptorSize;
|
||||||
|
uint8_t ConfigDescriptorData[512];
|
||||||
|
|
||||||
|
if ((USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful) ||
|
||||||
|
(ConfigDescriptorSize > sizeof(ConfigDescriptorData)) ||
|
||||||
|
(USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData)))
|
||||||
|
{
|
||||||
|
printf("Error Retrieving Configuration Descriptor.\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MS_Host_ConfigurePipes(&FlashDisk_MS_Interface,
|
||||||
|
ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)
|
||||||
|
{
|
||||||
|
printf("Attached Device Not a Valid Mouse.\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
|
||||||
|
{
|
||||||
|
printf("Error Setting Device Configuration.\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Mouse Enumerated.\r\n");
|
||||||
|
USB_HostState = HOST_STATE_Configured;
|
||||||
|
break;
|
||||||
|
case HOST_STATE_Configured:
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
|
||||||
|
|
||||||
|
uint8_t MaxLUNIndex;
|
||||||
|
if (MS_Host_GetMaxLUN(&FlashDisk_MS_Interface, &MaxLUNIndex))
|
||||||
|
{
|
||||||
|
printf("Error retrieving max LUN index.\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MS_Host_ResetMSInterface(&FlashDisk_MS_Interface))
|
||||||
|
{
|
||||||
|
printf("Error resetting Mass Storage interface.\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
SCSI_Inquiry_Response_t InquiryData;
|
||||||
|
if (MS_Host_GetInquiryData(&FlashDisk_MS_Interface, &InquiryData))
|
||||||
|
{
|
||||||
|
printf("Error retreiving device Inquiry data.\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Vendor \"%.8s\", Product \"%.16s\"\r\n", InquiryData.VendorID, InquiryData.ProductID);
|
||||||
|
|
||||||
|
bool DeviceReady;
|
||||||
|
printf("Waiting until ready...\r\n"));
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
if (USB_HostState != HOST_STATE_Configured)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (MS_Host_TestUnitReady(&FlashDisk_MS_Interface, 0, &DeviceReady))
|
||||||
|
{
|
||||||
|
printf("Error waiting for device to be ready.\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while (DeviceReady == false);
|
||||||
|
|
||||||
|
puts_P(PSTR("Retrieving Capacity... "));
|
||||||
|
|
||||||
|
SCSI_Capacity_t DiskCapacity;
|
||||||
|
if (MS_Host_ReadDeviceCapacity(0, &DiskCapacity))
|
||||||
|
{
|
||||||
|
printf("Error retrieving device capacity.\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("%lu blocks of %lu bytes.\r\n", DiskCapacity.Blocks, DiskCapacity.BlockSize);
|
||||||
|
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_READY);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
MS_Host_USBTask(&FlashDisk_MS_Interface);
|
||||||
|
USB_USBTask();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Configures the board hardware and chip peripherals for the demo's functionality. */
|
||||||
|
void SetupHardware(void)
|
||||||
|
{
|
||||||
|
/* Disable watchdog if enabled by bootloader/fuses */
|
||||||
|
MCUSR &= ~(1 << WDRF);
|
||||||
|
wdt_disable();
|
||||||
|
|
||||||
|
/* Disable clock division */
|
||||||
|
clock_prescale_set(clock_div_1);
|
||||||
|
|
||||||
|
/* Hardware Initialization */
|
||||||
|
SerialStream_Init(9600, false);
|
||||||
|
LEDs_Init();
|
||||||
|
USB_Init();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
|
||||||
|
* starts the library USB task to begin the enumeration and USB management process.
|
||||||
|
*/
|
||||||
|
void EVENT_USB_Host_DeviceAttached(void)
|
||||||
|
{
|
||||||
|
puts_P(PSTR("Device Attached.\r\n"));
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
|
||||||
|
* stops the library USB task management process.
|
||||||
|
*/
|
||||||
|
void EVENT_USB_Host_DeviceUnattached(void)
|
||||||
|
{
|
||||||
|
puts_P(PSTR("\r\nDevice Unattached.\r\n"));
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
|
||||||
|
* enumerated by the host and is now ready to be used by the application.
|
||||||
|
*/
|
||||||
|
void EVENT_USB_Host_DeviceEnumerationComplete(void)
|
||||||
|
{
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_READY);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
|
||||||
|
void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
|
||||||
|
{
|
||||||
|
USB_ShutDown();
|
||||||
|
|
||||||
|
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
|
||||||
|
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
|
||||||
|
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
for(;;);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while
|
||||||
|
* enumerating an attached USB device.
|
||||||
|
*/
|
||||||
|
void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
|
||||||
|
{
|
||||||
|
printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"
|
||||||
|
" -- Error Code %d\r\n"
|
||||||
|
" -- Sub Error Code %d\r\n"
|
||||||
|
" -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
|
||||||
|
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,78 @@
|
||||||
|
/*
|
||||||
|
LUFA Library
|
||||||
|
Copyright (C) Dean Camera, 2009.
|
||||||
|
|
||||||
|
dean [at] fourwalledcubicle [dot] com
|
||||||
|
www.fourwalledcubicle.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software
|
||||||
|
and its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in all
|
||||||
|
copies and that both that the copyright notice and this
|
||||||
|
permission notice and warranty disclaimer appear in supporting
|
||||||
|
documentation, and that the name of the author not be used in
|
||||||
|
advertising or publicity pertaining to distribution of the
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
The author disclaim all warranties with regard to this
|
||||||
|
software, including all implied warranties of merchantability
|
||||||
|
and fitness. In no event shall the author be liable for any
|
||||||
|
special, indirect or consequential damages or any damages
|
||||||
|
whatsoever resulting from loss of use, data or profits, whether
|
||||||
|
in an action of contract, negligence or other tortious action,
|
||||||
|
arising out of or in connection with the use or performance of
|
||||||
|
this software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** \file
|
||||||
|
*
|
||||||
|
* Header file for MassStorage.c.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _MASS_STORAGE_HOST_H_
|
||||||
|
#define _MASS_STORAGE_HOST_H_
|
||||||
|
|
||||||
|
/* Includes: */
|
||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/wdt.h>
|
||||||
|
#include <avr/pgmspace.h>
|
||||||
|
#include <avr/power.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#include <LUFA/Version.h>
|
||||||
|
#include <LUFA/Drivers/Misc/TerminalCodes.h>
|
||||||
|
#include <LUFA/Drivers/Peripheral/SerialStream.h>
|
||||||
|
#include <LUFA/Drivers/Board/LEDs.h>
|
||||||
|
#include <LUFA/Drivers/USB/USB.h>
|
||||||
|
#include <LUFA/Drivers/USB/Class/MassStorage.h>
|
||||||
|
|
||||||
|
/* Macros: */
|
||||||
|
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
|
||||||
|
#define LEDMASK_USB_NOTREADY LEDS_LED1
|
||||||
|
|
||||||
|
/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */
|
||||||
|
#define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)
|
||||||
|
|
||||||
|
/** LED mask for the library LED driver, to indicate that the USB interface is ready. */
|
||||||
|
#define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)
|
||||||
|
|
||||||
|
/** 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)
|
||||||
|
|
||||||
|
/** LED mask for the library LED driver, to indicate that the USB interface is busy. */
|
||||||
|
#define LEDMASK_USB_BUSY (LEDS_LED2)
|
||||||
|
|
||||||
|
/* Function Prototypes: */
|
||||||
|
void SetupHardware(void);
|
||||||
|
|
||||||
|
void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
|
||||||
|
void EVENT_USB_Host_DeviceAttached(void);
|
||||||
|
void EVENT_USB_Host_DeviceUnattached(void);
|
||||||
|
void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
|
||||||
|
void EVENT_USB_Host_DeviceEnumerationComplete(void);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,721 @@
|
||||||
|
# Hey Emacs, this is a -*- makefile -*-
|
||||||
|
#----------------------------------------------------------------------------
|
||||||
|
# WinAVR Makefile Template written by Eric B. Weddington, Jörg Wunsch, et al.
|
||||||
|
# >> Modified for use with the LUFA project. <<
|
||||||
|
#
|
||||||
|
# Released to the Public Domain
|
||||||
|
#
|
||||||
|
# Additional material for this makefile was written by:
|
||||||
|
# Peter Fleury
|
||||||
|
# Tim Henigan
|
||||||
|
# Colin O'Flynn
|
||||||
|
# Reiner Patommel
|
||||||
|
# Markus Pfaff
|
||||||
|
# Sander Pool
|
||||||
|
# Frederik Rouleau
|
||||||
|
# Carlos Lamas
|
||||||
|
# Dean Camera
|
||||||
|
# Opendous Inc.
|
||||||
|
# Denver Gingerich
|
||||||
|
#
|
||||||
|
#----------------------------------------------------------------------------
|
||||||
|
# On command line:
|
||||||
|
#
|
||||||
|
# make all = Make software.
|
||||||
|
#
|
||||||
|
# make clean = Clean out built project files.
|
||||||
|
#
|
||||||
|
# make coff = Convert ELF to AVR COFF.
|
||||||
|
#
|
||||||
|
# make extcoff = Convert ELF to AVR Extended COFF.
|
||||||
|
#
|
||||||
|
# make program = Download the hex file to the device, using avrdude.
|
||||||
|
# Please customize the avrdude settings below first!
|
||||||
|
#
|
||||||
|
# make dfu = Download the hex file to the device, using dfu-programmer (must
|
||||||
|
# have dfu-programmer installed).
|
||||||
|
#
|
||||||
|
# make flip = Download the hex file to the device, using Atmel FLIP (must
|
||||||
|
# have Atmel FLIP installed).
|
||||||
|
#
|
||||||
|
# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
|
||||||
|
# (must have dfu-programmer installed).
|
||||||
|
#
|
||||||
|
# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
|
||||||
|
# (must have Atmel FLIP installed).
|
||||||
|
#
|
||||||
|
# make doxygen = Generate DoxyGen documentation for the project (must have
|
||||||
|
# DoxyGen installed)
|
||||||
|
#
|
||||||
|
# make debug = Start either simulavr or avarice as specified for debugging,
|
||||||
|
# with avr-gdb or avr-insight as the front end for debugging.
|
||||||
|
#
|
||||||
|
# make filename.s = Just compile filename.c into the assembler code only.
|
||||||
|
#
|
||||||
|
# make filename.i = Create a preprocessed source file for use in submitting
|
||||||
|
# bug reports to the GCC project.
|
||||||
|
#
|
||||||
|
# To rebuild project do "make clean" then "make all".
|
||||||
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
# MCU name
|
||||||
|
MCU = at90usb647
|
||||||
|
|
||||||
|
|
||||||
|
# Target board (see library "Board Types" documentation, USER or blank for projects not requiring
|
||||||
|
# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
|
||||||
|
# "Board" inside the application directory.
|
||||||
|
BOARD = USBKEY
|
||||||
|
|
||||||
|
|
||||||
|
# Processor frequency.
|
||||||
|
# This will define a symbol, F_CPU, in all source code files equal to the
|
||||||
|
# processor frequency. You can then use this symbol in your source code to
|
||||||
|
# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
|
||||||
|
# automatically to create a 32-bit value in your source code.
|
||||||
|
# Typical values are:
|
||||||
|
# F_CPU = 1000000
|
||||||
|
# F_CPU = 1843200
|
||||||
|
# F_CPU = 2000000
|
||||||
|
# F_CPU = 3686400
|
||||||
|
# F_CPU = 4000000
|
||||||
|
# F_CPU = 7372800
|
||||||
|
# F_CPU = 8000000
|
||||||
|
# F_CPU = 11059200
|
||||||
|
# F_CPU = 14745600
|
||||||
|
# F_CPU = 16000000
|
||||||
|
# F_CPU = 18432000
|
||||||
|
# F_CPU = 20000000
|
||||||
|
F_CPU = 8000000
|
||||||
|
|
||||||
|
|
||||||
|
# Input clock frequency.
|
||||||
|
# This will define a symbol, F_CLOCK, in all source code files equal to the
|
||||||
|
# input clock frequency (before any prescaling is performed). This value may
|
||||||
|
# differ from F_CPU if prescaling is used on the latter, and is required as the
|
||||||
|
# raw input clock is fed directly to the PLL sections of the AVR for high speed
|
||||||
|
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
|
||||||
|
# at the end, this will be done automatically to create a 32-bit value in your
|
||||||
|
# source code.
|
||||||
|
#
|
||||||
|
# If no clock division is performed on the input clock inside the AVR (via the
|
||||||
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
|
F_CLOCK = $(F_CPU)
|
||||||
|
|
||||||
|
|
||||||
|
# Output format. (can be srec, ihex, binary)
|
||||||
|
FORMAT = ihex
|
||||||
|
|
||||||
|
|
||||||
|
# Target file name (without extension).
|
||||||
|
TARGET = MassStorageHost
|
||||||
|
|
||||||
|
|
||||||
|
# Object files directory
|
||||||
|
# To put object files in current directory, use a dot (.), do NOT make
|
||||||
|
# this an empty or blank macro!
|
||||||
|
OBJDIR = .
|
||||||
|
|
||||||
|
|
||||||
|
# Path to the LUFA library
|
||||||
|
LUFA_PATH = ../../../..
|
||||||
|
|
||||||
|
|
||||||
|
# LUFA library compile-time options
|
||||||
|
LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES
|
||||||
|
LUFA_OPTS += -D USB_HOST_ONLY
|
||||||
|
LUFA_OPTS += -D NO_STREAM_CALLBACKS
|
||||||
|
LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
|
||||||
|
|
||||||
|
|
||||||
|
# List C source files here. (C dependencies are automatically generated.)
|
||||||
|
SRC = $(TARGET).c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/MassStorage.c \
|
||||||
|
$(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/MassStorage.c \
|
||||||
|
|
||||||
|
|
||||||
|
# List C++ source files here. (C dependencies are automatically generated.)
|
||||||
|
CPPSRC =
|
||||||
|
|
||||||
|
|
||||||
|
# List Assembler source files here.
|
||||||
|
# Make them always end in a capital .S. Files ending in a lowercase .s
|
||||||
|
# will not be considered source files but generated files (assembler
|
||||||
|
# output from the compiler), and will be deleted upon "make clean"!
|
||||||
|
# Even though the DOS/Win* filesystem matches both .s and .S the same,
|
||||||
|
# it will preserve the spelling of the filenames, and gcc itself does
|
||||||
|
# care about how the name is spelled on its command-line.
|
||||||
|
ASRC =
|
||||||
|
|
||||||
|
|
||||||
|
# Optimization level, can be [0, 1, 2, 3, s].
|
||||||
|
# 0 = turn off optimization. s = optimize for size.
|
||||||
|
# (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
|
||||||
|
OPT = s
|
||||||
|
|
||||||
|
|
||||||
|
# Debugging format.
|
||||||
|
# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
|
||||||
|
# AVR Studio 4.10 requires dwarf-2.
|
||||||
|
# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
|
||||||
|
DEBUG = dwarf-2
|
||||||
|
|
||||||
|
|
||||||
|
# List any extra directories to look for include files here.
|
||||||
|
# Each directory must be seperated by a space.
|
||||||
|
# Use forward slashes for directory separators.
|
||||||
|
# For a directory that has spaces, enclose it in quotes.
|
||||||
|
EXTRAINCDIRS = $(LUFA_PATH)/
|
||||||
|
|
||||||
|
|
||||||
|
# Compiler flag to set the C Standard level.
|
||||||
|
# c89 = "ANSI" C
|
||||||
|
# gnu89 = c89 plus GCC extensions
|
||||||
|
# c99 = ISO C99 standard (not yet fully implemented)
|
||||||
|
# gnu99 = c99 plus GCC extensions
|
||||||
|
CSTANDARD = -std=gnu99
|
||||||
|
|
||||||
|
|
||||||
|
# Place -D or -U options here for C sources
|
||||||
|
CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
|
||||||
|
|
||||||
|
|
||||||
|
# Place -D or -U options here for ASM sources
|
||||||
|
ADEFS = -DF_CPU=$(F_CPU)
|
||||||
|
|
||||||
|
|
||||||
|
# Place -D or -U options here for C++ sources
|
||||||
|
CPPDEFS = -DF_CPU=$(F_CPU)UL
|
||||||
|
#CPPDEFS += -D__STDC_LIMIT_MACROS
|
||||||
|
#CPPDEFS += -D__STDC_CONSTANT_MACROS
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#---------------- Compiler Options C ----------------
|
||||||
|
# -g*: generate debugging information
|
||||||
|
# -O*: optimization level
|
||||||
|
# -f...: tuning, see GCC manual and avr-libc documentation
|
||||||
|
# -Wall...: warning level
|
||||||
|
# -Wa,...: tell GCC to pass this to the assembler.
|
||||||
|
# -adhlns...: create assembler listing
|
||||||
|
CFLAGS = -g$(DEBUG)
|
||||||
|
CFLAGS += $(CDEFS)
|
||||||
|
CFLAGS += -O$(OPT)
|
||||||
|
CFLAGS += -funsigned-char
|
||||||
|
CFLAGS += -funsigned-bitfields
|
||||||
|
CFLAGS += -ffunction-sections
|
||||||
|
CFLAGS += -fpack-struct
|
||||||
|
CFLAGS += -fshort-enums
|
||||||
|
CFLAGS += -finline-limit=20
|
||||||
|
CFLAGS += -Wall
|
||||||
|
CFLAGS += -Wstrict-prototypes
|
||||||
|
CFLAGS += -Wundef
|
||||||
|
#CFLAGS += -fno-unit-at-a-time
|
||||||
|
#CFLAGS += -Wunreachable-code
|
||||||
|
#CFLAGS += -Wsign-compare
|
||||||
|
CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
|
||||||
|
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
|
||||||
|
CFLAGS += $(CSTANDARD)
|
||||||
|
|
||||||
|
|
||||||
|
#---------------- Compiler Options C++ ----------------
|
||||||
|
# -g*: generate debugging information
|
||||||
|
# -O*: optimization level
|
||||||
|
# -f...: tuning, see GCC manual and avr-libc documentation
|
||||||
|
# -Wall...: warning level
|
||||||
|
# -Wa,...: tell GCC to pass this to the assembler.
|
||||||
|
# -adhlns...: create assembler listing
|
||||||
|
CPPFLAGS = -g$(DEBUG)
|
||||||
|
CPPFLAGS += $(CPPDEFS)
|
||||||
|
CPPFLAGS += -O$(OPT)
|
||||||
|
CPPFLAGS += -funsigned-char
|
||||||
|
CPPFLAGS += -funsigned-bitfields
|
||||||
|
CPPFLAGS += -fpack-struct
|
||||||
|
CPPFLAGS += -fshort-enums
|
||||||
|
CPPFLAGS += -fno-exceptions
|
||||||
|
CPPFLAGS += -Wall
|
||||||
|
CFLAGS += -Wundef
|
||||||
|
#CPPFLAGS += -mshort-calls
|
||||||
|
#CPPFLAGS += -fno-unit-at-a-time
|
||||||
|
#CPPFLAGS += -Wstrict-prototypes
|
||||||
|
#CPPFLAGS += -Wunreachable-code
|
||||||
|
#CPPFLAGS += -Wsign-compare
|
||||||
|
CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
|
||||||
|
CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
|
||||||
|
#CPPFLAGS += $(CSTANDARD)
|
||||||
|
|
||||||
|
|
||||||
|
#---------------- Assembler Options ----------------
|
||||||
|
# -Wa,...: tell GCC to pass this to the assembler.
|
||||||
|
# -adhlns: create listing
|
||||||
|
# -gstabs: have the assembler create line number information; note that
|
||||||
|
# for use in COFF files, additional information about filenames
|
||||||
|
# and function names needs to be present in the assembler source
|
||||||
|
# files -- see avr-libc docs [FIXME: not yet described there]
|
||||||
|
# -listing-cont-lines: Sets the maximum number of continuation lines of hex
|
||||||
|
# dump that will be displayed for a given single line of source input.
|
||||||
|
ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
|
||||||
|
|
||||||
|
|
||||||
|
#---------------- Library Options ----------------
|
||||||
|
# Minimalistic printf version
|
||||||
|
PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
|
||||||
|
|
||||||
|
# Floating point printf version (requires MATH_LIB = -lm below)
|
||||||
|
PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
|
||||||
|
|
||||||
|
# If this is left blank, then it will use the Standard printf version.
|
||||||
|
PRINTF_LIB =
|
||||||
|
#PRINTF_LIB = $(PRINTF_LIB_MIN)
|
||||||
|
#PRINTF_LIB = $(PRINTF_LIB_FLOAT)
|
||||||
|
|
||||||
|
|
||||||
|
# Minimalistic scanf version
|
||||||
|
SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
|
||||||
|
|
||||||
|
# Floating point + %[ scanf version (requires MATH_LIB = -lm below)
|
||||||
|
SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
|
||||||
|
|
||||||
|
# If this is left blank, then it will use the Standard scanf version.
|
||||||
|
SCANF_LIB =
|
||||||
|
#SCANF_LIB = $(SCANF_LIB_MIN)
|
||||||
|
#SCANF_LIB = $(SCANF_LIB_FLOAT)
|
||||||
|
|
||||||
|
|
||||||
|
MATH_LIB = -lm
|
||||||
|
|
||||||
|
|
||||||
|
# List any extra directories to look for libraries here.
|
||||||
|
# Each directory must be seperated by a space.
|
||||||
|
# Use forward slashes for directory separators.
|
||||||
|
# For a directory that has spaces, enclose it in quotes.
|
||||||
|
EXTRALIBDIRS =
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#---------------- External Memory Options ----------------
|
||||||
|
|
||||||
|
# 64 KB of external RAM, starting after internal RAM (ATmega128!),
|
||||||
|
# used for variables (.data/.bss) and heap (malloc()).
|
||||||
|
#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff
|
||||||
|
|
||||||
|
# 64 KB of external RAM, starting after internal RAM (ATmega128!),
|
||||||
|
# only used for heap (malloc()).
|
||||||
|
#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff
|
||||||
|
|
||||||
|
EXTMEMOPTS =
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#---------------- Linker Options ----------------
|
||||||
|
# -Wl,...: tell GCC to pass this to linker.
|
||||||
|
# -Map: create map file
|
||||||
|
# --cref: add cross reference to map file
|
||||||
|
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
|
||||||
|
LDFLAGS += -Wl,--relax
|
||||||
|
LDFLAGS += -Wl,--gc-sections
|
||||||
|
LDFLAGS += $(EXTMEMOPTS)
|
||||||
|
LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
|
||||||
|
LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
|
||||||
|
#LDFLAGS += -T linker_script.x
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#---------------- Programming Options (avrdude) ----------------
|
||||||
|
|
||||||
|
# Programming hardware: alf avr910 avrisp bascom bsd
|
||||||
|
# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500
|
||||||
|
#
|
||||||
|
# Type: avrdude -c ?
|
||||||
|
# to get a full listing.
|
||||||
|
#
|
||||||
|
AVRDUDE_PROGRAMMER = jtagmkII
|
||||||
|
|
||||||
|
# com1 = serial port. Use lpt1 to connect to parallel port.
|
||||||
|
AVRDUDE_PORT = usb
|
||||||
|
|
||||||
|
AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
|
||||||
|
#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
|
||||||
|
|
||||||
|
|
||||||
|
# Uncomment the following if you want avrdude's erase cycle counter.
|
||||||
|
# Note that this counter needs to be initialized first using -Yn,
|
||||||
|
# see avrdude manual.
|
||||||
|
#AVRDUDE_ERASE_COUNTER = -y
|
||||||
|
|
||||||
|
# Uncomment the following if you do /not/ wish a verification to be
|
||||||
|
# performed after programming the device.
|
||||||
|
#AVRDUDE_NO_VERIFY = -V
|
||||||
|
|
||||||
|
# Increase verbosity level. Please use this when submitting bug
|
||||||
|
# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>
|
||||||
|
# to submit bug reports.
|
||||||
|
#AVRDUDE_VERBOSE = -v -v
|
||||||
|
|
||||||
|
AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
|
||||||
|
AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
|
||||||
|
AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
|
||||||
|
AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#---------------- Debugging Options ----------------
|
||||||
|
|
||||||
|
# For simulavr only - target MCU frequency.
|
||||||
|
DEBUG_MFREQ = $(F_CPU)
|
||||||
|
|
||||||
|
# Set the DEBUG_UI to either gdb or insight.
|
||||||
|
# DEBUG_UI = gdb
|
||||||
|
DEBUG_UI = insight
|
||||||
|
|
||||||
|
# Set the debugging back-end to either avarice, simulavr.
|
||||||
|
DEBUG_BACKEND = avarice
|
||||||
|
#DEBUG_BACKEND = simulavr
|
||||||
|
|
||||||
|
# GDB Init Filename.
|
||||||
|
GDBINIT_FILE = __avr_gdbinit
|
||||||
|
|
||||||
|
# When using avarice settings for the JTAG
|
||||||
|
JTAG_DEV = /dev/com1
|
||||||
|
|
||||||
|
# Debugging port used to communicate between GDB / avarice / simulavr.
|
||||||
|
DEBUG_PORT = 4242
|
||||||
|
|
||||||
|
# Debugging host used to communicate between GDB / avarice / simulavr, normally
|
||||||
|
# just set to localhost unless doing some sort of crazy debugging when
|
||||||
|
# avarice is running on a different computer.
|
||||||
|
DEBUG_HOST = localhost
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#============================================================================
|
||||||
|
|
||||||
|
|
||||||
|
# Define programs and commands.
|
||||||
|
SHELL = sh
|
||||||
|
CC = avr-gcc
|
||||||
|
OBJCOPY = avr-objcopy
|
||||||
|
OBJDUMP = avr-objdump
|
||||||
|
SIZE = avr-size
|
||||||
|
AR = avr-ar rcs
|
||||||
|
NM = avr-nm
|
||||||
|
AVRDUDE = avrdude
|
||||||
|
REMOVE = rm -f
|
||||||
|
REMOVEDIR = rm -rf
|
||||||
|
COPY = cp
|
||||||
|
WINSHELL = cmd
|
||||||
|
|
||||||
|
# Define Messages
|
||||||
|
# English
|
||||||
|
MSG_ERRORS_NONE = Errors: none
|
||||||
|
MSG_BEGIN = -------- begin --------
|
||||||
|
MSG_END = -------- end --------
|
||||||
|
MSG_SIZE_BEFORE = Size before:
|
||||||
|
MSG_SIZE_AFTER = Size after:
|
||||||
|
MSG_COFF = Converting to AVR COFF:
|
||||||
|
MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
|
||||||
|
MSG_FLASH = Creating load file for Flash:
|
||||||
|
MSG_EEPROM = Creating load file for EEPROM:
|
||||||
|
MSG_EXTENDED_LISTING = Creating Extended Listing:
|
||||||
|
MSG_SYMBOL_TABLE = Creating Symbol Table:
|
||||||
|
MSG_LINKING = Linking:
|
||||||
|
MSG_COMPILING = Compiling C:
|
||||||
|
MSG_COMPILING_CPP = Compiling C++:
|
||||||
|
MSG_ASSEMBLING = Assembling:
|
||||||
|
MSG_CLEANING = Cleaning project:
|
||||||
|
MSG_CREATING_LIBRARY = Creating library:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Define all object files.
|
||||||
|
OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)
|
||||||
|
|
||||||
|
# Define all listing files.
|
||||||
|
LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)
|
||||||
|
|
||||||
|
|
||||||
|
# Compiler flags to generate dependency files.
|
||||||
|
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
|
||||||
|
|
||||||
|
|
||||||
|
# Combine all necessary flags and optional flags.
|
||||||
|
# Add target processor to flags.
|
||||||
|
ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)
|
||||||
|
ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS)
|
||||||
|
ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Default target.
|
||||||
|
all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end
|
||||||
|
|
||||||
|
# Change the build target to build a HEX file or a library.
|
||||||
|
build: elf hex eep lss sym
|
||||||
|
#build: lib
|
||||||
|
|
||||||
|
|
||||||
|
elf: $(TARGET).elf
|
||||||
|
hex: $(TARGET).hex
|
||||||
|
eep: $(TARGET).eep
|
||||||
|
lss: $(TARGET).lss
|
||||||
|
sym: $(TARGET).sym
|
||||||
|
LIBNAME=lib$(TARGET).a
|
||||||
|
lib: $(LIBNAME)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Eye candy.
|
||||||
|
# AVR Studio 3.x does not check make's exit code but relies on
|
||||||
|
# the following magic strings to be generated by the compile job.
|
||||||
|
begin:
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_BEGIN)
|
||||||
|
|
||||||
|
end:
|
||||||
|
@echo $(MSG_END)
|
||||||
|
@echo
|
||||||
|
|
||||||
|
|
||||||
|
# Display size of file.
|
||||||
|
HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
|
||||||
|
ELFSIZE = $(SIZE) $(MCU_FLAG) $(FORMAT_FLAG) $(TARGET).elf
|
||||||
|
MCU_FLAG = $(shell $(SIZE) --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) )
|
||||||
|
FORMAT_FLAG = $(shell $(SIZE) --help | grep -- --format=.*avr > /dev/null && echo --format=avr )
|
||||||
|
|
||||||
|
sizebefore:
|
||||||
|
@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
|
||||||
|
2>/dev/null; echo; fi
|
||||||
|
|
||||||
|
sizeafter:
|
||||||
|
@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
|
||||||
|
2>/dev/null; echo; fi
|
||||||
|
|
||||||
|
showeventhooks: build
|
||||||
|
@echo
|
||||||
|
@echo -------- Unhooked LUFA Events --------
|
||||||
|
@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \
|
||||||
|
cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \
|
||||||
|
echo "(None)"
|
||||||
|
@echo --------------------------------------
|
||||||
|
|
||||||
|
showliboptions:
|
||||||
|
@echo
|
||||||
|
@echo ---- Compile Time Library Options ----
|
||||||
|
@for i in $(LUFA_OPTS:-D%=%); do \
|
||||||
|
echo $$i; \
|
||||||
|
done
|
||||||
|
@echo --------------------------------------
|
||||||
|
|
||||||
|
showtarget:
|
||||||
|
@echo
|
||||||
|
@echo --------- Target Information ---------
|
||||||
|
@echo AVR Model: $(MCU)
|
||||||
|
@echo Board: $(BOARD)
|
||||||
|
@echo Clock: $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master
|
||||||
|
@echo --------------------------------------
|
||||||
|
|
||||||
|
# Display compiler version information.
|
||||||
|
gccversion :
|
||||||
|
@$(CC) --version
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Program the device.
|
||||||
|
program: $(TARGET).hex $(TARGET).eep
|
||||||
|
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
|
||||||
|
|
||||||
|
|
||||||
|
# Generate avr-gdb config/init file which does the following:
|
||||||
|
# define the reset signal, load the target file, connect to target, and set
|
||||||
|
# a breakpoint at main().
|
||||||
|
gdb-config:
|
||||||
|
@$(REMOVE) $(GDBINIT_FILE)
|
||||||
|
@echo define reset >> $(GDBINIT_FILE)
|
||||||
|
@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)
|
||||||
|
@echo end >> $(GDBINIT_FILE)
|
||||||
|
@echo file $(TARGET).elf >> $(GDBINIT_FILE)
|
||||||
|
@echo target remote $(DEBUG_HOST):$(DEBUG_PORT) >> $(GDBINIT_FILE)
|
||||||
|
ifeq ($(DEBUG_BACKEND),simulavr)
|
||||||
|
@echo load >> $(GDBINIT_FILE)
|
||||||
|
endif
|
||||||
|
@echo break main >> $(GDBINIT_FILE)
|
||||||
|
|
||||||
|
debug: gdb-config $(TARGET).elf
|
||||||
|
ifeq ($(DEBUG_BACKEND), avarice)
|
||||||
|
@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.
|
||||||
|
@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \
|
||||||
|
$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)
|
||||||
|
@$(WINSHELL) /c pause
|
||||||
|
|
||||||
|
else
|
||||||
|
@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \
|
||||||
|
$(DEBUG_MFREQ) --port $(DEBUG_PORT)
|
||||||
|
endif
|
||||||
|
@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
|
||||||
|
COFFCONVERT = $(OBJCOPY) --debugging
|
||||||
|
COFFCONVERT += --change-section-address .data-0x800000
|
||||||
|
COFFCONVERT += --change-section-address .bss-0x800000
|
||||||
|
COFFCONVERT += --change-section-address .noinit-0x800000
|
||||||
|
COFFCONVERT += --change-section-address .eeprom-0x810000
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
coff: $(TARGET).elf
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_COFF) $(TARGET).cof
|
||||||
|
$(COFFCONVERT) -O coff-avr $< $(TARGET).cof
|
||||||
|
|
||||||
|
|
||||||
|
extcoff: $(TARGET).elf
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_EXTENDED_COFF) $(TARGET).cof
|
||||||
|
$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Create final output files (.hex, .eep) from ELF output file.
|
||||||
|
%.hex: %.elf
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_FLASH) $@
|
||||||
|
$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
|
||||||
|
|
||||||
|
%.eep: %.elf
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_EEPROM) $@
|
||||||
|
-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
|
||||||
|
--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0
|
||||||
|
|
||||||
|
# Create extended listing file from ELF output file.
|
||||||
|
%.lss: %.elf
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_EXTENDED_LISTING) $@
|
||||||
|
$(OBJDUMP) -h -z -S $< > $@
|
||||||
|
|
||||||
|
# Create a symbol table from ELF output file.
|
||||||
|
%.sym: %.elf
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_SYMBOL_TABLE) $@
|
||||||
|
$(NM) -n $< > $@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Create library from object files.
|
||||||
|
.SECONDARY : $(TARGET).a
|
||||||
|
.PRECIOUS : $(OBJ)
|
||||||
|
%.a: $(OBJ)
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_CREATING_LIBRARY) $@
|
||||||
|
$(AR) $@ $(OBJ)
|
||||||
|
|
||||||
|
|
||||||
|
# Link: create ELF output file from object files.
|
||||||
|
.SECONDARY : $(TARGET).elf
|
||||||
|
.PRECIOUS : $(OBJ)
|
||||||
|
%.elf: $(OBJ)
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_LINKING) $@
|
||||||
|
$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
# Compile: create object files from C source files.
|
||||||
|
$(OBJDIR)/%.o : %.c
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_COMPILING) $<
|
||||||
|
$(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||||
|
|
||||||
|
|
||||||
|
# Compile: create object files from C++ source files.
|
||||||
|
$(OBJDIR)/%.o : %.cpp
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_COMPILING_CPP) $<
|
||||||
|
$(CC) -c $(ALL_CPPFLAGS) $< -o $@
|
||||||
|
|
||||||
|
|
||||||
|
# Compile: create assembler files from C source files.
|
||||||
|
%.s : %.c
|
||||||
|
$(CC) -S $(ALL_CFLAGS) $< -o $@
|
||||||
|
|
||||||
|
|
||||||
|
# Compile: create assembler files from C++ source files.
|
||||||
|
%.s : %.cpp
|
||||||
|
$(CC) -S $(ALL_CPPFLAGS) $< -o $@
|
||||||
|
|
||||||
|
|
||||||
|
# Assemble: create object files from assembler source files.
|
||||||
|
$(OBJDIR)/%.o : %.S
|
||||||
|
@echo
|
||||||
|
@echo $(MSG_ASSEMBLING) $<
|
||||||
|
$(CC) -c $(ALL_ASFLAGS) $< -o $@
|
||||||
|
|
||||||
|
|
||||||
|
# Create preprocessed source for use in sending a bug report.
|
||||||
|
%.i : %.c
|
||||||
|
$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@
|
||||||
|
|
||||||
|
|
||||||
|
# Target: clean project.
|
||||||
|
clean: begin clean_list clean_binary end
|
||||||
|
|
||||||
|
clean_binary:
|
||||||
|
$(REMOVE) $(TARGET).hex
|
||||||
|
|
||||||
|
clean_list:
|
||||||
|
@echo $(MSG_CLEANING)
|
||||||
|
$(REMOVE) $(TARGET).eep
|
||||||
|
$(REMOVE) $(TARGET)eep.hex
|
||||||
|
$(REMOVE) $(TARGET).cof
|
||||||
|
$(REMOVE) $(TARGET).elf
|
||||||
|
$(REMOVE) $(TARGET).map
|
||||||
|
$(REMOVE) $(TARGET).sym
|
||||||
|
$(REMOVE) $(TARGET).lss
|
||||||
|
$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)
|
||||||
|
$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)
|
||||||
|
$(REMOVE) $(SRC:.c=.s)
|
||||||
|
$(REMOVE) $(SRC:.c=.d)
|
||||||
|
$(REMOVE) $(SRC:.c=.i)
|
||||||
|
$(REMOVEDIR) .dep
|
||||||
|
|
||||||
|
|
||||||
|
doxygen:
|
||||||
|
@echo Generating Project Documentation...
|
||||||
|
@doxygen Doxygen.conf
|
||||||
|
@echo Documentation Generation Complete.
|
||||||
|
|
||||||
|
clean_doxygen:
|
||||||
|
rm -rf Documentation
|
||||||
|
|
||||||
|
# Create object files directory
|
||||||
|
$(shell mkdir $(OBJDIR) 2>/dev/null)
|
||||||
|
|
||||||
|
|
||||||
|
# Include the dependency files.
|
||||||
|
-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
|
||||||
|
|
||||||
|
|
||||||
|
# Listing of phony targets.
|
||||||
|
.PHONY : all showeventhooks showliboptions showtarget \
|
||||||
|
begin finish end sizebefore sizeafter gccversion build \
|
||||||
|
elf hex eep lss sym coff extcoff program clean debug \
|
||||||
|
clean_list clean_binary gdb-config doxygen dfu flip \
|
||||||
|
flip-ee dfu-ee
|
||||||
|
|
@ -20,6 +20,10 @@ all:
|
||||||
make -C MouseHost clean
|
make -C MouseHost clean
|
||||||
make -C MouseHost all
|
make -C MouseHost all
|
||||||
|
|
||||||
|
make -C MassStorageHost clean
|
||||||
|
make -C MassStorageHost all
|
||||||
|
|
||||||
%:
|
%:
|
||||||
make -C CDCHost $@
|
make -C CDCHost $@
|
||||||
make -C MouseHost $@
|
make -C MouseHost $@
|
||||||
|
make -C MassStorageHost $@
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -115,21 +115,10 @@ bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
|
||||||
|
|
||||||
void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
|
void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)
|
||||||
{
|
{
|
||||||
if (USB_DeviceState != DEVICE_STATE_Configured)
|
if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);
|
CDC_Device_Flush(CDCInterfaceInfo);
|
||||||
|
|
||||||
if (!(Endpoint_BytesInEndpoint()))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!(Endpoint_IsReadWriteAllowed()))
|
|
||||||
{
|
|
||||||
Endpoint_ClearIN();
|
|
||||||
Endpoint_WaitUntilReady();
|
|
||||||
}
|
|
||||||
|
|
||||||
Endpoint_ClearIN();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, char* const Data, const uint16_t Length)
|
void CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, char* const Data, const uint16_t Length)
|
||||||
|
|
@ -157,6 +146,23 @@ void CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, con
|
||||||
Endpoint_Write_Byte(Data);
|
Endpoint_Write_Byte(Data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CDC_Device_Flush(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
|
||||||
|
{
|
||||||
|
if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
|
||||||
|
return;
|
||||||
|
|
||||||
|
Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);
|
||||||
|
|
||||||
|
if (Endpoint_BytesInEndpoint())
|
||||||
|
{
|
||||||
|
Endpoint_ClearIN();
|
||||||
|
Endpoint_WaitUntilReady();
|
||||||
|
}
|
||||||
|
|
||||||
|
Endpoint_ClearIN();
|
||||||
|
Endpoint_WaitUntilReady();
|
||||||
|
}
|
||||||
|
|
||||||
uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
|
uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
|
||||||
{
|
{
|
||||||
Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);
|
Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);
|
||||||
|
|
|
||||||
|
|
@ -185,6 +185,12 @@
|
||||||
*/
|
*/
|
||||||
uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
|
uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
|
||||||
|
|
||||||
|
/** Flushes any data waiting to be sent, ensuring that the send buffer is cleared.
|
||||||
|
*
|
||||||
|
* \param[in,out] CDCInterfaceInfo Pointer to a structure containing a CDC Class configuration and state.
|
||||||
|
*/
|
||||||
|
void CDC_Device_Flush(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
|
||||||
|
|
||||||
/** Sends a Serial Control Line State Change notification to the host. This should be called when the virtual serial
|
/** Sends a Serial Control Line State Change notification to the host. This should be called when the virtual serial
|
||||||
* control lines (DCD, DSR, etc.) have changed states, or to give BREAK notfications to the host. Line states persist
|
* control lines (DCD, DSR, etc.) have changed states, or to give BREAK notfications to the host. Line states persist
|
||||||
* until they are cleared via a second notification. This should be called each time the CDC class driver's
|
* until they are cleared via a second notification. This should be called each time the CDC class driver's
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
|
||||||
#endif
|
#endif
|
||||||
HIDInterfaceInfo->State.SupportsBootSubClass = (CurrentHIDInterface->SubClass != 0);
|
HIDInterfaceInfo->State.SupportsBootSubClass = (CurrentHIDInterface->SubClass != 0);
|
||||||
|
|
||||||
while (FoundEndpoints != ((1 << HID_FOUND_DATAPIPE_IN) | (1 << HID_FOUND_DATAPIPE_OUT)))
|
while (FoundEndpoints != (HID_FOUND_DATAPIPE_IN | HID_FOUND_DATAPIPE_OUT))
|
||||||
{
|
{
|
||||||
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
|
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
|
||||||
DComp_HID_Host_NextInterfaceHIDDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
|
DComp_HID_Host_NextInterfaceHIDDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
|
||||||
|
|
@ -85,15 +85,17 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* HIDInterfaceInfo, uint
|
||||||
{
|
{
|
||||||
Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,
|
Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,
|
||||||
EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);
|
EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);
|
||||||
|
HIDInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;
|
||||||
|
|
||||||
FoundEndpoints |= (1 << HID_FOUND_DATAPIPE_IN);
|
FoundEndpoints |= HID_FOUND_DATAPIPE_IN;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_OUT,
|
Pipe_ConfigurePipe(HIDInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_OUT,
|
||||||
EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);
|
EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);
|
||||||
|
HIDInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;
|
||||||
|
|
||||||
FoundEndpoints |= (1 << HID_FOUND_DATAPIPE_OUT);
|
FoundEndpoints |= HID_FOUND_DATAPIPE_OUT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,7 @@
|
||||||
HID_ENUMERROR_NoError = 0, /**< Configuration Descriptor was processed successfully */
|
HID_ENUMERROR_NoError = 0, /**< Configuration Descriptor was processed successfully */
|
||||||
HID_ENUMERROR_InvalidConfigDescriptor = 1, /**< The device returned an invalid Configuration Descriptor */
|
HID_ENUMERROR_InvalidConfigDescriptor = 1, /**< The device returned an invalid Configuration Descriptor */
|
||||||
HID_ENUMERROR_NoHIDInterfaceFound = 2, /**< A compatible HID interface was not found in the device's Configuration Descriptor */
|
HID_ENUMERROR_NoHIDInterfaceFound = 2, /**< A compatible HID interface was not found in the device's Configuration Descriptor */
|
||||||
HID_ENUMERROR_EndpointsNotFound = 3, /**< Compatible HID endpoints were not found in the device's CDC interface */
|
HID_ENUMERROR_EndpointsNotFound = 3, /**< Compatible HID endpoints were not found in the device's HID interface */
|
||||||
} HIDHost_EnumerationFailure_ErrorCodes_t;
|
} HIDHost_EnumerationFailure_ErrorCodes_t;
|
||||||
|
|
||||||
/* Function Prototypes: */
|
/* Function Prototypes: */
|
||||||
|
|
|
||||||
|
|
@ -36,4 +36,99 @@
|
||||||
|
|
||||||
#warning The Mass Storage Host mode Class driver is currently incomplete and is for preview purposes only.
|
#warning The Mass Storage Host mode Class driver is currently incomplete and is for preview purposes only.
|
||||||
|
|
||||||
|
uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint16_t ConfigDescriptorLength,
|
||||||
|
uint8_t* DeviceConfigDescriptor)
|
||||||
|
{
|
||||||
|
uint8_t FoundEndpoints = 0;
|
||||||
|
|
||||||
|
memset(&MSInterfaceInfo->State, 0x00, sizeof(MSInterfaceInfo->State));
|
||||||
|
|
||||||
|
if (DESCRIPTOR_TYPE(DeviceConfigDescriptor) != DTYPE_Configuration)
|
||||||
|
return MS_ENUMERROR_InvalidConfigDescriptor;
|
||||||
|
|
||||||
|
if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor,
|
||||||
|
DComp_NextMassStorageInterface) != DESCRIPTOR_SEARCH_COMP_Found)
|
||||||
|
{
|
||||||
|
return MS_ENUMERROR_NoMSInterfaceFound;
|
||||||
|
}
|
||||||
|
|
||||||
|
MSInterfaceInfo->State.InterfaceNumber =
|
||||||
|
#if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
|
||||||
|
DESCRIPTOR_PCAST(DeviceConfigDescriptor, USB_Descriptor_Interface_t)->InterfaceNumber;
|
||||||
|
#else
|
||||||
|
DESCRIPTOR_PCAST(DeviceConfigDescriptor, USB_Descriptor_Interface_t)->bInterfaceNumber;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
while (FoundEndpoints != (MS_FOUND_DATAPIPE_IN | MS_FOUND_DATAPIPE_OUT))
|
||||||
|
{
|
||||||
|
if (USB_GetNextDescriptorComp(&ConfigDescriptorLength, &DeviceConfigDescriptor,
|
||||||
|
DComp_NextInterfaceBulkDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
|
||||||
|
{
|
||||||
|
return MS_ENUMERROR_EndpointsNotFound;
|
||||||
|
}
|
||||||
|
|
||||||
|
USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(DeviceConfigDescriptor, USB_Descriptor_Endpoint_t);
|
||||||
|
|
||||||
|
if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)
|
||||||
|
{
|
||||||
|
Pipe_ConfigurePipe(MSInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_IN,
|
||||||
|
EndpointData->EndpointAddress, EndpointData->EndpointSize,
|
||||||
|
PIPE_BANK_DOUBLE);
|
||||||
|
MSInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;
|
||||||
|
|
||||||
|
FoundEndpoints |= MS_FOUND_DATAPIPE_IN;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Pipe_ConfigurePipe(MSInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,
|
||||||
|
EndpointData->EndpointAddress, EndpointData->EndpointSize,
|
||||||
|
PIPE_BANK_DOUBLE);
|
||||||
|
MSInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;
|
||||||
|
|
||||||
|
FoundEndpoints |= MS_FOUND_DATAPIPE_OUT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MSInterfaceInfo->State.Active = true;
|
||||||
|
return MS_ENUMERROR_NoError;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint8_t DComp_NextMassStorageInterface(void* CurrentDescriptor)
|
||||||
|
{
|
||||||
|
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
|
||||||
|
{
|
||||||
|
if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class == MASS_STORE_CLASS) &&
|
||||||
|
(DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == MASS_STORE_SUBCLASS) &&
|
||||||
|
(DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == MASS_STORE_PROTOCOL))
|
||||||
|
{
|
||||||
|
return DESCRIPTOR_SEARCH_Found;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return DESCRIPTOR_SEARCH_NotFound;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor)
|
||||||
|
{
|
||||||
|
if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)
|
||||||
|
{
|
||||||
|
uint8_t EndpointType = (DESCRIPTOR_CAST(CurrentDescriptor,
|
||||||
|
USB_Descriptor_Endpoint_t).Attributes & EP_TYPE_MASK);
|
||||||
|
|
||||||
|
if (EndpointType == EP_TYPE_BULK)
|
||||||
|
return DESCRIPTOR_SEARCH_Found;
|
||||||
|
}
|
||||||
|
else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
|
||||||
|
{
|
||||||
|
return DESCRIPTOR_SEARCH_Fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
return DESCRIPTOR_SEARCH_NotFound;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MS_Host_USBTask(USB_ClassInfo_MS_Host_t* MSInterfaceInfo)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,66 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Public Interface - May be used in end-application: */
|
/* Public Interface - May be used in end-application: */
|
||||||
|
/* Type Defines: */
|
||||||
|
/** Class state structure. An instance of this structure should be made within the user application,
|
||||||
|
* and passed to each of the HID class driver functions as the HIDInterfaceInfo parameter. This
|
||||||
|
* stores each HID interface's configuration and state information.
|
||||||
|
*/
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
const struct
|
||||||
|
{
|
||||||
|
uint8_t DataINPipeNumber; /**< Pipe number of the MS interface's IN data pipe */
|
||||||
|
uint8_t DataOUTPipeNumber; /**< Pipe number of the MS interface's OUT data pipe */
|
||||||
|
} 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.
|
||||||
|
*/
|
||||||
|
struct
|
||||||
|
{
|
||||||
|
bool Active; /**< Indicates if the current interface instance is connected to an attached device, valid
|
||||||
|
* after \ref HID_Host_ConfigurePipes() is called and the Host state machine is in the
|
||||||
|
* Configured state
|
||||||
|
*/
|
||||||
|
uint8_t InterfaceNumber; /**< Interface index of the HID interface within the attached device */
|
||||||
|
|
||||||
|
uint16_t DataINPipeSize; /**< Size in bytes of the MS interface's IN data pipe */
|
||||||
|
uint16_t DataOUTPipeSize; /**< Size in bytes of the MS interface's OUT data pipe */
|
||||||
|
} State; /**< State data for the USB class interface within the device. All elements in this section
|
||||||
|
* <b>may</b> be set to initial values, but may also be ignored to default to sane values when
|
||||||
|
* the interface is enumerated.
|
||||||
|
*/
|
||||||
|
} USB_ClassInfo_MS_Host_t;
|
||||||
|
|
||||||
|
/* Enums: */
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
MS_ENUMERROR_NoError = 0, /**< Configuration Descriptor was processed successfully */
|
||||||
|
MS_ENUMERROR_InvalidConfigDescriptor = 1, /**< The device returned an invalid Configuration Descriptor */
|
||||||
|
MS_ENUMERROR_NoMSInterfaceFound = 2, /**< A compatible Mass Storage interface was not found in the device's Configuration Descriptor */
|
||||||
|
MS_ENUMERROR_EndpointsNotFound = 3, /**< Compatible Mass Storage endpoints were not found in the device's interfaces */
|
||||||
|
} MSHost_EnumerationFailure_ErrorCodes_t;
|
||||||
|
|
||||||
/* Function Prototypes: */
|
/* Function Prototypes: */
|
||||||
|
void MS_Host_USBTask(USB_ClassInfo_MS_Host_t* MSInterfaceInfo);
|
||||||
|
uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint16_t ConfigDescriptorLength,
|
||||||
|
uint8_t* DeviceConfigDescriptor);
|
||||||
|
|
||||||
|
/* Private Interface - For use in library only: */
|
||||||
|
#if !defined(__DOXYGEN__)
|
||||||
|
/* Macros: */
|
||||||
|
#define MASS_STORE_CLASS 0x08
|
||||||
|
#define MASS_STORE_SUBCLASS 0x06
|
||||||
|
#define MASS_STORE_PROTOCOL 0x50
|
||||||
|
|
||||||
|
#define MS_FOUND_DATAPIPE_IN (1 << 0)
|
||||||
|
#define MS_FOUND_DATAPIPE_OUT (1 << 1)
|
||||||
|
|
||||||
|
/* Function Prototypes: */
|
||||||
|
#if defined(INCLUDE_FROM_MS_CLASS_HOST_C)
|
||||||
|
static uint8_t DComp_NextMassStorageInterface(void* CurrentDescriptor);
|
||||||
|
static uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor);
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Disable C linkage for C++ Compilers: */
|
/* Disable C linkage for C++ Compilers: */
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
|
|
|
||||||
|
|
@ -213,10 +213,6 @@ void USB_ResetInterface(void)
|
||||||
#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
|
#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
|
||||||
USB_INT_Enable(USB_INT_VBUS);
|
USB_INT_Enable(USB_INT_VBUS);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONTROL_ONLY_DEVICE)
|
|
||||||
UENUM = ENDPOINT_CONTROLEP;
|
|
||||||
#endif
|
|
||||||
#elif defined(USB_HOST_ONLY)
|
#elif defined(USB_HOST_ONLY)
|
||||||
USB_Host_HostMode_On();
|
USB_Host_HostMode_On();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@
|
||||||
* <b>Changed:</b>
|
* <b>Changed:</b>
|
||||||
* - SetIdle requests to the HID device driver with a 0 idle period (send changes only) now only affect the requested
|
* - SetIdle requests to the HID device driver with a 0 idle period (send changes only) now only affect the requested
|
||||||
* HID interface within the device, not all HID interfaces.
|
* HID interface within the device, not all HID interfaces.
|
||||||
|
* - Added new CDC_Device_Flush() command to the CDC Class device driver.
|
||||||
*
|
*
|
||||||
* <b>Fixed:</b>
|
* <b>Fixed:</b>
|
||||||
* - Fixed possible lockup in the CDC device class driver, when the host sends data that is a multiple of the
|
* - Fixed possible lockup in the CDC device class driver, when the host sends data that is a multiple of the
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
*
|
*
|
||||||
* \section Sec_LUFAProjects Projects Using LUFA (Hobbyist)
|
* \section Sec_LUFAProjects Projects Using LUFA (Hobbyist)
|
||||||
*
|
*
|
||||||
* The following are hobbyist projects using LUFA. Most are open source, and show off interesting ways that the LUFA library
|
* The following are known hobbyist projects using LUFA. Most are open source, and show off interesting ways that the LUFA library
|
||||||
* can be incorporated into many different applications.
|
* can be incorporated into many different applications.
|
||||||
*
|
*
|
||||||
* - Bicycle POV: http://www.code.google.com/p/bicycleledpov/
|
* - Bicycle POV: http://www.code.google.com/p/bicycleledpov/
|
||||||
|
|
@ -36,8 +36,9 @@
|
||||||
* - Opendous-JTAG, an open source JTAG device: http://code.google.com/p/opendous-jtag/
|
* - Opendous-JTAG, an open source JTAG device: http://code.google.com/p/opendous-jtag/
|
||||||
* - Openkubus, an open source hardware-based authentication dongle: http://code.google.com/p/openkubus/
|
* - Openkubus, an open source hardware-based authentication dongle: http://code.google.com/p/openkubus/
|
||||||
* - Orbee, a USB connected RGB Orb for notifications: http://www.franksworkshop.com.au/Electronics/Orbee/Orbee.htm
|
* - Orbee, a USB connected RGB Orb for notifications: http://www.franksworkshop.com.au/Electronics/Orbee/Orbee.htm
|
||||||
|
* - NES Controller USB modification: http://projects.peterpolidoro.net/video/NESUSB.htm
|
||||||
* - Reprap with LUFA, a LUFA powered 3D printer: http://code.google.com/p/at90usb1287-code-for-arduino-and-eclipse/
|
* - Reprap with LUFA, a LUFA powered 3D printer: http://code.google.com/p/at90usb1287-code-for-arduino-and-eclipse/
|
||||||
* - SEGA Megadrive/Genesis Development Cartridge: http://www.spritesmind.net/_GenDev/forum/viewtopic.php?t=464
|
* - SEGA Megadrive/Genesis Development Cartridge: http://www.makestuff.eu/wordpress/?page_id=398
|
||||||
* - Stripe Snoop, a Magnetic Card reader: http://www.ossguy.com/ss_usb/
|
* - Stripe Snoop, a Magnetic Card reader: http://www.ossguy.com/ss_usb/
|
||||||
* - USB Interface for Playstation Portable Devices: http://forums.ps2dev.org/viewtopic.php?t=11001
|
* - USB Interface for Playstation Portable Devices: http://forums.ps2dev.org/viewtopic.php?t=11001
|
||||||
* - USB to Serial Bridge, via SPI and I2C: http://www.tty1.net/userial/
|
* - USB to Serial Bridge, via SPI and I2C: http://www.tty1.net/userial/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue