fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issues with _read_r in MK22FN512xx libc integration code

This commit is contained in:
Silvano Seva 2020-12-27 09:18:58 +01:00
parent aad19cc41c
commit efb235ae4e
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
platform/mcu/MK22FN512xxx12/boot/libc_integration.c
View File

@ -213,19 +213,28 @@ int _write_r(struct _reent *ptr, int fd, const void *buf, size_t cnt)
*/ */
int _read_r(struct _reent *ptr, int fd, void *buf, size_t cnt) int _read_r(struct _reent *ptr, int fd, void *buf, size_t cnt)
{ {
int ret = -1;
if(fd == STDIN_FILENO) if(fd == STDIN_FILENO)
{ {
for(;;) for(;;)
{ {
ssize_t r = vcom_readBlock(buf, cnt); ssize_t r = vcom_readBlock(buf, cnt);
if((r < 0) || (r == (ssize_t)(cnt))) return r; if((r < 0) || (r == ((ssize_t) cnt)))
{
ret = ((int) r);
break;
}
} }
} }
else else
{
/* If fd is not stdin */
ptr->_errno = EBADF;
ret = -1;
}
/* If fd is not stdin */ return ret;
ptr->_errno = EBADF;
return -1;
} }
int _read(int fd, void *buf, size_t cnt) int _read(int fd, void *buf, size_t cnt)

4
platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c
View File

@ -649,12 +649,12 @@ ssize_t vcom_writeBlock(const void *buf, size_t len)
ssize_t vcom_readBlock(void* buf, size_t len) ssize_t vcom_readBlock(void* buf, size_t len)
{ {
if((cdcVcom.attach == 1) && (cdcVcom.startTransactions == 1)) if(recvSize != 0)
{ {
size_t toTransfer = (len < recvSize) ? len : recvSize; size_t toTransfer = (len < recvSize) ? len : recvSize;
memcpy(buf, recvBuf, toTransfer); memcpy(buf, recvBuf, toTransfer);
recvSize = 0; recvSize = 0;
return toTransfer; return ((ssize_t) toTransfer);
} }
return 0; return 0;