Changeset 51eb8d5 in rtems
- Timestamp:
- 10/23/97 18:49:34 (25 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 5a5bd13b
- Parents:
- 87d3d02
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/exec/libcsupport/include/rtems/libio.h
r87d3d02 r51eb8d5 139 139 int (*deviceFirstOpen)(int major, int minor, void *arg), 140 140 int (*deviceLastClose)(int major, int minor, void *arg), 141 int (*deviceRead)(int minor , char *buf),141 int (*deviceRead)(int minor), 142 142 int (*deviceWrite)(int minor, char *buf, int len) 143 143 ); -
c/src/exec/libcsupport/src/termios.c
r87d3d02 r51eb8d5 98 98 */ 99 99 int (*lastClose)(int major, int minor, void *arg); 100 int (*read)(int minor , char *buf);100 int (*read)(int minor); 101 101 int (*write)(int minor, char *buf, int len); 102 102 }; … … 134 134 int (*deviceFirstOpen)(int major, int minor, void *arg), 135 135 int (*deviceLastClose)(int major, int minor, void *arg), 136 int (*deviceRead)(int minor , char *buf),136 int (*deviceRead)(int minor), 137 137 int (*deviceWrite)(int minor, char *buf, int len) 138 138 ) … … 604 604 fillBufferPoll (struct rtems_termios_tty *tty) 605 605 { 606 unsigned char c;607 606 int n; 608 607 609 608 if (tty->termios.c_lflag & ICANON) { 610 609 for (;;) { 611 n = (*tty->read)(tty->minor , &c);610 n = (*tty->read)(tty->minor); 612 611 if (n < 0) { 613 return RTEMS_UNSATISFIED;614 }615 else if (n == 0) {616 612 rtems_task_wake_after (1); 617 613 } 618 614 else { 619 if (siproc ( c, tty))615 if (siproc (n, tty)) 620 616 break; 621 617 } … … 627 623 rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); 628 624 for (;;) { 629 n = (*tty->read)(tty->minor , &c);625 n = (*tty->read)(tty->minor); 630 626 if (n < 0) { 631 return RTEMS_UNSATISFIED;632 }633 else if (n == 0) {634 627 if (tty->termios.c_cc[VMIN]) { 635 628 if (tty->termios.c_cc[VTIME] && tty->ccount) { … … 651 644 } 652 645 else { 653 siproc ( c, tty);646 siproc (n, tty); 654 647 if (tty->ccount >= tty->termios.c_cc[VMIN]) 655 648 break; -
c/src/lib/include/rtems/libio.h
r87d3d02 r51eb8d5 139 139 int (*deviceFirstOpen)(int major, int minor, void *arg), 140 140 int (*deviceLastClose)(int major, int minor, void *arg), 141 int (*deviceRead)(int minor , char *buf),141 int (*deviceRead)(int minor), 142 142 int (*deviceWrite)(int minor, char *buf, int len) 143 143 ); -
c/src/lib/libc/libio.h
r87d3d02 r51eb8d5 139 139 int (*deviceFirstOpen)(int major, int minor, void *arg), 140 140 int (*deviceLastClose)(int major, int minor, void *arg), 141 int (*deviceRead)(int minor , char *buf),141 int (*deviceRead)(int minor), 142 142 int (*deviceWrite)(int minor, char *buf, int len) 143 143 ); -
c/src/lib/libc/termios.c
r87d3d02 r51eb8d5 98 98 */ 99 99 int (*lastClose)(int major, int minor, void *arg); 100 int (*read)(int minor , char *buf);100 int (*read)(int minor); 101 101 int (*write)(int minor, char *buf, int len); 102 102 }; … … 134 134 int (*deviceFirstOpen)(int major, int minor, void *arg), 135 135 int (*deviceLastClose)(int major, int minor, void *arg), 136 int (*deviceRead)(int minor , char *buf),136 int (*deviceRead)(int minor), 137 137 int (*deviceWrite)(int minor, char *buf, int len) 138 138 ) … … 604 604 fillBufferPoll (struct rtems_termios_tty *tty) 605 605 { 606 unsigned char c;607 606 int n; 608 607 609 608 if (tty->termios.c_lflag & ICANON) { 610 609 for (;;) { 611 n = (*tty->read)(tty->minor , &c);610 n = (*tty->read)(tty->minor); 612 611 if (n < 0) { 613 return RTEMS_UNSATISFIED;614 }615 else if (n == 0) {616 612 rtems_task_wake_after (1); 617 613 } 618 614 else { 619 if (siproc ( c, tty))615 if (siproc (n, tty)) 620 616 break; 621 617 } … … 627 623 rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); 628 624 for (;;) { 629 n = (*tty->read)(tty->minor , &c);625 n = (*tty->read)(tty->minor); 630 626 if (n < 0) { 631 return RTEMS_UNSATISFIED;632 }633 else if (n == 0) {634 627 if (tty->termios.c_cc[VMIN]) { 635 628 if (tty->termios.c_cc[VTIME] && tty->ccount) { … … 651 644 } 652 645 else { 653 siproc ( c, tty);646 siproc (n, tty); 654 647 if (tty->ccount >= tty->termios.c_cc[VMIN]) 655 648 break; -
cpukit/libcsupport/include/rtems/libio.h
r87d3d02 r51eb8d5 139 139 int (*deviceFirstOpen)(int major, int minor, void *arg), 140 140 int (*deviceLastClose)(int major, int minor, void *arg), 141 int (*deviceRead)(int minor , char *buf),141 int (*deviceRead)(int minor), 142 142 int (*deviceWrite)(int minor, char *buf, int len) 143 143 ); -
cpukit/libcsupport/src/termios.c
r87d3d02 r51eb8d5 98 98 */ 99 99 int (*lastClose)(int major, int minor, void *arg); 100 int (*read)(int minor , char *buf);100 int (*read)(int minor); 101 101 int (*write)(int minor, char *buf, int len); 102 102 }; … … 134 134 int (*deviceFirstOpen)(int major, int minor, void *arg), 135 135 int (*deviceLastClose)(int major, int minor, void *arg), 136 int (*deviceRead)(int minor , char *buf),136 int (*deviceRead)(int minor), 137 137 int (*deviceWrite)(int minor, char *buf, int len) 138 138 ) … … 604 604 fillBufferPoll (struct rtems_termios_tty *tty) 605 605 { 606 unsigned char c;607 606 int n; 608 607 609 608 if (tty->termios.c_lflag & ICANON) { 610 609 for (;;) { 611 n = (*tty->read)(tty->minor , &c);610 n = (*tty->read)(tty->minor); 612 611 if (n < 0) { 613 return RTEMS_UNSATISFIED;614 }615 else if (n == 0) {616 612 rtems_task_wake_after (1); 617 613 } 618 614 else { 619 if (siproc ( c, tty))615 if (siproc (n, tty)) 620 616 break; 621 617 } … … 627 623 rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); 628 624 for (;;) { 629 n = (*tty->read)(tty->minor , &c);625 n = (*tty->read)(tty->minor); 630 626 if (n < 0) { 631 return RTEMS_UNSATISFIED;632 }633 else if (n == 0) {634 627 if (tty->termios.c_cc[VMIN]) { 635 628 if (tty->termios.c_cc[VTIME] && tty->ccount) { … … 651 644 } 652 645 else { 653 siproc ( c, tty);646 siproc (n, tty); 654 647 if (tty->ccount >= tty->termios.c_cc[VMIN]) 655 648 break;
Note: See TracChangeset
for help on using the changeset viewer.