X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4dc78b4651f006bf0404c8ec7db85651bcee7c2e..04ac67cc3cac14cd601daacd0592121ec0b84012:/lincan/src/read_rtl.c diff --git a/lincan/src/read_rtl.c b/lincan/src/read_rtl.c index a4bcf0c..a08521b 100644 --- a/lincan/src/read_rtl.c +++ b/lincan/src/read_rtl.c @@ -42,8 +42,8 @@ #include "../include/can_iortl.h" /* This is the 'Normal' read handler for normal transmission messages */ -static inline -ssize_t can_std_read_rtl(struct canque_ends_t *qends, int nonblock_fl, +static inline +ssize_t can_std_read_rtl(struct canque_ends_t *qends, int nonblock_fl, char *buffer, size_t length) { int ret; @@ -51,7 +51,7 @@ ssize_t can_std_read_rtl(struct canque_ends_t *qends, int nonblock_fl, int bytes_to_copy; struct canque_edge_t *qedge; struct canque_slot_t *slot; - + ret=canque_test_outslot(qends, &qedge, &slot); if(ret<0){ if (nonblock_fl) { @@ -70,7 +70,7 @@ ssize_t can_std_read_rtl(struct canque_ends_t *qends, int nonblock_fl, *(msg_buff++)=slot->msg; canque_free_outslot(qends, qedge, slot); bytes_to_copy = length-sizeof(struct canmsg_t); - + while (bytes_to_copy > 0) { ret=canque_test_outslot(qends, &qedge, &slot); if(ret<0) @@ -87,7 +87,7 @@ ssize_t can_std_read_rtl(struct canque_ends_t *qends, int nonblock_fl, ssize_t can_read_rtl_posix(struct rtl_file *fptr, char *buffer, size_t length, loff_t *ppos) { - struct canuser_t *canuser = + struct canuser_t *canuser = (struct canuser_t *)can_get_rtl_file_private_data(fptr); struct canque_ends_t *qends; int ret;