Commit 6933f2e1 authored by Dean Camera's avatar Dean Camera
Browse files

All comments in the library, bootloaders, demos and projects have now been...

All comments in the library, bootloaders, demos and projects have now been spell-checked and spelling mistakes/typos corrected.
parent fb3fcb96
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/** \file /** \file
* *
* Standard USB device descriptor defines and retrieval routines, for USB devices. This module contains * Standard USB device descriptor defines and retrieval routines, for USB devices. This module contains
* strucutures and macros for the easy creation of standard USB descriptors in USB device projects. * structures and macros for the easy creation of standard USB descriptors in USB device projects.
* *
* All standard descriptors have their elements named in an identical manner to the official USB specification, * All standard descriptors have their elements named in an identical manner to the official USB specification,
* however slightly more verbose alternate (non-standard) names are also supplied if the macro * however slightly more verbose alternate (non-standard) names are also supplied if the macro
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
uint16_t ReleaseNumber; /**< Product release (version) number. */ uint16_t ReleaseNumber; /**< Product release (version) number. */
uint8_t ManufacturerStrIndex; /**< String index for the manufacturer's name. The uint8_t ManufacturerStrIndex; /**< String index for the manufacturer's name. The
* host will request this string via a seperate * host will request this string via a separate
* control request for the string descriptor. * control request for the string descriptor.
* *
* \note If no string supplied, use NO_DESCRIPTOR. * \note If no string supplied, use NO_DESCRIPTOR.
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
* \see ManufacturerStrIndex structure entry. * \see ManufacturerStrIndex structure entry.
*/ */
uint8_t SerialNumStrIndex; /**< String index for the product's globally unique hexadecimal uint8_t SerialNumStrIndex; /**< String index for the product's globally unique hexadecimal
* serial number, in uppercase Unicoded ASCII. * serial number, in uppercase Unicode ASCII.
* *
* \see ManufacturerStrIndex structure entry. * \see ManufacturerStrIndex structure entry.
*/ */
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
/** Type define for a standard interface association descriptor. /** Type define for a standard interface association descriptor.
* *
* This descriptor has been added as a suppliment to the USB2.0 standard, in the ECN located at * This descriptor has been added as a supplement to the USB2.0 standard, in the ECN located at
* <a>http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf</a>. It allows compound * <a>http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf</a>. It allows compound
* devices with multiple interfaces related to the same function to have the multiple interfaces bound * devices with multiple interfaces related to the same function to have the multiple interfaces bound
* together at the point of enumeration, loading one generic driver for all the interfaces in the single * together at the point of enumeration, loading one generic driver for all the interfaces in the single
...@@ -425,7 +425,7 @@ ...@@ -425,7 +425,7 @@
* maximum packet size that the endpoint can receive at a time. * maximum packet size that the endpoint can receive at a time.
*/ */
uint8_t PollingIntervalMS; /**< Polling interval in milliseconds for the endpont uint8_t PollingIntervalMS; /**< Polling interval in milliseconds for the endpoint
* if it is an INTERRUPT or ISOCHRONOUS type. * if it is an INTERRUPT or ISOCHRONOUS type.
*/ */
#else #else
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
#define USB_INT_IsEnabled(int) ((USB_INT_GET_EN_REG(int) & USB_INT_GET_EN_MASK(int)) ? true : false) #define USB_INT_IsEnabled(int) ((USB_INT_GET_EN_REG(int) & USB_INT_GET_EN_MASK(int)) ? true : false)
/** Returns boolean true if the given interrupt flag is set (i.e. the condition for the interrupt has occurred, /** Returns boolean true if the given interrupt flag is set (i.e. the condition for the interrupt has occurred,
* but the interrupt vector is not neccesarily enabled), otherwise returns false. * but the interrupt vector is not necessarily enabled), otherwise returns false.
*/ */
#define USB_INT_HasOccurred(int) ((USB_INT_GET_INT_REG(int) & USB_INT_GET_INT_MASK(int)) ? true : false) #define USB_INT_HasOccurred(int) ((USB_INT_GET_INT_REG(int) & USB_INT_GET_INT_MASK(int)) ? true : false)
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
*/ */
extern volatile bool USB_IsConnected; extern volatile bool USB_IsConnected;
/** Indicates if the USB interface is currently initialized but not neccesarily connected to a host /** Indicates if the USB interface is currently initialized but not necessarily connected to a host
* or device (i.e. if USB_Init() has been run). If this is false, all other library globals are invalid. * or device (i.e. if USB_Init() has been run). If this is false, all other library globals are invalid.
* *
* \note This variable should be treated as read-only in the user application, and never manually * \note This variable should be treated as read-only in the user application, and never manually
...@@ -166,10 +166,10 @@ ...@@ -166,10 +166,10 @@
* The USB task must be serviced within 50mS in all modes, when needed. The task may be serviced * The USB task must be serviced within 50mS in all modes, when needed. The task may be serviced
* at all times, or (for minimum CPU consumption): * at all times, or (for minimum CPU consumption):
* *
* - In device mode, it may be disabled at startup, enabled on the firing of the USB_Connect event * - In device mode, it may be disabled at start-up, enabled on the firing of the USB_Connect event
* and disabled again on the firing of the USB_Disconnect event. * and disabled again on the firing of the USB_Disconnect event.
* *
* - In host mode, it may be disabled at startup, enabled on the firing of the USB_DeviceAttached * - In host mode, it may be disabled at start-up, enabled on the firing of the USB_DeviceAttached
* event and disabled again on the firing of the USB_DeviceUnattached event. * event and disabled again on the firing of the USB_DeviceUnattached event.
* *
* \see Events.h for more information on the USB events. * \see Events.h for more information on the USB events.
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
/** Indicates if the device is currently suspended by the host. While suspended, the device is /** Indicates if the device is currently suspended by the host. While suspended, the device is
* to enter a low power state until resumed by the host. While suspended no USB traffic to or * to enter a low power state until resumed by the host. While suspended no USB traffic to or
* from the device can ocurr (except for Remote Wakeup requests). * from the device can occur (except for Remote Wakeup requests).
* *
* This macro returns true if the USB communications have been suspended by the host, false * This macro returns true if the USB communications have been suspended by the host, false
* otherwise. * otherwise.
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* *
* Functions, macros and enums related to endpoint management when in USB Device mode. This * Functions, macros and enums related to endpoint management when in USB Device mode. This
* module contains the endpoint management macros, as well as endpoint interrupt and data * module contains the endpoint management macros, as well as endpoint interrupt and data
* send/recieve functions for various datatypes. * send/recieve functions for various data types.
*/ */
#ifndef __ENDPOINT_H__ #ifndef __ENDPOINT_H__
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
/** Returns true if the currently selected endpoint may be read from (if data is waiting in the endpoint /** Returns true if the currently selected endpoint may be read from (if data is waiting in the endpoint
* bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an * bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an
* IN direction). This function will return false if an error has occured in the endpoint, or if * IN direction). This function will return false if an error has occurred in the endpoint, or if
* the endpoint is an OUT direction and no packet has been received, or if the endpoint is an IN * the endpoint is an OUT direction and no packet has been received, or if the endpoint is an IN
* direction and the endpoint bank is full. * direction and the endpoint bank is full.
*/ */
...@@ -262,10 +262,10 @@ ...@@ -262,10 +262,10 @@
*/ */
#define Endpoint_ClearSetupOUT() MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE #define Endpoint_ClearSetupOUT() MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE
/** Stalls the current endpoint, indicating to the host that a logical problem occured with the /** Stalls the current endpoint, indicating to the host that a logical problem occurred with the
* indicated endpoint and that the current transfer sequence should be aborted. This provides a * indicated endpoint and that the current transfer sequence should be aborted. This provides a
* way for devices to indicate invalid commands to the host so that the current transfer can be * way for devices to indicate invalid commands to the host so that the current transfer can be
* aborted and the host can begin its own recovery seqeuence. * aborted and the host can begin its own recovery sequence.
* *
* The currently selected endpoint remains stalled until either the Endpoint_ClearStall() macro * The currently selected endpoint remains stalled until either the Endpoint_ClearStall() macro
* is called, or the host issues a CLEAR FEATURE request to the device for the currently selected * is called, or the host issues a CLEAR FEATURE request to the device for the currently selected
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
/** Clears the stall on the currently selected endpoint. */ /** Clears the stall on the currently selected endpoint. */
#define Endpoint_ClearStall() MACROS{ UECONX |= (1 << STALLRQC); }MACROE #define Endpoint_ClearStall() MACROS{ UECONX |= (1 << STALLRQC); }MACROE
/** Returns true if the currently selected endpoint is stalled, false othewise. */ /** Returns true if the currently selected endpoint is stalled, false otherwise. */
#define Endpoint_IsStalled() ((UECONX & (1 << STALLRQ)) ? true : false) #define Endpoint_IsStalled() ((UECONX & (1 << STALLRQ)) ? true : false)
/** Resets the data toggle of the currently selected endpoint. */ /** Resets the data toggle of the currently selected endpoint. */
...@@ -552,12 +552,12 @@ ...@@ -552,12 +552,12 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \note This routine should not be used on CONTROL type endpoints. * \note This routine should not be used on CONTROL type endpoints.
* *
* \param Length Number of bytes to send via the currently selected endpoint. * \param Length Number of bytes to send via the currently selected endpoint.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum. * \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -576,13 +576,13 @@ ...@@ -576,13 +576,13 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \note This routine should not be used on CONTROL type endpoints. * \note This routine should not be used on CONTROL type endpoints.
* *
* \param Buffer Pointer to the source data buffer to read from. * \param Buffer Pointer to the source data buffer to read from.
* \param Length Number of bytes to read for the currently selected endpoint into the buffer. * \param Length Number of bytes to read for the currently selected endpoint into the buffer.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum. * \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -601,13 +601,13 @@ ...@@ -601,13 +601,13 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \note This routine should not be used on CONTROL type endpoints. * \note This routine should not be used on CONTROL type endpoints.
* *
* \param Buffer Pointer to the source data buffer to read from. * \param Buffer Pointer to the source data buffer to read from.
* \param Length Number of bytes to read for the currently selected endpoint into the buffer. * \param Length Number of bytes to read for the currently selected endpoint into the buffer.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum. * \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -626,13 +626,13 @@ ...@@ -626,13 +626,13 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \note This routine should not be used on CONTROL type endpoints. * \note This routine should not be used on CONTROL type endpoints.
* *
* \param Buffer Pointer to the destination data buffer to write to. * \param Buffer Pointer to the destination data buffer to write to.
* \param Length Number of bytes to send via the currently selected endpoint. * \param Length Number of bytes to send via the currently selected endpoint.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum. * \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -651,13 +651,13 @@ ...@@ -651,13 +651,13 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \note This routine should not be used on CONTROL type endpoints. * \note This routine should not be used on CONTROL type endpoints.
* *
* \param Buffer Pointer to the destination data buffer to write to. * \param Buffer Pointer to the destination data buffer to write to.
* \param Length Number of bytes to send via the currently selected endpoint. * \param Length Number of bytes to send via the currently selected endpoint.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum. * \return A value from the Endpoint_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -749,27 +749,27 @@ ...@@ -749,27 +749,27 @@
#define Endpoint_Ignore_DWord() Endpoint_Discard_DWord() #define Endpoint_Ignore_DWord() Endpoint_Discard_DWord()
/** Alias for Endpoint_Read_Word_LE(). By default USB transfers use little endian format, thus /** Alias for Endpoint_Read_Word_LE(). By default USB transfers use little endian format, thus
* the command with no endianness specifier indicates little endian mode. * the command with no endianness specified indicates little endian mode.
*/ */
#define Endpoint_Read_Word() Endpoint_Read_Word_LE() #define Endpoint_Read_Word() Endpoint_Read_Word_LE()
/** Alias for Endpoint_Write_Word_LE(). By default USB transfers use little endian format, thus /** Alias for Endpoint_Write_Word_LE(). By default USB transfers use little endian format, thus
* the command with no endianness specifier indicates little endian mode. * the command with no endianness specified indicates little endian mode.
*/ */
#define Endpoint_Write_Word(Word) Endpoint_Write_Word_LE(Word) #define Endpoint_Write_Word(Word) Endpoint_Write_Word_LE(Word)
/** Alias for Endpoint_Read_DWord_LE(). By default USB transfers use little endian format, thus /** Alias for Endpoint_Read_DWord_LE(). By default USB transfers use little endian format, thus
* the command with no endianness specifier indicates little endian mode. * the command with no endianness specified indicates little endian mode.
*/ */
#define Endpoint_Read_DWord() Endpoint_Read_DWord_LE() #define Endpoint_Read_DWord() Endpoint_Read_DWord_LE()
/** Alias for Endpoint_Write_DWord_LE(). By default USB transfers use little endian format, thus /** Alias for Endpoint_Write_DWord_LE(). By default USB transfers use little endian format, thus
* the command with no endianness specifier indicates little endian mode. * the command with no endianness specified indicates little endian mode.
*/ */
#define Endpoint_Write_DWord(DWord) Endpoint_Write_DWord_LE(DWord) #define Endpoint_Write_DWord(DWord) Endpoint_Write_DWord_LE(DWord)
/** Alias for Endpoint_Read_Stream_LE(). By default USB transfers use little endian format, thus /** Alias for Endpoint_Read_Stream_LE(). By default USB transfers use little endian format, thus
* the command with no endianness specifier indicates little endian mode. * the command with no endianness specified indicates little endian mode.
*/ */
#if !defined(NO_STREAM_CALLBACKS) #if !defined(NO_STREAM_CALLBACKS)
#define Endpoint_Read_Stream(Buffer, Length, Callback) Endpoint_Read_Stream_LE(Buffer, Length, Callback) #define Endpoint_Read_Stream(Buffer, Length, Callback) Endpoint_Read_Stream_LE(Buffer, Length, Callback)
...@@ -778,7 +778,7 @@ ...@@ -778,7 +778,7 @@
#endif #endif
/** Alias for Endpoint_Write_Stream_LE(). By default USB transfers use little endian format, thus /** Alias for Endpoint_Write_Stream_LE(). By default USB transfers use little endian format, thus
* the command with no endianness specifier indicates little endian mode. * the command with no endianness specified indicates little endian mode.
*/ */
#if !defined(NO_STREAM_CALLBACKS) #if !defined(NO_STREAM_CALLBACKS)
#define Endpoint_Write_Stream(Buffer, Length, Callback) Endpoint_Write_Stream_LE(Buffer, Length, Callback) #define Endpoint_Write_Stream(Buffer, Length, Callback) Endpoint_Write_Stream_LE(Buffer, Length, Callback)
...@@ -787,12 +787,12 @@ ...@@ -787,12 +787,12 @@
#endif #endif
/** Alias for Endpoint_Read_Control_Stream_LE(). By default USB transfers use little endian format, thus /** Alias for Endpoint_Read_Control_Stream_LE(). By default USB transfers use little endian format, thus
* the command with no endianness specifier indicates little endian mode. * the command with no endianness specified indicates little endian mode.
*/ */
#define Endpoint_Read_Control_Stream(Data, Length) Endpoint_Read_Control_Stream_LE(Data, Length) #define Endpoint_Read_Control_Stream(Data, Length) Endpoint_Read_Control_Stream_LE(Data, Length)
/** Alias for Endpoint_Write_Control_Stream_LE(). By default USB transfers use little endian format, thus /** Alias for Endpoint_Write_Control_Stream_LE(). By default USB transfers use little endian format, thus
* the command with no endianness specifier indicates little endian mode. * the command with no endianness specified indicates little endian mode.
*/ */
#define Endpoint_Write_Control_Stream(Data, Length) Endpoint_Write_Control_Stream_LE(Data, Length) #define Endpoint_Write_Control_Stream(Data, Length) Endpoint_Write_Control_Stream_LE(Data, Length)
......
...@@ -93,8 +93,8 @@ void USB_Host_ResetDevice(void) ...@@ -93,8 +93,8 @@ void USB_Host_ResetDevice(void)
for (uint8_t MSRem = 10; MSRem != 0; MSRem--) for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
{ {
/* Workaround for powerless-pullup devices. After a USB bus reset, /* Workaround for powerless-pull-up devices. After a USB bus reset,
all disconnection interrupts are supressed while a USB frame is all disconnection interrupts are suppressed while a USB frame is
looked for - if it is found within 10ms, the device is still looked for - if it is found within 10ms, the device is still
present. */ present. */
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
*/ */
#define USB_Host_ResumeBus() MACROS{ UHCON |= (1 << SOFEN); }MACROE #define USB_Host_ResumeBus() MACROS{ UHCON |= (1 << SOFEN); }MACROE
/** Suspends the USB bus, preventing any communications from occuring between the host and attached /** Suspends the USB bus, preventing any communications from occurring between the host and attached
* device until the bus has been resumed. This stops the transmission of the 1MS Start Of Frame * device until the bus has been resumed. This stops the transmission of the 1MS Start Of Frame
* messages to the device. * messages to the device.
*/ */
...@@ -192,14 +192,14 @@ ...@@ -192,14 +192,14 @@
* event. * event.
*/ */
HOST_ENUMERROR_WaitStage = 1, /**< One of the delays between enumeration steps failed HOST_ENUMERROR_WaitStage = 1, /**< One of the delays between enumeration steps failed
* to complete successfuly, due to a timeout or other * to complete successfully, due to a timeout or other
* error. * error.
*/ */
HOST_ENUMERROR_NoDeviceDetected = 2, /**< No device was detected, despite the USB data lines HOST_ENUMERROR_NoDeviceDetected = 2, /**< No device was detected, despite the USB data lines
* indicating the attachment of a device. * indicating the attachment of a device.
*/ */
HOST_ENUMERROR_ControlError = 3, /**< One of the enumeration control requests failed to HOST_ENUMERROR_ControlError = 3, /**< One of the enumeration control requests failed to
* complete successfuly. * complete successfully.
*/ */
HOST_ENUMERROR_PipeConfigError = 4, /**< The default control pipe (address 0) failed to HOST_ENUMERROR_PipeConfigError = 4, /**< The default control pipe (address 0) failed to
* configure correctly. * configure correctly.
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
HOST_SENDCONTROL_DeviceDisconnect = 1, /**< The attached device was disconnected during the HOST_SENDCONTROL_DeviceDisconnect = 1, /**< The attached device was disconnected during the
* request transfer. * request transfer.
*/ */
HOST_SENDCONTROL_PipeError = 2, /**< An error occured in the pipe while sending the request. */ HOST_SENDCONTROL_PipeError = 2, /**< An error occurred in the pipe while sending the request. */
HOST_SENDCONTROL_SetupStalled = 3, /**< The attached device stalled the request, usually HOST_SENDCONTROL_SetupStalled = 3, /**< The attached device stalled the request, usually
* indicating that the request is unsupported on the device. * indicating that the request is unsupported on the device.
*/ */
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
* host mode indicates that VBUS should be applied and a session started. * host mode indicates that VBUS should be applied and a session started.
* *
* There are two different methods of sending a SRP - either pulses on the VBUS line, or by * There are two different methods of sending a SRP - either pulses on the VBUS line, or by
* pulsing the Data + line via the internal pullup resistor. The SRP mode is given as the * pulsing the Data + line via the internal pull-up resistor. The SRP mode is given as the
* "type" parameter, and can be either USB_OTG_SRP_VBUS or USB_OTG_STP_DATA. * "type" parameter, and can be either USB_OTG_SRP_VBUS or USB_OTG_STP_DATA.
*/ */
#define USB_OTG_DEV_Initiate_SRP(type) MACROS{ OTGCON = ((OTGCON & ~(1 << SRPSEL)) | (type | (1 << SRPREQ))); }MACROE #define USB_OTG_DEV_Initiate_SRP(type) MACROS{ OTGCON = ((OTGCON & ~(1 << SRPSEL)) | (type | (1 << SRPREQ))); }MACROE
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* *
* Functions, macros and enums related to pipe management when in USB Host mode. This * Functions, macros and enums related to pipe management when in USB Host mode. This
* module contains the pipe management macros, as well as pipe interrupt and data * module contains the pipe management macros, as well as pipe interrupt and data
* send/recieve functions for various datatypes. * send/recieve functions for various data types.
*/ */
#ifndef __PIPE_H__ #ifndef __PIPE_H__
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
/** Returns true if the master pipe error flag is set for the currently selected pipe, indicating that /** Returns true if the master pipe error flag is set for the currently selected pipe, indicating that
* some sort of hardware error has occurred on the pipe. * some sort of hardware error has occurred on the pipe.
* *
* \see Pipe_GetErrorFlags() macro for information on retreiving the exact error flag. * \see Pipe_GetErrorFlags() macro for information on retrieving the exact error flag.
*/ */
#define Pipe_IsError() ((UPINTX & (1 << PERRI)) ? true : false) #define Pipe_IsError() ((UPINTX & (1 << PERRI)) ? true : false)
...@@ -311,14 +311,14 @@ ...@@ -311,14 +311,14 @@
* flag for the pipe. */ * flag for the pipe. */
#define Pipe_ClearErrorFlags() MACROS{ UPERRX = 0; }MACROE #define Pipe_ClearErrorFlags() MACROS{ UPERRX = 0; }MACROE
/** Returns a mask of the hardware error flags which have occured on the currently selected pipe. This /** Returns a mask of the hardware error flags which have occurred on the currently selected pipe. This
* value can then be masked against the PIPE_ERRORFLAG_* masks to determine what error has occurred. * value can then be masked against the PIPE_ERRORFLAG_* masks to determine what error has occurred.
*/ */
#define Pipe_GetErrorFlags() UPERRX #define Pipe_GetErrorFlags() UPERRX
/** Returns true if the currently selected pipe may be read from (if data is waiting in the pipe /** Returns true if the currently selected pipe may be read from (if data is waiting in the pipe
* bank and the pipe is an IN direction, or if the bank is not yet full if the pipe is an OUT * bank and the pipe is an IN direction, or if the bank is not yet full if the pipe is an OUT
* direction). This function will return false if an error has occured in the pipe, or if the pipe * direction). This function will return false if an error has occurred in the pipe, or if the pipe
* is an IN direction and no packet has been received, or if the pipe is an OUT direction and the * is an IN direction and no packet has been received, or if the pipe is an OUT direction and the
* pipe bank is full. * pipe bank is full.
*/ */
...@@ -358,9 +358,9 @@ ...@@ -358,9 +358,9 @@
#define Pipe_ClearSetupOUT() MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE #define Pipe_ClearSetupOUT() MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE
/** Returns true if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on /** Returns true if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on
* the currently selected pipe. This ocurrs when the host sends a packet to the device, but the device * the currently selected pipe. This occurs when the host sends a packet to the device, but the device
* is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been * is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been
* received, it must be cleard using Pipe_ClearNAKReceived() before the previous (or any other) packet * received, it must be cleared using Pipe_ClearNAKReceived() before the previous (or any other) packet
* can be re-sent. * can be re-sent.
*/ */
#define Pipe_IsNAKReceived() ((UPINTX & (1 << NAKEDI)) ? true : false) #define Pipe_IsNAKReceived() ((UPINTX & (1 << NAKEDI)) ? true : false)
...@@ -607,11 +607,11 @@ ...@@ -607,11 +607,11 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \param Buffer Pointer to the source data buffer to read from. * \param Buffer Pointer to the source data buffer to read from.
* \param Length Number of bytes to read for the currently selected pipe into the buffer. * \param Length Number of bytes to read for the currently selected pipe into the buffer.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Pipe_Stream_RW_ErrorCodes_t enum. * \return A value from the Pipe_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -629,11 +629,11 @@ ...@@ -629,11 +629,11 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \param Buffer Pointer to the source data buffer to read from. * \param Buffer Pointer to the source data buffer to read from.
* \param Length Number of bytes to read for the currently selected pipe into the buffer. * \param Length Number of bytes to read for the currently selected pipe into the buffer.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Pipe_Stream_RW_ErrorCodes_t enum. * \return A value from the Pipe_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -651,10 +651,10 @@ ...@@ -651,10 +651,10 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \param Length Number of bytes to send via the currently selected pipe. * \param Length Number of bytes to send via the currently selected pipe.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Pipe_Stream_RW_ErrorCodes_t enum. * \return A value from the Pipe_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -672,11 +672,11 @@ ...@@ -672,11 +672,11 @@
* *
* The callback routine should be created using the STREAM_CALLBACK() macro. If the token * The callback routine should be created using the STREAM_CALLBACK() macro. If the token
* NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled * NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled
* and this function has the Callback parameter ommitted. * and this function has the Callback parameter omitted.
* *
* \param Buffer Pointer to the source data buffer to write to. * \param Buffer Pointer to the source data buffer to write to.
* \param Length Number of bytes to read for the currently selected pipe to read from. * \param Length Number of bytes to read for the currently selected pipe to read from.
* \param Callback Name of a callback routine to call between sucessive USB packet transfers, NULL if no callback * \param Callback Name of a callback routine to call between successive USB packet transfers, NULL if no callback
* *
* \return A value from the Pipe_Stream_RW_ErrorCodes_t enum. * \return A value from the Pipe_Stream_RW_ErrorCodes_t enum.
*/ */
...@@ -694,11 +694,11 @@ ...@@ -694,11 +694,11 @@