diff options
| -rw-r--r-- | demos/bsp/boards/board.h | 2 | ||||
| -rw-r--r-- | demos/bsp/boards/embedded_artists/ea4357/board_ea4357.c | 2 | ||||
| -rw-r--r-- | demos/bsp/boards/embedded_artists/ea4357/board_ea4357.h | 4 | ||||
| -rw-r--r-- | demos/device/device_os_none/mscd_app.c | 157 | ||||
| -rw-r--r-- | demos/device/device_os_none/mscd_app.h | 12 | ||||
| -rw-r--r-- | demos/device/device_os_none/mscd_app_ramdisk.c | 238 | ||||
| -rw-r--r-- | demos/device/device_os_none/mscd_app_romdisk.c | 118 | ||||
| -rw-r--r-- | demos/device/device_os_none/tusb_config.h | 5 | ||||
| -rw-r--r-- | tinyusb/class/msc_device.c | 3 | ||||
| -rw-r--r-- | tinyusb/device/dcd_lpc43xx.c | 10 |
10 files changed, 384 insertions, 167 deletions
diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h index 49eddc775..edc681a05 100644 --- a/demos/bsp/boards/board.h +++ b/demos/bsp/boards/board.h @@ -95,7 +95,7 @@ #elif BOARD == BOARD_RF1GHZNODE
#include "microbuilder/board_rf1ghznode.h"
#elif BOARD == BOARD_EA4357
- #include "embedded_artists/board_ea4357.h"
+ #include "embedded_artists/ea4357/board_ea4357.h"
#elif BOARD == BOARD_MCB4300
#include "keil/board_mcb4300.h"
#elif BOARD == BOARD_HITEX4350
diff --git a/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.c b/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.c index ad8ab4c18..16453c44d 100644 --- a/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.c +++ b/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.c @@ -36,7 +36,7 @@ */ /**************************************************************************/ -#include "../board.h" +#include "../../board.h" #if BOARD == BOARD_EA4357 diff --git a/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.h b/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.h index 0ba60624a..da57a0d1a 100644 --- a/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.h +++ b/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.h @@ -64,8 +64,8 @@ #include "lpc43xx_i2c.h" -#include "oem_base_board/pca9532.h" // LEDs -#include "oem_board/nand.h" +#include "../oem_base_board/pca9532.h" // LEDs +//#include "../oem_board/nand.h" //#define CFG_PRINTF_TARGET PRINTF_TARGET_SWO diff --git a/demos/device/device_os_none/mscd_app.c b/demos/device/device_os_none/mscd_app.c index b92b53e52..b30f9a5b1 100644 --- a/demos/device/device_os_none/mscd_app.c +++ b/demos/device/device_os_none/mscd_app.c @@ -46,68 +46,7 @@ //--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
//--------------------------------------------------------------------+
-enum
-{
- DISK_BLOCK_NUM = 16, // 8KB is the smallest size that windows allow to mount
- DISK_BLOCK_SIZE = 512
-};
-
-typedef ATTR_PACKED_STRUCT(struct) {
- //------------- common -------------//
- uint8_t jump_code[3] ; ///< Assembly instruction to jump to boot code.
- uint8_t oem_name[8] ; ///< OEM Name in ASCII.
- uint16_t byte_per_sector ; ///< Bytes per sector. Allowed values include 512, 1024, 2048, and 4096.
- uint8_t sector_per_cluster ; ///< Sectors per cluster (data unit). Allowed values are powers of 2, but the cluster size must be 32KB or smaller.
- uint16_t reserved_sectors ; ///< Size in sectors of the reserved area.
- uint8_t fat_num ; ///< Number of FATs. Typically two for redundancy, but according to Microsoft it can be one for some small storage devices.
- uint16_t fat12_root_entry_num ; ///< Maximum number of files in the root directory for FAT12 and FAT16. This is 0 for FAT32 and typically 512 for FAT16.
- uint16_t fat12_sector_num_16 ; ///< 16-bit number of sectors in file system. If the number of sectors is larger than can be represented in this 2-byte value, a 4-byte value exists later in the data structure and this should be 0.
- uint8_t media_type ; ///< 0xf8 should be used for fixed disks and 0xf0 for removable.
- uint16_t sector_per_fat ; ///< 16-bit size in sectors of each FAT for FAT12 and FAT16. For FAT32, this field is 0.
- uint16_t sector_per_track ; ///< Sectors per track of storage device.
- uint16_t head_num ; ///< Number of heads in storage device.
- uint32_t hidden_sectors ; ///< Number of sectors before the start of partition.
- uint32_t sector_num_32 ; ///< 32-bit value of number of sectors in file system. Either this value or the 16-bit value above must be 0.
-
- //------------- FAT32 -------------//
- uint8_t drive_number ; ///< Physical drive number (0x00 for (first) removable media, 0x80 for (first) fixed disk
- uint8_t reserved ;
- uint8_t extended_boot_signature ; ///< should be 0x29
- uint32_t volume_serial_number ; ///< Volume serial number, which some versions of Windows will calculate based on the creation date and time.
- uint8_t volume_label[11] ;
- uint8_t filesystem_type[8] ; ///< File system type label in ASCII, padded with blank (0x20). Standard values include "FAT," "FAT12," and "FAT16," but nothing is required.
- uint8_t reserved2[448] ;
- uint16_t fat_signature ; ///< Signature value (0xAA55).
-}fat12_boot_sector_t;
-
-STATIC_ASSERT(sizeof(fat12_boot_sector_t) == 512, "size is not correct");
-
-typedef ATTR_PACKED_STRUCT(struct) {
- uint8_t name[11];
-
- ATTR_PACKED_STRUCT(struct){
- uint8_t readonly : 1;
- uint8_t hidden : 1;
- uint8_t system : 1;
- uint8_t volume_label : 1;
- uint8_t directory : 1;
- uint8_t archive : 1;
- } attr; // Long File Name = 0x0f
-
- uint8_t reserved;
- uint8_t created_time_tenths_of_seconds;
- uint16_t created_time;
- uint16_t created_date;
- uint16_t accessed_date;
- uint16_t cluster_high;
- uint16_t written_time;
- uint16_t written_date;
- uint16_t cluster_low;
- uint32_t file_size;
-}fat_directory_t;
-
-STATIC_ASSERT(sizeof(fat_directory_t) == 32, "size is not correct");
-
+ATTR_USB_MIN_ALIGNMENT
static scsi_inquiry_data_t mscd_inquiry_data TUSB_CFG_ATTR_USBRAM =
{
.is_removable = 1,
@@ -118,12 +57,14 @@ static scsi_inquiry_data_t mscd_inquiry_data TUSB_CFG_ATTR_USBRAM = .product_revision = "0.01"
};
+ATTR_USB_MIN_ALIGNMENT
static scsi_read_capacity10_data_t mscd_read_capacity10_data TUSB_CFG_ATTR_USBRAM =
{
.last_lba = __le2be(DISK_BLOCK_NUM-1), // read capacity
.block_size = __le2be(DISK_BLOCK_SIZE)
};
+ATTR_USB_MIN_ALIGNMENT
static scsi_sense_fixed_data_t mscd_sense_data TUSB_CFG_ATTR_USBRAM =
{
.response_code = 0x70,
@@ -131,6 +72,7 @@ static scsi_sense_fixed_data_t mscd_sense_data TUSB_CFG_ATTR_USBRAM = .additional_sense_len = sizeof(scsi_sense_fixed_data_t) - 8
};
+ATTR_USB_MIN_ALIGNMENT
static scsi_read_format_capacity_data_t mscd_format_capacity_data TUSB_CFG_ATTR_USBRAM =
{
.list_length = 8,
@@ -139,6 +81,7 @@ static scsi_read_format_capacity_data_t mscd_format_capacity_data TUSB_CFG_ATTR_ .block_size_u16 = __h2be_16(DISK_BLOCK_SIZE)
};
+ATTR_USB_MIN_ALIGNMENT
static scsi_mode_parameters_t msc_dev_mode_para TUSB_CFG_ATTR_USBRAM =
{
.mode_data_length = 3,
@@ -150,28 +93,10 @@ static scsi_mode_parameters_t msc_dev_mode_para TUSB_CFG_ATTR_USBRAM = //--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
-uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] TUSB_CFG_ATTR_USBRAM;
//--------------------------------------------------------------------+
// tinyusb callback (ISR context)
//--------------------------------------------------------------------+
-static uint16_t read10(uint8_t coreid, uint8_t lun, scsi_read10_t* p_read10, void** pp_buffer)
-{
- uint8_t block_count = __be2h_16(p_read10->block_count);
-
- (*pp_buffer) = mscd_app_ramdisk[ __be2le(p_read10->lba)];
-
- return block_count*DISK_BLOCK_SIZE;
-}
-
-static uint16_t write10(uint8_t coreid, uint8_t lun, scsi_read10_t* p_read10, void** pp_buffer)
-{
- uint8_t block_count = __be2h_16(p_read10->block_count);
- (*pp_buffer) = mscd_app_ramdisk[ __be2le(p_read10->lba)];
-
- return block_count*DISK_BLOCK_SIZE;
-}
-
msc_csw_status_t tusbd_msc_scsi_received_isr (uint8_t coreid, uint8_t lun, uint8_t scsi_cmd[16], void ** pp_buffer, uint16_t* p_length)
{
switch (scsi_cmd[0])
@@ -228,81 +153,11 @@ msc_csw_status_t tusbd_msc_scsi_received_isr (uint8_t coreid, uint8_t lun, uint8 //--------------------------------------------------------------------+
// IMPLEMENTATION
//--------------------------------------------------------------------+
-void fat12_fs_init(uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE]);
void msc_dev_app_init (void)
{
- fat12_fs_init(mscd_app_ramdisk);
+ // fat12_fs_init(mscd_app_ramdisk);
}
-//--------------------------------------------------------------------+
-// HELPER
-//--------------------------------------------------------------------+
-void fat12_fs_init(uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE])
-{
- uint8_t const readme_contents[] =
-"This is tinyusb's MassStorage Class demo.\r\n\r\n\
-If you find any bugs or get any questions, feel free to file an\r\n\
-issue at https://github.com/hathach/tinyusb";
-
- //------------- Boot Sector -------------//
- fat12_boot_sector_t* p_boot_fat = (fat12_boot_sector_t* ) mscd_app_ramdisk[0];
- memclr_(p_boot_fat, sizeof(fat12_boot_sector_t));
-
- memcpy(p_boot_fat->jump_code, "\xEB\x3C\x90", 3);
- memcpy(p_boot_fat->oem_name, "MSDOS5.0", 8);
- p_boot_fat->byte_per_sector = DISK_BLOCK_SIZE;
- p_boot_fat->sector_per_cluster = 1;
- p_boot_fat->reserved_sectors = 1;
- p_boot_fat->fat_num = 1;
- p_boot_fat->fat12_root_entry_num = 16;
- p_boot_fat->fat12_sector_num_16 = DISK_BLOCK_NUM;
- p_boot_fat->media_type = 0xf8; // fixed disk
- p_boot_fat->sector_per_fat = 1;
- p_boot_fat->sector_per_track = 1;
- p_boot_fat->head_num = 1;
- p_boot_fat->hidden_sectors = 0;
-
- p_boot_fat->drive_number = 0x80;
- p_boot_fat->extended_boot_signature = 0x29;
- p_boot_fat->volume_serial_number = 0x1234;
- memcpy(p_boot_fat->volume_label , "tinyusb msc", 11);
- memcpy(p_boot_fat->filesystem_type, "FAT12 ", 8);
- p_boot_fat->fat_signature = 0xAA55;
-
- //------------- FAT12 Table (first 2 entries are F8FF, third entry is cluster end of readme file-------------//
- memcpy(mscd_app_ramdisk[1], "\xF8\xFF\xFF\xFF\x0F", 5);
-
- //------------- Root Directory -------------//
- fat_directory_t* p_entry = (fat_directory_t*) mscd_app_ramdisk[2];
-
- // first entry is volume label
- (*p_entry) = (fat_directory_t)
- {
- .name = "TINYUSB MSC",
- .attr.volume_label = 1,
- };
-
- p_entry += 1; // advance to second entry, second entry is readme file
- (*p_entry) = (fat_directory_t)
- {
- .name = "README TXT",
-
- .created_time = 0x6D52,
- .written_time = 0x6D52,
-
- .created_date = 0x4365,
- .accessed_date = 0x4365,
- .written_date = 0x4365,
-
- .cluster_high = 0,
- .cluster_low = 2,
- .file_size = sizeof(readme_contents)-1 // exculde NULL
- }; // first entry is volume label
-
- //------------- Readme Content -------------//
- memcpy(mscd_app_ramdisk[3], readme_contents, sizeof(readme_contents)-1);
-
-}
#endif
diff --git a/demos/device/device_os_none/mscd_app.h b/demos/device/device_os_none/mscd_app.h index 22e0760a5..08c2c8015 100644 --- a/demos/device/device_os_none/mscd_app.h +++ b/demos/device/device_os_none/mscd_app.h @@ -55,6 +55,18 @@ #if TUSB_CFG_DEVICE_MSC
+enum
+{
+ DISK_BLOCK_NUM = 16, // 8KB is the smallest size that windows allow to mount
+ DISK_BLOCK_SIZE = 512
+};
+
+#if MCU==MCU_LPC43XX
+ #define MSCD_APP_RAMDISK
+#else // defaults is rom disk
+ #define MSCD_APP_ROMDISK
+#endif
+
void msc_dev_app_init(void);
OSAL_TASK_FUNCTION( msc_dev_app_task ) (void* p_task_para);
diff --git a/demos/device/device_os_none/mscd_app_ramdisk.c b/demos/device/device_os_none/mscd_app_ramdisk.c new file mode 100644 index 000000000..7a43d6f52 --- /dev/null +++ b/demos/device/device_os_none/mscd_app_ramdisk.c @@ -0,0 +1,238 @@ +/**************************************************************************/
+/*!
+ @file mscd_app_ramdisk.c
+ @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.
+*/
+/**************************************************************************/
+
+#include "mscd_app.h"
+
+#if TUSB_CFG_DEVICE_MSC && defined (MSCD_APP_RAMDISK)
+
+//--------------------------------------------------------------------+
+// MACRO CONSTANT TYPEDEF
+//--------------------------------------------------------------------+
+#define README_CONTENTS \
+"This is tinyusb's MassStorage Class demo.\r\n\r\n\
+If you find any bugs or get any questions, feel free to file an\r\n\
+issue at github.com/hathach/tinyusb"
+
+//--------------------------------------------------------------------+
+// INTERNAL OBJECT & FUNCTION DECLARATION
+//--------------------------------------------------------------------+
+ATTR_USB_MIN_ALIGNMENT
+uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] TUSB_CFG_ATTR_USBRAM =
+{
+ //------------- Boot Sector -------------//
+ [0] =
+ {
+ 0xEB, 0x3C, 0x90, 0x4D, 0x53, 0x44, 0x4F, 0x53, 0x35, 0x2E, 0x30, 0x00, 0x02, 0x01, 0x01, 0x00,
+ 0x01, 0x10, 0x00, 0x10, 0x00, 0xF8, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x29, 0x34, 0x12, 0x00, 0x00, 0x74, 0x69, 0x6E, 0x79, 0x75,
+ 0x73, 0x62, 0x20, 0x6D, 0x73, 0x63, 0x46, 0x41, 0x54, 0x31, 0x32, 0x20, 0x20, 0x20, 0x00, 0x00,
+ [510] = 0x55, [511] = 0xAA // FAT magic code
+ },
+
+ //------------- FAT12 Table (first 2 entries are F8FF, third entry is cluster end of readme file-------------//
+ [1] =
+ {
+ 0xF8, 0xFF, 0xFF, 0xFF, 0x0F
+ },
+
+ //------------- Root Directory -------------//
+ [2] =
+ {
+ // first entry is volume label
+ 0x54, 0x49, 0x4E, 0x59, 0x55, 0x53, 0x42, 0x20, 0x4D, 0x53, 0x43, 0x08, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6D, 0x65, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ // second entry is readme file
+ 'R' , 'E' , 'A' , 'D' , 'M' , 'E' , ' ' , ' ' , 'T' , 'X' , 'T' , 0x20, 0x00, 0xC6, 0x52, 0x6D,
+ 0x65, 0x43, 0x65, 0x43, 0x00, 0x00, 0x88, 0x6D, 0x65, 0x43, 0x02, 0x00,
+ sizeof(README_CONTENTS)-1, 0x00, 0x00, 0x00 // readme's filesize (4 Bytes)
+ },
+
+ //------------- Readme Content -------------//
+ [3] = README_CONTENTS
+};
+
+//--------------------------------------------------------------------+
+// IMPLEMENTATION
+//--------------------------------------------------------------------+
+uint16_t read10(uint8_t coreid, uint8_t lun, scsi_read10_t* p_read10, void** pp_buffer)
+{
+ uint8_t block_count = __be2h_16(p_read10->block_count);
+
+ (*pp_buffer) = mscd_app_ramdisk[ __be2le(p_read10->lba)];
+
+ return block_count*DISK_BLOCK_SIZE;
+}
+
+uint16_t write10(uint8_t coreid, uint8_t lun, scsi_read10_t* p_read10, void** pp_buffer)
+{
+ uint8_t block_count = __be2h_16(p_read10->block_count);
+ (*pp_buffer) = mscd_app_ramdisk[ __be2le(p_read10->lba)];
+
+ return block_count*DISK_BLOCK_SIZE;
+}
+
+//--------------------------------------------------------------------+
+// HELPER
+//--------------------------------------------------------------------+
+
+#if 0 // no need to use fat12 helper
+typedef ATTR_PACKED_STRUCT(struct) {
+ //------------- common -------------//
+ uint8_t jump_code[3] ; ///< Assembly instruction to jump to boot code.
+ uint8_t oem_name[8] ; ///< OEM Name in ASCII.
+ uint16_t byte_per_sector ; ///< Bytes per sector. Allowed values include 512, 1024, 2048, and 4096.
+ uint8_t sector_per_cluster ; ///< Sectors per cluster (data unit). Allowed values are powers of 2, but the cluster size must be 32KB or smaller.
+ uint16_t reserved_sectors ; ///< Size in sectors of the reserved area.
+ uint8_t fat_num ; ///< Number of FATs. Typically two for redundancy, but according to Microsoft it can be one for some small storage devices.
+ uint16_t fat12_root_entry_num ; ///< Maximum number of files in the root directory for FAT12 and FAT16. This is 0 for FAT32 and typically 512 for FAT16.
+ uint16_t fat12_sector_num_16 ; ///< 16-bit number of sectors in file system. If the number of sectors is larger than can be represented in this 2-byte value, a 4-byte value exists later in the data structure and this should be 0.
+ uint8_t media_type ; ///< 0xf8 should be used for fixed disks and 0xf0 for removable.
+ uint16_t sector_per_fat ; ///< 16-bit size in sectors of each FAT for FAT12 and FAT16. For FAT32, this field is 0.
+ uint16_t sector_per_track ; ///< Sectors per track of storage device.
+ uint16_t head_num ; ///< Number of heads in storage device.
+ uint32_t hidden_sectors ; ///< Number of sectors before the start of partition.
+ uint32_t sector_num_32 ; ///< 32-bit value of number of sectors in file system. Either this value or the 16-bit value above must be 0.
+
+ //------------- FAT32 -------------//
+ uint8_t drive_number ; ///< Physical drive number (0x00 for (first) removable media, 0x80 for (first) fixed disk
+ uint8_t reserved ;
+ uint8_t extended_boot_signature ; ///< should be 0x29
+ uint32_t volume_serial_number ; ///< Volume serial number, which some versions of Windows will calculate based on the creation date and time.
+ uint8_t volume_label[11] ;
+ uint8_t filesystem_type[8] ; ///< File system type label in ASCII, padded with blank (0x20). Standard values include "FAT," "FAT12," and "FAT16," but nothing is required.
+ uint8_t reserved2[448] ;
+ uint16_t fat_signature ; ///< Signature value (0xAA55).
+}fat12_boot_sector_t;
+
+STATIC_ASSERT(sizeof(fat12_boot_sector_t) == 512, "size is not correct");
+
+typedef ATTR_PACKED_STRUCT(struct) {
+ uint8_t name[11];
+
+ ATTR_PACKED_STRUCT(struct){
+ uint8_t readonly : 1;
+ uint8_t hidden : 1;
+ uint8_t system : 1;
+ uint8_t volume_label : 1;
+ uint8_t directory : 1;
+ uint8_t archive : 1;
+ } attr; // Long File Name = 0x0f
+
+ uint8_t reserved;
+ uint8_t created_time_tenths_of_seconds;
+ uint16_t created_time;
+ uint16_t created_date;
+ uint16_t accessed_date;
+ uint16_t cluster_high;
+ uint16_t written_time;
+ uint16_t written_date;
+ uint16_t cluster_low;
+ uint32_t file_size;
+}fat_directory_t;
+
+STATIC_ASSERT(sizeof(fat_directory_t) == 32, "size is not correct");
+
+void fat12_fs_init(uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE])
+{
+ uint8_t const readme_contents[] =
+"This is tinyusb's MassStorage Class demo.\r\n\r\n\
+If you find any bugs or get any questions, feel free to file an\r\n\
+issue at https://github.com/hathach/tinyusb";
+
+ //------------- Boot Sector -------------//
+ fat12_boot_sector_t* p_boot_fat = (fat12_boot_sector_t* ) mscd_app_ramdisk[0];
+ memclr_(p_boot_fat, sizeof(fat12_boot_sector_t));
+
+ memcpy(p_boot_fat->jump_code, "\xEB\x3C\x90", 3);
+ memcpy(p_boot_fat->oem_name, "MSDOS5.0", 8);
+ p_boot_fat->byte_per_sector = DISK_BLOCK_SIZE;
+ p_boot_fat->sector_per_cluster = 1;
+ p_boot_fat->reserved_sectors = 1;
+ p_boot_fat->fat_num = 1;
+ p_boot_fat->fat12_root_entry_num = 16;
+ p_boot_fat->fat12_sector_num_16 = DISK_BLOCK_NUM;
+ p_boot_fat->media_type = 0xf8; // fixed disk
+ p_boot_fat->sector_per_fat = 1;
+ p_boot_fat->sector_per_track = 1;
+ p_boot_fat->head_num = 1;
+ p_boot_fat->hidden_sectors = 0;
+
+ p_boot_fat->drive_number = 0x80;
+ p_boot_fat->extended_boot_signature = 0x29;
+ p_boot_fat->volume_serial_number = 0x1234;
+ memcpy(p_boot_fat->volume_label , "tinyusb msc", 11);
+ memcpy(p_boot_fat->filesystem_type, "FAT12 ", 8);
+ p_boot_fat->fat_signature = 0xAA55;
+
+ //------------- FAT12 Table (first 2 entries are F8FF, third entry is cluster end of readme file-------------//
+ memcpy(mscd_app_ramdisk[1], "\xF8\xFF\xFF\xFF\x0F", 5);
+
+ //------------- Root Directory -------------//
+ fat_directory_t* p_entry = (fat_directory_t*) mscd_app_ramdisk[2];
+
+ // first entry is volume label
+ (*p_entry) = (fat_directory_t)
+ {
+ .name = "TINYUSB MSC",
+ .attr.volume_label = 1,
+ };
+
+ p_entry += 1; // advance to second entry, second entry is readme file
+ (*p_entry) = (fat_directory_t)
+ {
+ .name = "README TXT",
+
+ .created_time = 0x6D52,
+ .written_time = 0x6D52,
+
+ .created_date = 0x4365,
+ .accessed_date = 0x4365,
+ .written_date = 0x4365,
+
+ .cluster_high = 0,
+ .cluster_low = 2,
+ .file_size = sizeof(readme_contents)-1 // exculde NULL
+ }; // first entry is volume label
+
+ //------------- Readme Content -------------//
+ memcpy(mscd_app_ramdisk[3], readme_contents, sizeof(readme_contents)-1);
+
+}
+#endif
+
+#endif
diff --git a/demos/device/device_os_none/mscd_app_romdisk.c b/demos/device/device_os_none/mscd_app_romdisk.c new file mode 100644 index 000000000..0388af2f4 --- /dev/null +++ b/demos/device/device_os_none/mscd_app_romdisk.c @@ -0,0 +1,118 @@ +/**************************************************************************/
+/*!
+ @file mscd_app_romdisk.c
+ @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.
+*/
+/**************************************************************************/
+
+#include "mscd_app.h"
+
+#if TUSB_CFG_DEVICE_MSC && defined (MSCD_APP_ROMDISK)
+
+//--------------------------------------------------------------------+
+// INCLUDE
+//--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// MACRO CONSTANT TYPEDEF
+//--------------------------------------------------------------------+
+#define README_CONTENTS \
+"This is tinyusb's MassStorage Class demo.\r\n\r\n\
+If you find any bugs or get any questions, feel free to file an\r\n\
+issue at github.com/hathach/tinyusb"
+
+//--------------------------------------------------------------------+
+// INTERNAL OBJECT & FUNCTION DECLARATION
+//--------------------------------------------------------------------+
+const uint8_t mscd_app_rommdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =
+{
+ //------------- Boot Sector -------------//
+ [0] =
+ {
+ 0xEB, 0x3C, 0x90, 0x4D, 0x53, 0x44, 0x4F, 0x53, 0x35, 0x2E, 0x30, 0x00, 0x02, 0x01, 0x01, 0x00,
+ 0x01, 0x10, 0x00, 0x10, 0x00, 0xF8, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x29, 0x34, 0x12, 0x00, 0x00, 0x74, 0x69, 0x6E, 0x79, 0x75,
+ 0x73, 0x62, 0x20, 0x6D, 0x73, 0x63, 0x46, 0x41, 0x54, 0x31, 0x32, 0x20, 0x20, 0x20, 0x00, 0x00,
+ [510] = 0x55, [511] = 0xAA // FAT magic code
+ },
+
+ //------------- FAT12 Table (first 2 entries are F8FF, third entry is cluster end of readme file-------------//
+ [1] =
+ {
+ 0xF8, 0xFF, 0xFF, 0xFF, 0x0F
+ },
+
+ //------------- Root Directory -------------//
+ [2] =
+ {
+ // first entry is volume label
+ 0x54, 0x49, 0x4E, 0x59, 0x55, 0x53, 0x42, 0x20, 0x4D, 0x53, 0x43, 0x08, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6D, 0x65, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ // second entry is readme file
+ 0x52, 0x45, 0x41, 0x44, 0x4D, 0x45, 0x20, 0x20, 0x54, 0x58, 0x54, 0x20, 0x00, 0xC6, 0x52, 0x6D,
+ 0x65, 0x43, 0x65, 0x43, 0x00, 0x00, 0x88, 0x6D, 0x65, 0x43, 0x02, 0x00,
+ sizeof(README_CONTENTS)-1, 0x00, 0x00, 0x00 // readme's filesize
+ },
+
+ //------------- Readme Content -------------//
+ [3] = README_CONTENTS
+};
+
+ATTR_USB_MIN_ALIGNMENT
+static uint8_t ramdisk_buffer[DISK_BLOCK_SIZE] TUSB_CFG_ATTR_USBRAM;
+
+//--------------------------------------------------------------------+
+// IMPLEMENTATION
+//--------------------------------------------------------------------+
+uint16_t read10(uint8_t coreid, uint8_t lun, scsi_read10_t* p_read10, void** pp_buffer)
+{
+ uint8_t block_count = __be2h_16(p_read10->block_count);
+
+ memcpy(ramdisk_buffer, mscd_app_rommdisk[ __be2le(p_read10->lba)], DISK_BLOCK_SIZE);
+
+ (*pp_buffer) = ramdisk_buffer;
+
+ return block_count*DISK_BLOCK_SIZE;
+}
+
+// Stall write10 as this is readonly disk
+uint16_t write10(uint8_t coreid, uint8_t lun, scsi_read10_t* p_read10, void** pp_buffer)
+{
+ (*pp_buffer) = NULL;
+
+ return 0;
+}
+
+#endif
+
diff --git a/demos/device/device_os_none/tusb_config.h b/demos/device/device_os_none/tusb_config.h index cdabfdc81..32f3a89e2 100644 --- a/demos/device/device_os_none/tusb_config.h +++ b/demos/device/device_os_none/tusb_config.h @@ -75,9 +75,10 @@ //--------------------------------------------------------------------+
// DEVICE CONFIGURATION
//--------------------------------------------------------------------+
-#define TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE 64
+#define TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE 64 // TODO refractor remove
#define TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT 4
-#define TUSB_CFG_DEVICE_FULLSPEED 1 // TODO refractor, remove
+
+#define TUSB_CFG_DEVICE_FULLSPEED 1 // TODO refractor, remove
//------------- CLASS -------------//
#define TUSB_CFG_DEVICE_HID_KEYBOARD 0
diff --git a/tinyusb/class/msc_device.c b/tinyusb/class/msc_device.c index b4c1c520d..a975e759e 100644 --- a/tinyusb/class/msc_device.c +++ b/tinyusb/class/msc_device.c @@ -176,8 +176,7 @@ void mscd_isr(endpoint_handle_t edpt_hdl, tusb_event_t event, uint32_t xferred_b }
//------------- Status Phase -------------//
- // TODO need to be true for dcd_lpc43xx to clean up qtd !!!
- ASSERT( dcd_pipe_xfer( p_msc->edpt_in , &p_msc->csw, sizeof(msc_cmd_status_wrapper_t), true) == TUSB_ERROR_NONE, VOID_RETURN );
+ ASSERT( dcd_pipe_xfer( p_msc->edpt_in , &p_msc->csw, sizeof(msc_cmd_status_wrapper_t), true) == TUSB_ERROR_NONE, VOID_RETURN ); // need to be true for dcd to clean up qtd !!
//------------- Queue the next CBW -------------//
ASSERT( dcd_pipe_xfer( p_msc->edpt_out, &p_msc->cbw, sizeof(msc_cmd_block_wrapper_t), true) == TUSB_ERROR_NONE, VOID_RETURN );
diff --git a/tinyusb/device/dcd_lpc43xx.c b/tinyusb/device/dcd_lpc43xx.c index c1898f548..7253b2541 100644 --- a/tinyusb/device/dcd_lpc43xx.c +++ b/tinyusb/device/dcd_lpc43xx.c @@ -143,10 +143,9 @@ typedef struct { /// thus there are 16 bytes padding free that we can make use of.
//--------------------------------------------------------------------+
uint8_t class_code; // Class code that endpoint belongs to
- uint8_t xfer_type;
uint8_t list_qtd_idx[DCD_QTD_PER_QHD_MAX];
- uint8_t reserved[14-DCD_QTD_PER_QHD_MAX];
+ uint8_t reserved[15-DCD_QTD_PER_QHD_MAX];
} ATTR_ALIGNED(64) dcd_qhd_t;
STATIC_ASSERT( sizeof(dcd_qhd_t) == 64, "size is not correct");
@@ -404,7 +403,7 @@ tusb_error_t dcd_pipe_clear_stall(uint8_t coreid, uint8_t edpt_addr) endpoint_handle_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const * p_endpoint_desc, uint8_t class_code)
{
// TODO USB1 only has 4 non-control enpoint (USB0 has 5)
- endpoint_handle_t const null_handle = { .coreid = 0, .xfer_type = 0, .index = 0 };
+ endpoint_handle_t const null_handle = { 0 };
if (p_endpoint_desc->bmAttributes.xfer == TUSB_XFER_ISOCHRONOUS)
return null_handle; // TODO not support ISO yet
@@ -418,7 +417,6 @@ endpoint_handle_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const memclr_(p_qhd, sizeof(dcd_qhd_t));
p_qhd->class_code = class_code;
- p_qhd->xfer_type = p_endpoint_desc->bmAttributes.xfer;
p_qhd->zero_length_termination = 1;
p_qhd->max_package_size = p_endpoint_desc->wMaxPacketSize.size;
p_qhd->qtd_overlay.next = QTD_NEXT_INVALID;
@@ -432,7 +430,6 @@ endpoint_handle_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const return (endpoint_handle_t)
{
.coreid = coreid,
- .xfer_type = p_endpoint_desc->bmAttributes.xfer,
.index = ep_idx,
.class_code = class_code
};
@@ -449,8 +446,6 @@ bool dcd_pipe_is_busy(endpoint_handle_t edpt_hdl) // add only, controller virtually cannot know
static tusb_error_t pipe_add_xfer(endpoint_handle_t edpt_hdl, void * buffer, uint16_t total_bytes, bool int_on_complete)
{
- ASSERT(edpt_hdl.xfer_type != TUSB_XFER_ISOCHRONOUS, TUSB_ERROR_NOT_SUPPORTED_YET);
-
uint8_t qtd_idx = qtd_find_free(edpt_hdl.coreid);
ASSERT(qtd_idx != 0, TUSB_ERROR_DCD_NOT_ENOUGH_QTD);
@@ -509,7 +504,6 @@ void xfer_complete_isr(uint8_t coreid, uint32_t reg_complete) endpoint_handle_t edpt_hdl =
{
.coreid = coreid,
- .xfer_type = p_qhd->xfer_type,
.index = ep_idx,
.class_code = p_qhd->class_code
};
|