summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/daplink/dap_main.c41
-rw-r--r--platform/idf/usbh_fatfs.c5
-rw-r--r--platform/rtthread/rt_usbd_adb.c1
-rw-r--r--platform/rtthread/rt_usbd_serial.c1
-rw-r--r--platform/zephyr/usbh_msc_disk.c126
5 files changed, 126 insertions, 48 deletions
diff --git a/platform/daplink/dap_main.c b/platform/daplink/dap_main.c
index 27e0355b..b145c223 100644
--- a/platform/daplink/dap_main.c
+++ b/platform/daplink/dap_main.c
@@ -335,17 +335,16 @@ static USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t USB_Request[DAP_PACKET_COU
static USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t USB_Response[DAP_PACKET_COUNT][DAP_PACKET_SIZE]; // Response Buffer
static uint16_t USB_RespSize[DAP_PACKET_COUNT]; // Response Size
-volatile struct cdc_line_coding g_cdc_lincoding;
-volatile uint8_t config_uart = 0;
-volatile uint8_t config_uart_transfer = 0;
-
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t uartrx_ringbuffer[CONFIG_UARTRX_RINGBUF_SIZE];
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t usbrx_ringbuffer[CONFIG_USBRX_RINGBUF_SIZE];
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t usb_tmpbuffer[DAP_PACKET_SIZE];
+static volatile struct cdc_line_coding g_cdc_lincoding;
+static volatile uint8_t config_uart = 0;
+static volatile uint8_t config_uart_transfer = 0;
static volatile uint8_t usbrx_idle_flag = 0;
-static volatile uint8_t usbtx_idle_flag = 0;
-static volatile uint8_t uarttx_idle_flag = 0;
+static volatile uint8_t usbtx_idle_flag = 1;
+static volatile uint8_t uarttx_idle_flag = 1;
USB_NOCACHE_RAM_SECTION chry_ringbuffer_t g_uartrx;
USB_NOCACHE_RAM_SECTION chry_ringbuffer_t g_usbrx;
@@ -356,9 +355,6 @@ void usbd_event_handler(uint8_t busid, uint8_t event)
switch (event) {
case USBD_EVENT_RESET:
usbrx_idle_flag = 0;
- usbtx_idle_flag = 0;
- uarttx_idle_flag = 0;
- config_uart_transfer = 0;
break;
case USBD_EVENT_CONNECTED:
break;
@@ -437,20 +433,13 @@ void usbd_cdc_acm_bulk_out(uint8_t busid, uint8_t ep, uint32_t nbytes)
void usbd_cdc_acm_bulk_in(uint8_t busid, uint8_t ep, uint32_t nbytes)
{
(void)busid;
- uint32_t size;
- uint8_t *buffer;
chry_ringbuffer_linear_read_done(&g_uartrx, nbytes);
if ((nbytes % DAP_PACKET_SIZE) == 0 && nbytes) {
/* send zlp */
usbd_ep_start_write(0, CDC_IN_EP, NULL, 0);
} else {
- if (chry_ringbuffer_get_used(&g_uartrx)) {
- buffer = chry_ringbuffer_linear_read_setup(&g_uartrx, &size);
- usbd_ep_start_write(0, CDC_IN_EP, buffer, size);
- } else {
- usbtx_idle_flag = 1;
- }
+ usbtx_idle_flag = 1;
}
}
@@ -624,7 +613,8 @@ void chry_dap_handle(void)
void usbd_cdc_acm_set_line_coding(uint8_t busid, uint8_t intf, struct cdc_line_coding *line_coding)
{
(void)busid;
- if (memcmp(line_coding, (uint8_t *)&g_cdc_lincoding, sizeof(struct cdc_line_coding)) != 0) {
+
+ if (memcmp((uint8_t *)&g_cdc_lincoding, line_coding, sizeof(struct cdc_line_coding)) != 0 && line_coding->dwDTERate != 0) {
memcpy((uint8_t *)&g_cdc_lincoding, line_coding, sizeof(struct cdc_line_coding));
config_uart = 1;
config_uart_transfer = 0;
@@ -642,6 +632,10 @@ void chry_dap_usb2uart_handle(void)
uint32_t size;
uint8_t *buffer;
+ if (usb_device_is_configured(0) == 0) {
+ return;
+ }
+
if (config_uart) {
/* disable irq here */
config_uart = 0;
@@ -700,16 +694,9 @@ __WEAK void chry_dap_usb2uart_uart_config_callback(struct cdc_line_coding *line_
/* called by user */
void chry_dap_usb2uart_uart_send_complete(uint32_t size)
{
- uint8_t *buffer;
-
chry_ringbuffer_linear_read_done(&g_usbrx, size);
- if (chry_ringbuffer_get_used(&g_usbrx)) {
- buffer = chry_ringbuffer_linear_read_setup(&g_usbrx, &size);
- chry_dap_usb2uart_uart_send_bydma(buffer, size);
- } else {
- uarttx_idle_flag = 1;
- }
+ uarttx_idle_flag = 1;
}
/* implment by user */
@@ -746,4 +733,4 @@ int usbd_msc_sector_write(uint32_t sector, uint8_t *buffer, uint32_t length)
memcpy(mass_block[sector].BlockSpace, buffer, length);
return 0;
}
-#endif
+#endif \ No newline at end of file
diff --git a/platform/idf/usbh_fatfs.c b/platform/idf/usbh_fatfs.c
index fef0798f..ca2713ae 100644
--- a/platform/idf/usbh_fatfs.c
+++ b/platform/idf/usbh_fatfs.c
@@ -9,6 +9,7 @@
#include "sdkconfig.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
+#include "esp_idf_version.h"
#include "esp_log.h"
#include "esp_check.h"
#include "diskio_impl.h"
@@ -215,12 +216,16 @@ esp_err_t msc_host_vfs_register(struct usbh_msc *msc_class,
strcpy(vfs->base_path, base_path);
vfs->pdrv = pdrv;
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(6, 0, 0)
esp_vfs_fat_conf_t conf = {
.base_path = base_path,
.fat_drive = drive,
.max_files = mount_config->max_files,
};
ret = esp_vfs_fat_register(&conf, &fs);
+#else
+ ret = esp_vfs_fat_register(base_path, drive, mount_config->max_files, &fs);
+#endif
ESP_GOTO_ON_ERROR(ret, fail, TAG, "Failed to register filesystem, error=%s", esp_err_to_name(ret));
vfs->fs = fs;
diff --git a/platform/rtthread/rt_usbd_adb.c b/platform/rtthread/rt_usbd_adb.c
index 4ab7f59a..4ab7bbe1 100644
--- a/platform/rtthread/rt_usbd_adb.c
+++ b/platform/rtthread/rt_usbd_adb.c
@@ -126,6 +126,7 @@ void usbd_adb_shell_init(uint8_t in_ep, uint8_t out_ep)
#endif
g_usbd_adb_shell.tx_done = usb_osal_sem_create(0);
+ USB_ASSERT(g_usbd_adb_shell.tx_done != NULL);
rt_ringbuffer_init(&g_usbd_adb_shell.rx_rb, g_usbd_adb_shell.rx_rb_buffer, sizeof(g_usbd_adb_shell.rx_rb_buffer));
}
diff --git a/platform/rtthread/rt_usbd_serial.c b/platform/rtthread/rt_usbd_serial.c
index 41fb01af..138f4cc8 100644
--- a/platform/rtthread/rt_usbd_serial.c
+++ b/platform/rtthread/rt_usbd_serial.c
@@ -258,6 +258,7 @@ void usbd_cdc_acm_serial_init(uint8_t busid, uint8_t in_ep, uint8_t out_ep)
serial->in_ep = in_ep;
serial->out_ep = out_ep;
serial->tx_done = usb_osal_sem_create(0);
+ USB_ASSERT(serial->tx_done != NULL);
usbd_add_interface(busid, usbd_cdc_acm_init_intf(busid, &serial->intf_ctrl));
usbd_add_interface(busid, usbd_cdc_acm_init_intf(busid, &serial->intf_data));
diff --git a/platform/zephyr/usbh_msc_disk.c b/platform/zephyr/usbh_msc_disk.c
index 6890f985..129cbfe4 100644
--- a/platform/zephyr/usbh_msc_disk.c
+++ b/platform/zephyr/usbh_msc_disk.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2025, sakumisu
+ * Copyright (c) 2025-2026 sakumisu
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -13,16 +13,37 @@
#endif
#endif
-struct usbh_msc *active_msc_class;
+struct usbh_msc_disk_context {
+ struct usbh_msc *msc_class;
+ struct disk_info disk;
+ char name[CONFIG_USBHOST_DEV_NAMELEN];
+ char devname[CONFIG_USBHOST_DEV_NAMELEN];
+};
+
+static struct usbh_msc_disk_context
+ msc_disk_context[CONFIG_USBHOST_MAX_MSC_CLASS];
+
+static struct usbh_msc_disk_context *disk_msc_context(struct disk_info *disk)
+{
+ return CONTAINER_OF(disk, struct usbh_msc_disk_context, disk);
+}
+
+static bool disk_msc_connected(const struct usbh_msc *msc_class)
+{
+ return msc_class != NULL && msc_class->hport != NULL &&
+ msc_class->hport->connected;
+}
static int disk_msc_access_init(struct disk_info *disk)
{
- active_msc_class = (struct usbh_msc *)usbh_find_class_instance("/dev/sda");
- if (active_msc_class == NULL) {
- printf("do not find /dev/sda\r\n");
+ struct usbh_msc_disk_context *ctx = disk_msc_context(disk);
+
+ ctx->msc_class = (struct usbh_msc *)usbh_find_class_instance(ctx->devname);
+ if (ctx->msc_class == NULL) {
+ printf("do not find %s\r\n", ctx->devname);
return -ENODEV;
}
- if (usbh_msc_scsi_init(active_msc_class) < 0) {
+ if (usbh_msc_scsi_init(ctx->msc_class) < 0) {
return -EIO;
}
return 0;
@@ -30,6 +51,12 @@ static int disk_msc_access_init(struct disk_info *disk)
static int disk_msc_access_status(struct disk_info *disk)
{
+ struct usbh_msc_disk_context *ctx = disk_msc_context(disk);
+
+ if (!disk_msc_connected(ctx->msc_class)) {
+ return DISK_STATUS_NOMEDIA;
+ }
+
return DISK_STATUS_OK;
}
@@ -38,25 +65,30 @@ static int disk_msc_access_read(struct disk_info *disk, uint8_t *buff,
{
int ret;
uint8_t *align_buf;
+ struct usbh_msc_disk_context *ctx = disk_msc_context(disk);
+
+ if (!disk_msc_connected(ctx->msc_class)) {
+ return -ENODEV;
+ }
align_buf = (uint8_t *)buff;
#ifdef CONFIG_DCACHE
if ((uint32_t)buff & (CONFIG_USB_ALIGN_SIZE - 1)) {
- align_buf = (uint8_t *)k_aligned_alloc(CONFIG_USB_ALIGN_SIZE, count * active_msc_class->blocksize);
+ align_buf = (uint8_t *)k_aligned_alloc(CONFIG_USB_ALIGN_SIZE, count * ctx->msc_class->blocksize);
if (!align_buf) {
printf("msc get align buf failed\r\n");
return -ENOMEM;
}
}
#endif
- if (usbh_msc_scsi_read10(active_msc_class, sector, align_buf, count) < 0) {
+ if (usbh_msc_scsi_read10(ctx->msc_class, sector, align_buf, count) < 0) {
ret = -EIO;
} else {
ret = 0;
}
#ifdef CONFIG_DCACHE
if ((uint32_t)buff & (CONFIG_USB_ALIGN_SIZE - 1)) {
- usb_memcpy(buff, align_buf, count * active_msc_class->blocksize);
+ usb_memcpy(buff, align_buf, count * ctx->msc_class->blocksize);
k_free(align_buf);
}
#endif
@@ -68,19 +100,24 @@ static int disk_msc_access_write(struct disk_info *disk, const uint8_t *buff,
{
int ret;
uint8_t *align_buf;
+ struct usbh_msc_disk_context *ctx = disk_msc_context(disk);
+
+ if (!disk_msc_connected(ctx->msc_class)) {
+ return -ENODEV;
+ }
align_buf = (uint8_t *)buff;
#ifdef CONFIG_DCACHE
if ((uint32_t)buff & (CONFIG_USB_ALIGN_SIZE - 1)) {
- align_buf = (uint8_t *)k_aligned_alloc(CONFIG_USB_ALIGN_SIZE, count * active_msc_class->blocksize);
+ align_buf = (uint8_t *)k_aligned_alloc(CONFIG_USB_ALIGN_SIZE, count * ctx->msc_class->blocksize);
if (!align_buf) {
printf("msc get align buf failed\r\n");
return -ENOMEM;
}
- usb_memcpy(align_buf, buff, count * active_msc_class->blocksize);
+ usb_memcpy(align_buf, buff, count * ctx->msc_class->blocksize);
}
#endif
- if (usbh_msc_scsi_write10(active_msc_class, sector, align_buf, count) < 0) {
+ if (usbh_msc_scsi_write10(ctx->msc_class, sector, align_buf, count) < 0) {
ret = -EIO;
} else {
ret = 0;
@@ -95,14 +132,22 @@ static int disk_msc_access_write(struct disk_info *disk, const uint8_t *buff,
static int disk_msc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buff)
{
+ struct usbh_msc_disk_context *ctx = disk_msc_context(disk);
+
switch (cmd) {
case DISK_IOCTL_CTRL_SYNC:
break;
case DISK_IOCTL_GET_SECTOR_COUNT:
- *(uint32_t *)buff = active_msc_class->blocknum;
+ if (!disk_msc_connected(ctx->msc_class)) {
+ return -ENODEV;
+ }
+ *(uint32_t *)buff = ctx->msc_class->blocknum;
break;
case DISK_IOCTL_GET_SECTOR_SIZE:
- *(uint32_t *)buff = active_msc_class->blocksize;
+ if (!disk_msc_connected(ctx->msc_class)) {
+ return -ENODEV;
+ }
+ *(uint32_t *)buff = ctx->msc_class->blocksize;
break;
case DISK_IOCTL_GET_ERASE_BLOCK_SZ:
*(uint32_t *)buff = 1U;
@@ -126,17 +171,56 @@ static const struct disk_operations msc_disk_ops = {
.ioctl = disk_msc_access_ioctl,
};
-static struct disk_info usbh_msc_disk = {
- .name = "USB",
- .ops = &msc_disk_ops,
-};
+__WEAK void usbh_msc_app_run(struct usbh_msc *msc_class)
+{
+ (void)msc_class;
+}
+
+__WEAK void usbh_msc_app_stop(struct usbh_msc *msc_class)
+{
+ (void)msc_class;
+}
void usbh_msc_run(struct usbh_msc *msc_class)
{
- disk_access_register(&usbh_msc_disk);
+ uint8_t index;
+ struct usbh_msc_disk_context *ctx;
+
+ if (msc_class == NULL || msc_class->sdchar < 'a' ||
+ msc_class->sdchar >= 'a' + CONFIG_USBHOST_MAX_MSC_CLASS) {
+ return;
+ }
+
+ index = msc_class->sdchar - 'a';
+ ctx = &msc_disk_context[index];
+ memset(ctx, 0, sizeof(*ctx));
+ snprintf(ctx->name, sizeof(ctx->name), "USB%u", index);
+ snprintf(ctx->devname, sizeof(ctx->devname), "/dev/sd%c", msc_class->sdchar);
+ ctx->msc_class = msc_class;
+ ctx->disk.name = ctx->name;
+ ctx->disk.ops = &msc_disk_ops;
+
+ if (disk_access_register(&ctx->disk) < 0) {
+ return;
+ }
+
+ usbh_msc_app_run(msc_class);
}
void usbh_msc_stop(struct usbh_msc *msc_class)
{
- disk_access_unregister(&usbh_msc_disk);
-} \ No newline at end of file
+ uint8_t index;
+ struct usbh_msc_disk_context *ctx;
+
+ usbh_msc_app_stop(msc_class);
+
+ if (msc_class == NULL || msc_class->sdchar < 'a' ||
+ msc_class->sdchar >= 'a' + CONFIG_USBHOST_MAX_MSC_CLASS) {
+ return;
+ }
+
+ index = msc_class->sdchar - 'a';
+ ctx = &msc_disk_context[index];
+ disk_access_unregister(&ctx->disk);
+ ctx->msc_class = NULL;
+}
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-01 00:14:32 +0000