RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Changed prototype of read routine.

Browse Source
This commit is contained in:
Joel Sherrill
1997-10-23 18:49:34 +00:00
parent 87d3d02640
commit 51eb8d55a0
7 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
c/src/exec/libcsupport/include/rtems/libio.h
View File

@@ -138,7 +138,7 @@ rtems_status_code rtems_termios_open (
void *arg, void *arg,
int (*deviceFirstOpen)(int major, int minor, void *arg), int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg), int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor, char *buf), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len) int (*deviceWrite)(int minor, char *buf, int len)
); );

19
c/src/exec/libcsupport/src/termios.c
View File

@@ -97,7 +97,7 @@ struct rtems_termios_tty {
* Callbacks to device-specific routines * Callbacks to device-specific routines
*/ */
int (*lastClose)(int major, int minor, void *arg); int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor, char *buf); int (*read)(int minor);
int (*write)(int minor, char *buf, int len); int (*write)(int minor, char *buf, int len);
}; };
static struct rtems_termios_tty *ttyHead, *ttyTail; static struct rtems_termios_tty *ttyHead, *ttyTail;
@@ -133,7 +133,7 @@ rtems_termios_open (
void *arg, void *arg,
int (*deviceFirstOpen)(int major, int minor, void *arg), int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg), int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor, char *buf), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len) int (*deviceWrite)(int minor, char *buf, int len)
) )
{ {
@@ -603,20 +603,16 @@ siproc (unsigned char c, struct rtems_termios_tty *tty)
static rtems_status_code static rtems_status_code
fillBufferPoll (struct rtems_termios_tty *tty) fillBufferPoll (struct rtems_termios_tty *tty)
{ {
unsigned char c;
int n; int n;
if (tty->termios.c_lflag & ICANON) { if (tty->termios.c_lflag & ICANON) {
for (;;) { for (;;) {
n = (*tty->read)(tty->minor, &c); n = (*tty->read)(tty->minor);
if (n < 0) { if (n < 0) {
return RTEMS_UNSATISFIED;
}
else if (n == 0) {
rtems_task_wake_after (1); rtems_task_wake_after (1);
} }
else { else {
if (siproc (c, tty)) if (siproc (n, tty))
break; break;
} }
} }
@@ -626,11 +622,8 @@ fillBufferPoll (struct rtems_termios_tty *tty)
if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME]) if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
for (;;) { for (;;) {
n = (*tty->read)(tty->minor, &c); n = (*tty->read)(tty->minor);
if (n < 0) { if (n < 0) {
return RTEMS_UNSATISFIED;
}
else if (n == 0) {
if (tty->termios.c_cc[VMIN]) { if (tty->termios.c_cc[VMIN]) {
if (tty->termios.c_cc[VTIME] && tty->ccount) { if (tty->termios.c_cc[VTIME] && tty->ccount) {
rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now); rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
@@ -650,7 +643,7 @@ fillBufferPoll (struct rtems_termios_tty *tty)
rtems_task_wake_after (1); rtems_task_wake_after (1);
} }
else { else {
siproc (c, tty); siproc (n, tty);
if (tty->ccount >= tty->termios.c_cc[VMIN]) if (tty->ccount >= tty->termios.c_cc[VMIN])
break; break;
if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME]) if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])

2
c/src/lib/include/rtems/libio.h
View File

@@ -138,7 +138,7 @@ rtems_status_code rtems_termios_open (
void *arg, void *arg,
int (*deviceFirstOpen)(int major, int minor, void *arg), int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg), int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor, char *buf), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len) int (*deviceWrite)(int minor, char *buf, int len)
); );

2
c/src/lib/libc/libio.h
View File

@@ -138,7 +138,7 @@ rtems_status_code rtems_termios_open (
void *arg, void *arg,
int (*deviceFirstOpen)(int major, int minor, void *arg), int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg), int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor, char *buf), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len) int (*deviceWrite)(int minor, char *buf, int len)
); );

19
c/src/lib/libc/termios.c
View File

@@ -97,7 +97,7 @@ struct rtems_termios_tty {
* Callbacks to device-specific routines * Callbacks to device-specific routines
*/ */
int (*lastClose)(int major, int minor, void *arg); int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor, char *buf); int (*read)(int minor);
int (*write)(int minor, char *buf, int len); int (*write)(int minor, char *buf, int len);
}; };
static struct rtems_termios_tty *ttyHead, *ttyTail; static struct rtems_termios_tty *ttyHead, *ttyTail;
@@ -133,7 +133,7 @@ rtems_termios_open (
void *arg, void *arg,
int (*deviceFirstOpen)(int major, int minor, void *arg), int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg), int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor, char *buf), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len) int (*deviceWrite)(int minor, char *buf, int len)
) )
{ {
@@ -603,20 +603,16 @@ siproc (unsigned char c, struct rtems_termios_tty *tty)
static rtems_status_code static rtems_status_code
fillBufferPoll (struct rtems_termios_tty *tty) fillBufferPoll (struct rtems_termios_tty *tty)
{ {
unsigned char c;
int n; int n;
if (tty->termios.c_lflag & ICANON) { if (tty->termios.c_lflag & ICANON) {
for (;;) { for (;;) {
n = (*tty->read)(tty->minor, &c); n = (*tty->read)(tty->minor);
if (n < 0) { if (n < 0) {
return RTEMS_UNSATISFIED;
}
else if (n == 0) {
rtems_task_wake_after (1); rtems_task_wake_after (1);
} }
else { else {
if (siproc (c, tty)) if (siproc (n, tty))
break; break;
} }
} }
@@ -626,11 +622,8 @@ fillBufferPoll (struct rtems_termios_tty *tty)
if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME]) if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
for (;;) { for (;;) {
n = (*tty->read)(tty->minor, &c); n = (*tty->read)(tty->minor);
if (n < 0) { if (n < 0) {
return RTEMS_UNSATISFIED;
}
else if (n == 0) {
if (tty->termios.c_cc[VMIN]) { if (tty->termios.c_cc[VMIN]) {
if (tty->termios.c_cc[VTIME] && tty->ccount) { if (tty->termios.c_cc[VTIME] && tty->ccount) {
rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now); rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
@@ -650,7 +643,7 @@ fillBufferPoll (struct rtems_termios_tty *tty)
rtems_task_wake_after (1); rtems_task_wake_after (1);
} }
else { else {
siproc (c, tty); siproc (n, tty);
if (tty->ccount >= tty->termios.c_cc[VMIN]) if (tty->ccount >= tty->termios.c_cc[VMIN])
break; break;
if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME]) if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])

2
cpukit/libcsupport/include/rtems/libio.h
View File

@@ -138,7 +138,7 @@ rtems_status_code rtems_termios_open (
void *arg, void *arg,
int (*deviceFirstOpen)(int major, int minor, void *arg), int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg), int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor, char *buf), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len) int (*deviceWrite)(int minor, char *buf, int len)
); );

19
cpukit/libcsupport/src/termios.c
View File

@@ -97,7 +97,7 @@ struct rtems_termios_tty {
* Callbacks to device-specific routines * Callbacks to device-specific routines
*/ */
int (*lastClose)(int major, int minor, void *arg); int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor, char *buf); int (*read)(int minor);
int (*write)(int minor, char *buf, int len); int (*write)(int minor, char *buf, int len);
}; };
static struct rtems_termios_tty *ttyHead, *ttyTail; static struct rtems_termios_tty *ttyHead, *ttyTail;
@@ -133,7 +133,7 @@ rtems_termios_open (
void *arg, void *arg,
int (*deviceFirstOpen)(int major, int minor, void *arg), int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg), int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor, char *buf), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len) int (*deviceWrite)(int minor, char *buf, int len)
) )
{ {
@@ -603,20 +603,16 @@ siproc (unsigned char c, struct rtems_termios_tty *tty)
static rtems_status_code static rtems_status_code
fillBufferPoll (struct rtems_termios_tty *tty) fillBufferPoll (struct rtems_termios_tty *tty)
{ {
unsigned char c;
int n; int n;
if (tty->termios.c_lflag & ICANON) { if (tty->termios.c_lflag & ICANON) {
for (;;) { for (;;) {
n = (*tty->read)(tty->minor, &c); n = (*tty->read)(tty->minor);
if (n < 0) { if (n < 0) {
return RTEMS_UNSATISFIED;
}
else if (n == 0) {
rtems_task_wake_after (1); rtems_task_wake_after (1);
} }
else { else {
if (siproc (c, tty)) if (siproc (n, tty))
break; break;
} }
} }
@@ -626,11 +622,8 @@ fillBufferPoll (struct rtems_termios_tty *tty)
if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME]) if (!tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])
rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then); rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &then);
for (;;) { for (;;) {
n = (*tty->read)(tty->minor, &c); n = (*tty->read)(tty->minor);
if (n < 0) { if (n < 0) {
return RTEMS_UNSATISFIED;
}
else if (n == 0) {
if (tty->termios.c_cc[VMIN]) { if (tty->termios.c_cc[VMIN]) {
if (tty->termios.c_cc[VTIME] && tty->ccount) { if (tty->termios.c_cc[VTIME] && tty->ccount) {
rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now); rtems_clock_get (RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &now);
@@ -650,7 +643,7 @@ fillBufferPoll (struct rtems_termios_tty *tty)
rtems_task_wake_after (1); rtems_task_wake_after (1);
} }
else { else {
siproc (c, tty); siproc (n, tty);
if (tty->ccount >= tty->termios.c_cc[VMIN]) if (tty->ccount >= tty->termios.c_cc[VMIN])
break; break;
if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME]) if (tty->termios.c_cc[VMIN] && tty->termios.c_cc[VTIME])