From ce92867bea9b027af4119c694aa6b72a043b4fea Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 2 Feb 2005 00:06:18 +0000 Subject: 2005-02-01 Joel Sherrill * libblock/include/rtems/bdbuf.h, libblock/include/rtems/ide_part_table.h, libblock/src/blkdev.c, libcsupport/include/rtems/termiostypes.h, libcsupport/src/termios.c, posix/macros/rtems/posix/cond.inl, posix/macros/rtems/posix/mutex.inl : Remove warnings. --- cpukit/ChangeLog | 8 ++++++++ cpukit/libblock/include/rtems/bdbuf.h | 15 ++++++++------- cpukit/libblock/include/rtems/ide_part_table.h | 2 +- cpukit/libblock/src/blkdev.c | 4 ++-- cpukit/libcsupport/include/rtems/termiostypes.h | 2 +- cpukit/libcsupport/src/termios.c | 18 ++++++++++-------- cpukit/posix/macros/rtems/posix/cond.inl | 5 ++++- cpukit/posix/macros/rtems/posix/mutex.inl | 10 ++++++++-- 8 files changed, 42 insertions(+), 22 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 3db9708c93..bc233bcffe 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2005-02-01 Joel Sherrill + + * libblock/include/rtems/bdbuf.h, + libblock/include/rtems/ide_part_table.h, libblock/src/blkdev.c, + libcsupport/include/rtems/termiostypes.h, libcsupport/src/termios.c, + posix/macros/rtems/posix/cond.inl, + posix/macros/rtems/posix/mutex.inl : Remove warnings. + 2005-02-01 Ralf Corsepius * aclocal/prog-cc.m4: Remove refs to gcc-isystem.m4. diff --git a/cpukit/libblock/include/rtems/bdbuf.h b/cpukit/libblock/include/rtems/bdbuf.h index 8b39ce4fa7..0a10636966 100644 --- a/cpukit/libblock/include/rtems/bdbuf.h +++ b/cpukit/libblock/include/rtems/bdbuf.h @@ -54,7 +54,7 @@ typedef struct bdbuf_buffer { dev_t dev; /* device number */ blkdev_bnum block; /* block number on the device */ - char *buffer; /* Pointer to the buffer memory area */ + unsigned char *buffer; /* Pointer to the buffer memory area */ rtems_status_code status; /* Last I/O operation completion status */ int error; /* If status != RTEMS_SUCCESSFUL, this field contains errno value which can be used by user later */ @@ -79,12 +79,13 @@ typedef struct bdbuf_buffer { * amount, memory location) for buffering layer */ typedef struct rtems_bdbuf_config { - int size; /* Size of block */ - int num; /* Number of blocks of appropriate size */ - char *mem_area; /* Pointer to the blocks location or NULL, in this - case memory for blocks will be allocated by - Buffering Layer with the help of RTEMS partition - manager */ + int size; /* Size of block */ + int num; /* Number of blocks of appropriate size */ + unsigned char *mem_area; + /* Pointer to the blocks location or NULL, in this + case memory for blocks will be allocated by + Buffering Layer with the help of RTEMS partition + manager */ } rtems_bdbuf_config; extern rtems_bdbuf_config rtems_bdbuf_configuration[]; diff --git a/cpukit/libblock/include/rtems/ide_part_table.h b/cpukit/libblock/include/rtems/ide_part_table.h index 01efc0cdfb..f0910a58e6 100644 --- a/cpukit/libblock/include/rtems/ide_part_table.h +++ b/cpukit/libblock/include/rtems/ide_part_table.h @@ -134,7 +134,7 @@ typedef struct disk_desc_s { dev_t dev; /* device number */ /* device name in /dev filesystem */ - uint8_t dev_name[RTEMS_IDE_PARTITION_DEV_NAME_LENGTH_MAX]; + char dev_name[RTEMS_IDE_PARTITION_DEV_NAME_LENGTH_MAX]; uint32_t sector_size; /* size of sector */ uint32_t sector_bits; /* the base-2 logarithm of sector_size */ diff --git a/cpukit/libblock/src/blkdev.c b/cpukit/libblock/src/blkdev.c index bc6ec4b7f2..537950eb25 100644 --- a/cpukit/libblock/src/blkdev.c +++ b/cpukit/libblock/src/blkdev.c @@ -33,7 +33,7 @@ rtems_blkdev_generic_read( rtems_libio_rw_args_t *args = arg; int block_size_log2; int block_size; - char *buf; + unsigned char *buf; unsigned int count; unsigned int block; unsigned int blkofs; @@ -93,7 +93,7 @@ rtems_blkdev_generic_write( rtems_libio_rw_args_t *args = arg; int block_size_log2; int block_size; - char *buf; + unsigned char *buf; unsigned int count; unsigned int block; unsigned int blkofs; diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/cpukit/libcsupport/include/rtems/termiostypes.h index b4c1369c36..67233895d4 100644 --- a/cpukit/libcsupport/include/rtems/termiostypes.h +++ b/cpukit/libcsupport/include/rtems/termiostypes.h @@ -159,7 +159,7 @@ void rtems_termios_rxirq_occured(struct rtems_termios_tty *tty); * FIXME: this should move to termios.h! * put a string to output ring buffer */ -void rtems_termios_puts (const char *buf, +void rtems_termios_puts (const void *buf, int len, struct rtems_termios_tty *tty); /* diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c index 14031f396d..deb231866b 100644 --- a/cpukit/libcsupport/src/termios.c +++ b/cpukit/libcsupport/src/termios.c @@ -626,14 +626,16 @@ rtems_termios_ioctl (void *arg) * Send characters to device-specific code */ void -rtems_termios_puts (const char *buf, int len, struct rtems_termios_tty *tty) +rtems_termios_puts ( + const void *_buf, int len, struct rtems_termios_tty *tty) { + const unsigned char *buf = _buf; unsigned int newHead; rtems_interrupt_level level; rtems_status_code sc; if (tty->device.outputUsesInterrupts == TERMIOS_POLLED) { - (*tty->device.write)(tty->minor, buf, len); + (*tty->device.write)(tty->minor, (void *)buf, len); return; } newHead = tty->rawOutBuf.Head; @@ -1032,8 +1034,8 @@ fillBufferQueue (struct rtems_termios_tty *tty) || (tty->flow_ctrl & FL_OSTOP))) { /* XON should be sent now... */ (*tty->device.write)(tty->minor, - &(tty->termios.c_cc[VSTART]), - 1); + (void *)&(tty->termios.c_cc[VSTART]), + 1); } else if (tty->flow_ctrl & FL_MDRTS) { tty->flow_ctrl &= ~FL_IRTSOFF; @@ -1215,8 +1217,8 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len) /* call write function here */ tty->flow_ctrl |= FL_ISNTXOF; (*tty->device.write)(tty->minor, - &(tty->termios.c_cc[VSTOP]), - 1); + (void *)&(tty->termios.c_cc[VSTOP]), + 1); } } else if ((tty->flow_ctrl & (FL_MDRTS | FL_IRTSOFF)) @@ -1270,7 +1272,7 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) == (FL_MDXOF | FL_IREQXOF)) { /* XOFF should be sent now... */ (*tty->device.write)(tty->minor, - &(tty->termios.c_cc[VSTOP]), 1); + (void *)&(tty->termios.c_cc[VSTOP]), 1); rtems_interrupt_disable(level); tty->t_dqlen--; @@ -1290,7 +1292,7 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) * Therefore the dequeue "length" should be reduced by 1 */ (*tty->device.write)(tty->minor, - &(tty->termios.c_cc[VSTART]), 1); + (void *)&(tty->termios.c_cc[VSTART]), 1); rtems_interrupt_disable(level); tty->t_dqlen--; diff --git a/cpukit/posix/macros/rtems/posix/cond.inl b/cpukit/posix/macros/rtems/posix/cond.inl index 5cec198e23..8dd08f23d4 100644 --- a/cpukit/posix/macros/rtems/posix/cond.inl +++ b/cpukit/posix/macros/rtems/posix/cond.inl @@ -76,7 +76,10 @@ } while (0) -static POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get ( +/* If we find a compiler that doesn't accept static inline functions, + * then this will have to move to a .c file. Until then, we will use this. + */ +static inline POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get ( Objects_Id *id, Objects_Locations *location ) diff --git a/cpukit/posix/macros/rtems/posix/mutex.inl b/cpukit/posix/macros/rtems/posix/mutex.inl index f1b9c98a8f..15265738ab 100644 --- a/cpukit/posix/macros/rtems/posix/mutex.inl +++ b/cpukit/posix/macros/rtems/posix/mutex.inl @@ -67,7 +67,10 @@ } \ } while (0) -static POSIX_Mutex_Control * _POSIX_Mutex_Get( +/* If we find a compiler that doesn't accept static inline functions, + * then this will have to move to a .c file. Until then, we will use this. + */ +static inline POSIX_Mutex_Control * _POSIX_Mutex_Get( Objects_Id *id, Objects_Locations *location ) @@ -78,7 +81,10 @@ static POSIX_Mutex_Control * _POSIX_Mutex_Get( _Objects_Get( &_POSIX_Mutex_Information, *id, location ); } -static POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable( +/* If we find a compiler that doesn't accept static inline functions, + * then this will have to move to a .c file. Until then, we will use this. + */ +static inline POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable( Objects_Id *id, Objects_Locations *location, ISR_Level *level -- cgit v1.2.3