diff options
| author | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-11-04 18:22:10 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-11-17 12:10:37 +0100 |
| commit | 047ef92897e40079328d11fddd92e1dab75e2dc4 (patch) | |
| tree | 970d109a94a9c5d696734bafaf0decd31971fa4d | |
| parent | e43f0673c4dbf95df451f938df9fcb0a67670df3 (diff) | |
| download | SLOF-047ef92897e40079328d11fddd92e1dab75e2dc4.zip SLOF-047ef92897e40079328d11fddd92e1dab75e2dc4.tar.gz SLOF-047ef92897e40079328d11fddd92e1dab75e2dc4.tar.bz2 | |
Silenced some compiler warnings
When the biosemu has been enabled, there were some additional compiler warnings
showing up which have been silenced now.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
| -rw-r--r-- | clients/net-snk/app/biosemu/vbe.c | 8 | ||||
| -rw-r--r-- | other-licence/x86emu/Makefile | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/clients/net-snk/app/biosemu/vbe.c b/clients/net-snk/app/biosemu/vbe.c index 06b1b18..61b7102 100644 --- a/clients/net-snk/app/biosemu/vbe.c +++ b/clients/net-snk/app/biosemu/vbe.c @@ -488,7 +488,11 @@ uint32_t vbe_get_info(uint8_t argc, char ** argv) { uint8_t rval; + static const uint8_t valid_edid_sig[] = { + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00 + }; uint32_t i; + if (argc < 4) { printf ("Usage %s <vmem_base> <device_path> <address of screen_info_t>\n", @@ -592,10 +596,8 @@ vbe_get_info(uint8_t argc, char ** argv) sizeof(ddc_info.edid_block_zero)); } #endif - if (*((uint64_t *) ddc_info.edid_block_zero) != - (uint64_t) 0x00FFFFFFFFFFFF00) { + if (memcmp(ddc_info.edid_block_zero, valid_edid_sig, 8) != 0) { // invalid EDID signature... probably no monitor - output->display_type = 0x0; return 0; } else if ((ddc_info.edid_block_zero[20] & 0x80) != 0) { diff --git a/other-licence/x86emu/Makefile b/other-licence/x86emu/Makefile index 5f1fac4..c25bc15 100644 --- a/other-licence/x86emu/Makefile +++ b/other-licence/x86emu/Makefile @@ -22,8 +22,10 @@ LDFLAGS = ASFLAGS = -I./include -Wa,-mregnames #NOTE: -DDEBUG only needed for debugging/tracing... -#CFLAGS = -DDEBUG -I. -I./include -I./include/x86emu -I$(ROOTDIR)/include -I$(ROOTDIR)/lib/libc/include -g -O2 -msoft-float -Wall -save-temps -nostdinc -fno-builtin -ffreestanding -CFLAGS = -UDEBUG -m64 -I. -I./include -I./include/x86emu -I$(TOP)/clients/net-snk/include -I$(ROOTDIR)/include -I$(ROOTDIR)/lib/libc/include -O3 -Wall -nostdinc -fno-builtin -ffreestanding +CFLAGS = -UDEBUG -m64 -I. -I./include -I./include/x86emu \ + -I$(TOP)/clients/net-snk/include -I$(ROOTDIR)/include \ + -I$(ROOTDIR)/lib/libc/include -O3 -nostdinc -fno-builtin \ + -ffreestanding -Wall -Wno-unused X86EMU_OBJS = debug.o decode.o fpu.o ops2.o ops.o prim_ops.o sys.o |