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

Corrected prototypes for all termios console write driver entries to

Browse Source 
properly reflect the const on the buffer pointer being passed in.
This commit is contained in:
Joel Sherrill
1997-12-22 17:29:51 +00:00
parent 2ab1b3ac52
commit 608641e6d2
10 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,7 @@ rtems_status_code rtems_termios_open (
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), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len), int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts 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_write (void *arg);
rtems_status_code rtems_termios_ioctl (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_enqueue_raw_characters (void *ttyp, char *buf, int len);
void rtems_termios_dequeue_characters (void *ttyp, int len);
void rtems_termios_reserve_resources( void rtems_termios_reserve_resources(
rtems_configuration_table *configuration, rtems_configuration_table *configuration,
rtems_unsigned32 number_of_devices rtems_unsigned32 number_of_devices

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

@@ -111,7 +111,7 @@ struct rtems_termios_tty {
*/ */
int (*lastClose)(int major, int minor, void *arg); int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor); 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 struct rtems_termios_tty *ttyHead, *ttyTail;
static rtems_id ttyMutex; static rtems_id ttyMutex;
@@ -170,7 +170,7 @@ rtems_termios_open (
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), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len), int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts int deviceOutputUsesInterrupts
) )
{ {

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

@@ -139,7 +139,7 @@ rtems_status_code rtems_termios_open (
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), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len), int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts 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_write (void *arg);
rtems_status_code rtems_termios_ioctl (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_enqueue_raw_characters (void *ttyp, char *buf, int len);
void rtems_termios_dequeue_characters (void *ttyp, int len);
void rtems_termios_reserve_resources( void rtems_termios_reserve_resources(
rtems_configuration_table *configuration, rtems_configuration_table *configuration,
rtems_unsigned32 number_of_devices rtems_unsigned32 number_of_devices

2
c/src/lib/libbsp/m68k/dmv152/console/console.c
View File

@@ -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; int nwrite = 0;

4
c/src/lib/libbsp/m68k/gen68360/console/console.c
View File

@@ -183,10 +183,10 @@ smc1Read (int minor)
* Transmit all characters. * Transmit all characters.
*/ */
static int static int
smc1Write (int minor, char *buf, int len) smc1Write (int minor, const char *buf, int len)
{ {
#if (defined (M360_SMC1_INTERRUPT)) #if (defined (M360_SMC1_INTERRUPT))
smcTxBd->buffer = buf; smcTxBd->buffer = (char *)buf;
smcTxBd->length = len; smcTxBd->length = len;
smcTxBd->status = M360_BD_READY | M360_BD_WRAP | M360_BD_INTERRUPT; smcTxBd->status = M360_BD_READY | M360_BD_WRAP | M360_BD_INTERRUPT;
#else #else

2
c/src/lib/libbsp/sparc/erc32/console/console.c
View File

@@ -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; int nwrite = 0;

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

@@ -139,7 +139,7 @@ rtems_status_code rtems_termios_open (
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), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len), int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts 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_write (void *arg);
rtems_status_code rtems_termios_ioctl (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_enqueue_raw_characters (void *ttyp, char *buf, int len);
void rtems_termios_dequeue_characters (void *ttyp, int len);
void rtems_termios_reserve_resources( void rtems_termios_reserve_resources(
rtems_configuration_table *configuration, rtems_configuration_table *configuration,
rtems_unsigned32 number_of_devices rtems_unsigned32 number_of_devices

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

@@ -111,7 +111,7 @@ struct rtems_termios_tty {
*/ */
int (*lastClose)(int major, int minor, void *arg); int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor); 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 struct rtems_termios_tty *ttyHead, *ttyTail;
static rtems_id ttyMutex; static rtems_id ttyMutex;
@@ -170,7 +170,7 @@ rtems_termios_open (
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), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len), int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts int deviceOutputUsesInterrupts
) )
{ {

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

@@ -139,7 +139,7 @@ rtems_status_code rtems_termios_open (
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), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len), int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts 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_write (void *arg);
rtems_status_code rtems_termios_ioctl (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_enqueue_raw_characters (void *ttyp, char *buf, int len);
void rtems_termios_dequeue_characters (void *ttyp, int len);
void rtems_termios_reserve_resources( void rtems_termios_reserve_resources(
rtems_configuration_table *configuration, rtems_configuration_table *configuration,
rtems_unsigned32 number_of_devices rtems_unsigned32 number_of_devices

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

@@ -111,7 +111,7 @@ struct rtems_termios_tty {
*/ */
int (*lastClose)(int major, int minor, void *arg); int (*lastClose)(int major, int minor, void *arg);
int (*read)(int minor); 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 struct rtems_termios_tty *ttyHead, *ttyTail;
static rtems_id ttyMutex; static rtems_id ttyMutex;
@@ -170,7 +170,7 @@ rtems_termios_open (
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), int (*deviceRead)(int minor),
int (*deviceWrite)(int minor, char *buf, int len), int (*deviceWrite)(int minor, const char *buf, int len),
int deviceOutputUsesInterrupts int deviceOutputUsesInterrupts
) )
{ {