Correct UC3 global interrupt functions.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Common / RNDIS.h

diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDIS.h
index 6b67b97..f98fc6d 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Common/RNDIS.h
@@ -54,11 +54,9 @@
                #define __INCLUDE_FROM_CDC_DRIVER
 
        /* Includes: */
                #define __INCLUDE_FROM_CDC_DRIVER
 
        /* Includes: */

-               #include "../../HighLevel/StdDescriptors.h"
+               #include "../../Core/StdDescriptors.h"

                #include "CDC.h"
 
                #include "CDC.h"
 

-               #include <string.h>
-

        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
                        extern "C" {
        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
                        extern "C" {


@@ -214,7 +212,7 @@
                typedef struct
                {
                        uint8_t       Octets[6]; /**< Individual bytes of a MAC address */
                typedef struct
                {
                        uint8_t       Octets[6]; /**< Individual bytes of a MAC address */

-               } MAC_Address_t;
+               } ATTR_PACKED MAC_Address_t;

 
                /** \brief RNDIS Ethernet Frame Packet Information Structure.
                 *
 
                /** \brief RNDIS Ethernet Frame Packet Information Structure.
                 *


@@ -225,7 +223,7 @@
                        uint8_t       FrameData[ETHERNET_FRAME_SIZE_MAX]; /**< Ethernet frame contents. */
                        uint16_t      FrameLength; /**< Length in bytes of the Ethernet frame stored in the buffer. */
                        bool          FrameInBuffer; /**< Indicates if a frame is currently stored in the buffer. */
                        uint8_t       FrameData[ETHERNET_FRAME_SIZE_MAX]; /**< Ethernet frame contents. */
                        uint16_t      FrameLength; /**< Length in bytes of the Ethernet frame stored in the buffer. */
                        bool          FrameInBuffer; /**< Indicates if a frame is currently stored in the buffer. */

-               } Ethernet_Frame_Info_t;
+               } ATTR_PACKED Ethernet_Frame_Info_t;

 
                /** \brief RNDIS Common Message Header Structure.
                 *
 
                /** \brief RNDIS Common Message Header Structure.
                 *


@@ -235,7 +233,7 @@
                {
                        uint32_t MessageType; /**< RNDIS message type, a \c REMOTE_NDIS_*_MSG constant */
                        uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */
                {
                        uint32_t MessageType; /**< RNDIS message type, a \c REMOTE_NDIS_*_MSG constant */
                        uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */

-               } RNDIS_Message_Header_t;
+               } ATTR_PACKED RNDIS_Message_Header_t;

 
                /** \brief RNDIS Message Structure.
                 *
 
                /** \brief RNDIS Message Structure.
                 *


@@ -254,7 +252,7 @@
                        uint32_t PerPacketInfoLength;
                        uint32_t VcHandle;
                        uint32_t Reserved;
                        uint32_t PerPacketInfoLength;
                        uint32_t VcHandle;
                        uint32_t Reserved;

-               } RNDIS_Packet_Message_t;
+               } ATTR_PACKED RNDIS_Packet_Message_t;

 
                /** \brief RNDIS Initialization Message Structure.
                 *
 
                /** \brief RNDIS Initialization Message Structure.
                 *


@@ -269,7 +267,7 @@
                        uint32_t MajorVersion;
                        uint32_t MinorVersion;
                        uint32_t MaxTransferSize;
                        uint32_t MajorVersion;
                        uint32_t MinorVersion;
                        uint32_t MaxTransferSize;

-               } RNDIS_Initialize_Message_t;
+               } ATTR_PACKED RNDIS_Initialize_Message_t;

 
                /** \brief RNDIS Initialize Complete Message Structure.
                 *
 
                /** \brief RNDIS Initialize Complete Message Structure.
                 *


@@ -291,7 +289,7 @@
                        uint32_t PacketAlignmentFactor;
                        uint32_t AFListOffset;
                        uint32_t AFListSize;
                        uint32_t PacketAlignmentFactor;
                        uint32_t AFListOffset;
                        uint32_t AFListSize;

-               } RNDIS_Initialize_Complete_t;
+               } ATTR_PACKED RNDIS_Initialize_Complete_t;

 
                /** \brief RNDIS Keep Alive Message Structure.
                 *
 
                /** \brief RNDIS Keep Alive Message Structure.
                 *


@@ -302,7 +300,7 @@
                        uint32_t MessageType;
                        uint32_t MessageLength;
                        uint32_t RequestId;
                        uint32_t MessageType;
                        uint32_t MessageLength;
                        uint32_t RequestId;

-               } RNDIS_KeepAlive_Message_t;
+               } ATTR_PACKED RNDIS_KeepAlive_Message_t;

 
                /** \brief RNDIS Keep Alive Complete Message Structure.
                 *
 
                /** \brief RNDIS Keep Alive Complete Message Structure.
                 *


@@ -314,7 +312,7 @@
                        uint32_t MessageLength;
                        uint32_t RequestId;
                        uint32_t Status;
                        uint32_t MessageLength;
                        uint32_t RequestId;
                        uint32_t Status;

-               } RNDIS_KeepAlive_Complete_t;
+               } ATTR_PACKED RNDIS_KeepAlive_Complete_t;

 
                /** \brief RNDIS Reset Complete Message Structure.
                 *
 
                /** \brief RNDIS Reset Complete Message Structure.
                 *


@@ -327,7 +325,7 @@
                        uint32_t Status;
 
                        uint32_t AddressingReset;
                        uint32_t Status;
 
                        uint32_t AddressingReset;

-               } RNDIS_Reset_Complete_t;
+               } ATTR_PACKED RNDIS_Reset_Complete_t;

 
                /** \brief RNDIS OID Property Set Message Structure.
                 *
 
                /** \brief RNDIS OID Property Set Message Structure.
                 *


@@ -343,7 +341,7 @@
                        uint32_t InformationBufferLength;
                        uint32_t InformationBufferOffset;
                        uint32_t DeviceVcHandle;
                        uint32_t InformationBufferLength;
                        uint32_t InformationBufferOffset;
                        uint32_t DeviceVcHandle;

-               } RNDIS_Set_Message_t;
+               } ATTR_PACKED RNDIS_Set_Message_t;

 
                /** \brief RNDIS OID Property Set Complete Message Structure.
                 *
 
                /** \brief RNDIS OID Property Set Complete Message Structure.
                 *


@@ -355,7 +353,7 @@
                        uint32_t MessageLength;
                        uint32_t RequestId;
                        uint32_t Status;
                        uint32_t MessageLength;
                        uint32_t RequestId;
                        uint32_t Status;

-               } RNDIS_Set_Complete_t;
+               } ATTR_PACKED RNDIS_Set_Complete_t;

 
                /** \brief RNDIS OID Property Query Message Structure.
                 *
 
                /** \brief RNDIS OID Property Query Message Structure.
                 *


@@ -371,7 +369,7 @@
                        uint32_t InformationBufferLength;
                        uint32_t InformationBufferOffset;
                        uint32_t DeviceVcHandle;
                        uint32_t InformationBufferLength;
                        uint32_t InformationBufferOffset;
                        uint32_t DeviceVcHandle;

-               } RNDIS_Query_Message_t;
+               } ATTR_PACKED RNDIS_Query_Message_t;

 
                /** \brief RNDIS OID Property Query Complete Message Structure.
                 *
 
                /** \brief RNDIS OID Property Query Complete Message Structure.
                 *


@@ -386,7 +384,7 @@
 
                        uint32_t InformationBufferLength;
                        uint32_t InformationBufferOffset;
 
                        uint32_t InformationBufferLength;
                        uint32_t InformationBufferOffset;

-               } RNDIS_Query_Complete_t;
+               } ATTR_PACKED RNDIS_Query_Complete_t;

 
        /* Disable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
 
        /* Disable C linkage for C++ Compilers: */
                #if defined(__cplusplus)