From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- c/src/lib/include/Makefile.am | 9 +++------ c/src/lib/include/console.h | 4 ---- c/src/lib/include/motorola/Makefile.am | 9 +++------ c/src/lib/include/rtems/error.h | 9 +++++++++ c/src/lib/include/sys/Makefile.am | 9 +++------ c/src/lib/include/sys/termios.h | 10 +++++++++- c/src/lib/include/zilog/Makefile.am | 9 +++------ 7 files changed, 30 insertions(+), 29 deletions(-) (limited to 'c/src/lib/include') diff --git a/c/src/lib/include/Makefile.am b/c/src/lib/include/Makefile.am index 76d08e35a7..4a5e8d14c4 100644 --- a/c/src/lib/include/Makefile.am +++ b/c/src/lib/include/Makefile.am @@ -9,18 +9,15 @@ H_FILES = chain.h console.h clockdrv.h iosupp.h ringbuf.h spurious.h \ noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) SUBDIRS = sys motorola zilog diff --git a/c/src/lib/include/console.h b/c/src/lib/include/console.h index 7bc6b5e3d4..2d2f380012 100644 --- a/c/src/lib/include/console.h +++ b/c/src/lib/include/console.h @@ -24,10 +24,6 @@ extern "C" { { console_initialize, console_open, console_close, \ console_read, console_write, console_control } -void console_reserve_resources( - rtems_configuration_table *configuration -); - rtems_device_driver console_initialize( rtems_device_major_number, rtems_device_minor_number, diff --git a/c/src/lib/include/motorola/Makefile.am b/c/src/lib/include/motorola/Makefile.am index 91323785d8..cb589bda78 100644 --- a/c/src/lib/include/motorola/Makefile.am +++ b/c/src/lib/include/motorola/Makefile.am @@ -8,17 +8,14 @@ H_FILES = mc68230.h mc68681.h noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/motorola \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%) $(PROJECT_INCLUDE)/motorola: @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/motorola/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/rtems/error.h b/c/src/lib/include/rtems/error.h index a0698afb5d..de6e1715db 100644 --- a/c/src/lib/include/rtems/error.h +++ b/c/src/lib/include/rtems/error.h @@ -7,6 +7,10 @@ #ifndef __RTEMS_ERROR_h #define __RTEMS_ERROR_h +#ifdef __cplusplus +extern "C" { +#endif + /* * rtems_error() and rtems_panic() support */ @@ -34,5 +38,10 @@ void rtems_panic(const char *printf_format, ...); extern int rtems_panic_in_progress; +#ifdef __cplusplus +} +#endif + + #endif /* end of include file */ diff --git a/c/src/lib/include/sys/Makefile.am b/c/src/lib/include/sys/Makefile.am index 32068894e5..aa8c375690 100644 --- a/c/src/lib/include/sys/Makefile.am +++ b/c/src/lib/include/sys/Makefile.am @@ -18,17 +18,14 @@ H_FILES = utime.h $(NEWLIB_H_FILES) $(NETWORKING_H_FILES) noinst_HEADERS = utime.h termios.h ioctl.h -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/sys \ -$(H_FILES:%=$(PROJECT_INCLUDE)/sys/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \ + $(H_FILES:%=$(PROJECT_INCLUDE)/sys/%) $(PROJECT_INCLUDE)/sys: @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/sys/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/include/sys/termios.h b/c/src/lib/include/sys/termios.h index bb64d55433..7cc28d7d38 100644 --- a/c/src/lib/include/sys/termios.h +++ b/c/src/lib/include/sys/termios.h @@ -14,6 +14,8 @@ #ifndef TERMIOS_H #define TERMIOS_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -174,9 +176,15 @@ struct termios { #define TCSADRAIN 1 #define TCSAFLUSH 2 +int tcdrain(int); +int tcflow(int, int); +int tcflush(int, int); int tcgetattr(int, struct termios *); int tcsetattr(int, int, struct termios *); -int tcdrain(int); +pid_t tcgetprgrp(int); +int tcsetprgrp(int, pid_t); +int tcsendbreak(int, int); + speed_t cfgetospeed(const struct termios *tp); int cfsetospeed(struct termios *tp, speed_t speed); speed_t cfgetispeed(const struct termios *tp); diff --git a/c/src/lib/include/zilog/Makefile.am b/c/src/lib/include/zilog/Makefile.am index ec750d0097..db9ab19472 100644 --- a/c/src/lib/include/zilog/Makefile.am +++ b/c/src/lib/include/zilog/Makefile.am @@ -8,17 +8,14 @@ H_FILES = z8036.h z8530.h z8536.h noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/zilog \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%) $(PROJECT_INCLUDE)/zilog: @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/zilog/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3