git: 9front

Info  •  Files  •  Log  •  Branches

9boot: increase timeout, do less printing

--- a/sys/src/boot/pc/sub.c

+++ b/sys/src/boot/pc/sub.c

@@ -170,6 +170,8 @@

 	confend = BOOTARGS;

 	memset(confend, 0, BOOTARGSLEN);

+

+	e820conf();

 Loop:

 	while((n = readline(f, line)) > 0){

 		if(*line == 0 || strchr("#;=", *line))

@@ -196,7 +198,6 @@

 		*confend++ = '\n';

 		print(line); print(crnl);

 	}

-	e820conf();

 	*confend = 0;

 	if(f){

@@ -203,7 +204,7 @@

 		close(f);

 		f = 0;

-		if(kern && timeout(500))

+		if(kern && timeout(1000))

 			goto Loop;

 	}

@@ -218,24 +219,6 @@

 }

-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];

-}

-

 static void

 hexfmt(char *s, int i, ulong a)

 {

@@ -332,6 +315,24 @@

 	*confend++ = '\n';

 }

+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];

+}

+

 void a20(void);

 char*

@@ -341,9 +342,6 @@

 	ulong n;

 	Exec ex;

-	print("boot");

-	print(crnl);

-

 	a20();

 	if(readn(f, &ex, sizeof(ex)) != sizeof(ex))

@@ -365,7 +363,7 @@

 	close(f);

 	unload();

-	print("go!");

+	print("boot");

 	print(crnl);

 	jump(e);

-- 

⑨