summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-10-28 19:17:16 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-10-28 19:17:16 +0000
commit692b9f7fddd50daa9fc4052193a2b315717a3e54 (patch)
treea92a72536a082d415dccb64d4b501c1ac4241f37 /c/src
parentRemoved per Eric Norum (diff)
downloadrtems-692b9f7fddd50daa9fc4052193a2b315717a3e54.tar.bz2
Merged Vista SCORE603e, Radstone PPCn_60x, and DY-4 DMV177 BSPs along
with libchip.
Diffstat (limited to '')
-rw-r--r--c/src/exec/libcsupport/include/sys/termios.h2
-rw-r--r--c/src/lib/Makefile.in5
-rw-r--r--c/src/lib/include/sys/termios.h2
-rw-r--r--c/src/lib/libchip/serial/mc68681.c4
-rw-r--r--c/src/lib/libchip/serial/ns16550.c3
-rw-r--r--c/src/lib/libchip/serial/z85c30.c3
-rw-r--r--c/src/lib/wrapup/Makefile.in2
-rw-r--r--c/src/libchip/serial/mc68681.c4
-rw-r--r--c/src/libchip/serial/ns16550.c3
-rw-r--r--c/src/libchip/serial/z85c30.c3
-rw-r--r--c/src/wrapup/Makefile.in2
11 files changed, 23 insertions, 10 deletions
diff --git a/c/src/exec/libcsupport/include/sys/termios.h b/c/src/exec/libcsupport/include/sys/termios.h
index 1112ec4f5e..71a2492724 100644
--- a/c/src/exec/libcsupport/include/sys/termios.h
+++ b/c/src/exec/libcsupport/include/sys/termios.h
@@ -140,6 +140,8 @@ struct termios {
#define CIBAUD 002003600000 /* input baud rate (not used) */
#define CRTSCTS 020000000000 /* flow control */
+#define RTEMS_TERMIOS_NUMBER_BAUD_RATES 20
+
/* c_lflag bits */
#define ISIG 0000001
#define ICANON 0000002
diff --git a/c/src/lib/Makefile.in b/c/src/lib/Makefile.in
index 271ba5f8b7..f86d924e21 100644
--- a/c/src/lib/Makefile.in
+++ b/c/src/lib/Makefile.in
@@ -24,5 +24,6 @@ LIBRTEMSCPLUSPLUS = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V)
# General Hardware API library
LIBHWAPI=$(wildcard libhwapi)
-SUB_DIRS=start include $(NETWORKING_INCLUDE) libmisc libc libcpu libbsp \
- $(LIBNETWORKING) $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup
+SUB_DIRS=start include $(NETWORKING_INCLUDE) libmisc \
+ libc libchip libcpu libbsp $(LIBNETWORKING) \
+ $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup
diff --git a/c/src/lib/include/sys/termios.h b/c/src/lib/include/sys/termios.h
index 1112ec4f5e..71a2492724 100644
--- a/c/src/lib/include/sys/termios.h
+++ b/c/src/lib/include/sys/termios.h
@@ -140,6 +140,8 @@ struct termios {
#define CIBAUD 002003600000 /* input baud rate (not used) */
#define CRTSCTS 020000000000 /* flow control */
+#define RTEMS_TERMIOS_NUMBER_BAUD_RATES 20
+
/* c_lflag bits */
#define ISIG 0000001
#define ICANON 0000002
diff --git a/c/src/lib/libchip/serial/mc68681.c b/c/src/lib/libchip/serial/mc68681.c
index a41a00d1ae..a917f5aa46 100644
--- a/c/src/lib/libchip/serial/mc68681.c
+++ b/c/src/lib/libchip/serial/mc68681.c
@@ -656,8 +656,8 @@ MC68681_STATIC void mc68681_process(
ucLineStatus >>= 4;
if(ucLineStatus & MC68681_IR_TX_READY) {
- rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
- if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
+ if (rtems_termios_dequeue_characters(
+ Console_Port_Data[minor].termios_data, 1)) {
Console_Port_Data[minor].bActive = FALSE;
mc68681_enable_interrupts(minor, MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
}
diff --git a/c/src/lib/libchip/serial/ns16550.c b/c/src/lib/libchip/serial/ns16550.c
index 6f8c3f759f..918e87bf8c 100644
--- a/c/src/lib/libchip/serial/ns16550.c
+++ b/c/src/lib/libchip/serial/ns16550.c
@@ -488,7 +488,8 @@ NS16550_STATIC void ns16550_process(
#endif
rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
- if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
+ if (rtems_termios_dequeue_characters(
+ Console_Port_Data[minor].termios_data, 1)) {
if (Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
ns16550_negate_RTS(minor);
}
diff --git a/c/src/lib/libchip/serial/z85c30.c b/c/src/lib/libchip/serial/z85c30.c
index a4f3aaceee..b158887618 100644
--- a/c/src/lib/libchip/serial/z85c30.c
+++ b/c/src/lib/libchip/serial/z85c30.c
@@ -604,7 +604,8 @@ Z85C30_STATIC void z85c30_process(
#endif
rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
- if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
+ if (rtems_termios_dequeue_characters(
+ Console_Port_Data[minor].termios_data, 1)) {
if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
z85c30_negate_RTS(minor);
}
diff --git a/c/src/lib/wrapup/Makefile.in b/c/src/lib/wrapup/Makefile.in
index de322d9d04..d7c6fcdaf9 100644
--- a/c/src/lib/wrapup/Makefile.in
+++ b/c/src/lib/wrapup/Makefile.in
@@ -20,6 +20,8 @@ SRCS=$(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \
+ $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \
+ $(wildcard $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a) \
$(PROJECT_RELEASE)/lib/libcsupport$(LIB_VARIANT).a \
$(PROJECT_RELEASE)/lib/libmisc$(LIB_VARIANT).a \
$(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o) \
diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c
index a41a00d1ae..a917f5aa46 100644
--- a/c/src/libchip/serial/mc68681.c
+++ b/c/src/libchip/serial/mc68681.c
@@ -656,8 +656,8 @@ MC68681_STATIC void mc68681_process(
ucLineStatus >>= 4;
if(ucLineStatus & MC68681_IR_TX_READY) {
- rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
- if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
+ if (rtems_termios_dequeue_characters(
+ Console_Port_Data[minor].termios_data, 1)) {
Console_Port_Data[minor].bActive = FALSE;
mc68681_enable_interrupts(minor, MC68681_IMR_ENABLE_ALL_EXCEPT_TX);
}
diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c
index 6f8c3f759f..918e87bf8c 100644
--- a/c/src/libchip/serial/ns16550.c
+++ b/c/src/libchip/serial/ns16550.c
@@ -488,7 +488,8 @@ NS16550_STATIC void ns16550_process(
#endif
rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
- if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
+ if (rtems_termios_dequeue_characters(
+ Console_Port_Data[minor].termios_data, 1)) {
if (Console_Port_Tbl[minor].pDeviceFlow != &ns16550_flow_RTSCTS) {
ns16550_negate_RTS(minor);
}
diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c
index a4f3aaceee..b158887618 100644
--- a/c/src/libchip/serial/z85c30.c
+++ b/c/src/libchip/serial/z85c30.c
@@ -604,7 +604,8 @@ Z85C30_STATIC void z85c30_process(
#endif
rtems_termios_dequeue_characters(Console_Port_Data[minor].termios_data, 1);
- if (rtems_termios_is_more_to_tx( Console_Port_Data[minor].termios_data )) {
+ if (rtems_termios_dequeue_characters(
+ Console_Port_Data[minor].termios_data, 1)) {
if (Console_Port_Tbl[minor].pDeviceFlow != &z85c30_flow_RTSCTS) {
z85c30_negate_RTS(minor);
}
diff --git a/c/src/wrapup/Makefile.in b/c/src/wrapup/Makefile.in
index de322d9d04..d7c6fcdaf9 100644
--- a/c/src/wrapup/Makefile.in
+++ b/c/src/wrapup/Makefile.in
@@ -20,6 +20,8 @@ SRCS=$(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a) \
$(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \
+ $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \
+ $(wildcard $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a) \
$(PROJECT_RELEASE)/lib/libcsupport$(LIB_VARIANT).a \
$(PROJECT_RELEASE)/lib/libmisc$(LIB_VARIANT).a \
$(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o) \