Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 22:20:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

drivers/usbdev: Register the device after successful set configuration

Browse Source 
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
This commit is contained in:
dongjiuzhu1
2024-01-24 18:37:00 +08:00
committed by Xiang Xiao
parent 443306793c
commit c093514cea
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usbdev/Kconfig
+1
View File
@@ -1229,6 +1229,7 @@ endif # CDCECM
config USBDEV_FS
bool
default n
select SCHED_HPWORK
---help---
Enables USBDEV FS support, userspace can use fs to control USB device.
drivers/usbdev/usbdev_fs.c
+43 -8
View File
@@ -37,6 +37,7 @@
#include <nuttx/usb/usbdev_trace.h>
#include <nuttx/usb/composite.h>
#include <nuttx/fs/fs.h>
#include <nuttx/wqueue.h>
#include "composite.h"
#include "usbdev_fs.h"
@@ -81,6 +82,7 @@ struct usbdev_fs_dev_s
{
FAR struct composite_dev_s *cdev;
uint8_t config;
struct work_s work;
struct usbdev_devinfo_s devinfo;
FAR struct usbdev_fs_ep_s *eps;
bool uninitialized;
@@ -929,8 +931,7 @@ static void usbdev_fs_connect(FAR struct usbdev_fs_dev_s *fs, int connect)
*
****************************************************************************/
static int usbdev_fs_ep_bind(FAR const char *devname,
FAR struct usbdev_s *dev, uint8_t epno,
static int usbdev_fs_ep_bind(FAR struct usbdev_s *dev, uint8_t epno,
FAR const struct usbdev_epinfo_s *epinfo,
FAR struct usbdev_fs_ep_s *fs_ep)
{
@@ -994,8 +995,7 @@ static int usbdev_fs_ep_bind(FAR const char *devname,
}
fs_ep->crefs = 0;
return register_driver(devname, &g_usbdev_fs_fops, 0666, fs_ep);
return 0;
}
/****************************************************************************
@@ -1094,6 +1094,43 @@ static void usbdev_fs_classresetconfig(FAR struct usbdev_fs_dev_s *fs)
}
}
/****************************************************************************
* Name: usbdev_fs_register_driver
*
* Description:
* Register the driver after successful set configuration.
*
****************************************************************************/
static void usbdev_fs_register_driver(FAR void *arg)
{
FAR struct usbdev_fs_dev_s *fs = arg;
FAR struct usbdev_devinfo_s *devinfo = &fs->devinfo;
int i;
for (i = 0; i < devinfo->nendpoints; i++)
{
char devname[32];
int ret;
snprintf(devname, sizeof(devname), "%s/ep%d",
devinfo->name, i + 1);
ret = register_driver(devname, &g_usbdev_fs_fops, 0666, &fs->eps[i]);
if (ret < 0)
{
uerr("Failed to register driver:%s, ret:%d\n", devname, ret);
while (i--)
{
snprintf(devname, sizeof(devname), "%s/ep%d",
devinfo->name, i + 1);
unregister_driver(devname);
}
break;
}
}
}
/****************************************************************************
* Name: usbdev_fs_classsetconfig
*
@@ -1158,6 +1195,7 @@ static int usbdev_fs_classsetconfig(FAR struct usbdev_fs_dev_s *fs,
}
fs->config = config;
work_queue(HPWORK, &fs->work, usbdev_fs_register_driver, fs, 0);
/* We are successfully configured. Char device is now active */
@@ -1184,7 +1222,6 @@ static int usbdev_fs_classbind(FAR struct usbdevclass_driver_s *driver,
driver, FAR struct usbdev_fs_driver_s, drvr);
FAR struct usbdev_fs_dev_s *fs = &fs_drvr->dev;
FAR struct usbdev_devinfo_s *devinfo = &fs->devinfo;
char devname[32];
uint16_t i;
int ret;
@@ -1204,9 +1241,7 @@ static int usbdev_fs_classbind(FAR struct usbdevclass_driver_s *driver,
for (i = 0; i < devinfo->nendpoints; i++)
{
fs->eps[i].dev = fs;
snprintf(devname, sizeof(devname), "%s/ep%d",
devinfo->name, i + 1);
ret = usbdev_fs_ep_bind(devname, dev,
ret = usbdev_fs_ep_bind(dev,
devinfo->epno[i],
devinfo->epinfos[i],
&fs->eps[i]);