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-12-03 02:17:04 +08:00
parent d7a781c1dd
commit 48e8317c66
7 changed files with 44 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
device/i2c.c
View File

@@ -50,10 +50,9 @@ static ssize_t mr_i2c_bus_isr(struct mr_dev *dev, int event, void *args)
case MR_ISR_I2C_RD_INT:
{
struct mr_i2c_dev *i2c_dev = (struct mr_i2c_dev *)i2c_bus->owner;
uint8_t data = 0;
uint8_t data = ops->read(i2c_bus);
/* Read data to FIFO. if callback is set, call it */
ops->read(i2c_bus, &data, sizeof(data));
mr_ringbuf_push_force(&i2c_dev->rd_fifo, data);
if (i2c_dev->dev.rd_call.call != MR_NULL)
{
@@ -192,16 +191,30 @@ MR_INLINE ssize_t i2c_dev_read(struct mr_i2c_dev *i2c_dev, uint8_t *buf, size_t
{
struct mr_i2c_bus *i2c_bus = (struct mr_i2c_bus *)i2c_dev->dev.link;
struct mr_i2c_bus_ops *ops = (struct mr_i2c_bus_ops *)i2c_bus->dev.drv->ops;
uint8_t *rd_buf = (uint8_t *)buf;
ssize_t rd_size = 0;
return ops->read(i2c_bus, buf, size);
for (rd_size = 0; rd_size < size; rd_size += sizeof(*rd_buf))
{
*rd_buf = ops->read(i2c_bus);
rd_buf++;
}
return rd_size;
}
MR_INLINE ssize_t i2c_dev_write(struct mr_i2c_dev *i2c_dev, const uint8_t *buf, size_t size)
{
struct mr_i2c_bus *i2c_bus = (struct mr_i2c_bus *)i2c_dev->dev.link;
struct mr_i2c_bus_ops *ops = (struct mr_i2c_bus_ops *)i2c_bus->dev.drv->ops;
uint8_t *wr_buf = (uint8_t *)buf;
ssize_t wr_size = 0;
return ops->write(i2c_bus, buf, size);
for (wr_size = 0; wr_size < size; wr_size += sizeof(*wr_buf))
{
ops->write(i2c_bus, *wr_buf);
wr_buf++;
}
return wr_size;
}
static int mr_i2c_dev_open(struct mr_dev *dev)

34
device/serial.c
View File

@@ -47,38 +47,47 @@ static ssize_t mr_serial_read(struct mr_dev *dev, int off, void *buf, size_t siz
{
struct mr_serial *serial = (struct mr_serial *)dev;
struct mr_serial_ops *ops = (struct mr_serial_ops *)dev->drv->ops;
uint8_t *rd_buf = (uint8_t *)buf;
ssize_t rd_size = 0;
if (mr_ringbuf_get_bufsz(&serial->rd_fifo) == 0)
{
return ops->read(serial, buf, size);
for (rd_size = 0; rd_size < size; rd_size += sizeof(*rd_buf))
{
*rd_buf = ops->read(serial);
rd_buf++;
}
} else
{
return (ssize_t)mr_ringbuf_read(&serial->rd_fifo, buf, size);
rd_size = (ssize_t)mr_ringbuf_read(&serial->rd_fifo, buf, size);
}
return rd_size;
}
static ssize_t mr_serial_write(struct mr_dev *dev, int off, const void *buf, size_t size, int async)
{
struct mr_serial *serial = (struct mr_serial *)dev;
struct mr_serial_ops *ops = (struct mr_serial_ops *)dev->drv->ops;
uint8_t *wr_buf = (uint8_t *)buf;
ssize_t wr_size = 0;
if ((async == MR_SYNC) || (mr_ringbuf_get_bufsz(&serial->wr_fifo) == 0))
{
return ops->write(serial, buf, size);
for (wr_size = 0; wr_size < size; wr_size += sizeof(*wr_buf))
{
ops->write(serial, *wr_buf);
wr_buf++;
}
} else
{
if (mr_ringbuf_get_bufsz(&serial->wr_fifo) == 0)
wr_size = (ssize_t)mr_ringbuf_write(&serial->wr_fifo, buf, size);
if (wr_size > 0)
{
return ops->write(serial, buf, size);
} else
{
ssize_t ret = (ssize_t)mr_ringbuf_write(&serial->wr_fifo, buf, size);
/* Start interrupt sending */
ops->start_tx(serial);
return ret;
}
}
return wr_size;
}
static int mr_serial_ioctl(struct mr_dev *dev, int off, int cmd, void *args)
@@ -183,8 +192,7 @@ static ssize_t mr_serial_isr(struct mr_dev *dev, int event, void *args)
case MR_ISR_SERIAL_RD_INT:
{
/* Read data to FIFO */
uint8_t data = 0;
ops->read(serial, &data, sizeof(data));
uint8_t data = ops->read(serial);
mr_ringbuf_push_force(&serial->rd_fifo, data);
return (ssize_t)mr_ringbuf_get_data_size(&serial->rd_fifo);
@@ -195,7 +203,7 @@ static ssize_t mr_serial_isr(struct mr_dev *dev, int event, void *args)
uint8_t data = 0;
if (mr_ringbuf_pop(&serial->wr_fifo, &data) == sizeof(data))
{
ops->write(serial, &data, sizeof(data));
ops->write(serial, data);
} else
{
ops->stop_tx(serial);

4
include/device/i2c.h
View File

@@ -90,8 +90,8 @@ struct mr_i2c_bus_ops
void (*start)(struct mr_i2c_bus *i2c_bus);
void (*send_addr)(struct mr_i2c_bus *i2c_bus, int addr, int addr_bits);
void (*stop)(struct mr_i2c_bus *i2c_bus);
ssize_t (*read)(struct mr_i2c_bus *i2c_bus, uint8_t *buf, size_t size);
ssize_t (*write)(struct mr_i2c_bus *i2c_bus, const uint8_t *buf, size_t size);
uint8_t (*read)(struct mr_i2c_bus *i2c_bus);
void (*write)(struct mr_i2c_bus *i2c_bus, uint8_t data);
};
/**

4
include/device/pin.h
View File

@@ -75,8 +75,8 @@ struct mr_pin
struct mr_pin_ops
{
int (*configure)(struct mr_pin *pin, int number, int mode);
int (*read)(struct mr_pin *pin, int number);
void (*write)(struct mr_pin *pin, int number, int value);
uint8_t (*read)(struct mr_pin *pin, int number);
void (*write)(struct mr_pin *pin, int number, uint8_t value);
};
/**

4
include/device/serial.h
View File

@@ -118,8 +118,8 @@ struct mr_serial
struct mr_serial_ops
{
int (*configure)(struct mr_serial *serial, struct mr_serial_config *config);
ssize_t (*read)(struct mr_serial *serial, uint8_t *buf, size_t size);
ssize_t (*write)(struct mr_serial *serial, const uint8_t *buf, size_t size);
uint8_t (*read)(struct mr_serial *serial);
void (*write)(struct mr_serial *serial, uint8_t data);
void (*start_tx)(struct mr_serial *serial);
void (*stop_tx)(struct mr_serial *serial);
};

54
include/mr_drv.h
View File

@@ -1,54 +0,0 @@
/*
* @copyright (c) 2023, MR Development Team
*
* @license SPDX-License-Identifier: Apache-2.0
*
* @date 2023-11-11 MacRsh First version
*/
#ifndef _MR_DRV_H_
#define _MR_DRV_H_
#include "include/mr_config.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#ifdef MR_USING_ADC
#include "driver/drv_adc.h"
#endif
#ifdef MR_USING_CAN
#include "driver/drv_can.h"
#endif
#ifdef MR_USING_DAC
#include "driver/drv_dac.h"
#endif
#ifdef MR_USING_I2C
#include "driver/drv_i2c.h"
#endif
#ifdef MR_USING_PIN
#include "driver/drv_pin.h"
#endif
#ifdef MR_USING_SERIAL
#include "driver/drv_serial.h"
#endif
#ifdef MR_USING_SPI
#include "driver/drv_spi.h"
#endif
#ifdef MR_USING_TIMER
#include "driver/drv_timer.h"
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* _MR_DRV_H_ */

8
source/service.c
View File

@@ -531,7 +531,6 @@ size_t mr_ringbuf_pop(struct mr_ringbuf *ringbuf, uint8_t *data)
{
ringbuf->read_index++;
}
return 1;
}
@@ -581,7 +580,6 @@ size_t mr_ringbuf_read(struct mr_ringbuf *ringbuf, void *buffer, size_t size)
ringbuf->read_mirror = ~ringbuf->read_mirror;
ringbuf->read_index = size - (ringbuf->size - ringbuf->read_index);
return size;
}
@@ -613,7 +611,6 @@ size_t mr_ringbuf_push(struct mr_ringbuf *ringbuf, uint8_t data)
{
ringbuf->write_index++;
}
return 1;
}
@@ -662,7 +659,6 @@ size_t mr_ringbuf_push_force(struct mr_ringbuf *ringbuf, uint8_t data)
ringbuf->read_index = ringbuf->write_index;
}
}
return 1;
}
@@ -712,7 +708,6 @@ size_t mr_ringbuf_write(struct mr_ringbuf *ringbuf, const void *buffer, size_t s
ringbuf->write_mirror = ~ringbuf->write_mirror;
ringbuf->write_index = size - (ringbuf->size - ringbuf->write_index);
return size;
}
@@ -778,7 +773,6 @@ size_t mr_ringbuf_write_force(struct mr_ringbuf *ringbuf, const void *buffer, si
ringbuf->read_index = ringbuf->write_index;
}
return size;
}
@@ -1001,7 +995,6 @@ struct mr_avl *mr_avl_find(struct mr_avl *tree, uint32_t value)
{
return mr_avl_find(tree->right_child, value);
}
return MR_NULL;
}
@@ -1030,6 +1023,5 @@ size_t mr_avl_get_length(struct mr_avl *tree)
{
length += mr_avl_get_length(tree->right_child);
}
return length;
}