lby/mr-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.系统api更新。

Browse Source
This commit is contained in:
MacRsh
2023-09-08 13:15:03 +08:00
parent c044c51a82
commit 4bb7d03851
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
device/dac/dac.c
View File

@@ -22,7 +22,7 @@ static mr_err_t err_io_dac_channel_configure(mr_dac_t dac, struct mr_dac_config
return -MR_ERR_IO;
}
static void err_io_dac_write(mr_dac_t dac, mr_pos_t channel, mr_uint32_t value)
static void err_io_dac_write(mr_dac_t dac, mr_off_t channel, mr_uint32_t value)
{
}
@@ -39,7 +39,7 @@ static mr_err_t mr_dac_close(mr_device_t device)
mr_dac_t dac = (mr_dac_t)device;
/* Disable all channel */
dac->config.channel.mask = 0;
dac->config.channel._mask = 0;
return dac->ops->configure(dac, MR_DISABLE);
}
@@ -49,9 +49,9 @@ static mr_err_t mr_dac_ioctl(mr_device_t device, int cmd, void *args)
mr_dac_t dac = (mr_dac_t)device;
mr_err_t ret = MR_ERR_OK;
switch (cmd & MR_CTRL_FLAG_MASK)
switch (cmd)
{
case MR_CTRL_SET_CONFIG:
case MR_DEVICE_CTRL_SET_CONFIG:
{
if (args)
{
@@ -66,7 +66,7 @@ static mr_err_t mr_dac_ioctl(mr_device_t device, int cmd, void *args)
return -MR_ERR_INVALID;
}
case MR_CTRL_GET_CONFIG:
case MR_DEVICE_CTRL_GET_CONFIG:
{
if (args)
{
@@ -82,7 +82,7 @@ static mr_err_t mr_dac_ioctl(mr_device_t device, int cmd, void *args)
}
}
static mr_ssize_t mr_dac_write(mr_device_t device, mr_pos_t pos, const void *buffer, mr_size_t size)
static mr_ssize_t mr_dac_write(mr_device_t device, mr_off_t pos, const void *buffer, mr_size_t size)
{
mr_dac_t dac = (mr_dac_t)device;
mr_uint32_t *write_buffer = (mr_uint32_t *)buffer;
@@ -123,7 +123,7 @@ mr_err_t mr_dac_device_add(mr_dac_t dac, const char *name, struct mr_dac_ops *op
MR_ASSERT(ops != MR_NULL);
/* Initialize the private fields */
dac->config.channel.mask = 0;
dac->config.channel._mask = 0;
/* Protect every operation of the dac device */
ops->configure = ops->configure ? ops->configure : err_io_dac_configure;
@@ -132,7 +132,7 @@ mr_err_t mr_dac_device_add(mr_dac_t dac, const char *name, struct mr_dac_ops *op
dac->ops = ops;
/* Add the device */
return mr_device_add(&dac->device, name, Mr_Device_Type_DAC, MR_OPEN_WRONLY, &device_ops, data);
return mr_device_add(&dac->device, name, Mr_Device_Type_DAC, MR_DEVICE_OPEN_FLAG_WRONLY, &device_ops, data);
}
#endif

12
device/dac/dac.h
View File

@@ -11,7 +11,11 @@
#ifndef _DAC_H_
#define _DAC_H_
#include "mrlib.h"
#include "mrapi.h"
#ifdef __cplusplus
extern "C" {
#endif
#if (MR_CFG_DAC == MR_CFG_ENABLE)
@@ -33,7 +37,7 @@ struct mr_dac_ops
{
mr_err_t (*configure)(mr_dac_t dac, mr_state_t state);
mr_err_t (*channel_configure)(mr_dac_t dac, mr_dac_config_t config);
void (*write)(mr_dac_t dac, mr_pos_t channel, mr_uint32_t value);
void (*write)(mr_dac_t dac, mr_off_t channel, mr_uint32_t value);
};
/**
@@ -57,4 +61,8 @@ mr_err_t mr_dac_device_add(mr_dac_t dac, const char *name, struct mr_dac_ops *op
#endif
#ifdef __cplusplus
}
#endif
#endif /* _DAC_H_ */