2005-02-01 Joel Sherrill <joel@OARcorp.com>

* 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.
This commit is contained in:
Joel Sherrill
2005-02-02 00:06:18 +00:00
parent 1d386ff925
commit ce92867bea
8 changed files with 42 additions and 22 deletions

View File

@@ -1,3 +1,11 @@
2005-02-01 Joel Sherrill <joel@OARcorp.com>
* 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 <ralf.corsepius@rtems.org> 2005-02-01 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/prog-cc.m4: Remove refs to gcc-isystem.m4. * aclocal/prog-cc.m4: Remove refs to gcc-isystem.m4.

View File

@@ -54,7 +54,7 @@ typedef struct bdbuf_buffer {
dev_t dev; /* device number */ dev_t dev; /* device number */
blkdev_bnum block; /* block number on the device */ 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 */ rtems_status_code status; /* Last I/O operation completion status */
int error; /* If status != RTEMS_SUCCESSFUL, this field contains int error; /* If status != RTEMS_SUCCESSFUL, this field contains
errno value which can be used by user later */ errno value which can be used by user later */
@@ -79,12 +79,13 @@ typedef struct bdbuf_buffer {
* amount, memory location) for buffering layer * amount, memory location) for buffering layer
*/ */
typedef struct rtems_bdbuf_config { typedef struct rtems_bdbuf_config {
int size; /* Size of block */ int size; /* Size of block */
int num; /* Number of blocks of appropriate size */ int num; /* Number of blocks of appropriate size */
char *mem_area; /* Pointer to the blocks location or NULL, in this unsigned char *mem_area;
case memory for blocks will be allocated by /* Pointer to the blocks location or NULL, in this
Buffering Layer with the help of RTEMS partition case memory for blocks will be allocated by
manager */ Buffering Layer with the help of RTEMS partition
manager */
} rtems_bdbuf_config; } rtems_bdbuf_config;
extern rtems_bdbuf_config rtems_bdbuf_configuration[]; extern rtems_bdbuf_config rtems_bdbuf_configuration[];

View File

@@ -134,7 +134,7 @@ typedef struct disk_desc_s {
dev_t dev; /* device number */ dev_t dev; /* device number */
/* device name in /dev filesystem */ /* 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_size; /* size of sector */
uint32_t sector_bits; /* the base-2 logarithm of sector_size */ uint32_t sector_bits; /* the base-2 logarithm of sector_size */

View File

@@ -33,7 +33,7 @@ rtems_blkdev_generic_read(
rtems_libio_rw_args_t *args = arg; rtems_libio_rw_args_t *args = arg;
int block_size_log2; int block_size_log2;
int block_size; int block_size;
char *buf; unsigned char *buf;
unsigned int count; unsigned int count;
unsigned int block; unsigned int block;
unsigned int blkofs; unsigned int blkofs;
@@ -93,7 +93,7 @@ rtems_blkdev_generic_write(
rtems_libio_rw_args_t *args = arg; rtems_libio_rw_args_t *args = arg;
int block_size_log2; int block_size_log2;
int block_size; int block_size;
char *buf; unsigned char *buf;
unsigned int count; unsigned int count;
unsigned int block; unsigned int block;
unsigned int blkofs; unsigned int blkofs;

View File

@@ -159,7 +159,7 @@ void rtems_termios_rxirq_occured(struct rtems_termios_tty *tty);
* FIXME: this should move to termios.h! * FIXME: this should move to termios.h!
* put a string to output ring buffer * put a string to output ring buffer
*/ */
void rtems_termios_puts (const char *buf, void rtems_termios_puts (const void *buf,
int len, int len,
struct rtems_termios_tty *tty); struct rtems_termios_tty *tty);
/* /*

View File

@@ -626,14 +626,16 @@ rtems_termios_ioctl (void *arg)
* Send characters to device-specific code * Send characters to device-specific code
*/ */
void 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; unsigned int newHead;
rtems_interrupt_level level; rtems_interrupt_level level;
rtems_status_code sc; rtems_status_code sc;
if (tty->device.outputUsesInterrupts == TERMIOS_POLLED) { if (tty->device.outputUsesInterrupts == TERMIOS_POLLED) {
(*tty->device.write)(tty->minor, buf, len); (*tty->device.write)(tty->minor, (void *)buf, len);
return; return;
} }
newHead = tty->rawOutBuf.Head; newHead = tty->rawOutBuf.Head;
@@ -1032,8 +1034,8 @@ fillBufferQueue (struct rtems_termios_tty *tty)
|| (tty->flow_ctrl & FL_OSTOP))) { || (tty->flow_ctrl & FL_OSTOP))) {
/* XON should be sent now... */ /* XON should be sent now... */
(*tty->device.write)(tty->minor, (*tty->device.write)(tty->minor,
&(tty->termios.c_cc[VSTART]), (void *)&(tty->termios.c_cc[VSTART]),
1); 1);
} }
else if (tty->flow_ctrl & FL_MDRTS) { else if (tty->flow_ctrl & FL_MDRTS) {
tty->flow_ctrl &= ~FL_IRTSOFF; tty->flow_ctrl &= ~FL_IRTSOFF;
@@ -1215,8 +1217,8 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len)
/* call write function here */ /* call write function here */
tty->flow_ctrl |= FL_ISNTXOF; tty->flow_ctrl |= FL_ISNTXOF;
(*tty->device.write)(tty->minor, (*tty->device.write)(tty->minor,
&(tty->termios.c_cc[VSTOP]), (void *)&(tty->termios.c_cc[VSTOP]),
1); 1);
} }
} }
else if ((tty->flow_ctrl & (FL_MDRTS | FL_IRTSOFF)) 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)) { == (FL_MDXOF | FL_IREQXOF)) {
/* XOFF should be sent now... */ /* XOFF should be sent now... */
(*tty->device.write)(tty->minor, (*tty->device.write)(tty->minor,
&(tty->termios.c_cc[VSTOP]), 1); (void *)&(tty->termios.c_cc[VSTOP]), 1);
rtems_interrupt_disable(level); rtems_interrupt_disable(level);
tty->t_dqlen--; 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 * Therefore the dequeue "length" should be reduced by 1
*/ */
(*tty->device.write)(tty->minor, (*tty->device.write)(tty->minor,
&(tty->termios.c_cc[VSTART]), 1); (void *)&(tty->termios.c_cc[VSTART]), 1);
rtems_interrupt_disable(level); rtems_interrupt_disable(level);
tty->t_dqlen--; tty->t_dqlen--;

View File

@@ -76,7 +76,10 @@
} while (0) } 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_Id *id,
Objects_Locations *location Objects_Locations *location
) )

View File

@@ -67,7 +67,10 @@
} \ } \
} while (0) } 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_Id *id,
Objects_Locations *location Objects_Locations *location
) )
@@ -78,7 +81,10 @@ static POSIX_Mutex_Control * _POSIX_Mutex_Get(
_Objects_Get( &_POSIX_Mutex_Information, *id, location ); _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_Id *id,
Objects_Locations *location, Objects_Locations *location,
ISR_Level *level ISR_Level *level