diff options
| author | hathach <[email protected]> | 2013-12-27 13:40:31 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-12-27 13:40:59 +0700 |
| commit | 275e834bbed4928094b0a631c7dd36fdcc0b40fe (patch) | |
| tree | ef56607443081a29ab50fa17452294add7141f33 /demos/device/src | |
| parent | 8de6ee22dc81d871a14d3c3cb63aa3863a5cb2d6 (diff) | |
add device_os_none keil project for all boards
Diffstat (limited to 'demos/device/src')
| -rw-r--r-- | demos/device/src/mscd_app.c | 8 | ||||
| -rw-r--r-- | demos/device/src/tusb_config.h | 16 | ||||
| -rw-r--r-- | demos/device/src/tusb_descriptors.h | 2 |
3 files changed, 17 insertions, 9 deletions
diff --git a/demos/device/src/mscd_app.c b/demos/device/src/mscd_app.c index 755153458..ad689549f 100644 --- a/demos/device/src/mscd_app.c +++ b/demos/device/src/mscd_app.c @@ -60,8 +60,8 @@ static scsi_inquiry_data_t mscd_inquiry_data TUSB_CFG_ATTR_USBRAM = ATTR_USB_MIN_ALIGNMENT
static scsi_read_capacity10_data_t mscd_read_capacity10_data TUSB_CFG_ATTR_USBRAM =
{
- .last_lba = __n2be(DISK_BLOCK_NUM-1), // read capacity
- .block_size = __n2be(DISK_BLOCK_SIZE)
+ .last_lba = ENDIAN_BE(DISK_BLOCK_NUM-1), // read capacity
+ .block_size = ENDIAN_BE(DISK_BLOCK_SIZE)
};
ATTR_USB_MIN_ALIGNMENT
@@ -76,9 +76,9 @@ ATTR_USB_MIN_ALIGNMENT static scsi_read_format_capacity_data_t mscd_format_capacity_data TUSB_CFG_ATTR_USBRAM =
{
.list_length = 8,
- .block_num = __n2be(DISK_BLOCK_NUM), // write capacity
+ .block_num = ENDIAN_BE(DISK_BLOCK_NUM), // write capacity
.descriptor_type = 2, // TODO formatted media, refractor to const
- .block_size_u16 = __n2be_16(DISK_BLOCK_SIZE)
+ .block_size_u16 = ENDIAN_BE16(DISK_BLOCK_SIZE)
};
ATTR_USB_MIN_ALIGNMENT
diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h index 527103091..e7d76a2a6 100644 --- a/demos/device/src/tusb_config.h +++ b/demos/device/src/tusb_config.h @@ -89,7 +89,7 @@ #define TUSB_CFG_DEVICE_HID_MOUSE 0
#define TUSB_CFG_DEVICE_HID_GENERIC 0
#define TUSB_CFG_DEVICE_MSC 1
-#define TUSB_CFG_DEVICE_CDC 1
+#define TUSB_CFG_DEVICE_CDC 0
@@ -103,7 +103,7 @@ #define TUSB_CFG_OS_TICKS_PER_SECOND 1000
-#ifdef __CODE_RED // make use of code red's support for ram region macros
+#ifdef __CODE_RED // compiled with lpcxpresso
#if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)
#define TUSB_RAM_SECTION ".data.$RAM2"
#elif (TUSB_CFG_MCU == MCU_LPC43XX)
@@ -116,9 +116,17 @@ #define TUSB_CFG_ATTR_USBRAM __attribute__ ((section(TUSB_RAM_SECTION)))
-#elif defined __CC_ARM // Compiled with Keil armcc
+#elif defined __CC_ARM // Compiled with Keil armcc, USBRAM_SECTION is defined in scatter files
- #define TUSB_CFG_ATTR_USBRAM
+ #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)
+ #define TUSB_CFG_ATTR_USBRAM __attribute__ ((section("USBRAM_SECTION")))
+ #elif (TUSB_CFG_MCU == MCU_LPC43XX)
+ #define TUSB_CFG_ATTR_USBRAM
+ #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)
+ #define TUSB_CFG_ATTR_USBRAM
+ #else
+ #error Please define USB RAM section
+ #endif
#elif __ICCARM__ // compiled with IAR
diff --git a/demos/device/src/tusb_descriptors.h b/demos/device/src/tusb_descriptors.h index 957661534..a72284791 100644 --- a/demos/device/src/tusb_descriptors.h +++ b/demos/device/src/tusb_descriptors.h @@ -179,7 +179,7 @@ typedef ATTR_PACKED_STRUCT(struct) //--------------------------------------------------------------------+ // STRINGS DESCRIPTOR //--------------------------------------------------------------------+ -tusb_descriptor_string_t * const desc_str_table[TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT]; +extern tusb_descriptor_string_t * const desc_str_table[TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT]; //--------------------------------------------------------------------+ // Export descriptors |