easylinux/OpenTXW81X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pure sdk for main

Browse Source
This commit is contained in:
divadiow
2025-08-27 09:51:58 +01:00
parent f0d033f1c9
commit 0571416e7c
3283 changed files with 1577720 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk/app/usbd_mass_speed_optimize/usbd_mass_speed_optimize.c
+358
View File
@@ -0,0 +1,358 @@
#include "sys_config.h"
#include "typesdef.h"
#include "list.h"
#include "dev.h"
#include "devid.h"
#include "osal/string.h"
#include "osal/mutex.h"
#include "osal/semaphore.h"
#include "osal/task.h"
#include "osal/msgqueue.h"
#include "osal/irq.h"
#include "osal/sleep.h"
#include "hal/gpio.h"
#include "hal/usb_device.h"
#include "lib/usb/usb_device_mass.h"
#include "usbd_mass_speed_optimize.h"
#if SDH_EN
#include "lib/sdhost/sdhost.h"
#endif
#if FLASHDISK_EN
#include "hal/spi_nor.h"
#include "flashdisk/flashdisk.h"
#endif
#if PINGPANG_BUF_EN
volatile uint32_t pingpang_flag = 0;
struct usbd_mass_speed_dev_t *g_dev = NULL;
int usbd_mass_speed_optimize_send_mq(struct usbd_mass_speed_dev_t *dev, uint32_t sector_addr, uint32_t sector_count, uint32_t read_write_flag)
{
dev->mq.read_write_flag = read_write_flag;
dev->mq.sector_addr = sector_addr;
dev->mq.sector_count = sector_count;
// os_printf("mq.read_write_flag:%d sector_addr:%x sector_count:%d\n",read_write_flag,sector_addr,sector_count);
void *ptr = os_malloc(sizeof(struct usbd_mass_speed_optimize_mq));
if (ptr) {
os_memcpy(ptr, (uint8_t *)&dev->mq, sizeof(struct usbd_mass_speed_optimize_mq));
if (os_msgq_put(dev->msgqueue, (uint32)ptr, osWaitForever)) {
os_free(ptr);
return -1;
}
return 0;
}
return -1;
}
static void usbd_mass_speed_optimize_thread(void *arg)
{
struct usbd_mass_speed_dev_t *dev = (struct usbd_mass_speed_dev_t *)arg;
struct usbd_mass_speed_optimize_mq *mq = NULL;
uint8_t *buff = NULL;
int ret = 0;
while(1)
{
void *ptr = (void *)os_msgq_get(dev->msgqueue, osWaitForever);
if(ptr){
dev->error_flag = 0;
mq = ptr;
//此处判断是否结束线程
if (mq->read_write_flag == RELEASE_FLAG)
{
dev->thread_status = 0;
os_free(ptr);
break;
}
uint32_t sec = mq->sector_count;
uint32_t lba = mq->sector_addr;
uint32_t multi_sector_en = 0;
if((sec >= MULTI_SECTOR_COUNT) && (sec % MULTI_SECTOR_COUNT == 0))
{
sec = sec / MULTI_SECTOR_COUNT;
multi_sector_en = 1;
}
//先读写一包
os_sema_down(dev->usb_sem_write, osWaitForever);//保证读和写最后一包都会起这个信号量
if(pingpang_flag)
{
buff = dev->disk->buf_1;
pingpang_flag = 0;
}
else
{
buff = dev->disk->buf_2;
pingpang_flag = 1;
}
switch (mq->read_write_flag)
{
case READ_FLAG:
if(dev->error_flag == 0)
{
if(multi_sector_en)
{
ret = dev->udisk_read(lba,MULTI_SECTOR_COUNT,buff);
}
else
{
ret = dev->udisk_read(lba,1,buff);
}
}
if(ret){
dev->error_flag = 1;
os_printf("read err!!!!!!!!!!!!\r\n");
os_sema_up(dev->sem);
goto __exit_err;
}
os_sema_up(dev->sem); //读：sd线程接收到mq后，就开始读一包，读完起信号量通知usb发送，usb发送前起信号量告诉sd线程先开始接收下一包
break;
case WRITE_FLAG:
os_sema_up(dev->sem); //写：usb读了一包后，获取到mq后开始写卡线程，sd卡写卡前起信号量通知usb开始读下一包
if(dev->error_flag == 0)
{
os_printf("sector write\n");
if(multi_sector_en)
{
ret = dev->udisk_write(lba,MULTI_SECTOR_COUNT,buff);
}
else
{
ret = dev->udisk_write(lba,1,buff);
}
}
if(ret){
dev->error_flag = 1;
os_printf("write err!!!!!!!!!!!!\r\n");
}
break;
default:
break;
}
if(multi_sector_en)
{
lba+=MULTI_SECTOR_COUNT;
}
else
{
lba++;
}
sec--;
//读：紧接着开始读第二包，切换pingpang buff，利用usb正在同步发送的时间进行读sd卡
//写：usb读完下一包后，起信号量通知sd线程继续写卡，利用sd写卡的时间进行usb同步接收
while(sec--)
{
os_sema_down(dev->usb_sem_write, osWaitForever);
if(pingpang_flag)
{
buff = dev->disk->buf_1;
pingpang_flag = 0;
}
else
{
buff = dev->disk->buf_2;
pingpang_flag = 1;
}
switch (mq->read_write_flag)
{
case READ_FLAG:
if(dev->error_flag == 0)
{
if(multi_sector_en)
{
ret = dev->udisk_read(lba,MULTI_SECTOR_COUNT,buff);
}
else
{
ret = dev->udisk_read(lba,1,buff);
}
}
if(ret){
dev->error_flag = 1;
os_printf("read err!!!!!!!!!!!!\r\n");
os_sema_up(dev->sem);
goto __exit_err;
}
os_sema_up(dev->sem);
break;
case WRITE_FLAG:
os_sema_up(dev->sem);
if(dev->error_flag == 0)
{
os_printf("sector write\n");
if(multi_sector_en)
{
ret = dev->udisk_write(lba,MULTI_SECTOR_COUNT,buff);
}
else
{
ret = dev->udisk_write(lba,1,buff);
}
}
if(ret){
dev->error_flag = 1;
os_printf("write err!!!!!!!!!!!!\r\n");
}
break;
default:
break;
}
if(multi_sector_en)
{
lba+=MULTI_SECTOR_COUNT;
}
else
{
lba++;
}
}
__exit_err:
os_free(ptr);
}
}
}
void* usbd_mass_speed_optimize_thread_init(void *arg)
{
struct usbd_mass_speed_info *disk = (struct usbd_mass_speed_info *)arg;
struct usbd_mass_speed_dev_t *dev = os_zalloc(sizeof(struct usbd_mass_speed_dev_t));
if(dev == NULL)
{
os_printf("usbd_mass_speed_optimize_thread_init malloc fail\n");
return 0;
}
dev->msgqueue = os_malloc(sizeof(struct os_msgqueue));
if(dev->msgqueue == NULL)
{
os_printf("usbd_mass_speed_optimize_thread_init msgqueue malloc fail\n");
return 0;
}
dev->sem = os_malloc(sizeof(struct os_semaphore));
if(dev->sem == NULL)
{
os_printf("usbd_mass_speed_optimize_thread_init sem malloc fail\n");
return 0;
}
dev->usb_sem_write = os_malloc(sizeof(struct os_semaphore));
if(dev->usb_sem_write == NULL)
{
os_printf("usbd_mass_speed_optimize_thread_init usb_sem_write malloc fail\n");
return 0;
}
dev->disk = disk;
dev->error_flag = 0;
dev->thread_status = 1;
#if USBDISK == 1
//暂时仅支持旧架构sd u盘的读写速度优化
dev->udisk_read = usb_sd_scsi_read;
dev->udisk_write = usb_sd_scsi_write;
#elif USBDISK == 2
dev->udisk_read = flashdisk_usb_read;
dev->udisk_write = flashdisk_usb_write;
#endif
g_dev = dev;
#if USB_IO_TEST_TIME
gpio_set_dir(PA_1, GPIO_DIR_OUTPUT);
gpio_set_dir(PA_2,GPIO_DIR_OUTPUT);
gpio_set_val(PA_1, 0);
gpio_set_val(PA_2, 0);
#endif
os_sema_init(dev->sem, 0);
os_sema_init(dev->usb_sem_write, 1);
os_msgq_init(dev->msgqueue, 16);
OS_TASK_INIT("usbd_mass_speed_optimize", &dev->disk->usbd_mass_speed_task, usbd_mass_speed_optimize_thread, (void *)dev, OS_TASK_PRIORITY_HIGH-1, 1024);
return (void *)dev;
}
void usbd_mass_speed_optimize_thread_deinit()
{
if(g_dev != NULL)
{
usbd_mass_speed_optimize_send_mq(g_dev, 0, 0, RELEASE_FLAG);
do
{
os_sleep_ms(1); //此处等待线程完成读写流程
} while (g_dev->thread_status);
if(g_dev->disk->usbd_mass_speed_task.hdl)
{
os_task_del(&g_dev->disk->usbd_mass_speed_task);
}
if(g_dev->msgqueue)
{
os_msgq_del(g_dev->msgqueue);
os_free(g_dev->msgqueue);
}
if(g_dev->sem)
{
os_sema_del(g_dev->sem);
os_free(g_dev->sem);
}
if(g_dev->usb_sem_write)
{
os_sema_del(g_dev->usb_sem_write);
os_free(g_dev->usb_sem_write);
}
os_free(g_dev);
g_dev = NULL;
#if USB_IO_TEST_TIME
gpio_set_dir(PA_1, GPIO_DIR_INPUT);
gpio_set_dir(PA_2,GPIO_DIR_INPUT);
#endif
}
}
#endif
sdk/app/usbd_mass_speed_optimize/usbd_mass_speed_optimize.h
+71
View File
@@ -0,0 +1,71 @@
#ifndef USBD_MASS_SPEED_OPTIMIZE_H
#define USBD_MASS_SPEED_OPTIMIZE_H
#include "sys_config.h"
#define PINGPANG_BUF_EN 0 //usbd mass读写速度优化线程使能
//SD : malloc sram = 512 x MULTI_SECTOR_COUNT x 2 (默认MULTI_SECTOR_COUNT = 4)
//FLASH: malloc sram = 4096 x MULTI_SECTOR_COUNT x 2 (默认MULTI_SECTOR_COUNT = 2)
#if PINGPANG_BUF_EN
#if USBDISK == 1
#define MULTI_SECTOR_COUNT 4
#elif USBDISK == 2
#define MULTI_SECTOR_COUNT 2
#endif
#else
#define MULTI_SECTOR_COUNT 1
#endif
#define USB_IO_TEST_TIME 0
#if PINGPANG_BUF_EN
enum read_write_flag
{
READ_FLAG = 0,
WRITE_FLAG,
RELEASE_FLAG,
};
typedef int (*usbd_mass_read)(uint32 lba, uint32 count, uint8* buf);
typedef int (*usbd_mass_write)(uint32 lba, uint32 count, uint8* buf);
struct usbd_mass_speed_info
{
uint8_t *buf_1;
uint8_t *buf_2;
struct os_task usbd_mass_speed_task;
};
struct usbd_mass_speed_optimize_mq
{
uint32_t read_write_flag; //0:read, 1:write, 2:delete thread
uint32_t sector_addr;
uint32_t sector_count;
};
struct usbd_mass_speed_dev_t
{
struct usbd_mass_speed_info *disk;
struct os_msgqueue *msgqueue;
struct os_semaphore *sem;
struct os_semaphore *usb_sem_write;
struct usbd_mass_speed_optimize_mq mq;
uint32_t error_flag;
uint32_t thread_status;
usbd_mass_read udisk_read;
usbd_mass_write udisk_write;
};
extern volatile uint32_t pingpang_flag;
extern struct usbd_mass_speed_dev_t *g_dev;
int usbd_mass_speed_optimize_send_mq(struct usbd_mass_speed_dev_t *dev, uint32_t sector_addr, uint32_t sector_count, uint32_t read_write_flag);
void* usbd_mass_speed_optimize_thread_init(void *arg);
void usbd_mass_speed_optimize_thread_deinit();
#endif
#endif