sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/nxscope: add support for CDCACM dev

Browse Source
This commit is contained in:
raiden00pl 2023-02-07 14:14:56 +01:00 committed by Xiang Xiao
parent 3fd4ea8587
commit bcd721b627
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/nxscope/Kconfig
View File

@ -34,6 +34,11 @@ config EXAMPLES_NXSCOPE_SERIAL_BAUD
int "nxscope serial baud" int "nxscope serial baud"
default 115200 default 115200
config EXAMPLES_NXSCOPE_CDCACM
bool "nxscope CDCACM device support"
depends on CDCACM
default n
endif # LOGGING_NXSCOPE_INTF_SERIAL endif # LOGGING_NXSCOPE_INTF_SERIAL
config EXAMPLES_NXSCOPE_FORCE_ENABLE config EXAMPLES_NXSCOPE_FORCE_ENABLE

53
examples/nxscope/nxscope_main.c
View File

@ -24,6 +24,8 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/boardctl.h>
#include <assert.h> #include <assert.h>
#include <pthread.h> #include <pthread.h>
#include <stdio.h> #include <stdio.h>
@ -237,6 +239,34 @@ static FAR void *nxscope_crichan_thr(FAR void *arg)
} }
#endif #endif
#ifdef CONFIG_EXAMPLES_NXSCOPE_CDCACM
/****************************************************************************
* Name: nxscope_cdcacm_init
****************************************************************************/
static int nxscope_cdcacm_init(void)
{
struct boardioc_usbdev_ctrl_s ctrl;
FAR void *handle;
int ret = OK;
ctrl.usbdev = BOARDIOC_USBDEV_CDCACM;
ctrl.action = BOARDIOC_USBDEV_CONNECT;
ctrl.instance = 0;
ctrl.handle = &handle;
ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
if (ret < 0)
{
printf("ERROR: BOARDIOC_USBDEV_CONTROL failed %d\n", ret);
goto errout;
}
errout:
return ret;
}
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -263,6 +293,29 @@ int main(int argc, FAR char *argv[])
struct nxscope_dummy_cfg_s nxs_dummy_cfg; struct nxscope_dummy_cfg_s nxs_dummy_cfg;
#endif #endif
#ifndef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization (if configured) */
boardctl(BOARDIOC_INIT, 0);
# ifdef CONFIG_BOARDCTL_FINALINIT
/* Perform architecture-specific final-initialization (if configured) */
boardctl(BOARDIOC_FINALINIT, 0);
# endif
#endif
#ifdef CONFIG_EXAMPLES_NXSCOPE_CDCACM
/* Initialize the USB CDCACM device */
ret = nxscope_cdcacm_init();
if (ret < 0)
{
printf("ERROR: nxscope_cdcacm_init failed %d\n", ret);
goto errout_noproto;
}
#endif
/* Default serial protocol */ /* Default serial protocol */
ret = nxscope_proto_ser_init(&proto, NULL); ret = nxscope_proto_ser_init(&proto, NULL);