Merge branch 'RT-Thread:master' into master

Author: illustriousness

MAINTAINERS

@@ -61,6 +61,10 @@ tag: libc
 path: components/libc
 owners: Meco Jianting Man(mysterywolf)<[email protected]>
 
+tag: rvlibcpu
+path: libcpu/risc-v
+owners: Shun Wang(Yaochenger)<[email protected]>
+
 tag: serial_v2
 path: components/drivers/serial/dev_serial_v2.c
 path: components/drivers/include/drivers/dev_serial_v2.h

components/drivers/clk/clk.c

@@ -14,10 +14,9 @@
 #include <rtdevice.h>
 
 /**
- * @addtogroup group_Drivers RTTHREAD Driver
- * @defgroup group_clk clk
+ * @defgroup    group_clk clk
  * @brief       clk driver api
- * @ingroup group_Drivers
+ * @ingroup     group_device_driver
  * @addtogroup  group_clk
  * @{
  */

components/drivers/include/drivers/adc.h

@@ -15,10 +15,10 @@
 
 #include <rtthread.h>
 /**
- * @addtogroup group_Drivers RTTHREAD Driver
- * @defgroup group_ADC ADC
- *
+ * @defgroup    group_ADC ADC
  * @brief       ADC driver api
+ * @ingroup     group_device_driver
+ *
  *
  * <b>Example</b>
  * @code {.c}
@@ -56,8 +56,6 @@
  * MSH_CMD_EXPORT(adc_vol_sample, adc voltage convert sample);
  *
  * @endcode
- *
- * @ingroup group_Drivers
  */
 
 

components/drivers/include/drivers/blk.h

@@ -17,10 +17,9 @@
 #include <drivers/classes/block.h>
 
 /**
- * @addtogroup group_Drivers RTTHREAD Driver
- * @defgroup group_blk blk
+ * @defgroup    group_blk blk
  * @brief       blk driver api
- * @ingroup group_Drivers
+ * @ingroup     group_device_driver
  * @addtogroup  group_blk
  * @{
  */

components/drivers/include/drivers/clk.h

@@ -18,10 +18,9 @@
 #include <drivers/ofw.h>
 
 /**
- * @addtogroup group_Drivers RTTHREAD Driver
- * @defgroup group_clk clk
+ * @defgroup    group_clk clk
  * @brief       clk driver api
- * @ingroup group_Drivers
+ * @ingroup     group_device_driver
  * @addtogroup  group_clk
  * @{
  */

components/drivers/include/drivers/dac.h

@@ -12,10 +12,9 @@
 #define __DAC_H__
 #include <rtthread.h>
 /**
- * @addtogroup group_Drivers RTTHREAD Driver
- * @defgroup group_DAC DAC
- *
+ * @defgroup    group_DAC DAC
  * @brief       DAC driver api
+ * @ingroup     group_device_driver
  *
  * <b>Example</b>
  * @code {.c}
@@ -59,8 +58,6 @@
  * MSH_CMD_EXPORT(dac_vol_sample, dac voltage convert sample);
  *
  * @endcode
- *
- * @ingroup group_Drivers
  */
 
 /*!

components/drivers/include/drivers/dev_audio.h

@@ -16,11 +16,9 @@
 #include "dev_audio_pipe.h"
 
 /**
- * @defgroup group_Audio Audio
- *
- * @ingroup group_Drivers RT-Thread Drivers
- *
- * @brief Audio driver API.
+ * @defgroup    group_Audio Audio
+ * @brief       Audio driver API.
+ * @ingroup     group_device_driver
  *
  * @{
  */

components/drivers/include/drivers/dev_can.h

@@ -64,10 +64,9 @@ enum CANBAUD
 #define RT_CAN_MODE_NOPRIV              0x00
 
 /**
- * @addtogroup group_Drivers RTTHREAD Driver
- * @defgroup group_CAN_Device CAN Driver
- *
+ * @defgroup    group_CAN_Device CAN Driver
  * @brief       CAN driver api
+ * @ingroup     group_device_driver
  *
  * <b>Example</b>
  * @code {.c}
@@ -198,9 +197,6 @@ enum CANBAUD
  * // 导出到 msh 命令列表中
  * MSH_CMD_EXPORT(can_sample, can device sample);
  * @endcode
- *
- * @ingroup group_Drivers
- *
  */
 
 

components/drivers/include/drivers/dev_i2c.h

@@ -14,10 +14,9 @@
 
 #include <rtthread.h>
 /**
- * @addtogroup group_Drivers RTTHREAD Driver
- * @defgroup group_I2C I2C
- *
+ * @defgroup    group_I2C I2C
  * @brief       I2C driver api
+ * @ingroup     group_device_driver
  *
  * <b>Example</b>
  * @code {.c}
@@ -168,8 +167,6 @@
  * // 导出到 msh 命令列表中
  * MSH_CMD_EXPORT(i2c_aht10_sample, i2c aht10 sample);
  * @endcode
- *
- * @ingroup group_Drivers
  */
 
 /*!

components/drivers/include/drivers/dev_pin.h

@@ -15,10 +15,9 @@
 #include <rtthread.h>
 
 /**
- * @addtogroup group_Drivers RTTHREAD Driver
- * @defgroup group_Pin Pin
- *
+ * @defgroup    group_Pin Pin
  * @brief       Pin driver api
+ * @ingroup     group_device_driver
  *
  * <b>Example</b>
  * @code {.c}
@@ -67,8 +66,6 @@
  *
  * MSH_CMD_EXPORT(pin_beep_sample, pin beep sample);
  * @endcode
- *
- * @ingroup group_Drivers
  */
 
 /*!