xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

efi: fix compiler warnings, remove indicator prints in readn()

Browse source
This commit is contained in:
cinap_lenrek 2014-10-19 22:01:13 +02:00
parent f0ff0fb054
commit d6ea496960
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/boot/efi/efi.c
View file

@ -7,7 +7,7 @@ enum {
}; };
UINTN MK; UINTN MK;
EFI_HANDLE *IH; EFI_HANDLE IH;
EFI_SYSTEM_TABLE *ST; EFI_SYSTEM_TABLE *ST;
EFI_GRAPHICS_OUTPUT_PROTOCOL *gop; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;

1
sys/src/boot/efi/mkfile
View file

@ -1,6 +1,7 @@
TARG=bootia32.efi bootx64.efi TARG=bootia32.efi bootx64.efi
HFILES=fns.h mem.h HFILES=fns.h mem.h
IMAGEBASE=0x8000 IMAGEBASE=0x8000
CFLAGS=-FTVw
PEFLAGS=$CFLAGS '-DIMAGEBASE='$IMAGEBASE PEFLAGS=$CFLAGS '-DIMAGEBASE='$IMAGEBASE
all:V: $TARG all:V: $TARG

10
sys/src/boot/efi/sub.c
View file

@ -20,19 +20,13 @@ readn(void *f, void *data, int len)
{ {
uchar *p, *e; uchar *p, *e;
putc(' ');
p = data; p = data;
e = p + len; e = p + len;
while(p < e){ while(p < e){
if(((ulong)p & 0xF000) == 0){
putc('\b');
putc(hex[((ulong)p>>16)&0xF]);
}
if((len = read(f, p, e - p)) <= 0) if((len = read(f, p, e - p)) <= 0)
break; break;
p += len; p += len;
} }
putc('\b');
return p - (uchar*)data; return p - (uchar*)data;
} }
@ -362,13 +356,13 @@ bootkern(void *f)
if(readn(f, t, n) != n) if(readn(f, t, n) != n)
goto Error; goto Error;
t += n; t += n;
d = (uchar*)PGROUND((ulong)t); d = (uchar*)PGROUND((uintptr)t);
memset(t, 0, d - t); memset(t, 0, d - t);
n = beswal(ex.data); n = beswal(ex.data);
if(readn(f, d, n) != n) if(readn(f, d, n) != n)
goto Error; goto Error;
d += n; d += n;
t = (uchar*)PGROUND((ulong)d); t = (uchar*)PGROUND((uintptr)d);
t += PGROUND(beswal(ex.bss)); t += PGROUND(beswal(ex.bss));
memset(d, 0, t - d); memset(d, 0, t - d);