summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1997-12-22 17:29:51 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1997-12-22 17:29:51 +0000
commit608641e6d22b41af782c567f9115cce6485738ba (patch)
tree9ee0a875475a2a8947c5dd466bfbd79387cd337e
parentNow generating this file with autoconf to avoid having to embed so (diff)
downloadrtems-608641e6d22b41af782c567f9115cce6485738ba.tar.bz2
Corrected prototypes for all termios console write driver entries to
properly reflect the const on the buffer pointer being passed in.
-rw-r--r--c/src/exec/libcsupport/include/rtems/libio.h3
-rw-r--r--c/src/exec/libcsupport/src/termios.c4
-rw-r--r--c/src/lib/include/rtems/libio.h3
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/console/console.c2
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/console/console.c4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/console/console.c2
-rw-r--r--c/src/lib/libc/libio.h3
-rw-r--r--c/src/lib/libc/termios.c4
-rw-r--r--cpukit/libcsupport/include/rtems/libio.h3
-rw-r--r--cpukit/libcsupport/src/termios.c4
10 files changed, 18 insertions, 14 deletions
diff --git a/c/src/exec/libcsupport/include/rtems/libio.h b/c/src/exec/libcsupport/include/rtems/libio.h
index bf9fbf68ea..e687596df1 100644
--- a/c/src/exec/libcsupport/include/rtems/libio.h
+++ b/c/src/exec/libcsupport/include/rtems/libio.h
@@ -139,7 +139,7 @@ rtems_status_code rtems_termios_open (
int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor),
- int (*deviceWrite)(int minor, char *buf, int len),
+ int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts
);
@@ -148,6 +148,7 @@ rtems_status_code rtems_termios_read (void *arg);
rtems_status_code rtems_termios_write (void *arg);
rtems_status_code rtems_termios_ioctl (void *arg);
void rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len);
+void rtems_termios_dequeue_characters (void *ttyp, int len);
void rtems_termios_reserve_resources(
rtems_configuration_table *configuration,
rtems_unsigned32 number_of_devices
diff --git a/c/src/exec/libcsupport/src/termios.c b/c/src/exec/libcsupport/src/termios.c
index 5eb8997b15..edc92ed484 100644
--- a/c/src/exec/libcsupport/src/termios.c
+++ b/c/src/exec/libcsupport/src/termios.c
@@ -111,7 +111,7 @@ struct rtems_termios_tty {
*/
int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor);
- int (*write)(int minor, char *buf, int len);
+ int (*write)(int minor, const char *buf, int len);
};
static struct rtems_termios_tty *ttyHead, *ttyTail;
static rtems_id ttyMutex;
@@ -170,7 +170,7 @@ rtems_termios_open (
int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor),
- int (*deviceWrite)(int minor, char *buf, int len),
+ int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts
)
{
diff --git a/c/src/lib/include/rtems/libio.h b/c/src/lib/include/rtems/libio.h
index bf9fbf68ea..e687596df1 100644
--- a/c/src/lib/include/rtems/libio.h
+++ b/c/src/lib/include/rtems/libio.h
@@ -139,7 +139,7 @@ rtems_status_code rtems_termios_open (
int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor),
- int (*deviceWrite)(int minor, char *buf, int len),
+ int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts
);
@@ -148,6 +148,7 @@ rtems_status_code rtems_termios_read (void *arg);
rtems_status_code rtems_termios_write (void *arg);
rtems_status_code rtems_termios_ioctl (void *arg);
void rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len);
+void rtems_termios_dequeue_characters (void *ttyp, int len);
void rtems_termios_reserve_resources(
rtems_configuration_table *configuration,
rtems_unsigned32 number_of_devices
diff --git a/c/src/lib/libbsp/m68k/dmv152/console/console.c b/c/src/lib/libbsp/m68k/dmv152/console/console.c
index e46576d3b2..13007fc606 100644
--- a/c/src/lib/libbsp/m68k/dmv152/console/console.c
+++ b/c/src/lib/libbsp/m68k/dmv152/console/console.c
@@ -118,7 +118,7 @@ void DEBUG_puts(
*
*/
-int console_write_support (int minor, char *buf, int len)
+int console_write_support (int minor, const char *buf, int len)
{
int nwrite = 0;
diff --git a/c/src/lib/libbsp/m68k/gen68360/console/console.c b/c/src/lib/libbsp/m68k/gen68360/console/console.c
index 2c2ce594e2..8f428faf43 100644
--- a/c/src/lib/libbsp/m68k/gen68360/console/console.c
+++ b/c/src/lib/libbsp/m68k/gen68360/console/console.c
@@ -183,10 +183,10 @@ smc1Read (int minor)
* Transmit all characters.
*/
static int
-smc1Write (int minor, char *buf, int len)
+smc1Write (int minor, const char *buf, int len)
{
#if (defined (M360_SMC1_INTERRUPT))
- smcTxBd->buffer = buf;
+ smcTxBd->buffer = (char *)buf;
smcTxBd->length = len;
smcTxBd->status = M360_BD_READY | M360_BD_WRAP | M360_BD_INTERRUPT;
#else
diff --git a/c/src/lib/libbsp/sparc/erc32/console/console.c b/c/src/lib/libbsp/sparc/erc32/console/console.c
index 6dcf48567c..f2fef4a209 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/console.c
+++ b/c/src/lib/libbsp/sparc/erc32/console/console.c
@@ -354,7 +354,7 @@ void DEBUG_puts(
*
*/
-int console_write_support (int minor, char *buf, int len)
+int console_write_support (int minor, const char *buf, int len)
{
int nwrite = 0;
diff --git a/c/src/lib/libc/libio.h b/c/src/lib/libc/libio.h
index bf9fbf68ea..e687596df1 100644
--- a/c/src/lib/libc/libio.h
+++ b/c/src/lib/libc/libio.h
@@ -139,7 +139,7 @@ rtems_status_code rtems_termios_open (
int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor),
- int (*deviceWrite)(int minor, char *buf, int len),
+ int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts
);
@@ -148,6 +148,7 @@ rtems_status_code rtems_termios_read (void *arg);
rtems_status_code rtems_termios_write (void *arg);
rtems_status_code rtems_termios_ioctl (void *arg);
void rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len);
+void rtems_termios_dequeue_characters (void *ttyp, int len);
void rtems_termios_reserve_resources(
rtems_configuration_table *configuration,
rtems_unsigned32 number_of_devices
diff --git a/c/src/lib/libc/termios.c b/c/src/lib/libc/termios.c
index 5eb8997b15..edc92ed484 100644
--- a/c/src/lib/libc/termios.c
+++ b/c/src/lib/libc/termios.c
@@ -111,7 +111,7 @@ struct rtems_termios_tty {
*/
int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor);
- int (*write)(int minor, char *buf, int len);
+ int (*write)(int minor, const char *buf, int len);
};
static struct rtems_termios_tty *ttyHead, *ttyTail;
static rtems_id ttyMutex;
@@ -170,7 +170,7 @@ rtems_termios_open (
int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor),
- int (*deviceWrite)(int minor, char *buf, int len),
+ int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts
)
{
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index bf9fbf68ea..e687596df1 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -139,7 +139,7 @@ rtems_status_code rtems_termios_open (
int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor),
- int (*deviceWrite)(int minor, char *buf, int len),
+ int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts
);
@@ -148,6 +148,7 @@ rtems_status_code rtems_termios_read (void *arg);
rtems_status_code rtems_termios_write (void *arg);
rtems_status_code rtems_termios_ioctl (void *arg);
void rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len);
+void rtems_termios_dequeue_characters (void *ttyp, int len);
void rtems_termios_reserve_resources(
rtems_configuration_table *configuration,
rtems_unsigned32 number_of_devices
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c
index 5eb8997b15..edc92ed484 100644
--- a/cpukit/libcsupport/src/termios.c
+++ b/cpukit/libcsupport/src/termios.c
@@ -111,7 +111,7 @@ struct rtems_termios_tty {
*/
int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor);
- int (*write)(int minor, char *buf, int len);
+ int (*write)(int minor, const char *buf, int len);
};
static struct rtems_termios_tty *ttyHead, *ttyTail;
static rtems_id ttyMutex;
@@ -170,7 +170,7 @@ rtems_termios_open (
int (*deviceFirstOpen)(int major, int minor, void *arg),
int (*deviceLastClose)(int major, int minor, void *arg),
int (*deviceRead)(int minor),
- int (*deviceWrite)(int minor, char *buf, int len),
+ int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts
)
{