fix iar warning

2 files changed, 194 insertions, 194 deletions

diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h
index 70200268d..77cc628a9 100644
--- a/demos/device/src/tusb_config.h
+++ b/demos/device/src/tusb_config.h
@@ -114,7 +114,7 @@
     #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"")

   #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)

     #define TUSB_CFG_ATTR_USBRAM

-  #elif (TUSB_CFG_MCU == MCU_LPC11UXX)

+  #elif (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)

     #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"")

   #endif

 

diff --git a/demos/device/src/tusb_descriptors.h b/demos/device/src/tusb_descriptors.h
index adb5fce92..a2cd62a54 100644
--- a/demos/device/src/tusb_descriptors.h
+++ b/demos/device/src/tusb_descriptors.h
@@ -1,193 +1,193 @@
-/**************************************************************************/
-/*!
-    @file     tusb_descriptors.h
-    @author   hathach (tinyusb.org)
-
-    @section LICENSE
-
-    Software License Agreement (BSD License)
-
-    Copyright (c) 2013, hathach (tinyusb.org)
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holders nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    This file is part of the tinyusb stack.
-*/
-/**************************************************************************/
-
-#ifndef _TUSB_DESCRIPTORS_H_
-#define _TUSB_DESCRIPTORS_H_
-
-#include "tusb.h"
-
-//--------------------------------------------------------------------+
-// Descriptors Value (calculated by enabled Classes)
-//--------------------------------------------------------------------+
-#define CFG_VENDORID            0x1FC9 // NXP
-//#define CFG_PRODUCTID           0x4567 // use auto product id to prevent conflict with pc's driver
-
-// each combination of interfaces need to have a unique productid, as windows will bind & remember device driver after the first plug.
-#ifndef CFG_PRODUCTID // Auto ProductID layout's Bitmap: (MSB) MassStorage | Generic | Mouse | Key | CDC (LSB)
-  #define PRODUCTID_BITMAP(interface, n)  ( (TUSB_CFG_DEVICE_##interface) << (n) )
-  #define CFG_PRODUCTID                   (0x4000 | ( PRODUCTID_BITMAP(CDC, 0) | PRODUCTID_BITMAP(HID_KEYBOARD, 1) | \
-                                           PRODUCTID_BITMAP(HID_MOUSE, 2) | PRODUCTID_BITMAP(HID_GENERIC, 3) | \
-                                           PRODUCTID_BITMAP(MSC, 4) ) )
-#endif
-
-
-#define INTERFACE_NUM_CDC           0
-#define INTERFACE_NUM_HID_KEYBOARD (INTERFACE_NUM_CDC          + 2*TUSB_CFG_DEVICE_CDC        )
-#define INTERFACE_NUM_HID_MOUSE    (INTERFACE_NUM_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_KEYBOARD )
-#define INTERFACE_NUM_HID_GENERIC  (INTERFACE_NUM_HID_MOUSE    + TUSB_CFG_DEVICE_HID_MOUSE    )
-#define INTERFACE_NUM_MSC          (INTERFACE_NUM_HID_GENERIC  + TUSB_CFG_DEVICE_HID_GENERIC  )
-
-#define TOTAL_INTEFACES            (2*TUSB_CFG_DEVICE_CDC + TUSB_CFG_DEVICE_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_MOUSE + \
-                                    TUSB_CFG_DEVICE_HID_GENERIC + TUSB_CFG_DEVICE_MSC)
-
-// Interface Assosication Descriptor is required when enable CDC
-#define IAD_DESC_REQUIRED           ( TUSB_CFG_DEVICE_CDC )
-
-//--------------------------------------------------------------------+
-// Endpoints Address & Max Packet Size
-//--------------------------------------------------------------------+
-#define EDPT_IN(x)    (0x80 | (x))
-#define EDPT_OUT(x)   (x)
-
-#if TUSB_CFG_MCU == MCU_LPC175X_6X
-//------------- These MCUs's endpoint number has a fixed type -------------//
-//------------- CDC -------------//
-#define CDC_EDPT_NOTIFICATION_ADDR            EDPT_IN (1)
-#define CDC_EDPT_NOTIFICATION_PACKETSIZE      64
-
-#define CDC_EDPT_DATA_OUT_ADDR                EDPT_OUT(2)
-#define CDC_EDPT_DATA_IN_ADDR                 EDPT_IN (2)
-#define CDC_EDPT_DATA_PACKETSIZE              64
-
-//------------- HID Keyboard -------------//
-#define HID_KEYBOARD_EDPT_ADDR                EDPT_IN (4)
-#define HID_KEYBOARD_EDPT_PACKETSIZE          8
-
-//------------- HID Mouse -------------//
-#define HID_MOUSE_EDPT_ADDR                   EDPT_IN (7)
-#define HID_MOUSE_EDPT_PACKETSIZE             8
-
-//------------- HID Generic -------------//
-
-//------------- Mass Storage -------------//
-#define MSC_EDPT_OUT_ADDR                     EDPT_OUT(5)
-#define MSC_EDPT_IN_ADDR                      EDPT_IN (5)
-#define MSC_EDPT_PACKETSIZE                   (TUSB_CFG_DEVICE_FULLSPEED ? 64 : 512)
-
-
-#else
-
-//------------- CDC -------------//
-#define CDC_EDPT_NOTIFICATION_ADDR            EDPT_IN (INTERFACE_NUM_CDC+1)
-#define CDC_EDPT_NOTIFICATION_PACKETSIZE      64
-
-#define CDC_EDPT_DATA_OUT_ADDR                EDPT_OUT(INTERFACE_NUM_CDC+2)
-#define CDC_EDPT_DATA_IN_ADDR                 EDPT_IN (INTERFACE_NUM_CDC+2)
-#define CDC_EDPT_DATA_PACKETSIZE              64
-
-//------------- HID Keyboard -------------//
-#define HID_KEYBOARD_EDPT_ADDR                EDPT_IN (INTERFACE_NUM_HID_KEYBOARD+1)
-#define HID_KEYBOARD_EDPT_PACKETSIZE          8
-
-//------------- HID Mouse -------------//
-#define HID_MOUSE_EDPT_ADDR                   EDPT_IN (INTERFACE_NUM_HID_MOUSE+1)
-#define HID_MOUSE_EDPT_PACKETSIZE             8
-
-//------------- HID Generic -------------//
-
-//------------- Mass Storage -------------//
-#define MSC_EDPT_OUT_ADDR                     EDPT_OUT(INTERFACE_NUM_MSC+1)
-#define MSC_EDPT_IN_ADDR                      EDPT_IN (INTERFACE_NUM_MSC+1)
-#define MSC_EDPT_PACKETSIZE                   (TUSB_CFG_DEVICE_FULLSPEED ? 64 : 512)
-
-#endif
-
-//--------------------------------------------------------------------+
-// CONFIGURATION DESCRIPTOR
-//--------------------------------------------------------------------+
-typedef ATTR_PACKED_STRUCT(struct)
-{
-  tusb_descriptor_configuration_t              configuration;
-
-  //------------- CDC -------------//
-#if TUSB_CFG_DEVICE_CDC
-  #if IAD_DESC_REQUIRED
-  tusb_descriptor_interface_association_t      cdc_iad;
-  #endif
-
-  //CDC Control Interface
-  tusb_descriptor_interface_t                  cdc_comm_interface;
-  cdc_desc_func_header_t                       cdc_header;
-  cdc_desc_func_abstract_control_management_t  cdc_acm;
-  cdc_desc_func_union_t                        cdc_union;
-  tusb_descriptor_endpoint_t                   cdc_endpoint_notification;
-
-  //CDC Data Interface
-  tusb_descriptor_interface_t                  cdc_data_interface;
-  tusb_descriptor_endpoint_t                   cdc_endpoint_out;
-  tusb_descriptor_endpoint_t                   cdc_endpoint_in;
-#endif
-
-  //------------- HID Keyboard -------------//
-#if TUSB_CFG_DEVICE_HID_KEYBOARD
-  tusb_descriptor_interface_t                    keyboard_interface;
-  tusb_hid_descriptor_hid_t                      keyboard_hid;
-  tusb_descriptor_endpoint_t                     keyboard_endpoint;
-#endif
-
-//------------- HID Mouse -------------//
-#if TUSB_CFG_DEVICE_HID_MOUSE
-  tusb_descriptor_interface_t                    mouse_interface;
-  tusb_hid_descriptor_hid_t                      mouse_hid;
-  tusb_descriptor_endpoint_t                     mouse_endpoint;
-#endif
-
-//------------- Mass Storage -------------//
-#if TUSB_CFG_DEVICE_MSC
-  tusb_descriptor_interface_t                    msc_interface;
-  tusb_descriptor_endpoint_t                     msc_endpoint_in;
-  tusb_descriptor_endpoint_t                     msc_endpoint_out;
-#endif
-
-} app_descriptor_configuration_t;
-
-//--------------------------------------------------------------------+
-// STRINGS DESCRIPTOR
-//--------------------------------------------------------------------+
-extern uint8_t * const desc_str_table[TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT];
-
-//--------------------------------------------------------------------+
-// Export descriptors
-//--------------------------------------------------------------------+
-extern tusb_descriptor_device_t app_tusb_desc_device;
-extern app_descriptor_configuration_t app_tusb_desc_configuration;
-
-extern uint8_t app_tusb_keyboard_desc_report[];
-extern uint8_t app_tusb_mouse_desc_report[];
-
-#endif
+/**************************************************************************/

+/*!

+    @file     tusb_descriptors.h

+    @author   hathach (tinyusb.org)

+

+    @section LICENSE

+

+    Software License Agreement (BSD License)

+

+    Copyright (c) 2013, hathach (tinyusb.org)

+    All rights reserved.

+

+    Redistribution and use in source and binary forms, with or without

+    modification, are permitted provided that the following conditions are met:

+    1. Redistributions of source code must retain the above copyright

+    notice, this list of conditions and the following disclaimer.

+    2. Redistributions in binary form must reproduce the above copyright

+    notice, this list of conditions and the following disclaimer in the

+    documentation and/or other materials provided with the distribution.

+    3. Neither the name of the copyright holders nor the

+    names of its contributors may be used to endorse or promote products

+    derived from this software without specific prior written permission.

+

+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY

+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY

+    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+    INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND

+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+    INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS

+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+    This file is part of the tinyusb stack.

+*/

+/**************************************************************************/

+

+#ifndef _TUSB_DESCRIPTORS_H_

+#define _TUSB_DESCRIPTORS_H_

+

+#include "tusb.h"

+

+//--------------------------------------------------------------------+

+// Descriptors Value (calculated by enabled Classes)

+//--------------------------------------------------------------------+

+#define CFG_VENDORID            0x1FC9 // NXP

+//#define CFG_PRODUCTID           0x4567 // use auto product id to prevent conflict with pc's driver

+

+// each combination of interfaces need to have a unique productid, as windows will bind & remember device driver after the first plug.

+#ifndef CFG_PRODUCTID // Auto ProductID layout's Bitmap: (MSB) MassStorage | Generic | Mouse | Key | CDC (LSB)

+  #define PRODUCTID_BITMAP(interface, n)  ( (TUSB_CFG_DEVICE_##interface) << (n) )

+  #define CFG_PRODUCTID                   (0x4000 | ( PRODUCTID_BITMAP(CDC, 0) | PRODUCTID_BITMAP(HID_KEYBOARD, 1) | \

+                                           PRODUCTID_BITMAP(HID_MOUSE, 2) | PRODUCTID_BITMAP(HID_GENERIC, 3) | \

+                                           PRODUCTID_BITMAP(MSC, 4) ) )

+#endif

+

+

+#define INTERFACE_NUM_CDC           0

+#define INTERFACE_NUM_HID_KEYBOARD (INTERFACE_NUM_CDC          + 2*TUSB_CFG_DEVICE_CDC        )

+#define INTERFACE_NUM_HID_MOUSE    (INTERFACE_NUM_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_KEYBOARD )

+#define INTERFACE_NUM_HID_GENERIC  (INTERFACE_NUM_HID_MOUSE    + TUSB_CFG_DEVICE_HID_MOUSE    )

+#define INTERFACE_NUM_MSC          (INTERFACE_NUM_HID_GENERIC  + TUSB_CFG_DEVICE_HID_GENERIC  )

+

+#define TOTAL_INTEFACES            (2*TUSB_CFG_DEVICE_CDC + TUSB_CFG_DEVICE_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_MOUSE + \

+                                    TUSB_CFG_DEVICE_HID_GENERIC + TUSB_CFG_DEVICE_MSC)

+

+// Interface Assosication Descriptor is required when enable CDC

+#define IAD_DESC_REQUIRED           ( TUSB_CFG_DEVICE_CDC )

+

+//--------------------------------------------------------------------+

+// Endpoints Address & Max Packet Size

+//--------------------------------------------------------------------+

+#define EDPT_IN(x)    (0x80 | (x))

+#define EDPT_OUT(x)   (x)

+

+#if TUSB_CFG_MCU == MCU_LPC175X_6X

+//------------- These MCUs's endpoint number has a fixed type -------------//

+//------------- CDC -------------//

+#define CDC_EDPT_NOTIFICATION_ADDR            EDPT_IN (1)

+#define CDC_EDPT_NOTIFICATION_PACKETSIZE      64

+

+#define CDC_EDPT_DATA_OUT_ADDR                EDPT_OUT(2)

+#define CDC_EDPT_DATA_IN_ADDR                 EDPT_IN (2)

+#define CDC_EDPT_DATA_PACKETSIZE              64

+

+//------------- HID Keyboard -------------//

+#define HID_KEYBOARD_EDPT_ADDR                EDPT_IN (4)

+#define HID_KEYBOARD_EDPT_PACKETSIZE          8

+

+//------------- HID Mouse -------------//

+#define HID_MOUSE_EDPT_ADDR                   EDPT_IN (7)

+#define HID_MOUSE_EDPT_PACKETSIZE             8

+

+//------------- HID Generic -------------//

+

+//------------- Mass Storage -------------//

+#define MSC_EDPT_OUT_ADDR                     EDPT_OUT(5)

+#define MSC_EDPT_IN_ADDR                      EDPT_IN (5)

+#define MSC_EDPT_PACKETSIZE                   (TUSB_CFG_DEVICE_FULLSPEED ? 64 : 512)

+

+

+#else

+

+//------------- CDC -------------//

+#define CDC_EDPT_NOTIFICATION_ADDR            EDPT_IN (INTERFACE_NUM_CDC+1)

+#define CDC_EDPT_NOTIFICATION_PACKETSIZE      64

+

+#define CDC_EDPT_DATA_OUT_ADDR                EDPT_OUT(INTERFACE_NUM_CDC+2)

+#define CDC_EDPT_DATA_IN_ADDR                 EDPT_IN (INTERFACE_NUM_CDC+2)

+#define CDC_EDPT_DATA_PACKETSIZE              64

+

+//------------- HID Keyboard -------------//

+#define HID_KEYBOARD_EDPT_ADDR                EDPT_IN (INTERFACE_NUM_HID_KEYBOARD+1)

+#define HID_KEYBOARD_EDPT_PACKETSIZE          8

+

+//------------- HID Mouse -------------//

+#define HID_MOUSE_EDPT_ADDR                   EDPT_IN (INTERFACE_NUM_HID_MOUSE+1)

+#define HID_MOUSE_EDPT_PACKETSIZE             8

+

+//------------- HID Generic -------------//

+

+//------------- Mass Storage -------------//

+#define MSC_EDPT_OUT_ADDR                     EDPT_OUT(INTERFACE_NUM_MSC+1)

+#define MSC_EDPT_IN_ADDR                      EDPT_IN (INTERFACE_NUM_MSC+1)

+#define MSC_EDPT_PACKETSIZE                   (TUSB_CFG_DEVICE_FULLSPEED ? 64 : 512)

+

+#endif

+

+//--------------------------------------------------------------------+

+// CONFIGURATION DESCRIPTOR

+//--------------------------------------------------------------------+

+typedef ATTR_PACKED_STRUCT(struct)

+{

+  tusb_descriptor_configuration_t              configuration;

+

+  //------------- CDC -------------//

+#if TUSB_CFG_DEVICE_CDC

+  #if IAD_DESC_REQUIRED

+  tusb_descriptor_interface_association_t      cdc_iad;

+  #endif

+

+  //CDC Control Interface

+  tusb_descriptor_interface_t                  cdc_comm_interface;

+  cdc_desc_func_header_t                       cdc_header;

+  cdc_desc_func_abstract_control_management_t  cdc_acm;

+  cdc_desc_func_union_t                        cdc_union;

+  tusb_descriptor_endpoint_t                   cdc_endpoint_notification;

+

+  //CDC Data Interface

+  tusb_descriptor_interface_t                  cdc_data_interface;

+  tusb_descriptor_endpoint_t                   cdc_endpoint_out;

+  tusb_descriptor_endpoint_t                   cdc_endpoint_in;

+#endif

+

+  //------------- HID Keyboard -------------//

+#if TUSB_CFG_DEVICE_HID_KEYBOARD

+  tusb_descriptor_interface_t                    keyboard_interface;

+  tusb_hid_descriptor_hid_t                      keyboard_hid;

+  tusb_descriptor_endpoint_t                     keyboard_endpoint;

+#endif

+

+//------------- HID Mouse -------------//

+#if TUSB_CFG_DEVICE_HID_MOUSE

+  tusb_descriptor_interface_t                    mouse_interface;

+  tusb_hid_descriptor_hid_t                      mouse_hid;

+  tusb_descriptor_endpoint_t                     mouse_endpoint;

+#endif

+

+//------------- Mass Storage -------------//

+#if TUSB_CFG_DEVICE_MSC

+  tusb_descriptor_interface_t                    msc_interface;

+  tusb_descriptor_endpoint_t                     msc_endpoint_in;

+  tusb_descriptor_endpoint_t                     msc_endpoint_out;

+#endif

+

+} app_descriptor_configuration_t;

+

+//--------------------------------------------------------------------+

+// STRINGS DESCRIPTOR

+//--------------------------------------------------------------------+

+extern uint8_t * const desc_str_table[TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT];

+

+//--------------------------------------------------------------------+

+// Export descriptors

+//--------------------------------------------------------------------+

+extern tusb_descriptor_device_t app_tusb_desc_device;

+extern app_descriptor_configuration_t app_tusb_desc_configuration;

+

+extern uint8_t app_tusb_keyboard_desc_report[];

+extern uint8_t app_tusb_mouse_desc_report[];

+

+#endif