Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 23:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-03-17 Ralf Corsépius <ralf.corsepius@rtems.org>

Browse Source 
* libcsupport/include/rtems/termiostypes.h,
	libcsupport/src/termios.c: Prefix linesw, struct linesw, nwlinesw
	with rtems_termios_*.
This commit is contained in:
Ralf Corsepius
2007-03-17 06:46:45 +00:00
parent d7c655d575
commit 30ceeaa30c
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cpukit/ChangeLog
View File

@@ -1,5 +1,8 @@
2007-03-17 Ralf Corsépius <ralf.corsepius@rtems.org> 2007-03-17 Ralf Corsépius <ralf.corsepius@rtems.org>
* libcsupport/include/rtems/termiostypes.h,
libcsupport/src/termios.c: Prefix linesw, struct linesw, nwlinesw
with rtems_termios_*.
* libnetworking/sys/conf.h: Remove linesw, struct linesw, nlinesw. * libnetworking/sys/conf.h: Remove linesw, struct linesw, nlinesw.
(Clash with termiostypes.h - PR 1229). (Clash with termiostypes.h - PR 1229).

6
cpukit/libcsupport/include/rtems/termiostypes.h
View File

@@ -131,7 +131,7 @@ struct rtems_termios_tty {
int tty_rcvwakeup; int tty_rcvwakeup;
}; };
struct linesw { struct rtems_termios_linesw {
int (*l_open) (struct rtems_termios_tty *tp); int (*l_open) (struct rtems_termios_tty *tp);
int (*l_close)(struct rtems_termios_tty *tp); int (*l_close)(struct rtems_termios_tty *tp);
int (*l_read )(struct rtems_termios_tty *tp,rtems_libio_rw_args_t *args); int (*l_read )(struct rtems_termios_tty *tp,rtems_libio_rw_args_t *args);
@@ -165,8 +165,8 @@ void rtems_termios_puts (const void *buf,
/* /*
* global hooks for line disciplines * global hooks for line disciplines
*/ */
extern struct linesw linesw[]; extern struct rtems_termios_linesw rtems_termios_linesw[];
extern int nlinesw; extern int rtems_termios_nlinesw;
#define TTYDISC 0 /* termios tty line discipline */ #define TTYDISC 0 /* termios tty line discipline */
#define TABLDISC 3 /* tablet discipline */ #define TABLDISC 3 /* tablet discipline */

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

@@ -60,9 +60,9 @@
{ NULL, NULL, NULL, NULL, \ { NULL, NULL, NULL, NULL, \
NULL, NULL, NULL, NULL } NULL, NULL, NULL, NULL }
/* /*
* FIXME: change linesw entries consistant with linesw entry usage... * FIXME: change rtems_termios_linesw entries consistant with rtems_termios_linesw entry usage...
*/ */
struct linesw linesw[MAXLDISC] = struct rtems_termios_linesw rtems_termios_linesw[MAXLDISC] =
{ {
NODISC(0), /* 0- termios-built-in */ NODISC(0), /* 0- termios-built-in */
NODISC(1), /* 1- defunct */ NODISC(1), /* 1- defunct */
@@ -74,7 +74,7 @@ struct linesw linesw[MAXLDISC] =
NODISC(7), /* loadable */ NODISC(7), /* loadable */
}; };
int nlinesw = sizeof (linesw) / sizeof (linesw[0]); int rtems_termios_nlinesw = sizeof (rtems_termios_linesw) / sizeof (rtems_termios_linesw[0]);
extern struct rtems_termios_tty *rtems_termios_ttyHead; extern struct rtems_termios_tty *rtems_termios_ttyHead;
extern struct rtems_termios_tty *rtems_termios_ttyTail; extern struct rtems_termios_tty *rtems_termios_ttyTail;
@@ -364,11 +364,11 @@ rtems_termios_close (void *arg)
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
rtems_fatal_error_occurred (sc); rtems_fatal_error_occurred (sc);
if (--tty->refcount == 0) { if (--tty->refcount == 0) {
if (linesw[tty->t_line].l_close != NULL) { if (rtems_termios_linesw[tty->t_line].l_close != NULL) {
/* /*
* call discipline-specific close * call discipline-specific close
*/ */
sc = linesw[tty->t_line].l_close(tty); sc = rtems_termios_linesw[tty->t_line].l_close(tty);
} }
else { else {
/* /*
@@ -525,8 +525,8 @@ rtems_termios_ioctl (void *arg)
} }
switch (args->command) { switch (args->command) {
default: default:
if (linesw[tty->t_line].l_ioctl != NULL) { if (rtems_termios_linesw[tty->t_line].l_ioctl != NULL) {
sc = linesw[tty->t_line].l_ioctl(tty,args); sc = rtems_termios_linesw[tty->t_line].l_ioctl(tty,args);
} }
else { else {
sc = RTEMS_INVALID_NUMBER; sc = RTEMS_INVALID_NUMBER;
@@ -596,16 +596,16 @@ rtems_termios_ioctl (void *arg)
/* /*
* close old line discipline * close old line discipline
*/ */
if (linesw[tty->t_line].l_close != NULL) { if (rtems_termios_linesw[tty->t_line].l_close != NULL) {
sc = linesw[tty->t_line].l_close(tty); sc = rtems_termios_linesw[tty->t_line].l_close(tty);
} }
tty->t_line=*(int*)(args->buffer); tty->t_line=*(int*)(args->buffer);
tty->t_sc = NULL; /* ensure that no more valid data */ tty->t_sc = NULL; /* ensure that no more valid data */
/* /*
* open new line discipline * open new line discipline
*/ */
if (linesw[tty->t_line].l_open != NULL) { if (rtems_termios_linesw[tty->t_line].l_open != NULL) {
sc = linesw[tty->t_line].l_open(tty); sc = rtems_termios_linesw[tty->t_line].l_open(tty);
} }
break; break;
case TIOCGETD: case TIOCGETD:
@@ -755,8 +755,8 @@ rtems_termios_write (void *arg)
sc = rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT); sc = rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
return sc; return sc;
if (linesw[tty->t_line].l_write != NULL) { if (rtems_termios_linesw[tty->t_line].l_write != NULL) {
sc = linesw[tty->t_line].l_write(tty,args); sc = rtems_termios_linesw[tty->t_line].l_write(tty,args);
rtems_semaphore_release (tty->osem); rtems_semaphore_release (tty->osem);
return sc; return sc;
} }
@@ -1090,8 +1090,8 @@ rtems_termios_read (void *arg)
sc = rtems_semaphore_obtain (tty->isem, RTEMS_WAIT, RTEMS_NO_TIMEOUT); sc = rtems_semaphore_obtain (tty->isem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
return sc; return sc;
if (linesw[tty->t_line].l_read != NULL) { if (rtems_termios_linesw[tty->t_line].l_read != NULL) {
sc = linesw[tty->t_line].l_read(tty,args); sc = rtems_termios_linesw[tty->t_line].l_read(tty,args);
tty->tty_rcvwakeup = 0; tty->tty_rcvwakeup = 0;
rtems_semaphore_release (tty->isem); rtems_semaphore_release (tty->isem);
return sc; return sc;
@@ -1146,10 +1146,10 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len)
boolean flow_rcv = FALSE; /* TRUE, if flow control char received */ boolean flow_rcv = FALSE; /* TRUE, if flow control char received */
rtems_interrupt_level level; rtems_interrupt_level level;
if (linesw[tty->t_line].l_rint != NULL) { if (rtems_termios_linesw[tty->t_line].l_rint != NULL) {
while (len--) { while (len--) {
c = *buf++; c = *buf++;
linesw[tty->t_line].l_rint(c,tty); rtems_termios_linesw[tty->t_line].l_rint(c,tty);
} }
/* /*
@@ -1416,8 +1416,8 @@ rtems_termios_dequeue_characters (void *ttyp, int len)
/* /*
* call any line discipline start function * call any line discipline start function
*/ */
if (linesw[tty->t_line].l_start != NULL) { if (rtems_termios_linesw[tty->t_line].l_start != NULL) {
linesw[tty->t_line].l_start(tty); rtems_termios_linesw[tty->t_line].l_start(tty);
} }
return 0; /* nothing to output in IRQ... */ return 0; /* nothing to output in IRQ... */
} }
@@ -1451,8 +1451,8 @@ static rtems_task rtems_termios_txdaemon(rtems_task_argument argument)
/* /*
* call any line discipline start function * call any line discipline start function
*/ */
if (linesw[tty->t_line].l_start != NULL) { if (rtems_termios_linesw[tty->t_line].l_start != NULL) {
linesw[tty->t_line].l_start(tty); rtems_termios_linesw[tty->t_line].l_start(tty);
} }
/* /*
* try to push further characters to device * try to push further characters to device