diff options
| author | Wang-Huachen <[email protected]> | 2020-12-07 09:44:37 +0800 |
|---|---|---|
| committer | Wang-Huachen <[email protected]> | 2020-12-07 09:44:37 +0800 |
| commit | 1af5b72a99850644d87b19df89e105d18b30ec9f (patch) | |
| tree | 513dfa298961c065c381fa2d2b7afcf86dc88a72 /components/drivers/include | |
| parent | 72583289231b5664b38363c1d3d5d411a970bb57 (diff) | |
| parent | cc9374f052c2fd6f4b70d76ee8fefa331942dd3a (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'components/drivers/include')
| -rw-r--r-- | components/drivers/include/drivers/alarm.h | 2 | ||||
| -rw-r--r-- | components/drivers/include/ipc/ringbuffer.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/components/drivers/include/drivers/alarm.h b/components/drivers/include/drivers/alarm.h index dd59f4c1e8..e59c4142c7 100644 --- a/components/drivers/include/drivers/alarm.h +++ b/components/drivers/include/drivers/alarm.h @@ -49,6 +49,8 @@ struct rt_alarm rt_uint32_t flag; rt_alarm_callback_t callback; struct tm wktime; + + void *user_data; }; struct rt_alarm_setup diff --git a/components/drivers/include/ipc/ringbuffer.h b/components/drivers/include/ipc/ringbuffer.h index 4487d02c47..2afd2ca213 100644 --- a/components/drivers/include/ipc/ringbuffer.h +++ b/components/drivers/include/ipc/ringbuffer.h @@ -71,6 +71,7 @@ rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb, const rt_uint8_t *pt rt_size_t rt_ringbuffer_putchar(struct rt_ringbuffer *rb, const rt_uint8_t ch); rt_size_t rt_ringbuffer_putchar_force(struct rt_ringbuffer *rb, const rt_uint8_t ch); rt_size_t rt_ringbuffer_get(struct rt_ringbuffer *rb, rt_uint8_t *ptr, rt_uint16_t length); +rt_size_t rt_ringbuffer_peak(struct rt_ringbuffer *rb, rt_uint8_t **ptr); rt_size_t rt_ringbuffer_getchar(struct rt_ringbuffer *rb, rt_uint8_t *ch); rt_size_t rt_ringbuffer_data_len(struct rt_ringbuffer *rb); |