merge

[plan9front.git] / sys / src / boot / efi / sub.c

diff --git a/sys/src/boot/efi/sub.c b/sys/src/boot/efi/sub.c
index ee951bd9fc24f62e3e4a2ccfcd019baaf741f8f7..c4ab445120c431d05810cc1e1eccdda968895b31 100644 (file)
--- a/sys/src/boot/efi/sub.c
+++ b/sys/src/boot/efi/sub.c
@@ -20,19 +20,13 @@ readn(void *f, void *data, int len)
 {
        uchar *p, *e;
 
-       putc(' ');
        p = data;
        e = p + len;
        while(p < e){
-               if(((ulong)p & 0xF000) == 0){
-                       putc('\b');
-                       putc(hex[((ulong)p>>16)&0xF]);
-               }
                if((len = read(f, p, e - p)) <= 0)
                        break;
                p += len;
        }
-       putc('\b');
 
        return p - (uchar*)data;
 }
@@ -120,6 +114,8 @@ readline(void *f, char buf[64])
                                if(*p == '\r')
                                        putc('\n');
                                else if(*p == '\b' && p > buf){
+                                       putc(' ');
+                                       putc('\b');
                                        p--;
                                        continue;
                                }
@@ -362,17 +358,18 @@ bootkern(void *f)
        if(readn(f, t, n) != n)
                goto Error;
        t += n;
-       d = (uchar*)PGROUND((ulong)t);
+       d = (uchar*)PGROUND((uintptr)t);
        memset(t, 0, d - t);
        n = beswal(ex.data);
        if(readn(f, d, n) != n)
                goto Error;
        d += n;
-       t = (uchar*)PGROUND((ulong)d);
+       t = (uchar*)PGROUND((uintptr)d);
        t += PGROUND(beswal(ex.bss));
        memset(d, 0, t - d);
 
        close(f);
+       print("boot\n");
        unload();
 
        jump(e);