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

add clear command to 9boot to reset configuration

Browse source
This commit is contained in:
cinap_lenrek 2011-04-15 08:31:19 +00:00
parent 856aeaf333
commit 0653e52f4b
1 changed files with 50 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
sys/src/boot/pc/sub.c
View file

@ -85,50 +85,6 @@ readn(void *f, void *data, int len)
return p - (uchar*)data; return p - (uchar*)data;
} }
static ushort
beswab(ushort s)
{
uchar *p;
p = (uchar*)&s;
return (p[0]<<8) | p[1];
}
static ulong
beswal(ulong l)
{
uchar *p;
p = (uchar*)&l;
return (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
}
char*
bootkern(void *f)
{
uchar *e, *d;
Exec ex;
int n;
a20();
if(readn(f, &ex, sizeof(ex)) != sizeof(ex))
return "bad header";
if(beswal(ex.magic) != I_MAGIC)
return "bad magic";
e = (uchar*)(beswal(ex.entry) & ~0xF0000000UL);
n = beswal(ex.text);
if(readn(f, e, n) != n)
goto err;
d = (uchar*)(((ulong)e + n + 0xFFF) & ~0xFFFUL);
n = beswal(ex.data);
if(readn(f, d, n) != n)
goto err;
close(f);
jump(e);
err:
return "i/o error";
}
static int static int
readline(void *f, char buf[64]) readline(void *f, char buf[64])
{ {
@ -169,6 +125,7 @@ configure(void *f, char *path)
char line[64], *p, *kern; char line[64], *p, *kern;
int inblock, n; int inblock, n;
Clear:
kern = 0; kern = 0;
inblock = 0; inblock = 0;
p = (char*)((CONFADDR + 64) & ~0xF0000000UL); p = (char*)((CONFADDR + 64) & ~0xF0000000UL);
@ -180,6 +137,10 @@ Loop:
inblock = memcmp("[common]", line, 8); inblock = memcmp("[common]", line, 8);
continue; continue;
} }
if(memcmp("clear", line, 6) == 0){
print("ok\r\n");
goto Clear;
}
if(memcmp("boot", line, 5) == 0) if(memcmp("boot", line, 5) == 0)
break; break;
if(inblock || !strrchr(line, '=')) if(inblock || !strrchr(line, '='))
@ -206,3 +167,48 @@ Loop:
kern = p+1; kern = p+1;
return kern; return kern;
} }
static ushort
beswab(ushort s)
{
uchar *p;
p = (uchar*)&s;
return (p[0]<<8) | p[1];
}
static ulong
beswal(ulong l)
{
uchar *p;
p = (uchar*)&l;
return (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
}
char*
bootkern(void *f)
{
uchar *e, *d;
Exec ex;
int n;
a20();
if(readn(f, &ex, sizeof(ex)) != sizeof(ex))
return "bad header";
if(beswal(ex.magic) != I_MAGIC)
return "bad magic";
e = (uchar*)(beswal(ex.entry) & ~0xF0000000UL);
n = beswal(ex.text);
if(readn(f, e, n) != n)
goto Error;
d = (uchar*)(((ulong)e + n + 0xFFF) & ~0xFFFUL);
n = beswal(ex.data);
if(readn(f, d, n) != n)
goto Error;
close(f);
jump(e);
Error:
return "i/o error";
}