i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BSerialPort: Implement WaitForInput() using wait_for_objects.

Browse Source 
Fixes #17867.

Change-Id: Ib59781128d5d21317c4042f250333b177a0ed91b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6432
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2023-05-09 23:33:43 +00:00
committed by waddlesplash
parent 54fc4c3c49
commit 071ff801ee
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/device/SerialPort.cpp
+12 -3
View File
@@ -17,6 +17,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/ioctl.h>
#include <termios.h> #include <termios.h>
@@ -469,10 +470,18 @@ BSerialPort::IsDCD(void)
ssize_t ssize_t
BSerialPort::WaitForInput(void) BSerialPort::WaitForInput(void)
{ {
ssize_t size; object_wait_info info[1];
int err = ioctl(ffd, TCWAITEVENT, &size, sizeof size); info[0].type = B_OBJECT_TYPE_FD;
info[0].object = ffd;
info[0].events = B_EVENT_READ | B_EVENT_ERROR | B_EVENT_DISCONNECTED;
status_t status = wait_for_objects_etc(info, 1, B_RELATIVE_TIMEOUT, fTimeout);
if (status < 0)
return status;
return (err < B_OK) ? errno : size; int size;
if (ioctl(ffd, FIONREAD, &size, sizeof(size)) < 0)
return errno;
return size;
} }