deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add read with timeout for USART driver.

Browse Source
This commit is contained in:
NIIBE Yutaka
2019-03-29 11:53:41 +09:00
parent 02ca3a6cd5
commit 06130d071b
3 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
contrib/usart-stm32f103.c
View File

@@ -394,6 +394,14 @@ rb_empty_check (void *arg)
return rb->empty == 0;
}
/* Can be used two ways:
*
* When the ring buffer is rb_a2h:
* Hardware-side polling if data is available from application.
*
* When the ring buffer is rb_h2a:
* Application-side polling if data is available from hardware.
*/
static void
rb_get_prepare_poll (struct rb *rb, chopstx_poll_cond_t *poll_desc)
{
@@ -611,6 +619,43 @@ usart_read (uint8_t dev_no, char *buf, uint16_t buflen)
return rb_read (rb, (uint8_t *)buf, buflen);
}
void
usart_read_prepare_poll (uint8_t dev_no, chopstx_poll_cond_t *poll_desc)
{
struct rb *rb;
if (dev_no == 2)
rb = &usart2_rb_h2a;
else if (dev_no == 3)
rb = &usart3_rb_h2a;
else
return;
rb_get_prepare_poll (rb, poll_desc);
}
int
usart_read_ext (uint8_t dev_no, char *buf, uint16_t buflen, uint32 *timeout_p)
{
struct rb *rb;
chopstx_poll_cond_t poll_desc;
int r;
if (dev_no == 2)
rb = &usart2_rb_h2a;
else if (dev_no == 3)
rb = &usart3_rb_h2a;
else
return -1;
rb_get_prepare_poll (rb, &poll_desc);
r = chopstx_poll (timeout_p, 1, (struct chx_poll_head *const)&poll_desc);
if (r == 0)
return 0;
else
return rb_read (rb, (uint8_t *)buf, buflen);
}
int
usart_write (uint8_t dev_no, char *buf, uint16_t buflen)
{

3
contrib/usart.h
View File

@@ -73,3 +73,6 @@ int usart_write (uint8_t dev_no, char *buf, uint16_t buflen);
const struct usart_stat *usart_stat (uint8_t dev_no);
int usart_send_break (uint8_t dev_no);
void usart_config_clken (uint8_t dev_no, int on);
void usart_read_prepare_poll (uint8_t dev_no, chopstx_poll_cond_t *poll_desc);
int usart_read_ext (uint8_t dev_no, char *buf, uint16_t buflen, uint32 *timeout_p);