diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2005-05-03 13:02:46 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2005-05-03 13:02:46 +0000 |
| commit | 73871e0e3325f7cfdcdcfd78f8dfc6b3609f8269 (patch) | |
| tree | 349e9a12eb91eb127c703d836cc59b313d2e9e5e | |
| parent | 67c593f5191b1dc903da4497feeebee472ffef8e (diff) | |
Convert the size of a memory chunk from bytes to megabytes before
casting to a 32-bit value, not after. Corrects the display of large
memory chunks in the probing: line (mem[615K 3518M 0M a20=on] becomes
mem[615K 3518M 12288M a20=on]).
Bump version on boot, cdboot and pxeboot accordingly.
"looks ok to me" weingart@
| -rw-r--r-- | sys/arch/amd64/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/cdboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/libsa/memprobe.c | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/memprobe.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/stand/pxeboot/conf.c | 4 |
8 files changed, 18 insertions, 16 deletions
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c index 8dbe954c75e..7bc4c2dcdc5 100644 --- a/sys/arch/amd64/stand/boot/conf.c +++ b/sys/arch/amd64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.4 2005/04/30 16:39:03 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.5 2005/05/03 13:02:45 tom Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -42,7 +42,7 @@ #include <biosdev.h> #include <dev/cons.h> -const char version[] = "2.08"; +const char version[] = "2.09"; int debug = 1; diff --git a/sys/arch/amd64/stand/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c index 0c86cdf9e85..e74ee752bfe 100644 --- a/sys/arch/amd64/stand/cdboot/conf.c +++ b/sys/arch/amd64/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.3 2005/04/30 16:39:03 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.4 2005/05/03 13:02:45 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -42,7 +42,7 @@ #include <biosdev.h> #include <dev/cons.h> -const char version[] = "1.02"; +const char version[] = "1.03"; int debug = 1; diff --git a/sys/arch/amd64/stand/libsa/memprobe.c b/sys/arch/amd64/stand/libsa/memprobe.c index 58543d1da6b..312fc1e6b91 100644 --- a/sys/arch/amd64/stand/libsa/memprobe.c +++ b/sys/arch/amd64/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.1 2004/02/03 12:09:47 mickey Exp $ */ +/* $OpenBSD: memprobe.c,v 1.2 2005/05/03 13:02:45 tom Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -328,7 +328,8 @@ memprobe(void) /* Count only "good" memory chunks 12K and up in size */ if ((im->type == BIOS_MAP_FREE) && (im->size >= 12*1024)) { if (im->size > 1024 * 1024) - printf("%uM ", (u_int)im->size / (1024 * 1024)); + printf("%uM ", (u_int)(im->size / + (1024 * 1024))); else printf("%uK ", (u_int)im->size / 1024); diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c index 8193d75113c..39a1851fbfa 100644 --- a/sys/arch/amd64/stand/pxeboot/conf.c +++ b/sys/arch/amd64/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 2005/04/30 16:39:03 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2005/05/03 13:02:45 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -45,7 +45,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "1.04"; +const char version[] = "1.05"; int debug = 0; #undef _TEST diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c index b8cddc2e6d3..7b8a7ce5564 100644 --- a/sys/arch/i386/stand/boot/conf.c +++ b/sys/arch/i386/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.30 2005/04/30 16:14:35 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.31 2005/05/03 13:02:44 tom Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -43,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "2.08"; +const char version[] = "2.09"; int debug = 1; diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c index 6587e485dd5..204ae6d5081 100644 --- a/sys/arch/i386/stand/cdboot/conf.c +++ b/sys/arch/i386/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.3 2005/04/30 16:14:35 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.4 2005/05/03 13:02:45 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -43,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "1.02"; +const char version[] = "1.03"; int debug = 1; #undef _TEST diff --git a/sys/arch/i386/stand/libsa/memprobe.c b/sys/arch/i386/stand/libsa/memprobe.c index d17507daf4e..156dd22cf95 100644 --- a/sys/arch/i386/stand/libsa/memprobe.c +++ b/sys/arch/i386/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.42 2004/03/09 19:12:13 tom Exp $ */ +/* $OpenBSD: memprobe.c,v 1.43 2005/05/03 13:02:44 tom Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -334,7 +334,8 @@ memprobe(void) /* Count only "good" memory chunks 12K and up in size */ if ((im->type == BIOS_MAP_FREE) && (im->size >= 12*1024)) { if (im->size > 1024 * 1024) - printf("%uM ", (u_int)im->size / (1024 * 1024)); + printf("%uM ", (u_int)(im->size / + (1024 * 1024))); else printf("%uK ", (u_int)im->size / 1024); diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c index 1f020ae46ff..009c908a81f 100644 --- a/sys/arch/i386/stand/pxeboot/conf.c +++ b/sys/arch/i386/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 2005/04/30 16:14:35 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2005/05/03 13:02:45 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -46,7 +46,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "1.04"; +const char version[] = "1.05"; int debug = 1; #undef _TEST |