Skip to content

Commit

Permalink
[add]Add rtthread script support to better integrate into rtthread pr…
Browse files Browse the repository at this point in the history
…ojects.
  • Loading branch information
Rbb666 committed Apr 16, 2024
1 parent 50738f2 commit bb16d74
Show file tree
Hide file tree
Showing 9 changed files with 715 additions and 1 deletion.
11 changes: 11 additions & 0 deletions SConscript
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# RT-Thread building script for bridge

import os
from building import *

objs = []
cwd = GetCurrentDir()

objs = objs + SConscript(cwd + '/src/osal/rt-thread/SConscript')

Return('objs')
2 changes: 1 addition & 1 deletion src/osal/osal.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ typedef void (*osal_task_func_t)( void * );
#elif CFG_TUSB_OS == OPT_OS_PICO
#include "osal_pico.h"
#elif CFG_TUSB_OS == OPT_OS_RTTHREAD
#include "osal_rtthread.h"
#include "rt-thread/osal_rtthread.h"
#elif CFG_TUSB_OS == OPT_OS_RTX4
#include "osal_rtx4.h"
#elif CFG_TUSB_OS == OPT_OS_CUSTOM
Expand Down
43 changes: 43 additions & 0 deletions src/osal/rt-thread/SConscript
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import rtconfig
from building import *

cwd = GetCurrentDir()
src = Split("""
../../tusb.c
../../common/tusb_fifo.c
../../device/usbd.c
../../device/usbd_control.c
./tinyusb_port.c
./usb_descriptor.c
""")
path = [cwd, cwd + "/../../../src"]

# BSP
if GetDepend(["SOC_FAMILY_STM32"]):
src += ["../../portable/synopsys/dwc2/dcd_dwc2.c",
"../../portable/st/stm32_fsdev/dcd_stm32_fsdev.c"]

if GetDepend(["SOC_NRF52840"]):
src += ["../../portable/nordic/nrf5x/dcd_nrf5x.c"]

if GetDepend(["SOC_FAMILY_RENESAS"]):
src += ["../../portable/renesas/rusb2/dcd_rusb2.c",
"../../portable/renesas/rusb2/rusb2_common.c"]

# Device class
if GetDepend(["PKG_TINYUSB_DEVICE_CDC"]):
src += ["../../class/cdc/cdc_device.c"]

if GetDepend(["PKG_TINYUSB_DEVICE_MSC"]):
src += ["../../class/msc/msc_device.c", "port/msc_device_port.c"]

LOCAL_CFLAGS = ''

if rtconfig.PLATFORM == 'gcc' or rtconfig.PLATFORM == 'armclang': # GCC or Keil AC6
LOCAL_CFLAGS += ' -std=c99'
elif rtconfig.PLATFORM == 'armcc': # Keil AC5
LOCAL_CFLAGS += ' --c99 --gnu'

group = DefineGroup('TinyUSB', src, depend = ['PKG_USING_TINYUSB'], CPPPATH = path, LOCAL_CFLAGS = LOCAL_CFLAGS)

Return('group')
File renamed without changes.
165 changes: 165 additions & 0 deletions src/osal/rt-thread/port/msc_device_port.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2019 Ha Thach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* This file is part of the TinyUSB stack.
*/
#ifdef __RTTHREAD__
#include <tusb.h>
#include <stdint.h>

#include <board.h>
#include <rtdevice.h>

static bool ejected = false;
static rt_device_t flash_device;
static struct rt_device_blk_geometry blk_geom;

#ifdef __CC_ARM
uint16_t __builtin_bswap16(uint16_t x)
{
return (x << 8) | (x >> 8);
}
#endif

void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16], uint8_t product_rev[4])
{
(void) lun;

const char vid[] = PKG_TINYUSB_DEVICE_MSC_VID;
const char pid[] = PKG_TINYUSB_DEVICE_MSC_PID;
const char rev[] = PKG_TINYUSB_DEVICE_MSC_REV;

memcpy(vendor_id, vid, strlen(vid));
memcpy(product_id, pid, strlen(pid));
memcpy(product_rev, rev, strlen(rev));
}

bool tud_msc_test_unit_ready_cb(uint8_t lun)
{
(void) lun;

if (ejected)
{
tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3a, 0x00);
return false;
}

if (flash_device == NULL)
{
flash_device = rt_device_find(PKG_TINYUSB_DEVICE_MSC_NAME);
}
if (flash_device != NULL)
{
rt_device_open(flash_device, 0);
rt_device_control(flash_device, RT_DEVICE_CTRL_BLK_GETGEOME, &blk_geom);
return true;
}

return false;
}

void tud_msc_capacity_cb(uint8_t lun, uint32_t *block_count, uint16_t *block_size)
{
(void) lun;

*block_count = blk_geom.sector_count;
*block_size = blk_geom.bytes_per_sector;
}

bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, bool load_eject)
{
(void) lun;
(void) power_condition;

if (load_eject)
{
if (start)
{
ejected = false;
} else {
// unload disk storage
ejected = true;
}
}

return true;
}

int32_t tud_msc_read10_cb(uint8_t lun, uint32_t lba, uint32_t offset, void *buffer, uint32_t bufsize)
{
(void) lun;
(void) offset;
(void) bufsize;

return (int32_t) rt_device_read(flash_device, (rt_off_t) lba, buffer, 1) * blk_geom.bytes_per_sector;
}

int32_t tud_msc_write10_cb(uint8_t lun, uint32_t lba, uint32_t offset, uint8_t *buffer, uint32_t bufsize)
{
(void) lun;
(void) offset;
(void) bufsize;

return (int32_t) rt_device_write(flash_device, (rt_off_t) lba, buffer, 1) * blk_geom.bytes_per_sector;
}

int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cmd[16], void *buffer, uint16_t bufsize)
{
void const *response = NULL;
uint16_t resplen = 0;

// most scsi handled is input
bool in_xfer = true;

switch (scsi_cmd[0])
{
case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:
// Host is about to read/write etc ... better not to disconnect disk
resplen = 0;
break;

default:
// Set Sense = Invalid Command Operation
tud_msc_set_sense(lun, SCSI_SENSE_ILLEGAL_REQUEST, 0x20, 0x00);

// negative means error -> tinyusb could stall and/or response with failed status
resplen = -1;
break;
}

// return resplen must not larger than bufsize
if (resplen > bufsize) resplen = bufsize;

if (response && (resplen > 0))
{
if (in_xfer)
{
memcpy(buffer, response, resplen);
} else {
// SCSI output
}
}

return resplen;
}
#endif /*__RTTHREAD__*/
81 changes: 81 additions & 0 deletions src/osal/rt-thread/tinyusb_port.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2019 Ha Thach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* This file is part of the TinyUSB stack.
*/
#ifdef __RTTHREAD__
#include <rtthread.h>

#define DBG_TAG "TinyUSB"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#include <tusb.h>

#ifndef RT_USING_HEAP
/* if there is not enable heap, we should use static thread and stack. */
static rt_uint8_t tusb_stack[PKG_TINYUSB_STACK_SIZE];
static struct rt_thread tusb_thread;
#endif /* RT_USING_HEAP */

extern int tusb_board_init(void);

static void tusb_thread_entry(void *parameter)
{
(void) parameter;
while (1)
{
tud_task();
}
}

static int init_tinyusb(void)
{
rt_thread_t tid;

tusb_board_init();
tusb_init();

#ifdef RT_USING_HEAP
tid = rt_thread_create("tusb", tusb_thread_entry, RT_NULL,
PKG_TINYUSB_STACK_SIZE,
PKG_TINYUSB_THREAD_PRIORITY, 10);
if (tid == RT_NULL)
#else
rt_err_t result;

tid = &tusb_thread;
result = rt_thread_init(tid, "tusb", tusb_thread_entry, RT_NULL,
tusb_stack, sizeof(tusb_stack), 4, 10);
if (result != RT_EOK)
#endif /* RT_USING_HEAP */
{
LOG_E("Fail to create TinyUSB thread");
return -1;
}

rt_thread_startup(tid);

return 0;
}
INIT_APP_EXPORT(init_tinyusb);
#endif /*__RTTHREAD__*/
Loading

0 comments on commit bb16d74

Please sign in to comment.