SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

change PIIODevice read* and write* methods size to "ssize_t"

Browse Source
This commit is contained in:
Пелипенко Иван
2022-08-01 18:52:30 +03:00
parent 1b499530c5
commit b1e220e454
39 changed files with 135 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/main/io_devices/pican.cpp
View File

@@ -98,13 +98,13 @@ bool PICAN::closeDevice() {
}
int PICAN::readDevice(void * read_to, int max_size) {
ssize_t PICAN::readDevice(void * read_to, ssize_t max_size) {
#ifdef PIP_CAN
//piCout << "PICAN read";
can_frame frame;
int ret = 0;
ssize_t ret = 0;
ret = ::read(sock, &frame, sizeof(can_frame));
if(ret < 0) {/*piCoutObj << "Error while read CAN frame " << ret;*/ return -1;}
if (ret < 0) {/*piCoutObj << "Error while read CAN frame " << ret;*/ return -1;}
//piCoutObj << "receive CAN frame Id =" << frame.can_id;
memcpy(read_to, frame.data, piMini(frame.can_dlc, max_size));
readed_id = frame.can_id;
@@ -114,7 +114,7 @@ int PICAN::readDevice(void * read_to, int max_size) {
}
int PICAN::writeDevice(const void * data, int max_size) {
ssize_t PICAN::writeDevice(const void * data, ssize_t max_size) {
#ifdef PIP_CAN
//piCout << "PICAN write" << can_id << max_size;
if (max_size > 8) {piCoutObj << "Can't send CAN frame bigger than 8 bytes (requested " << max_size << ")!"; return -1;}
@@ -122,9 +122,9 @@ int PICAN::writeDevice(const void * data, int max_size) {
frame.can_id = can_id;
frame.can_dlc = max_size;
memcpy(frame.data, data, max_size);
int ret = 0;
ssize_t ret = 0;
ret = ::write(sock, &frame, sizeof(can_frame));
if(ret < 0) {piCoutObj << "Error while send CAN frame " << ret; return -1;}
if (ret < 0) {piCoutObj << "Error while send CAN frame " << ret; return -1;}
return max_size;
#endif
return 0;