forked from mfulz_github/qmk_firmware
Moved USBtoSerial demo the Projects directory, as it is simply an expanded CDC demo. Added const qualifier to Endpoint/Pipe stream write routines.
This commit is contained in:
parent
c3dfc58707
commit
de70f0f1cf
|
@ -53,9 +53,6 @@ all:
|
||||||
make -C RNDISEthernet clean
|
make -C RNDISEthernet clean
|
||||||
make -C RNDISEthernet all
|
make -C RNDISEthernet all
|
||||||
|
|
||||||
make -C USBtoSerial clean
|
|
||||||
make -C USBtoSerial all
|
|
||||||
|
|
||||||
%:
|
%:
|
||||||
make -C AudioInput $@
|
make -C AudioInput $@
|
||||||
make -C AudioOutput $@
|
make -C AudioOutput $@
|
||||||
|
@ -70,4 +67,3 @@ all:
|
||||||
make -C MIDI $@
|
make -C MIDI $@
|
||||||
make -C Mouse $@
|
make -C Mouse $@
|
||||||
make -C RNDISEthernet $@
|
make -C RNDISEthernet $@
|
||||||
make -C USBtoSerial $@
|
|
||||||
|
|
|
@ -216,8 +216,6 @@ static void SCSI_Command_Read_Capacity_10(void)
|
||||||
/** Command processing for an issued SCSI SEND DIAGNOSTIC command. This command performs a quick check of the Dataflash ICs on the
|
/** Command processing for an issued SCSI SEND DIAGNOSTIC command. This command performs a quick check of the Dataflash ICs on the
|
||||||
* board, and indicates if they are present and functioning correctly. Only the Self-Test portion of the diagnostic command is
|
* board, and indicates if they are present and functioning correctly. Only the Self-Test portion of the diagnostic command is
|
||||||
* supported.
|
* supported.
|
||||||
*
|
|
||||||
* \param[in] MSInterfaceInfo Pointer to the Mass Storage class interface structure that the command is associated with
|
|
||||||
*/
|
*/
|
||||||
static void SCSI_Command_Send_Diagnostic(void)
|
static void SCSI_Command_Send_Diagnostic(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,275 +0,0 @@
|
||||||
/*
|
|
||||||
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
|
|
||||||
*
|
|
||||||
* USB Device Descriptors, for library use when in USB device mode. Descriptors are special
|
|
||||||
* computer-readable structures which the host requests upon device enumeration, to determine
|
|
||||||
* the device's capabilities and functions.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Descriptors.h"
|
|
||||||
|
|
||||||
/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as
|
|
||||||
* the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.
|
|
||||||
* This allows the host to track a device across insertions on different ports, allowing them to retain allocated
|
|
||||||
* resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices
|
|
||||||
* so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value
|
|
||||||
* from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and
|
|
||||||
* port location).
|
|
||||||
*/
|
|
||||||
#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)
|
|
||||||
#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
|
|
||||||
* device characteristics, including the supported USB version, control endpoint size and the
|
|
||||||
* number of device configurations. The descriptor is read out by the USB host when the enumeration
|
|
||||||
* process begins.
|
|
||||||
*/
|
|
||||||
USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
|
|
||||||
|
|
||||||
.USBSpecification = VERSION_BCD(01.10),
|
|
||||||
.Class = 0x02,
|
|
||||||
.SubClass = 0x00,
|
|
||||||
.Protocol = 0x00,
|
|
||||||
|
|
||||||
.Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
|
|
||||||
|
|
||||||
.VendorID = 0x03EB,
|
|
||||||
.ProductID = 0x204B,
|
|
||||||
.ReleaseNumber = 0x0000,
|
|
||||||
|
|
||||||
.ManufacturerStrIndex = 0x01,
|
|
||||||
.ProductStrIndex = 0x02,
|
|
||||||
.SerialNumStrIndex = USE_INTERNAL_SERIAL,
|
|
||||||
|
|
||||||
.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
|
|
||||||
* of the device in one of its supported configurations, including information about any device interfaces
|
|
||||||
* and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
|
|
||||||
* a configuration so that the host may correctly communicate with the USB device.
|
|
||||||
*/
|
|
||||||
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
|
|
||||||
{
|
|
||||||
.Config =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
|
|
||||||
|
|
||||||
.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
|
|
||||||
.TotalInterfaces = 2,
|
|
||||||
|
|
||||||
.ConfigurationNumber = 1,
|
|
||||||
.ConfigurationStrIndex = NO_DESCRIPTOR,
|
|
||||||
|
|
||||||
.ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
|
|
||||||
|
|
||||||
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
|
|
||||||
},
|
|
||||||
|
|
||||||
.CCI_Interface =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
|
||||||
|
|
||||||
.InterfaceNumber = 0,
|
|
||||||
.AlternateSetting = 0,
|
|
||||||
|
|
||||||
.TotalEndpoints = 1,
|
|
||||||
|
|
||||||
.Class = 0x02,
|
|
||||||
.SubClass = 0x02,
|
|
||||||
.Protocol = 0x01,
|
|
||||||
|
|
||||||
.InterfaceStrIndex = NO_DESCRIPTOR
|
|
||||||
},
|
|
||||||
|
|
||||||
.CDC_Functional_IntHeader =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
|
|
||||||
.SubType = 0x00,
|
|
||||||
|
|
||||||
.Data = {0x01, 0x10}
|
|
||||||
},
|
|
||||||
|
|
||||||
.CDC_Functional_CallManagement =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
|
|
||||||
.SubType = 0x01,
|
|
||||||
|
|
||||||
.Data = {0x03, 0x01}
|
|
||||||
},
|
|
||||||
|
|
||||||
.CDC_Functional_AbstractControlManagement =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},
|
|
||||||
.SubType = 0x02,
|
|
||||||
|
|
||||||
.Data = {0x06}
|
|
||||||
},
|
|
||||||
|
|
||||||
.CDC_Functional_Union=
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
|
|
||||||
.SubType = 0x06,
|
|
||||||
|
|
||||||
.Data = {0x00, 0x01}
|
|
||||||
},
|
|
||||||
|
|
||||||
.ManagementEndpoint =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
|
|
||||||
|
|
||||||
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),
|
|
||||||
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
||||||
.EndpointSize = CDC_NOTIFICATION_EPSIZE,
|
|
||||||
.PollingIntervalMS = 0xFF
|
|
||||||
},
|
|
||||||
|
|
||||||
.DCI_Interface =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
|
||||||
|
|
||||||
.InterfaceNumber = 1,
|
|
||||||
.AlternateSetting = 0,
|
|
||||||
|
|
||||||
.TotalEndpoints = 2,
|
|
||||||
|
|
||||||
.Class = 0x0A,
|
|
||||||
.SubClass = 0x00,
|
|
||||||
.Protocol = 0x00,
|
|
||||||
|
|
||||||
.InterfaceStrIndex = NO_DESCRIPTOR
|
|
||||||
},
|
|
||||||
|
|
||||||
.DataOutEndpoint =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
|
|
||||||
|
|
||||||
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),
|
|
||||||
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
||||||
.EndpointSize = CDC_TXRX_EPSIZE,
|
|
||||||
.PollingIntervalMS = 0x00
|
|
||||||
},
|
|
||||||
|
|
||||||
.DataInEndpoint =
|
|
||||||
{
|
|
||||||
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
|
|
||||||
|
|
||||||
.EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),
|
|
||||||
.Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
||||||
.EndpointSize = CDC_TXRX_EPSIZE,
|
|
||||||
.PollingIntervalMS = 0x00
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
|
|
||||||
* the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
|
|
||||||
* via the language ID table available at USB.org what languages the device supports for its string descriptors.
|
|
||||||
*/
|
|
||||||
USB_Descriptor_String_t PROGMEM LanguageString =
|
|
||||||
{
|
|
||||||
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
|
|
||||||
|
|
||||||
.UnicodeString = {LANGUAGE_ID_ENG}
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
|
|
||||||
* form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
|
|
||||||
* Descriptor.
|
|
||||||
*/
|
|
||||||
USB_Descriptor_String_t PROGMEM ManufacturerString =
|
|
||||||
{
|
|
||||||
.Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
|
|
||||||
|
|
||||||
.UnicodeString = L"Dean Camera"
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
|
|
||||||
* and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
|
|
||||||
* Descriptor.
|
|
||||||
*/
|
|
||||||
USB_Descriptor_String_t PROGMEM ProductString =
|
|
||||||
{
|
|
||||||
.Header = {.Size = USB_STRING_LEN(19), .Type = DTYPE_String},
|
|
||||||
|
|
||||||
.UnicodeString = L"LUFA USB-RS232 Demo"
|
|
||||||
};
|
|
||||||
|
|
||||||
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
|
|
||||||
* documentation) by the application code so that the address and size of a requested descriptor can be given
|
|
||||||
* to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
|
|
||||||
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
|
|
||||||
* USB host.
|
|
||||||
*/
|
|
||||||
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
|
|
||||||
{
|
|
||||||
const uint8_t DescriptorType = (wValue >> 8);
|
|
||||||
const uint8_t DescriptorNumber = (wValue & 0xFF);
|
|
||||||
|
|
||||||
void* Address = NULL;
|
|
||||||
uint16_t Size = NO_DESCRIPTOR;
|
|
||||||
|
|
||||||
switch (DescriptorType)
|
|
||||||
{
|
|
||||||
case DTYPE_Device:
|
|
||||||
Address = (void*)&DeviceDescriptor;
|
|
||||||
Size = sizeof(USB_Descriptor_Device_t);
|
|
||||||
break;
|
|
||||||
case DTYPE_Configuration:
|
|
||||||
Address = (void*)&ConfigurationDescriptor;
|
|
||||||
Size = sizeof(USB_Descriptor_Configuration_t);
|
|
||||||
break;
|
|
||||||
case DTYPE_String:
|
|
||||||
switch (DescriptorNumber)
|
|
||||||
{
|
|
||||||
case 0x00:
|
|
||||||
Address = (void*)&LanguageString;
|
|
||||||
Size = pgm_read_byte(&LanguageString.Header.Size);
|
|
||||||
break;
|
|
||||||
case 0x01:
|
|
||||||
Address = (void*)&ManufacturerString;
|
|
||||||
Size = pgm_read_byte(&ManufacturerString.Header.Size);
|
|
||||||
break;
|
|
||||||
case 0x02:
|
|
||||||
Address = (void*)&ProductString;
|
|
||||||
Size = pgm_read_byte(&ProductString.Header.Size);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
*DescriptorAddress = Address;
|
|
||||||
return Size;
|
|
||||||
}
|
|
|
@ -1,98 +0,0 @@
|
||||||
/*
|
|
||||||
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 Descriptors.c.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _DESCRIPTORS_H_
|
|
||||||
#define _DESCRIPTORS_H_
|
|
||||||
|
|
||||||
/* Includes: */
|
|
||||||
#include <LUFA/Drivers/USB/USB.h>
|
|
||||||
|
|
||||||
#include <avr/pgmspace.h>
|
|
||||||
|
|
||||||
/* Macros: */
|
|
||||||
/** 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
|
|
||||||
* a single typedef struct. A macro is used instead so that functional descriptors can be created
|
|
||||||
* easily by specifying the size of the payload. This allows sizeof() to work correctly.
|
|
||||||
*
|
|
||||||
* \param[in] DataSize Size in bytes of the CDC functional descriptor's data payload
|
|
||||||
*/
|
|
||||||
#define CDC_FUNCTIONAL_DESCRIPTOR(DataSize) \
|
|
||||||
struct \
|
|
||||||
{ \
|
|
||||||
USB_Descriptor_Header_t Header; \
|
|
||||||
uint8_t SubType; \
|
|
||||||
uint8_t Data[DataSize]; \
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Endpoint number of the CDC device-to-host notification IN endpoint. */
|
|
||||||
#define CDC_NOTIFICATION_EPNUM 2
|
|
||||||
|
|
||||||
/** Endpoint number of the CDC device-to-host data IN endpoint. */
|
|
||||||
#define CDC_TX_EPNUM 3
|
|
||||||
|
|
||||||
/** Endpoint number of the CDC host-to-device data OUT endpoint. */
|
|
||||||
#define CDC_RX_EPNUM 4
|
|
||||||
|
|
||||||
/** Size in bytes of the CDC device-to-host notification IN endpoint. */
|
|
||||||
#define CDC_NOTIFICATION_EPSIZE 8
|
|
||||||
|
|
||||||
/** Size in bytes of the CDC data IN and OUT endpoints. */
|
|
||||||
#define CDC_TXRX_EPSIZE 16
|
|
||||||
|
|
||||||
/* Type Defines: */
|
|
||||||
/** Type define for the device configuration descriptor structure. This must be defined in the
|
|
||||||
* application code, as the configuration descriptor contains several sub-descriptors which
|
|
||||||
* vary between devices, and which describe the device's usage to the host.
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
USB_Descriptor_Configuration_Header_t Config;
|
|
||||||
USB_Descriptor_Interface_t CCI_Interface;
|
|
||||||
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;
|
|
||||||
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;
|
|
||||||
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;
|
|
||||||
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;
|
|
||||||
USB_Descriptor_Endpoint_t ManagementEndpoint;
|
|
||||||
USB_Descriptor_Interface_t DCI_Interface;
|
|
||||||
USB_Descriptor_Endpoint_t DataOutEndpoint;
|
|
||||||
USB_Descriptor_Endpoint_t DataInEndpoint;
|
|
||||||
} USB_Descriptor_Configuration_t;
|
|
||||||
|
|
||||||
/* Function Prototypes: */
|
|
||||||
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
|
|
||||||
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
|
|
||||||
|
|
||||||
#endif
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,106 +0,0 @@
|
||||||
;************************************************************
|
|
||||||
; Windows USB CDC ACM Setup File
|
|
||||||
; Copyright (c) 2000 Microsoft Corporation
|
|
||||||
|
|
||||||
|
|
||||||
[Version]
|
|
||||||
Signature="$Windows NT$"
|
|
||||||
Class=Ports
|
|
||||||
ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
|
|
||||||
Provider=%MFGNAME%
|
|
||||||
LayoutFile=layout.inf
|
|
||||||
CatalogFile=%MFGFILENAME%.cat
|
|
||||||
DriverVer=11/15/2007,5.1.2600.0
|
|
||||||
|
|
||||||
[Manufacturer]
|
|
||||||
%MFGNAME%=DeviceList, NTamd64
|
|
||||||
|
|
||||||
[DestinationDirs]
|
|
||||||
DefaultDestDir=12
|
|
||||||
|
|
||||||
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
; Windows 2000/XP/Vista-32bit Sections
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
[DriverInstall.nt]
|
|
||||||
include=mdmcpq.inf
|
|
||||||
CopyFiles=DriverCopyFiles.nt
|
|
||||||
AddReg=DriverInstall.nt.AddReg
|
|
||||||
|
|
||||||
[DriverCopyFiles.nt]
|
|
||||||
usbser.sys,,,0x20
|
|
||||||
|
|
||||||
[DriverInstall.nt.AddReg]
|
|
||||||
HKR,,DevLoader,,*ntkern
|
|
||||||
HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
|
|
||||||
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
|
|
||||||
|
|
||||||
[DriverInstall.nt.Services]
|
|
||||||
AddService=usbser, 0x00000002, DriverService.nt
|
|
||||||
|
|
||||||
[DriverService.nt]
|
|
||||||
DisplayName=%SERVICE%
|
|
||||||
ServiceType=1
|
|
||||||
StartType=3
|
|
||||||
ErrorControl=1
|
|
||||||
ServiceBinary=%12%\%DRIVERFILENAME%.sys
|
|
||||||
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
; Vista-64bit Sections
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
[DriverInstall.NTamd64]
|
|
||||||
include=mdmcpq.inf
|
|
||||||
CopyFiles=DriverCopyFiles.NTamd64
|
|
||||||
AddReg=DriverInstall.NTamd64.AddReg
|
|
||||||
|
|
||||||
[DriverCopyFiles.NTamd64]
|
|
||||||
%DRIVERFILENAME%.sys,,,0x20
|
|
||||||
|
|
||||||
[DriverInstall.NTamd64.AddReg]
|
|
||||||
HKR,,DevLoader,,*ntkern
|
|
||||||
HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
|
|
||||||
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
|
|
||||||
|
|
||||||
[DriverInstall.NTamd64.Services]
|
|
||||||
AddService=usbser, 0x00000002, DriverService.NTamd64
|
|
||||||
|
|
||||||
[DriverService.NTamd64]
|
|
||||||
DisplayName=%SERVICE%
|
|
||||||
ServiceType=1
|
|
||||||
StartType=3
|
|
||||||
ErrorControl=1
|
|
||||||
ServiceBinary=%12%\%DRIVERFILENAME%.sys
|
|
||||||
|
|
||||||
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
; Vendor and Product ID Definitions
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
; When developing your USB device, the VID and PID used in the PC side
|
|
||||||
; application program and the firmware on the microcontroller must match.
|
|
||||||
; Modify the below line to use your VID and PID. Use the format as shown below.
|
|
||||||
; Note: One INF file can be used for multiple devices with different VID and PIDs.
|
|
||||||
; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
[SourceDisksFiles]
|
|
||||||
[SourceDisksNames]
|
|
||||||
[DeviceList]
|
|
||||||
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204B
|
|
||||||
|
|
||||||
[DeviceList.NTamd64]
|
|
||||||
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204B
|
|
||||||
|
|
||||||
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
; String Definitions
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
;Modify these strings to customize your device
|
|
||||||
;------------------------------------------------------------------------------
|
|
||||||
[Strings]
|
|
||||||
MFGFILENAME="CDC_vista"
|
|
||||||
DRIVERFILENAME ="usbser"
|
|
||||||
MFGNAME="CCS, Inc."
|
|
||||||
INSTDISK="LUFA USB-RS232 CDC Driver Installer"
|
|
||||||
DESCRIPTION="Communications Port"
|
|
||||||
SERVICE="USB RS-232 Emulation Driver"
|
|
|
@ -1,120 +0,0 @@
|
||||||
/*
|
|
||||||
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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "RingBuff.h"
|
|
||||||
|
|
||||||
void Buffer_Initialize(RingBuff_t* Buffer)
|
|
||||||
{
|
|
||||||
BUFF_ATOMIC_BLOCK
|
|
||||||
{
|
|
||||||
Buffer->InPtr = (RingBuff_Data_t*)&Buffer->Buffer;
|
|
||||||
Buffer->OutPtr = (RingBuff_Data_t*)&Buffer->Buffer;
|
|
||||||
Buffer->Elements = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Buffer_StoreElement(RingBuff_t* Buffer, RingBuff_Data_t Data)
|
|
||||||
{
|
|
||||||
BUFF_ATOMIC_BLOCK
|
|
||||||
{
|
|
||||||
#if defined(BUFF_DROPOLD)
|
|
||||||
if (Buffer->Elements == BUFF_LENGTH)
|
|
||||||
{
|
|
||||||
Buffer->OutPtr++;
|
|
||||||
|
|
||||||
if (Buffer->OutPtr == &Buffer->Buffer[BUFF_LENGTH])
|
|
||||||
Buffer->OutPtr = (RingBuff_Data_t*)&Buffer->Buffer;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Buffer->Elements++;
|
|
||||||
}
|
|
||||||
#elif defined(BUFF_DROPNEW)
|
|
||||||
if (Buffer->Elements == BUFF_LENGTH)
|
|
||||||
return;
|
|
||||||
|
|
||||||
Buffer->Elements++;
|
|
||||||
#elif defined(BUFF_NODROPCHECK)
|
|
||||||
Buffer->Elements++;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
*(Buffer->InPtr) = Data;
|
|
||||||
Buffer->InPtr++;
|
|
||||||
|
|
||||||
if (Buffer->InPtr == &Buffer->Buffer[BUFF_LENGTH])
|
|
||||||
Buffer->InPtr = (RingBuff_Data_t*)&Buffer->Buffer;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
RingBuff_Data_t Buffer_GetElement(RingBuff_t* Buffer)
|
|
||||||
{
|
|
||||||
RingBuff_Data_t BuffData;
|
|
||||||
|
|
||||||
BUFF_ATOMIC_BLOCK
|
|
||||||
{
|
|
||||||
#if defined(BUFF_EMPTYRETURNSZERO)
|
|
||||||
if (!(Buffer->Elements))
|
|
||||||
return 0;
|
|
||||||
#elif !defined(BUFF_NOEMPTYCHECK)
|
|
||||||
#error No empty buffer check behaviour specified.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
BuffData = *(Buffer->OutPtr);
|
|
||||||
|
|
||||||
Buffer->OutPtr++;
|
|
||||||
Buffer->Elements--;
|
|
||||||
|
|
||||||
if (Buffer->OutPtr == &Buffer->Buffer[BUFF_LENGTH])
|
|
||||||
Buffer->OutPtr = (RingBuff_Data_t*)&Buffer->Buffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
return BuffData;
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(BUFF_USEPEEK)
|
|
||||||
RingBuff_Data_t Buffer_PeekElement(const RingBuff_t* Buffer)
|
|
||||||
{
|
|
||||||
RingBuff_Data_t BuffData;
|
|
||||||
|
|
||||||
BUFF_ATOMIC_BLOCK
|
|
||||||
{
|
|
||||||
#if defined(BUFF_EMPTYRETURNSZERO)
|
|
||||||
if (!(Buffer->Elements))
|
|
||||||
return 0;
|
|
||||||
#elif !defined(BUFF_NOEMPTYCHECK)
|
|
||||||
#error No empty buffer check behaviour specified.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
BuffData = *(Buffer->OutPtr);
|
|
||||||
}
|
|
||||||
|
|
||||||
return BuffData;
|
|
||||||
}
|
|
||||||
#endif
|
|
|
@ -1,116 +0,0 @@
|
||||||
/*
|
|
||||||
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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Buffer Configuration: */
|
|
||||||
/* Buffer length - select static size of created ring buffers: */
|
|
||||||
#define BUFF_STATICSIZE 128 // Set to the static ring buffer size for all ring buffers (place size after define)
|
|
||||||
|
|
||||||
/* Volatile mode - uncomment to make buffers volatile, for use in ISRs, etc: */
|
|
||||||
#define BUFF_VOLATILE // Uncomment to cause all ring buffers to become volatile (and atomic if multi-byte) in access
|
|
||||||
|
|
||||||
/* Drop mode - select behaviour when Buffer_StoreElement called on a full buffer: */
|
|
||||||
#define BUFF_DROPOLD // Uncomment to cause full ring buffers to drop the oldest character to make space when full
|
|
||||||
// #define BUFF_DROPNEW // Uncomment to cause full ring buffers to drop the new character when full
|
|
||||||
// #define BUFF_NODROPCHECK // Uncomment to ignore full ring buffer checks - checking left to user!
|
|
||||||
|
|
||||||
/* Underflow behaviour - select behaviour when Buffer_GetElement is called with an empty ring buffer: */
|
|
||||||
//#define BUFF_EMPTYRETURNSZERO // Uncomment to return 0 when an empty ring buffer is read
|
|
||||||
#define BUFF_NOEMPTYCHECK // Uncomment to disable checking of empty ring buffers - checking left to user!
|
|
||||||
|
|
||||||
/* Buffer storage type - set the datatype for the stored data */
|
|
||||||
#define BUFF_DATATYPE uint8_t // Change to the data type that is going to be stored into the buffer
|
|
||||||
|
|
||||||
/* Peek routine - uncomment to include the peek routine (fetches next byte without removing it from the buffer */
|
|
||||||
//#define BUFF_USEPEEK
|
|
||||||
|
|
||||||
#ifndef _RINGBUFF_H_
|
|
||||||
#define _RINGBUFF_H_
|
|
||||||
|
|
||||||
/* Includes: */
|
|
||||||
#include <avr/io.h>
|
|
||||||
#include <avr/interrupt.h>
|
|
||||||
#include <util/atomic.h>
|
|
||||||
#include <limits.h>
|
|
||||||
|
|
||||||
#include <LUFA/Common/Common.h>
|
|
||||||
|
|
||||||
/* Defines and checks: */
|
|
||||||
#if defined(BUFF_STATICSIZE)
|
|
||||||
#define BUFF_LENGTH BUFF_STATICSIZE
|
|
||||||
#else
|
|
||||||
#error No buffer length specified!
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !(defined(BUFF_DROPOLD) || defined(BUFF_DROPNEW) || defined(BUFF_NODROPCHECK))
|
|
||||||
#error No buffer drop mode specified.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(BUFF_DATATYPE)
|
|
||||||
#error Ringbuffer storage data type not specified.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(BUFF_VOLATILE)
|
|
||||||
#define BUFF_MODE volatile
|
|
||||||
#define BUFF_ATOMIC_BLOCK ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
|
|
||||||
#else
|
|
||||||
#define BUFF_MODE
|
|
||||||
#define BUFF_ATOMIC_BLOCK
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if (BUFF_STATICSIZE > LONG_MAX)
|
|
||||||
#define RingBuff_Elements_t uint64_t
|
|
||||||
#elif (BUFF_STATICSIZE > INT_MAX)
|
|
||||||
#define RingBuff_Elements_t uint32_t
|
|
||||||
#elif (BUFF_STATICSIZE > CHAR_MAX)
|
|
||||||
#define RingBuff_Elements_t uint16_t
|
|
||||||
#else
|
|
||||||
#define RingBuff_Elements_t uint8_t
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Type Defines: */
|
|
||||||
typedef BUFF_DATATYPE RingBuff_Data_t;
|
|
||||||
|
|
||||||
typedef BUFF_MODE struct
|
|
||||||
{
|
|
||||||
RingBuff_Data_t Buffer[BUFF_LENGTH];
|
|
||||||
RingBuff_Data_t* InPtr;
|
|
||||||
RingBuff_Data_t* OutPtr;
|
|
||||||
RingBuff_Elements_t Elements;
|
|
||||||
} RingBuff_t;
|
|
||||||
|
|
||||||
/* Function Prototypes: */
|
|
||||||
void Buffer_Initialize(RingBuff_t* Buff);
|
|
||||||
void Buffer_StoreElement(RingBuff_t* Buffer, RingBuff_Data_t Data);
|
|
||||||
RingBuff_Data_t Buffer_GetElement(RingBuff_t* Buffer);
|
|
||||||
#if defined(BUFF_USEPEEK)
|
|
||||||
RingBuff_Data_t Buffer_PeekElement(const RingBuff_t* Buffer);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,340 +0,0 @@
|
||||||
/*
|
|
||||||
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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "USBtoSerial.h"
|
|
||||||
|
|
||||||
/** Contains the current baud rate and other settings of the virtual serial port.
|
|
||||||
*
|
|
||||||
* These values are set by the host via a class-specific request, and the physical USART should be reconfigured to match the
|
|
||||||
* new settings each time they are changed by the host.
|
|
||||||
*/
|
|
||||||
CDC_Line_Coding_t LineEncoding = { .BaudRateBPS = 0,
|
|
||||||
.CharFormat = OneStopBit,
|
|
||||||
.ParityType = Parity_None,
|
|
||||||
.DataBits = 8 };
|
|
||||||
|
|
||||||
/** Ring (circular) buffer to hold the RX data - data from the host to the attached device on the serial port. */
|
|
||||||
RingBuff_t Rx_Buffer;
|
|
||||||
|
|
||||||
/** Ring (circular) buffer to hold the TX data - data from the attached device on the serial port to the host. */
|
|
||||||
RingBuff_t Tx_Buffer;
|
|
||||||
|
|
||||||
/** Flag to indicate if the USART is currently transmitting data from the Rx_Buffer circular buffer. */
|
|
||||||
volatile bool Transmitting = false;
|
|
||||||
|
|
||||||
|
|
||||||
/** Main program entry point. This routine configures the hardware required by the application, then
|
|
||||||
* enters a loop to run the application tasks in sequence.
|
|
||||||
*/
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
SetupHardware();
|
|
||||||
|
|
||||||
/* Ring buffer Initialization */
|
|
||||||
Buffer_Initialize(&Rx_Buffer);
|
|
||||||
Buffer_Initialize(&Tx_Buffer);
|
|
||||||
|
|
||||||
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
|
|
||||||
|
|
||||||
for (;;)
|
|
||||||
{
|
|
||||||
CDC_Task();
|
|
||||||
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 */
|
|
||||||
Serial_Init(9600, false);
|
|
||||||
LEDs_Init();
|
|
||||||
USB_Init();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and
|
|
||||||
* starts the library USB task to begin the enumeration and USB management process.
|
|
||||||
*/
|
|
||||||
void EVENT_USB_Device_Connect(void)
|
|
||||||
{
|
|
||||||
/* Indicate USB enumerating */
|
|
||||||
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
|
|
||||||
* the status LEDs and stops the USB management and CDC management tasks.
|
|
||||||
*/
|
|
||||||
void EVENT_USB_Device_Disconnect(void)
|
|
||||||
{
|
|
||||||
/* Reset Tx and Rx buffers, device disconnected */
|
|
||||||
Buffer_Initialize(&Rx_Buffer);
|
|
||||||
Buffer_Initialize(&Tx_Buffer);
|
|
||||||
|
|
||||||
/* Indicate USB not ready */
|
|
||||||
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
|
|
||||||
* of the USB device after enumeration - the device endpoints are configured and the CDC management task started.
|
|
||||||
*/
|
|
||||||
void EVENT_USB_Device_ConfigurationChanged(void)
|
|
||||||
{
|
|
||||||
/* Indicate USB connected and ready */
|
|
||||||
LEDs_SetAllLEDs(LEDMASK_USB_READY);
|
|
||||||
|
|
||||||
/* Setup CDC Notification, Rx and Tx Endpoints */
|
|
||||||
if (!(Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,
|
|
||||||
ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,
|
|
||||||
ENDPOINT_BANK_SINGLE)))
|
|
||||||
{
|
|
||||||
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,
|
|
||||||
ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,
|
|
||||||
ENDPOINT_BANK_SINGLE)))
|
|
||||||
{
|
|
||||||
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,
|
|
||||||
ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,
|
|
||||||
ENDPOINT_BANK_SINGLE)))
|
|
||||||
{
|
|
||||||
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset line encoding baud rate so that the host knows to send new values */
|
|
||||||
LineEncoding.BaudRateBPS = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific
|
|
||||||
* control requests that are not handled internally by the USB library (including the CDC control commands,
|
|
||||||
* which are all issued via the control endpoint), so that they can be handled appropriately for the application.
|
|
||||||
*/
|
|
||||||
void EVENT_USB_Device_UnhandledControlRequest(void)
|
|
||||||
{
|
|
||||||
/* Process CDC specific control requests */
|
|
||||||
switch (USB_ControlRequest.bRequest)
|
|
||||||
{
|
|
||||||
case REQ_GetLineEncoding:
|
|
||||||
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
|
|
||||||
{
|
|
||||||
/* Acknowledge the SETUP packet, ready for data transfer */
|
|
||||||
Endpoint_ClearSETUP();
|
|
||||||
|
|
||||||
/* Write the line coding data to the control endpoint */
|
|
||||||
Endpoint_Write_Control_Stream_LE(&LineEncoding, sizeof(LineEncoding));
|
|
||||||
|
|
||||||
/* Finalize the stream transfer to send the last packet or clear the host abort */
|
|
||||||
Endpoint_ClearOUT();
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
case REQ_SetLineEncoding:
|
|
||||||
if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
|
|
||||||
{
|
|
||||||
/* Acknowledge the SETUP packet, ready for data transfer */
|
|
||||||
Endpoint_ClearSETUP();
|
|
||||||
|
|
||||||
/* Read the line coding data in from the host into the global struct */
|
|
||||||
Endpoint_Read_Control_Stream_LE(&LineEncoding, sizeof(LineEncoding));
|
|
||||||
|
|
||||||
/* Finalize the stream transfer to clear the last packet from the host */
|
|
||||||
Endpoint_ClearIN();
|
|
||||||
|
|
||||||
/* Reconfigure the USART with the new settings */
|
|
||||||
ReconfigureUSART();
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
case REQ_SetControlLineState:
|
|
||||||
if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
|
|
||||||
{
|
|
||||||
/* Acknowledge the SETUP packet, ready for data transfer */
|
|
||||||
Endpoint_ClearSETUP();
|
|
||||||
|
|
||||||
/* NOTE: Here you can read in the line state mask from the host, to get the current state of the output handshake
|
|
||||||
lines. The mask is read in from the wValue parameter in USB_ControlRequest, and can be masked against the
|
|
||||||
CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:
|
|
||||||
*/
|
|
||||||
|
|
||||||
Endpoint_ClearStatusStage();
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Task to manage CDC data transmission and reception to and from the host, from and to the physical USART. */
|
|
||||||
void CDC_Task(void)
|
|
||||||
{
|
|
||||||
/* Device must be connected and configured for the task to run */
|
|
||||||
if (USB_DeviceState != DEVICE_STATE_Configured)
|
|
||||||
return;
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
/* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232
|
|
||||||
handshake signal lines (and some error states), via the CONTROL_LINE_IN_* masks and the following code:
|
|
||||||
*/
|
|
||||||
|
|
||||||
USB_Notification_Header_t Notification = (USB_Notification_Header_t)
|
|
||||||
{
|
|
||||||
.NotificationType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
|
|
||||||
.Notification = NOTIF_SerialState,
|
|
||||||
.wValue = 0,
|
|
||||||
.wIndex = 0,
|
|
||||||
.wLength = sizeof(uint16_t),
|
|
||||||
};
|
|
||||||
|
|
||||||
uint16_t LineStateMask;
|
|
||||||
|
|
||||||
// Set LineStateMask here to a mask of CONTROL_LINE_IN_* masks to set the input handshake line states to send to the host
|
|
||||||
|
|
||||||
Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);
|
|
||||||
Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));
|
|
||||||
Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));
|
|
||||||
Endpoint_ClearIN();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Select the Serial Rx Endpoint */
|
|
||||||
Endpoint_SelectEndpoint(CDC_RX_EPNUM);
|
|
||||||
|
|
||||||
/* Check to see if a packet has been received from the host */
|
|
||||||
if (Endpoint_IsOUTReceived())
|
|
||||||
{
|
|
||||||
/* Read the bytes in from the endpoint into the buffer while space is available */
|
|
||||||
while (Endpoint_BytesInEndpoint() && (Rx_Buffer.Elements != BUFF_STATICSIZE))
|
|
||||||
{
|
|
||||||
/* Store each character from the endpoint */
|
|
||||||
Buffer_StoreElement(&Rx_Buffer, Endpoint_Read_Byte());
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check to see if all bytes in the current packet have been read */
|
|
||||||
if (!(Endpoint_BytesInEndpoint()))
|
|
||||||
{
|
|
||||||
/* Clear the endpoint buffer */
|
|
||||||
Endpoint_ClearOUT();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check if Rx buffer contains data - if so, send it */
|
|
||||||
if (Rx_Buffer.Elements)
|
|
||||||
Serial_TxByte(Buffer_GetElement(&Rx_Buffer));
|
|
||||||
|
|
||||||
/* Select the Serial Tx Endpoint */
|
|
||||||
Endpoint_SelectEndpoint(CDC_TX_EPNUM);
|
|
||||||
|
|
||||||
/* Check if the Tx buffer contains anything to be sent to the host */
|
|
||||||
if ((Tx_Buffer.Elements) && LineEncoding.BaudRateBPS)
|
|
||||||
{
|
|
||||||
/* Wait until Serial Tx Endpoint Ready for Read/Write */
|
|
||||||
Endpoint_WaitUntilReady();
|
|
||||||
|
|
||||||
/* Write the bytes from the buffer to the endpoint while space is available */
|
|
||||||
while (Tx_Buffer.Elements && Endpoint_IsReadWriteAllowed())
|
|
||||||
{
|
|
||||||
/* Write each byte retreived from the buffer to the endpoint */
|
|
||||||
Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Remember if the packet to send completely fills the endpoint */
|
|
||||||
bool IsFull = (Endpoint_BytesInEndpoint() == CDC_TXRX_EPSIZE);
|
|
||||||
|
|
||||||
/* Send the data */
|
|
||||||
Endpoint_ClearIN();
|
|
||||||
|
|
||||||
/* If no more data to send and the last packet filled the endpoint, send an empty packet to release
|
|
||||||
* the buffer on the receiver (otherwise all data will be cached until a non-full packet is received) */
|
|
||||||
if (IsFull && !(Tx_Buffer.Elements))
|
|
||||||
{
|
|
||||||
/* Wait until Serial Tx Endpoint Ready for Read/Write */
|
|
||||||
Endpoint_WaitUntilReady();
|
|
||||||
|
|
||||||
/* Send an empty packet to terminate the transfer */
|
|
||||||
Endpoint_ClearIN();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** ISR to handle the USART receive complete interrupt, fired each time the USART has received a character. This stores the received
|
|
||||||
* character into the Tx_Buffer circular buffer for later transmission to the host.
|
|
||||||
*/
|
|
||||||
ISR(USART1_RX_vect, ISR_BLOCK)
|
|
||||||
{
|
|
||||||
uint8_t ReceivedByte = UDR1;
|
|
||||||
|
|
||||||
/* Only store received characters if the USB interface is connected */
|
|
||||||
if ((USB_DeviceState == DEVICE_STATE_Configured) && LineEncoding.BaudRateBPS)
|
|
||||||
Buffer_StoreElement(&Tx_Buffer, ReceivedByte);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Reconfigures the USART to match the current serial port settings issued by the host as closely as possible. */
|
|
||||||
void ReconfigureUSART(void)
|
|
||||||
{
|
|
||||||
uint8_t ConfigMask = 0;
|
|
||||||
|
|
||||||
/* Determine parity - non odd/even parity mode defaults to no parity */
|
|
||||||
if (LineEncoding.ParityType == Parity_Odd)
|
|
||||||
ConfigMask = ((1 << UPM11) | (1 << UPM10));
|
|
||||||
else if (LineEncoding.ParityType == Parity_Even)
|
|
||||||
ConfigMask = (1 << UPM11);
|
|
||||||
|
|
||||||
/* Determine stop bits - 1.5 stop bits is set as 1 stop bit due to hardware limitations */
|
|
||||||
if (LineEncoding.CharFormat == TwoStopBits)
|
|
||||||
ConfigMask |= (1 << USBS1);
|
|
||||||
|
|
||||||
/* Determine data size - 5, 6, 7, or 8 bits are supported */
|
|
||||||
if (LineEncoding.DataBits == 6)
|
|
||||||
ConfigMask |= (1 << UCSZ10);
|
|
||||||
else if (LineEncoding.DataBits == 7)
|
|
||||||
ConfigMask |= (1 << UCSZ11);
|
|
||||||
else if (LineEncoding.DataBits == 8)
|
|
||||||
ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));
|
|
||||||
|
|
||||||
/* Enable double speed, gives better error percentages at 8MHz */
|
|
||||||
UCSR1A = (1 << U2X1);
|
|
||||||
|
|
||||||
/* Enable transmit and receive modules and interrupts */
|
|
||||||
UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));
|
|
||||||
|
|
||||||
/* Set the USART mode to the mask generated by the Line Coding options */
|
|
||||||
UCSR1C = ConfigMask;
|
|
||||||
|
|
||||||
/* Set the USART baud rate register to the desired baud rate value */
|
|
||||||
UBRR1 = SERIAL_2X_UBBRVAL((uint16_t)LineEncoding.BaudRateBPS);
|
|
||||||
}
|
|
|
@ -1,186 +0,0 @@
|
||||||
/*
|
|
||||||
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 USBtoSerial.c.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _USB_SERIAL_H_
|
|
||||||
#define _USB_SERIAL_H_
|
|
||||||
|
|
||||||
/* Includes: */
|
|
||||||
#include <avr/io.h>
|
|
||||||
#include <avr/wdt.h>
|
|
||||||
#include <avr/interrupt.h>
|
|
||||||
#include <avr/power.h>
|
|
||||||
|
|
||||||
#include "Descriptors.h"
|
|
||||||
|
|
||||||
#include "Lib/RingBuff.h"
|
|
||||||
|
|
||||||
#include <LUFA/Version.h>
|
|
||||||
#include <LUFA/Drivers/USB/USB.h>
|
|
||||||
#include <LUFA/Drivers/Peripheral/Serial.h>
|
|
||||||
#include <LUFA/Drivers/Board/LEDs.h>
|
|
||||||
|
|
||||||
/* Macros: */
|
|
||||||
/** CDC Class specific request to get the current virtual serial port configuration settings. */
|
|
||||||
#define REQ_GetLineEncoding 0x21
|
|
||||||
|
|
||||||
/** CDC Class specific request to set the current virtual serial port configuration settings. */
|
|
||||||
#define REQ_SetLineEncoding 0x20
|
|
||||||
|
|
||||||
/** CDC Class specific request to set the current virtual serial port handshake line states. */
|
|
||||||
#define REQ_SetControlLineState 0x22
|
|
||||||
|
|
||||||
/** Notification type constant for a change in the virtual serial port handshake line states, for
|
|
||||||
* use with a USB_Notification_Header_t notification structure when sent to the host via the CDC
|
|
||||||
* notification endpoint.
|
|
||||||
*/
|
|
||||||
#define NOTIF_SerialState 0x20
|
|
||||||
|
|
||||||
/** Mask for the DTR handshake line for use with the REQ_SetControlLineState class specific request
|
|
||||||
* from the host, to indicate that the DTR line state should be high.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_OUT_DTR (1 << 0)
|
|
||||||
|
|
||||||
/** Mask for the RTS handshake line for use with the REQ_SetControlLineState class specific request
|
|
||||||
* from the host, to indicate that theRTS line state should be high.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_OUT_RTS (1 << 1)
|
|
||||||
|
|
||||||
/** Mask for the DCD handshake line for use with the a NOTIF_SerialState class specific notification
|
|
||||||
* from the device to the host, to indicate that the DCD line state is currently high.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_IN_DCD (1 << 0)
|
|
||||||
|
|
||||||
/** Mask for the DSR handshake line for use with the a NOTIF_SerialState class specific notification
|
|
||||||
* from the device to the host, to indicate that the DSR line state is currently high.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_IN_DSR (1 << 1)
|
|
||||||
|
|
||||||
/** Mask for the BREAK handshake line for use with the a NOTIF_SerialState class specific notification
|
|
||||||
* from the device to the host, to indicate that the BREAK line state is currently high.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_IN_BREAK (1 << 2)
|
|
||||||
|
|
||||||
/** Mask for the RING handshake line for use with the a NOTIF_SerialState class specific notification
|
|
||||||
* from the device to the host, to indicate that the RING line state is currently high.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_IN_RING (1 << 3)
|
|
||||||
|
|
||||||
/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
|
|
||||||
* to indicate that a framing error has occurred on the virtual serial port.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_IN_FRAMEERROR (1 << 4)
|
|
||||||
|
|
||||||
/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
|
|
||||||
* to indicate that a parity error has occurred on the virtual serial port.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_IN_PARITYERROR (1 << 5)
|
|
||||||
|
|
||||||
/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
|
|
||||||
* to indicate that a data overrun error has occurred on the virtual serial port.
|
|
||||||
*/
|
|
||||||
#define CONTROL_LINE_IN_OVERRUNERROR (1 << 6)
|
|
||||||
|
|
||||||
/** 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)
|
|
||||||
|
|
||||||
/* Type Defines: */
|
|
||||||
/** Type define for the virtual serial port line encoding settings, for storing the current USART configuration
|
|
||||||
* as set by the host via a class specific request.
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */
|
|
||||||
uint8_t CharFormat; /**< Character format of the virtual serial port, a value from the
|
|
||||||
* CDCDevice_CDC_LineCodingFormats_t enum
|
|
||||||
*/
|
|
||||||
uint8_t ParityType; /**< Parity setting of the virtual serial port, a value from the
|
|
||||||
* CDCDevice_LineCodingParity_t enum
|
|
||||||
*/
|
|
||||||
uint8_t DataBits; /**< Bits of data per character of the virtual serial port */
|
|
||||||
} CDC_Line_Coding_t;
|
|
||||||
|
|
||||||
/** Type define for a CDC notification, sent to the host via the CDC notification endpoint to indicate a
|
|
||||||
* change in the device state asynchronously.
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
uint8_t NotificationType; /**< Notification type, a mask of REQDIR_*, REQTYPE_* and REQREC_* constants
|
|
||||||
* from the library StdRequestType.h header
|
|
||||||
*/
|
|
||||||
uint8_t Notification; /**< Notification value, a NOTIF_* constant */
|
|
||||||
uint16_t wValue; /**< Notification wValue, notification-specific */
|
|
||||||
uint16_t wIndex; /**< Notification wIndex, notification-specific */
|
|
||||||
uint16_t wLength; /**< Notification wLength, notification-specific */
|
|
||||||
} USB_Notification_Header_t;
|
|
||||||
|
|
||||||
/* Enums: */
|
|
||||||
/** Enum for the possible line encoding formats of a virtual serial port. */
|
|
||||||
enum CDCDevice_CDC_LineCodingFormats_t
|
|
||||||
{
|
|
||||||
OneStopBit = 0, /**< Each frame contains one stop bit */
|
|
||||||
OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits */
|
|
||||||
TwoStopBits = 2, /**< Each frame contains two stop bits */
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Enum for the possible line encoding parity settings of a virtual serial port. */
|
|
||||||
enum CDCDevice_LineCodingParity_t
|
|
||||||
{
|
|
||||||
Parity_None = 0, /**< No parity bit mode on each frame */
|
|
||||||
Parity_Odd = 1, /**< Odd parity bit mode on each frame */
|
|
||||||
Parity_Even = 2, /**< Even parity bit mode on each frame */
|
|
||||||
Parity_Mark = 3, /**< Mark parity bit mode on each frame */
|
|
||||||
Parity_Space = 4, /**< Space parity bit mode on each frame */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Function Prototypes: */
|
|
||||||
void SetupHardware(void);
|
|
||||||
void CDC_Task(void);
|
|
||||||
void ReconfigureUSART(void);
|
|
||||||
|
|
||||||
void EVENT_USB_Device_Connect(void);
|
|
||||||
void EVENT_USB_Device_Disconnect(void);
|
|
||||||
void EVENT_USB_Device_ConfigurationChanged(void);
|
|
||||||
void EVENT_USB_Device_UnhandledControlRequest(void);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,77 +0,0 @@
|
||||||
/** \file
|
|
||||||
*
|
|
||||||
* This file contains special DoxyGen information for the generation of the main page and other special
|
|
||||||
* documentation pages. It is not a project source file.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** \mainpage USB to Serial Converter Demo (via CDC-ACM class)
|
|
||||||
*
|
|
||||||
* \section SSec_Compat Demo Compatibility:
|
|
||||||
*
|
|
||||||
* The following list indicates what microcontrollers are compatible with this demo.
|
|
||||||
*
|
|
||||||
* - Series 7 USB AVRs
|
|
||||||
* - Series 6 USB AVRs
|
|
||||||
* - Series 4 USB AVRs
|
|
||||||
* - Series 2 USB AVRs
|
|
||||||
*
|
|
||||||
* \section SSec_Info USB Information:
|
|
||||||
*
|
|
||||||
* The following table gives a rundown of the USB utilization of this demo.
|
|
||||||
*
|
|
||||||
* <table>
|
|
||||||
* <tr>
|
|
||||||
* <td><b>USB Mode:</b></td>
|
|
||||||
* <td>Device</td>
|
|
||||||
* </tr>
|
|
||||||
* <tr>
|
|
||||||
* <td><b>USB Class:</b></td>
|
|
||||||
* <td>Communications Device Class (CDC)</td>
|
|
||||||
* </tr>
|
|
||||||
* <tr>
|
|
||||||
* <td><b>USB Subclass:</b></td>
|
|
||||||
* <td>Abstract Control Model (ACM)</td>
|
|
||||||
* </tr>
|
|
||||||
* <tr>
|
|
||||||
* <td><b>Relevant Standards:</b></td>
|
|
||||||
* <td>USBIF CDC Class Standard</td>
|
|
||||||
* </tr>
|
|
||||||
* <tr>
|
|
||||||
* <td><b>Usable Speeds:</b></td>
|
|
||||||
* <td>Full Speed Mode</td>
|
|
||||||
* </tr>
|
|
||||||
* </table>
|
|
||||||
*
|
|
||||||
* \section SSec_Description Project Description:
|
|
||||||
*
|
|
||||||
* Communications Device Class demonstration application.
|
|
||||||
* This gives a simple reference application for implementing
|
|
||||||
* a USB to Serial converter using the CDC class. Sent and
|
|
||||||
* received data on the serial port is communicated to the USB
|
|
||||||
* host.
|
|
||||||
*
|
|
||||||
* After running this demo for the first time on a new computer,
|
|
||||||
* you will need to supply the .INF file located in this demo
|
|
||||||
* project's directory as the device's driver when running under
|
|
||||||
* Windows. This will enable Windows to use its inbuilt CDC drivers,
|
|
||||||
* negating the need for custom drivers for the device. Other
|
|
||||||
* Operating Systems should automatically use their own inbuilt
|
|
||||||
* CDC-ACM drivers.
|
|
||||||
*
|
|
||||||
* \section SSec_Options Project Options
|
|
||||||
*
|
|
||||||
* The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.
|
|
||||||
*
|
|
||||||
* <table>
|
|
||||||
* <tr>
|
|
||||||
* <td><b>Define Name:</b></td>
|
|
||||||
* <td><b>Location:</b></td>
|
|
||||||
* <td><b>Description:</b></td>
|
|
||||||
* </tr>
|
|
||||||
* <tr>
|
|
||||||
* <td>BUFF_STATICSIZE</td>
|
|
||||||
* <td>RingBuff.h</td>
|
|
||||||
* <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer.</td>
|
|
||||||
* </tr>
|
|
||||||
* </table>
|
|
||||||
*/
|
|
|
@ -1,738 +0,0 @@
|
||||||
# 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 = at90usb1287
|
|
||||||
|
|
||||||
|
|
||||||
# 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 in Hz. 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.
|
|
||||||
#
|
|
||||||
# This will be an integer division of F_CLOCK below, as it is sourced by
|
|
||||||
# F_CLOCK after it has run through any CPU prescalers. Note that this value
|
|
||||||
# does not *change* the processor frequency - it should merely be updated to
|
|
||||||
# reflect the processor speed set externally so that the code can use accurate
|
|
||||||
# software delays.
|
|
||||||
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) in Hz. 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 = USBtoSerial
|
|
||||||
|
|
||||||
|
|
||||||
# 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 NO_STREAM_CALLBACKS
|
|
||||||
LUFA_OPTS += -D USB_DEVICE_ONLY
|
|
||||||
LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
|
|
||||||
LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
|
|
||||||
LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
|
|
||||||
LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
|
|
||||||
|
|
||||||
|
|
||||||
# List C source files here. (C dependencies are automatically generated.)
|
|
||||||
SRC = $(TARGET).c \
|
|
||||||
Descriptors.c \
|
|
||||||
Lib/RingBuff.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 \
|
|
||||||
|
|
||||||
|
|
||||||
# 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 += -fno-inline-small-functions
|
|
||||||
CFLAGS += -fpack-struct
|
|
||||||
CFLAGS += -fshort-enums
|
|
||||||
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 checkinvalidevents 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
|
|
||||||
|
|
||||||
$(LUFA_PATH)/LUFA/LUFA_Events.lst:
|
|
||||||
@make -C $(LUFA_PATH)/LUFA/ LUFA_Events.lst
|
|
||||||
|
|
||||||
checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst
|
|
||||||
@echo
|
|
||||||
@echo Checking for invalid events...
|
|
||||||
@$(shell) avr-nm $(OBJ) | sed -n -e 's/^.*EVENT_/EVENT_/p' | \
|
|
||||||
grep -F -v --file=$(LUFA_PATH)/LUFA/LUFA_Events.lst > InvalidEvents.tmp || true
|
|
||||||
@sed -n -e 's/^/ WARNING - INVALID EVENT NAME: /p' InvalidEvents.tmp
|
|
||||||
@if test -s InvalidEvents.tmp; then exit 1; fi
|
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
||||||
flip: $(TARGET).hex
|
|
||||||
batchisp -hardware usb -device $(MCU) -operation erase f
|
|
||||||
batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program
|
|
||||||
batchisp -hardware usb -device $(MCU) -operation start reset 0
|
|
||||||
|
|
||||||
dfu: $(TARGET).hex
|
|
||||||
dfu-programmer $(MCU) erase
|
|
||||||
dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex
|
|
||||||
dfu-programmer $(MCU) reset
|
|
||||||
|
|
||||||
flip-ee: $(TARGET).hex $(TARGET).eep
|
|
||||||
$(COPY) $(TARGET).eep $(TARGET)eep.hex
|
|
||||||
batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase
|
|
||||||
batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program
|
|
||||||
batchisp -hardware usb -device $(MCU) -operation start reset 0
|
|
||||||
$(REMOVE) $(TARGET)eep.hex
|
|
||||||
|
|
||||||
dfu-ee: $(TARGET).hex $(TARGET).eep
|
|
||||||
dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep
|
|
||||||
dfu-programmer $(MCU) reset
|
|
||||||
|
|
||||||
|
|
||||||
# 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)
|
|
||||||
$(REMOVE) InvalidEvents.tmp
|
|
||||||
$(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 checkinvalidevents showliboptions \
|
|
||||||
showtarget begin finish end sizebefore sizeafter \
|
|
||||||
gccversion build elf hex eep lss sym coff extcoff \
|
|
||||||
program dfu flip flip-ee dfu-ee clean debug \
|
|
||||||
clean_list clean_binary gdb-config doxygen
|
|
|
@ -50,9 +50,6 @@ all:
|
||||||
make -C RNDISEthernet clean
|
make -C RNDISEthernet clean
|
||||||
make -C RNDISEthernet all
|
make -C RNDISEthernet all
|
||||||
|
|
||||||
make -C USBtoSerial clean
|
|
||||||
make -C USBtoSerial all
|
|
||||||
|
|
||||||
%:
|
%:
|
||||||
make -C AudioInput $@
|
make -C AudioInput $@
|
||||||
make -C AudioOutput $@
|
make -C AudioOutput $@
|
||||||
|
@ -66,4 +63,3 @@ all:
|
||||||
make -C MIDI $@
|
make -C MIDI $@
|
||||||
make -C Mouse $@
|
make -C Mouse $@
|
||||||
make -C RNDISEthernet $@
|
make -C RNDISEthernet $@
|
||||||
make -C USBtoSerial $@
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -208,60 +208,70 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
|
||||||
}
|
}
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Write_Stream_LE
|
#define TEMPLATE_FUNC_NAME Endpoint_Write_Stream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(*(BufferPtr++))
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(*(BufferPtr++))
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Write_PStream_LE
|
#define TEMPLATE_FUNC_NAME Endpoint_Write_PStream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(pgm_read_byte(BufferPtr++))
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(pgm_read_byte(BufferPtr++))
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Write_EStream_LE
|
#define TEMPLATE_FUNC_NAME Endpoint_Write_EStream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(eeprom_read_byte(BufferPtr++))
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(eeprom_read_byte(BufferPtr++))
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Write_Stream_BE
|
#define TEMPLATE_FUNC_NAME Endpoint_Write_Stream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(*(BufferPtr--))
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(*(BufferPtr--))
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Write_EStream_BE
|
#define TEMPLATE_FUNC_NAME Endpoint_Write_EStream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(eeprom_read_byte(BufferPtr--))
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(eeprom_read_byte(BufferPtr--))
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Write_PStream_BE
|
#define TEMPLATE_FUNC_NAME Endpoint_Write_PStream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(pgm_read_byte(BufferPtr--))
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Endpoint_Write_Byte(pgm_read_byte(BufferPtr--))
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Read_Stream_LE
|
#define TEMPLATE_FUNC_NAME Endpoint_Read_Stream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearOUT()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) *(BufferPtr++) = Endpoint_Read_Byte()
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) *(BufferPtr++) = Endpoint_Read_Byte()
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Read_EStream_LE
|
#define TEMPLATE_FUNC_NAME Endpoint_Read_EStream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearOUT()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) eeprom_write_byte(BufferPtr++, Endpoint_Read_Byte())
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) eeprom_write_byte(BufferPtr++, Endpoint_Read_Byte())
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Read_Stream_BE
|
#define TEMPLATE_FUNC_NAME Endpoint_Read_Stream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearOUT()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) *(BufferPtr--) = Endpoint_Read_Byte()
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) *(BufferPtr--) = Endpoint_Read_Byte()
|
||||||
#include "Template/Template_Endpoint_RW.c"
|
#include "Template/Template_Endpoint_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Endpoint_Read_EStream_BE
|
#define TEMPLATE_FUNC_NAME Endpoint_Read_EStream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE void*
|
||||||
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearOUT()
|
#define TEMPLATE_CLEAR_ENDPOINT() Endpoint_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) eeprom_write_byte(BufferPtr--, Endpoint_Read_Byte())
|
#define TEMPLATE_TRANSFER_BYTE(BufferPtr) eeprom_write_byte(BufferPtr--, Endpoint_Read_Byte())
|
||||||
|
|
|
@ -795,7 +795,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_Stream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().
|
/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().
|
||||||
*
|
*
|
||||||
|
@ -807,7 +807,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_EStream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_EStream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** FLASH buffer source version of \ref Endpoint_Write_Stream_LE().
|
/** FLASH buffer source version of \ref Endpoint_Write_Stream_LE().
|
||||||
*
|
*
|
||||||
|
@ -821,7 +821,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_PStream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_PStream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** Writes the given number of bytes to the endpoint from the given buffer in big endian,
|
/** Writes the given number of bytes to the endpoint from the given buffer in big endian,
|
||||||
* sending full packets to the host as needed. The last packet filled is not automatically sent;
|
* sending full packets to the host as needed. The last packet filled is not automatically sent;
|
||||||
|
@ -844,7 +844,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_Stream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().
|
/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().
|
||||||
*
|
*
|
||||||
|
@ -856,7 +856,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_EStream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_EStream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** FLASH buffer source version of \ref Endpoint_Write_Stream_BE().
|
/** FLASH buffer source version of \ref Endpoint_Write_Stream_BE().
|
||||||
*
|
*
|
||||||
|
@ -870,7 +870,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_PStream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_PStream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** Reads the given number of bytes from the endpoint from the given buffer in little endian,
|
/** Reads the given number of bytes from the endpoint from the given buffer in little endian,
|
||||||
* discarding fully read packets from the host as needed. The last packet is not automatically
|
* discarding fully read packets from the host as needed. The last packet is not automatically
|
||||||
|
@ -962,7 +962,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_Control_Stream_LE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** EEPROM buffer source version of Endpoint_Write_Control_Stream_LE.
|
/** EEPROM buffer source version of Endpoint_Write_Control_Stream_LE.
|
||||||
*
|
*
|
||||||
|
@ -981,7 +981,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_Control_EStream_LE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_Control_EStream_LE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_LE().
|
/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_LE().
|
||||||
*
|
*
|
||||||
|
@ -1002,7 +1002,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_Control_PStream_LE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_Control_PStream_LE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,
|
/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,
|
||||||
* sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
|
* sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
|
||||||
|
@ -1024,7 +1024,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_Control_Stream_BE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** EEPROM buffer source version of \ref Endpoint_Write_Control_Stream_BE().
|
/** EEPROM buffer source version of \ref Endpoint_Write_Control_Stream_BE().
|
||||||
*
|
*
|
||||||
|
@ -1043,7 +1043,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_Control_EStream_BE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_Control_EStream_BE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_BE().
|
/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_BE().
|
||||||
*
|
*
|
||||||
|
@ -1064,7 +1064,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Endpoint_Write_Control_PStream_BE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Endpoint_Write_Control_PStream_BE(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,
|
/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,
|
||||||
* discarding fully read packets from the host as needed. The device IN acknowledgement is not
|
* discarding fully read packets from the host as needed. The device IN acknowledgement is not
|
||||||
|
|
|
@ -200,6 +200,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
}
|
}
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Write_Stream_LE
|
#define TEMPLATE_FUNC_NAME Pipe_Write_Stream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
|
@ -207,6 +208,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Write_PStream_LE
|
#define TEMPLATE_FUNC_NAME Pipe_Write_PStream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
|
@ -214,6 +216,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Write_EStream_LE
|
#define TEMPLATE_FUNC_NAME Pipe_Write_EStream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
|
@ -221,6 +224,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Write_Stream_BE
|
#define TEMPLATE_FUNC_NAME Pipe_Write_Stream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
|
@ -228,6 +232,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Write_PStream_BE
|
#define TEMPLATE_FUNC_NAME Pipe_Write_PStream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
|
@ -235,6 +240,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Write_EStream_BE
|
#define TEMPLATE_FUNC_NAME Pipe_Write_EStream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE const void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
#define TEMPLATE_TOKEN PIPE_TOKEN_OUT
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
|
@ -242,6 +248,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Read_Stream_LE
|
#define TEMPLATE_FUNC_NAME Pipe_Read_Stream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_IN
|
#define TEMPLATE_TOKEN PIPE_TOKEN_IN
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
|
@ -249,6 +256,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Read_EStream_LE
|
#define TEMPLATE_FUNC_NAME Pipe_Read_EStream_LE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_IN
|
#define TEMPLATE_TOKEN PIPE_TOKEN_IN
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
#define TEMPLATE_BUFFER_OFFSET(Length) 0
|
||||||
|
@ -256,6 +264,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Read_Stream_BE
|
#define TEMPLATE_FUNC_NAME Pipe_Read_Stream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_IN
|
#define TEMPLATE_TOKEN PIPE_TOKEN_IN
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
|
@ -263,6 +272,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
|
||||||
#include "Template/Template_Pipe_RW.c"
|
#include "Template/Template_Pipe_RW.c"
|
||||||
|
|
||||||
#define TEMPLATE_FUNC_NAME Pipe_Read_EStream_BE
|
#define TEMPLATE_FUNC_NAME Pipe_Read_EStream_BE
|
||||||
|
#define TEMPLATE_BUFFER_TYPE void*
|
||||||
#define TEMPLATE_TOKEN PIPE_TOKEN_IN
|
#define TEMPLATE_TOKEN PIPE_TOKEN_IN
|
||||||
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()
|
#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()
|
||||||
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
#define TEMPLATE_BUFFER_OFFSET(Length) Length - 1
|
||||||
|
|
|
@ -854,7 +854,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Pipe_Write_Stream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Pipe_Write_Stream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** EEPROM buffer source version of \ref Pipe_Write_Stream_LE().
|
/** EEPROM buffer source version of \ref Pipe_Write_Stream_LE().
|
||||||
*
|
*
|
||||||
|
@ -866,7 +866,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Pipe_Write_EStream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Pipe_Write_EStream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** FLASH buffer source version of \ref Pipe_Write_Stream_LE().
|
/** FLASH buffer source version of \ref Pipe_Write_Stream_LE().
|
||||||
*
|
*
|
||||||
|
@ -880,7 +880,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Pipe_Write_PStream_LE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Pipe_Write_PStream_LE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** Writes the given number of bytes to the pipe from the given buffer in big endian,
|
/** Writes the given number of bytes to the pipe from the given buffer in big endian,
|
||||||
* sending full packets to the device as needed. The last packet filled is not automatically sent;
|
* sending full packets to the device as needed. The last packet filled is not automatically sent;
|
||||||
|
@ -903,7 +903,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Pipe_Write_Stream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Pipe_Write_Stream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().
|
/** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().
|
||||||
*
|
*
|
||||||
|
@ -915,7 +915,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Pipe_Write_EStream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Pipe_Write_EStream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** FLASH buffer source version of \ref Pipe_Write_Stream_BE().
|
/** FLASH buffer source version of \ref Pipe_Write_Stream_BE().
|
||||||
*
|
*
|
||||||
|
@ -929,7 +929,7 @@
|
||||||
*
|
*
|
||||||
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
* \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
|
||||||
*/
|
*/
|
||||||
uint8_t Pipe_Write_PStream_BE(void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
uint8_t Pipe_Write_PStream_BE(const void* Buffer, uint16_t Length __CALLBACK_PARAM) ATTR_NON_NULL_PTR_ARG(1);
|
||||||
|
|
||||||
/** Reads the given number of bytes from the pipe into the given buffer in little endian,
|
/** Reads the given number of bytes from the pipe into the given buffer in little endian,
|
||||||
* sending full packets to the device as needed. The last packet filled is not automatically sent;
|
* sending full packets to the device as needed. The last packet filled is not automatically sent;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length)
|
uint8_t TEMPLATE_FUNC_NAME (const void* Buffer, uint16_t Length)
|
||||||
{
|
{
|
||||||
uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));
|
uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));
|
||||||
bool LastPacketFull = false;
|
bool LastPacketFull = false;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)
|
uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer, uint16_t Length __CALLBACK_PARAM)
|
||||||
{
|
{
|
||||||
uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));
|
uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));
|
||||||
uint8_t ErrorCode;
|
uint8_t ErrorCode;
|
||||||
|
@ -71,6 +71,7 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef TEMPLATE_FUNC_NAME
|
#undef TEMPLATE_FUNC_NAME
|
||||||
|
#undef TEMPLATE_BUFFER_TYPE
|
||||||
#undef TEMPLATE_TRANSFER_BYTE
|
#undef TEMPLATE_TRANSFER_BYTE
|
||||||
#undef TEMPLATE_CLEAR_ENDPOINT
|
#undef TEMPLATE_CLEAR_ENDPOINT
|
||||||
#undef TEMPLATE_BUFFER_OFFSET
|
#undef TEMPLATE_BUFFER_OFFSET
|
|
@ -1,4 +1,4 @@
|
||||||
uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)
|
uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer, uint16_t Length __CALLBACK_PARAM)
|
||||||
{
|
{
|
||||||
uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));
|
uint8_t* DataStream = (uint8_t*)(Buffer + TEMPLATE_BUFFER_OFFSET(Length));
|
||||||
uint8_t ErrorCode;
|
uint8_t ErrorCode;
|
||||||
|
@ -73,6 +73,7 @@ uint8_t TEMPLATE_FUNC_NAME (void* Buffer, uint16_t Length __CALLBACK_PARAM)
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef TEMPLATE_FUNC_NAME
|
#undef TEMPLATE_FUNC_NAME
|
||||||
|
#undef TEMPLATE_BUFFER_TYPE
|
||||||
#undef TEMPLATE_TOKEN
|
#undef TEMPLATE_TOKEN
|
||||||
#undef TEMPLATE_TRANSFER_BYTE
|
#undef TEMPLATE_TRANSFER_BYTE
|
||||||
#undef TEMPLATE_CLEAR_PIPE
|
#undef TEMPLATE_CLEAR_PIPE
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
* - Changed Audio Class driver sample read/write functions to be inline, to reduce the number of cycles needed to transfer
|
* - Changed Audio Class driver sample read/write functions to be inline, to reduce the number of cycles needed to transfer
|
||||||
* samples to and from the device (allowing more time for sample processing and output)
|
* samples to and from the device (allowing more time for sample processing and output)
|
||||||
* - Audio class Device mode demos now work at both 16MHz and 8MHz, rather than just at 8MHz
|
* - Audio class Device mode demos now work at both 16MHz and 8MHz, rather than just at 8MHz
|
||||||
|
* - The previous USBtoSerial demo has been moved into the projects directory, as it was just a modified CDC demo
|
||||||
|
* - The Endpoint/Pipe functions now use the const qualifier on the input buffer
|
||||||
*
|
*
|
||||||
* <b>Fixed:</b>
|
* <b>Fixed:</b>
|
||||||
* - Fixed PrinterHost demo returning invalid Device ID data when the attached device does not have a
|
* - Fixed PrinterHost demo returning invalid Device ID data when the attached device does not have a
|
||||||
|
@ -31,6 +33,7 @@
|
||||||
* to send report to the attached device
|
* to send report to the attached device
|
||||||
* - Fixed ClassDriver AudioOutput device demo not selecting an audio output mode
|
* - Fixed ClassDriver AudioOutput device demo not selecting an audio output mode
|
||||||
* - Fixed incorrect SampleFrequencyType value in the AudioInput and AudioOutput ClassDriver demos' descriptors
|
* - Fixed incorrect SampleFrequencyType value in the AudioInput and AudioOutput ClassDriver demos' descriptors
|
||||||
|
* - Fixed incorrect event name rule in demo/project/bootloader makefiles
|
||||||
*
|
*
|
||||||
* \section Sec_ChangeLog090924 Version 090924
|
* \section Sec_ChangeLog090924 Version 090924
|
||||||
*
|
*
|
||||||
|
|
|
@ -23,8 +23,9 @@
|
||||||
* - Change makefiles to allow for absolute LUFA location to be used
|
* - Change makefiles to allow for absolute LUFA location to be used
|
||||||
* - Abstract out the physical media from the Mass Storage device demos
|
* - Abstract out the physical media from the Mass Storage device demos
|
||||||
* - Add RNDIS Host Class driver
|
* - Add RNDIS Host Class driver
|
||||||
* - Fix audio demos on Linux
|
* - Add unit testing to APIs
|
||||||
* - Make new demos
|
* - Make new demos
|
||||||
|
* -# Keyboard/Mouse Dual Class Host
|
||||||
* -# Multiple-report HID device
|
* -# Multiple-report HID device
|
||||||
* -# Mouse/CDC Dual Class Device
|
* -# Mouse/CDC Dual Class Device
|
||||||
* - Port LUFA to other architectures
|
* - Port LUFA to other architectures
|
||||||
|
|
|
@ -45,7 +45,6 @@
|
||||||
* - <b>MIDI</b> - MIDI In demo, using the library USB MIDI-Audio Class driver framework
|
* - <b>MIDI</b> - MIDI In demo, using the library USB MIDI-Audio Class driver framework
|
||||||
* - <b>Mouse</b> - USB Mouse demo, using the library USB HID driver framework
|
* - <b>Mouse</b> - USB Mouse demo, using the library USB HID driver framework
|
||||||
* - <b>RNDISEthernet</b> - RNDIS Ethernet Webserver demo, using the library USB RNDIS driver framework
|
* - <b>RNDISEthernet</b> - RNDIS Ethernet Webserver demo, using the library USB RNDIS driver framework
|
||||||
* - <b>USBtoSerial</b> - USB to USART Serial converter demo, using the library USB CDC driver framework
|
|
||||||
* - <b>LowLevel</b>
|
* - <b>LowLevel</b>
|
||||||
* - <b>AudioInput</b> - Audio In (microphone) demo, using the low level LUFA APIs to implement the USB Audio class
|
* - <b>AudioInput</b> - Audio In (microphone) demo, using the low level LUFA APIs to implement the USB Audio class
|
||||||
* - <b>AudioOutput</b> - Audio Out (speaker) demo, using the low level LUFA APIs to implement the USB Audio class
|
* - <b>AudioOutput</b> - Audio Out (speaker) demo, using the low level LUFA APIs to implement the USB Audio class
|
||||||
|
@ -59,7 +58,6 @@
|
||||||
* - <b>MIDI</b> - MIDI In demo, using the low level LUFA APIs to implement the USB MIDI-Audio class
|
* - <b>MIDI</b> - MIDI In demo, using the low level LUFA APIs to implement the USB MIDI-Audio class
|
||||||
* - <b>Mouse</b> - USB Mouse demo, using the low level LUFA APIs to implement the USB HID class
|
* - <b>Mouse</b> - USB Mouse demo, using the low level LUFA APIs to implement the USB HID class
|
||||||
* - <b>RNDISEthernet</b> - RNDIS Ethernet Webserver demo, using the low level LUFA APIs to implement the USB RNDIS class
|
* - <b>RNDISEthernet</b> - RNDIS Ethernet Webserver demo, using the low level LUFA APIs to implement the USB RNDIS class
|
||||||
* - <b>USBtoSerial</b> - USB to USART Serial converter demo, using the low level LUFA APIs to implement the USB CDC class
|
|
||||||
* - <b>Incomplete</b>
|
* - <b>Incomplete</b>
|
||||||
* - <b>SideShow</b> - Incomplete Windows SideShow demo, using the low level LUFA APIs to implement the USB SideShow class
|
* - <b>SideShow</b> - Incomplete Windows SideShow demo, using the low level LUFA APIs to implement the USB SideShow class
|
||||||
* - <b>Host</b>
|
* - <b>Host</b>
|
||||||
|
@ -98,6 +96,7 @@
|
||||||
* - <b>Benito</b> - Benito Board Arduino Programmer project
|
* - <b>Benito</b> - Benito Board Arduino Programmer project
|
||||||
* - <b>Magstripe</b> - Magnetic Stripe Card Reader project
|
* - <b>Magstripe</b> - Magnetic Stripe Card Reader project
|
||||||
* - <b>MissileLaucher</b> - Toy Missile Launcher Host project
|
* - <b>MissileLaucher</b> - Toy Missile Launcher Host project
|
||||||
|
* - <b>USBtoSerial</b> - USB to USART Serial Converter project
|
||||||
*
|
*
|
||||||
* </small>
|
* </small>
|
||||||
*/
|
*/
|
|
@ -10,8 +10,8 @@
|
||||||
* to the next version released. It does not indicate all new additions to the library in each version change, only
|
* to the next version released. It does not indicate all new additions to the library in each version change, only
|
||||||
* areas relevant to making older projects compatible with the API changes of each new release.
|
* areas relevant to making older projects compatible with the API changes of each new release.
|
||||||
*
|
*
|
||||||
* \section Sec_MigrationXXXXXX Migrating from 090810 to XXXXXX
|
* \section Sec_MigrationXXXXXX Migrating from 090924 to XXXXXX
|
||||||
* <b>No Migration information for this release.</b>
|
* <b>No Migration information for this release - all library elements are backwards-compatible with 090924.</b>
|
||||||
*
|
*
|
||||||
* \section Sec_Migration090924 Migrating from 090810 to 090924
|
* \section Sec_Migration090924 Migrating from 090810 to 090924
|
||||||
*
|
*
|
||||||
|
|
|
@ -221,9 +221,9 @@ USB_Descriptor_String_t PROGMEM ManufacturerString =
|
||||||
*/
|
*/
|
||||||
USB_Descriptor_String_t PROGMEM ProductString =
|
USB_Descriptor_String_t PROGMEM ProductString =
|
||||||
{
|
{
|
||||||
.Header = {.Size = USB_STRING_LEN(19), .Type = DTYPE_String},
|
.Header = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},
|
||||||
|
|
||||||
.UnicodeString = L"LUFA USB-RS232 Demo"
|
.UnicodeString = L"LUFA USB-RS232 Adapter"
|
||||||
};
|
};
|
||||||
|
|
||||||
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
|
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
/** \file
|
/** \file
|
||||||
*
|
*
|
||||||
* Main source file for the USBtoSerial demo. This file contains the main tasks of
|
* Main source file for the USBtoSerial project. This file contains the main tasks of
|
||||||
* the demo and is responsible for the initial application hardware configuration.
|
* the demo and is responsible for the initial application hardware configuration.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -112,7 +112,7 @@ OBJDIR = .
|
||||||
|
|
||||||
|
|
||||||
# Path to the LUFA library
|
# Path to the LUFA library
|
||||||
LUFA_PATH = ../../../..
|
LUFA_PATH = ../..
|
||||||
|
|
||||||
|
|
||||||
# LUFA library compile-time options
|
# LUFA library compile-time options
|
|
@ -26,8 +26,12 @@ all:
|
||||||
make -C MissileLauncher clean
|
make -C MissileLauncher clean
|
||||||
make -C MissileLauncher all
|
make -C MissileLauncher all
|
||||||
|
|
||||||
|
make -C USBtoSerial clean
|
||||||
|
make -C USBtoSerial all
|
||||||
|
|
||||||
%:
|
%:
|
||||||
make -C AVRISP $@
|
make -C AVRISP $@
|
||||||
make -C Benito $@
|
make -C Benito $@
|
||||||
make -C Magstripe $@
|
make -C Magstripe $@
|
||||||
make -C MissileLauncher $@
|
make -C MissileLauncher $@
|
||||||
|
make -C USBtoSerial $@
|
||||||
|
|
Loading…
Reference in New Issue