From e414cb459d5f0410376ef3fea35809e47df252a3 Mon Sep 17 00:00:00 2001 From: tyx <462747508@qq.com> Date: Sun, 17 Apr 2022 22:04:42 +0800 Subject: [PATCH] [components][drivers] Update device type definition and command definition --- components/drivers/hwcrypto/hwcrypto.c | 2 +- components/drivers/include/drivers/adc.h | 4 ++-- components/drivers/include/drivers/audio.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/drivers/hwcrypto/hwcrypto.c b/components/drivers/hwcrypto/hwcrypto.c index 473b52fb9a..3806298f90 100644 --- a/components/drivers/hwcrypto/hwcrypto.c +++ b/components/drivers/hwcrypto/hwcrypto.c @@ -246,7 +246,7 @@ rt_err_t rt_hwcrypto_register(struct rt_hwcrypto_device *device, const char *nam #endif device->parent.user_data = RT_NULL; - device->parent.type = RT_Device_Class_Miscellaneous; + device->parent.type = RT_Device_Class_Security; /* Register device */ err = rt_device_register(&device->parent, name, RT_DEVICE_FLAG_RDWR); diff --git a/components/drivers/include/drivers/adc.h b/components/drivers/include/drivers/adc.h index e2ce087fb9..2ff4102a3b 100644 --- a/components/drivers/include/drivers/adc.h +++ b/components/drivers/include/drivers/adc.h @@ -29,8 +29,8 @@ typedef struct rt_adc_device *rt_adc_device_t; typedef enum { - RT_ADC_CMD_ENABLE, - RT_ADC_CMD_DISABLE, + RT_ADC_CMD_ENABLE = RT_DEVICE_CTRL_BASE(ADC) + 1, + RT_ADC_CMD_DISABLE = RT_DEVICE_CTRL_BASE(ADC) + 2, } rt_adc_cmd_t; rt_err_t rt_hw_adc_register(rt_adc_device_t adc,const char *name, const struct rt_adc_ops *ops, const void *user_data); diff --git a/components/drivers/include/drivers/audio.h b/components/drivers/include/drivers/audio.h index 45c31be2f3..d9a7388678 100644 --- a/components/drivers/include/drivers/audio.h +++ b/components/drivers/include/drivers/audio.h @@ -16,7 +16,7 @@ #include "audio_pipe.h" /* AUDIO command */ -#define _AUDIO_CTL(a) (0x10 + a) +#define _AUDIO_CTL(a) (RT_DEVICE_CTRL_BASE(Sound) + a) #define AUDIO_CTL_GETCAPS _AUDIO_CTL(1) #define AUDIO_CTL_CONFIGURE _AUDIO_CTL(2)