IssueID:1919:improve PWM and ADC driver framework

[Detail]
Improve PWM driver framework.
Improve ADC driver framework.
New VFS support.
Userspace support.

[Verified Cases]
Build Pass: helloworld_demo@haaseduk1
Test Pass: helloworld_demo@haaseduk1

Author: wuxn9999

components/drivers/core/base/include/aos/device.h

@@ -16,10 +16,10 @@ typedef enum {
     AOS_DEV_TYPE_WATCHDOG,
     AOS_DEV_TYPE_ETHERNET,
     AOS_DEV_TYPE_WLAN,
-    AOS_DEV_TYPE_BLOCK,
+    AOS_DEV_TYPE_DISK,
+    AOS_DEV_TYPE_DISKPART,
     AOS_DEV_TYPE_FLASH,
     AOS_DEV_TYPE_FLASHPART,
-    AOS_DEV_TYPE_MTD,
     AOS_DEV_TYPE_RTC,
     AOS_DEV_TYPE_SPI,
     AOS_DEV_TYPE_I2C,

components/drivers/core/base/include/aos/device_core.h

@@ -8,29 +8,22 @@
 #include <aos/kernel.h>
 #include <aos/list.h>
 #include <k_rbtree.h>
+#include <aos/device.h>
+#ifdef AOS_COMP_DEVFS
+#include <aos/devfs.h>
+#endif
+#if defined(CONFIG_DRV_CORE) && CONFIG_DRV_CORE != 0
 #include <drivers/u_ld.h>
-#ifdef AOS_COMP_VFS
-#include <aos/vfs.h>
 #endif
-#include <aos/device.h>
 
 struct aos_dev_ops;
 
-#ifdef AOS_COMP_VFS
-#define AOS_DEV_NAME_MAX_LEN    63
-
-typedef struct {
-    char name[AOS_DEV_NAME_MAX_LEN + 1];
-    const struct file_ops *ops;
-} aos_dev_vfs_helper_t;
-#endif
-
 typedef struct aos_dev {
     aos_dev_type_t type;
     uint32_t id;
     const struct aos_dev_ops *ops;
-#ifdef AOS_COMP_VFS
-    aos_dev_vfs_helper_t vfs_helper;
+#ifdef AOS_COMP_DEVFS
+    aos_devfs_node_t devfs_node;
 #endif
     struct k_rbtree_node_t rb_node;
     aos_sem_t rb_sem;
@@ -53,6 +46,9 @@ typedef struct aos_dev_ops {
 extern "C" {
 #endif
 
+#if !(defined(CONFIG_DRV_CORE) && CONFIG_DRV_CORE != 0)
+aos_status_t aos_dev_core_init(void);
+#endif
 aos_status_t aos_dev_register(aos_dev_t *dev);
 aos_status_t aos_dev_unregister(aos_dev_type_t type, uint32_t id);
 aos_status_t aos_dev_ref(aos_dev_ref_t *ref, aos_dev_t *dev);

components/drivers/core/base/src/device.c

@@ -2,7 +2,6 @@
  * Copyright (C) 2020-2021 Alibaba Group Holding Limited
  */
 
-#include <string.h>
 #include <aos/device_core.h>
 
 #define REF_COUNT_PENDING       UINT32_MAX
@@ -11,6 +10,24 @@
 static struct k_rbtree_root_t device_map = RBT_ROOT;
 static aos_mutex_t device_map_mutex;
 
+static aos_status_t device_core_init(void)
+{
+    return aos_mutex_new(&device_map_mutex);
+}
+
+#if defined(CONFIG_DRV_CORE) && CONFIG_DRV_CORE != 0
+static int dev_core_init(void)
+{
+    return (int)device_core_init();
+}
+CORE_DRIVER_ENTRY(dev_core_init)
+#else
+aos_status_t aos_dev_core_init(void)
+{
+    return device_core_init();
+}
+#endif
+
 static void device_map_lock(void)
 {
     (void)aos_mutex_lock(&device_map_mutex, AOS_WAIT_FOREVER);
@@ -96,37 +113,6 @@ static void remove_device(aos_dev_t *dev)
     k_rbtree_erase(&dev->rb_node, &device_map);
 }
 
-#ifdef AOS_COMP_VFS
-static aos_status_t add_to_vfs(aos_dev_t *dev)
-{
-    const char prefix[] = "/dev/";
-    char path[sizeof(prefix) - 1 + sizeof(dev->vfs_helper.name)];
-
-    if (dev->vfs_helper.name[0] == '\0' || !dev->vfs_helper.ops)
-        return 0;
-
-    memcpy(path, prefix, sizeof(prefix) - 1);
-    strncpy(&path[sizeof(prefix) - 1], dev->vfs_helper.name, sizeof(dev->vfs_helper.name) - 1);
-    path[sizeof(path) - 1] = '\0';
-
-    return aos_register_driver(path, dev->vfs_helper.ops, dev);
-}
-
-static void remove_from_vfs(aos_dev_t *dev)
-{
-    const char prefix[] = "/dev/";
-    char path[sizeof(prefix) - 1 + sizeof(dev->vfs_helper.name)];
-
-    if (dev->vfs_helper.name[0] == '\0' || !dev->vfs_helper.ops)
-        return;
-
-    memcpy(path, prefix, sizeof(prefix) - 1);
-    strncpy(&path[sizeof(prefix) - 1], dev->vfs_helper.name, sizeof(dev->vfs_helper.name) - 1);
-    path[sizeof(path) - 1] = '\0';
-    (void)aos_unregister_driver(path);
-}
-#endif /* AOS_COMP_VFS */
-
 aos_status_t aos_dev_register(aos_dev_t *dev)
 {
     aos_status_t ret;
@@ -157,15 +143,17 @@ aos_status_t aos_dev_register(aos_dev_t *dev)
     insert_device(dev);
     device_map_unlock();
 
-#ifdef AOS_COMP_VFS
-    ret = add_to_vfs(dev);
-    if (ret) {
-        device_map_lock();
-        remove_device(dev);
-        device_map_unlock();
-        aos_mutex_free(&dev->mutex);
-        aos_sem_free(&dev->rb_sem);
-        return ret;
+#ifdef AOS_COMP_DEVFS
+    if (aos_devfs_node_is_valid(&dev->devfs_node)) {
+        ret = aos_devfs_add_node(&dev->devfs_node);
+        if (ret) {
+            device_map_lock();
+            remove_device(dev);
+            device_map_unlock();
+            aos_mutex_free(&dev->mutex);
+            aos_sem_free(&dev->rb_sem);
+            return ret;
+        }
     }
 #endif
 
@@ -179,7 +167,6 @@ aos_status_t aos_dev_register(aos_dev_t *dev)
 aos_status_t aos_dev_unregister(aos_dev_type_t type, uint32_t id)
 {
     aos_dev_t *dev;
-    aos_status_t ret;
 
     device_map_lock();
     dev = find_device(type, id);
@@ -206,8 +193,9 @@ aos_status_t aos_dev_unregister(aos_dev_type_t type, uint32_t id)
 
     aos_dev_unlock(dev);
     device_allow_removal(dev);
-#ifdef AOS_COMP_VFS
-    remove_from_vfs(dev);
+#ifdef AOS_COMP_DEVFS
+    if (aos_devfs_node_is_valid(&dev->devfs_node))
+        (void)aos_devfs_remove_node(&dev->devfs_node);
 #endif
     device_map_lock();
     device_wait_removal(dev);
@@ -302,10 +290,3 @@ void aos_dev_put(aos_dev_ref_t *ref)
     aos_dev_unlock(ref->dev);
     aos_dev_ref_init(ref);
 }
-
-static int device_core_init(void)
-{
-    return (int)aos_mutex_new(&device_map_mutex);
-}
-
-CORE_DRIVER_ENTRY(device_core_init)

components/drivers/peripheral/adc/include/aos/adc.h

@@ -2,39 +2,61 @@
  * Copyright (C) 2021 Alibaba Group Holding Limited
  */
 
-#ifndef _AOS_ADC_H
-#define _AOS_ADC_H
+#ifndef AOS_ADC_H
+#define AOS_ADC_H
 
-#include <stdint.h>
-#include <aos/kernel.h>
+#ifdef AOS_KERNEL_BUILD
 #include <aos/device.h>
-
-#ifdef __cplusplus
-extern "C" {
+#else
+#include <stdint.h>
 #endif
 
-/** @defgroup driver_api driver
- *  @ingroup aos_components
- * @{
- */
-
-/** @} */
-
 /**
- * @defgroup aos_adc_app ADC
+ * @defgroup adc_api ADC
  * @ingroup driver_api
- * 给应用提供ADC操作的AOS API.
- *
+ * @brief AOS API for ADC.
  * @{
  */
 
-typedef aos_dev_ref_t aos_adc_ref_t;  /**< ADC设备的引用 */
-
 typedef enum {
     AOS_ADC_MODE_SINGLE,   /**< 单次采样模式 */
     AOS_ADC_MODE_CONTINUE, /**< 连续采样模式 */
 } aos_adc_mode_t;
 
+#if (defined(AOS_KERNEL_BUILD) && defined(AOS_COMP_DEVFS)) || !defined(AOS_KERNEL_BUILD)
+
+typedef struct {
+    int32_t channel;
+    uint32_t time;
+} aos_adc_set_sample_time_args_t;
+
+typedef struct {
+    int32_t channel;
+    uint32_t range;
+} aos_adc_get_range_args_t;
+
+typedef struct {
+    int32_t channel;
+    int32_t data;
+} aos_adc_read_args_t;
+
+#define AOS_ADC_IOC_SET_SAMPLE_TIME     0x4101
+#define AOS_ADC_IOC_SET_MODE            0x4102
+#define AOS_ADC_IOC_GET_RESOLUTION      0x4103
+#define AOS_ADC_IOC_GET_RANGE           0x4104
+#define AOS_ADC_IOC_READ                0x4105
+#define AOS_ADC_IOC_READ_VOLTAGE        0x4106
+
+#endif /* (defined(AOS_KERNEL_BUILD) && defined(AOS_COMP_DEVFS)) || !defined(AOS_KERNEL_BUILD) */
+
+#ifdef AOS_KERNEL_BUILD
+
+typedef aos_dev_ref_t aos_adc_ref_t;  /**< ADC设备的引用 */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * 获取一个ADC设备的引用
  *
@@ -120,9 +142,12 @@ aos_status_t aos_adc_read(aos_adc_ref_t *ref, int32_t channel, int32_t *data);
  */
 aos_status_t aos_adc_read_voltage(aos_adc_ref_t *ref, int32_t channel, int32_t *data);
 
-/** @} */
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _AOS_ADC_H */
+#endif /* AOS_KERNEL_BUILD */
+
+/** @} */
+
+#endif /* AOS_ADC_H */

components/drivers/peripheral/adc/include/aos/adc_core.h

@@ -2,11 +2,9 @@
  * Copyright (C) 2021 Alibaba Group Holding Limited
  */
 
-#ifndef _AOS_ADC_CORE_H
-#define _AOS_ADC_CORE_H
+#ifndef AOS_ADC_CORE_H
+#define AOS_ADC_CORE_H
 
-#include <stdint.h>
-#include <aos/kernel.h>
 #include <aos/device_core.h>
 #include <aos/adc.h>
 
@@ -84,4 +82,4 @@ aos_status_t aos_adc_unregister(uint32_t id);
 }
 #endif
 
-#endif /* _AOS_ADC_CORE_H */
+#endif /* AOS_ADC_CORE_H */

components/drivers/peripheral/adc/package.yaml

@@ -1,13 +1,12 @@
-
 ## 第一部分： 基础信息
 name: adc                                           # <必选项> 包名称 （符合C语言变量命名规则），长度少于等于64字节
-version: master                                    # <必选项> 组件版本号
-description: ADC 通用驱动                           # <必选项> 建议至少20字以上
+version: master                                     # <必选项> 组件版本号
+description: ADC通用驱动                            # <必选项> 建议至少20字以上
 type: common                                        # <必选项> 组件类型，为：solution, chip, board, common, sdk
 
 tag: 第三方驱动                                     # <可选项> 组件分类，缺省值： ''
 keywords:                                           # <可选项> 标签，会影响到组件被搜索的效果，合理的标签很重要
-  - adc core and vfs driver
+  - adc driver
 license: Apache license v2.0                        # <可选项> 源代码的许可证，要确保所有代码、文件的许可证不冲突。如：MIT，Apache license v2.0，BSD
 
 ## 第二部分：依赖信息
@@ -18,7 +17,7 @@ license: Apache license v2.0                        # <可选项> 源代码的
 #   - aos: >=v7.2.0
 depends:
   - base: master
-  - vfs: master
+  - csi: master ? <AOS_CONFIG_ADC_CSI>
 
 ## 第四部分：编译连接信息
 # build_config:                            # <可选项> 编译配置项
@@ -47,29 +46,26 @@ build_config:
 # source_file:                             # <可选项> 指定参与编译的源代码文件，支持通配符，采用相对路径
 #   - src/*.c                              # 例：组件 src 目录下所有的扩展名为 c 的源代码文件
 source_file:
-
-# ADC
-  - src/adc_dev.c ? <CONFIG_U_ADC_DEV>
-  - src/adc.c ? <CONFIG_U_ADC_CORE>
-  - src/adc_csi.c ? <CONFIG_U_ADC_CORE>
+  - src/adc.c
+  - src/adc_csi.c ? <AOS_CONFIG_ADC_CSI>
 
 ## 第五部分：配置信息
 # def_config:                              # 组件的可配置项
 #   CONFIG_DEBUG: y
 #   CONFIG_PARAM_NOT_CHECK: y
 #   CONFIG_CLI: y
 def_config:
-  CONFIG_U_ADC_DEV: 1                      # ADC device node named witch "/dev/adc[x]"
-  CONFIG_U_ADC_CORE: 0                     # ADC subsys AOS API driver
+  AOS_COMP_ADC: 1
 
 ## 第六部分：安装信息
 # install:
 #   - dest: include/                       # 安装的目的路径 dest是相当路径，通常是相对于YoC SDK 安装目录
 #     source:                              # 安装源列表
 #      - src/*.h                           # 支持通配符，相对路径
 install:
-  - dest: "include/devices"
+  - dest: "include/aos"
     source:
+      - "include/aos/adc.h"
 
 ## 第七部分：导出部分
 # export: