mirror of
https://gitlab.com/qemu-project/openbios.git
synced 2024-02-13 08:34:06 +08:00
Use standard types
Replace uchar, uint, ulong, u_char, u_int, u_long, u_int* with their standard equivalents. Fixes warnings like these on OpenBSD: CC target/arch/unix/unix.o In file included from ../arch/unix/unix.c:29: ../include/config.h:26: warning: redefinition of `ulong' /usr/include/sys/types.h:56: warning: `ulong' previously declared here ../include/config.h:26: warning: redundant redeclaration of `ulong' in same scope Signed-off-by: Blue Swirl <blauwirbel@gmail.com> git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@830 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
@@ -56,13 +56,13 @@ static struct {
|
||||
static int
|
||||
get_conschar( int x, int y )
|
||||
{
|
||||
if( (uint)x < cons.w && (uint)y < cons.h )
|
||||
if( (unsigned int)x < cons.w && (unsigned int)y < cons.h )
|
||||
return cons.buf[y*cons.w + x];
|
||||
return ' ';
|
||||
}
|
||||
|
||||
static void
|
||||
draw_char( uint h, uint v )
|
||||
draw_char( unsigned int h, unsigned int v )
|
||||
{
|
||||
const unsigned char *c = fontdata;
|
||||
int x, y, xx, rskip, m;
|
||||
@@ -152,7 +152,7 @@ console_close( void )
|
||||
static void
|
||||
rec_char( int ch, int x, int y )
|
||||
{
|
||||
if( (uint)x < cons.w && (uint)y < cons.h ) {
|
||||
if( (unsigned int)x < cons.w && (unsigned int)y < cons.h ) {
|
||||
cons.buf[y*cons.w + x] = ch;
|
||||
draw_char( x, y );
|
||||
}
|
||||
@@ -318,8 +318,8 @@ do_con_trol(unsigned char ch)
|
||||
cons.y = cons.vc_par[0];
|
||||
return;
|
||||
case 'J':
|
||||
if (cons.vc_par[0] == 0 && (uint)cons.y < (uint)cons.h &&
|
||||
(uint)cons.x < (uint)cons.w) {
|
||||
if (cons.vc_par[0] == 0 && (unsigned int)cons.y < (unsigned int)cons.h &&
|
||||
(unsigned int)cons.x < (unsigned int)cons.w) {
|
||||
// erase from cursor to end of display
|
||||
for (i = cons.x; i < cons.w; i++)
|
||||
cons.buf[cons.y * cons.w + i] = ' ';
|
||||
|
||||
Reference in New Issue
Block a user