system/cdcacm: Support sercon and serdis in CONFIG_BUILD_KERNEL

- Put sercon and serdis in separate source files, so that the main
functions can be compiled in also in kernel build.
- Don't store the ttyacm handle in the application, it is stored
in kernel side in case of the system_cdcacm

Signed-off-by: Jukka Laitinen <[email protected]>

Author: jlaitine

system/cdcacm/CMakeLists.txt

@@ -21,7 +21,6 @@
 # ##############################################################################
 
 if(CONFIG_SYSTEM_CDCACM)
-  nuttx_add_application(NAME sercon SRCS cdcacm_main.c)
-
-  nuttx_add_application(NAME serdis)
+  nuttx_add_application(NAME sercon SRCS sercon_main.c)
+  nuttx_add_application(NAME serdis SRCS serdis_main.c)
 endif()

system/cdcacm/Makefile

@@ -24,7 +24,7 @@ include $(APPDIR)/Make.defs
 
 # USB CDC/ACM serial mass storage add-on
 
-MAINSRC = cdcacm_main.c
+MAINSRC = sercon_main.c serdis_main.c
 
 PROGNAME = sercon serdis
 PRIORITY = SCHED_PRIORITY_DEFAULT

system/cdcacm/cdcacm.h

@@ -93,24 +93,6 @@
 #define TRACE_BITSET            (TRACE_INIT_BITS|TRACE_ERROR_BITS|TRACE_CLASS_BITS|\
                                  TRACE_TRANSFER_BITS|TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS)
 
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/* All global variables used by this add-on are packed into a structure in
- * order to avoid name collisions.
- */
-
-struct cdcacm_state_s
-{
-  /* This is the handle that references to this particular USB CDC/ACM driver
-   * instance. The value of the driver handle must be remembered between the
-   * 'sercon' and 'msdis' commands.
-   */
-
-  FAR void *handle;
-};
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/

system/cdcacm/cdcacm_main.c renamed to system/cdcacm/sercon_main.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/system/cdcacm/cdcacm_main.c
+ * apps/system/cdcacm/sercon_main.c
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -37,16 +37,6 @@
 
 #include "cdcacm.h"
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/* All global variables used by this add-on are packed into a structure in
- * order to avoid name collisions.
- */
-
-static struct cdcacm_state_s g_cdcacm;
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -64,16 +54,6 @@ int main(int argc, FAR char *argv[])
   struct boardioc_usbdev_ctrl_s ctrl;
   int ret;
 
-  /* Check if there is a non-NULL USB mass storage device handle
-   * (meaning that the USB mass storage device is already configured).
-   */
-
-  if (g_cdcacm.handle)
-    {
-      printf("sercon:: ERROR: Already connected\n");
-      return EXIT_FAILURE;
-    }
-
   /* Then, in any event, enable trace data collection as configured BEFORE
    * enabling the CDC/ACM device.
    */
@@ -87,7 +67,7 @@ int main(int argc, FAR char *argv[])
   ctrl.usbdev   = BOARDIOC_USBDEV_CDCACM;
   ctrl.action   = BOARDIOC_USBDEV_CONNECT;
   ctrl.instance = CONFIG_SYSTEM_CDCACM_DEVMINOR;
-  ctrl.handle   = &g_cdcacm.handle;
+  ctrl.handle   = NULL;
 
   ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
   if (ret < 0)
@@ -100,44 +80,3 @@ int main(int argc, FAR char *argv[])
   printf("sercon: Successfully registered the CDC/ACM serial driver\n");
   return EXIT_SUCCESS;
 }
-
-/****************************************************************************
- * serdis_main
- *
- * Description:
- *   This is a program entry point that will disconnect the CDC/ACM serial
- *   device.
- ****************************************************************************/
-
-int serdis_main(int argc, char *argv[])
-{
-  struct boardioc_usbdev_ctrl_s ctrl;
-
-  /* First check if the USB mass storage device is already connected */
-
-  if (!g_cdcacm.handle)
-    {
-      printf("serdis: ERROR: Not connected\n");
-      return EXIT_FAILURE;
-    }
-
-  /* Then, in any event, disable trace data collection as configured BEFORE
-   * enabling the CDC/ACM device.
-   */
-
-  usbtrace_enable(0);
-
-  /* Then disconnect the device and uninitialize the USB mass storage
-   * driver
-   */
-
-  ctrl.usbdev   = BOARDIOC_USBDEV_CDCACM;
-  ctrl.action   = BOARDIOC_USBDEV_DISCONNECT;
-  ctrl.instance = CONFIG_SYSTEM_CDCACM_DEVMINOR;
-  ctrl.handle   = &g_cdcacm.handle;
-
-  boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
-  g_cdcacm.handle = NULL;
-  printf("serdis: Disconnected\n");
-  return EXIT_SUCCESS;
-}

system/cdcacm/serdis_main.c

@@ -0,0 +1,82 @@
+/****************************************************************************
+ * apps/system/cdcacm/serdis_main.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <sys/boardctl.h>
+
+#include <stdio.h>
+#include <debug.h>
+
+#include <nuttx/usb/usbdev.h>
+#include <nuttx/usb/cdcacm.h>
+
+#include "cdcacm.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * serdis_main
+ *
+ * Description:
+ *   This is a program entry point that will disconnect the CDC/ACM serial
+ *   device.
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  struct boardioc_usbdev_ctrl_s ctrl;
+  int ret;
+
+  /* Disable trace data collection as configured before disabling the
+   * CDC/ACM device.
+   */
+
+  usbtrace_enable(0);
+
+  /* Then disconnect the device and uninitialize the USB mass storage
+   * driver
+   */
+
+  ctrl.usbdev   = BOARDIOC_USBDEV_CDCACM;
+  ctrl.action   = BOARDIOC_USBDEV_DISCONNECT;
+  ctrl.instance = CONFIG_SYSTEM_CDCACM_DEVMINOR;
+  ctrl.handle   = NULL;
+
+  ret = boardctl(BOARDIOC_USBDEV_CONTROL, (uintptr_t)&ctrl);
+  if (ret < 0)
+    {
+      printf("serdis: ERROR: "
+             "Failed to disconnect the CDC/ACM serial device: %d\n", -ret);
+      return EXIT_FAILURE;
+    }
+
+  printf("serdis: Disconnected\n");
+  return EXIT_SUCCESS;
+}