diff --git a/examples/obsolete/device/src/cdc_device_app.c b/examples/obsolete/device/src/cdc_device_app.c index c6e903fc..843ab5a7 100644 --- a/examples/obsolete/device/src/cdc_device_app.c +++ b/examples/obsolete/device/src/cdc_device_app.c @@ -44,17 +44,16 @@ #include "app_os_prio.h" //--------------------------------------------------------------------+ -// INCLUDE +// MACRO CONSTANT TYPEDEF //--------------------------------------------------------------------+ enum { SERIAL_BUFFER_SIZE = 64 }; -//--------------------------------------------------------------------+ -// MACRO CONSTANT TYPEDEF -//--------------------------------------------------------------------+ - //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ +void cdc_serial_app_task(void* param); + +OSAL_TASK_DEF(cdc_task_def, "blinky", cdc_serial_app_task, CDC_SERIAL_APP_TASK_PRIO, 128); //--------------------------------------------------------------------+ // tinyusb callbacks @@ -78,6 +77,7 @@ void tud_cdc_rx_cb(uint8_t rhport) //--------------------------------------------------------------------+ void cdc_serial_app_init(void) { + osal_task_create(&cdc_task_def); } tusb_error_t cdc_serial_subtask(void); diff --git a/examples/obsolete/device/src/main.c b/examples/obsolete/device/src/main.c index 6b3bdeee..7d8f86e9 100644 --- a/examples/obsolete/device/src/main.c +++ b/examples/obsolete/device/src/main.c @@ -130,12 +130,14 @@ void tud_umount_cb(uint8_t rhport) //--------------------------------------------------------------------+ // BLINKING TASK //--------------------------------------------------------------------+ +OSAL_TASK_DEF(blink_task_def, "blinky", led_blinking_task, LED_BLINKING_APP_TASK_PRIO, 128); + static uint32_t led_blink_interval_ms = 1000; // default is 1 second void led_blinking_init(void) { led_blink_interval_ms = 1000; - osal_task_create(led_blinking_task, "blinky", 128, NULL, LED_BLINKING_APP_TASK_PRIO); + osal_task_create(&blink_task_def); } void led_blinking_set_interval(uint32_t ms) diff --git a/examples/obsolete/device/src/msc_device_ramdisk.c b/examples/obsolete/device/src/msc_device_ramdisk.c index cb36548e..7133e745 100644 --- a/examples/obsolete/device/src/msc_device_ramdisk.c +++ b/examples/obsolete/device/src/msc_device_ramdisk.c @@ -111,133 +111,4 @@ int32_t tud_msc_write10_cb (uint8_t rhport, uint8_t lun, uint32_t lba, uint32_t return bufsize; } -//--------------------------------------------------------------------+ -// 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; - -VERIFY_STATIC(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; - -VERIFY_STATIC(sizeof(fat_directory_t) == 32, "size is not correct"); - -void fat12_fs_init(uint8_t msc_device_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* ) msc_device_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(msc_device_ramdisk[1], "\xF8\xFF\xFF\xFF\x0F", 5); - - //------------- Root Directory -------------// - fat_directory_t* p_entry = (fat_directory_t*) msc_device_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(msc_device_ramdisk[3], readme_contents, sizeof(readme_contents)-1); - -} -#endif - #endif diff --git a/tinyusb/osal/osal_freeRTOS.h b/tinyusb/osal/osal_freeRTOS.h index ce9e9592..6e6535da 100644 --- a/tinyusb/osal/osal_freeRTOS.h +++ b/tinyusb/osal/osal_freeRTOS.h @@ -65,14 +65,27 @@ static inline bool in_isr(void) //--------------------------------------------------------------------+ // TASK API //--------------------------------------------------------------------+ -typedef void (*osal_func_t)(void *param); -typedef void* osal_task_t; +#define OSAL_TASK_DEF(_name, _str, _func, _prio, _stack_sz) \ + uint8_t _name##_##buf[_stack_sz*sizeof(StackType_t)]; \ + osal_task_def_t _name = { .func = _func, .prio = _prio, .stack_sz = _stack_sz, .buf = _name##_##buf, .strname = _str }; -static inline osal_task_t osal_task_create(osal_func_t code, const char* name, uint32_t stack_size, void* param, uint32_t prio) +typedef struct { - osal_task_t task_hdl; - xTaskCreate(code, (const char*) name, stack_size, param, prio, &task_hdl); - return task_hdl; + void (*func)(void *param); + + uint16_t prio; + uint16_t stack_sz; + void* buf; + const char* strname; + + StaticTask_t stask; +}osal_task_def_t; + +typedef TaskHandle_t osal_task_t; + +static inline osal_task_t osal_task_create(osal_task_def_t* taskdef) +{ + return xTaskCreateStatic(taskdef->func, taskdef->strname, taskdef->stack_sz, NULL, taskdef->prio, taskdef->buf, &taskdef->stask); } static inline void osal_task_delay(uint32_t msec) @@ -85,7 +98,7 @@ static inline void osal_task_delay(uint32_t msec) //--------------------------------------------------------------------+ #define OSAL_QUEUE_DEF(_name, _depth, _type) \ uint8_t _name##_##buf[_depth*sizeof(_type)];\ - osal_queue_def_t _name = { .depth = _depth, .item_sz = sizeof(_type), .buf = _name##_##buf };\ + osal_queue_def_t _name = { .depth = _depth, .item_sz = sizeof(_type), .buf = _name##_##buf }; typedef struct {