summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/include/biosvar.h8
-rw-r--r--sys/arch/i386/stand/libsa/cmd_i386.c6
-rw-r--r--sys/arch/i386/stand/libsa/memprobe.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h
index 1f3cb40d602..d4ea9e94c01 100644
--- a/sys/arch/i386/include/biosvar.h
+++ b/sys/arch/i386/include/biosvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosvar.h,v 1.19 1997/10/18 00:33:14 weingart Exp $ */
+/* $OpenBSD: biosvar.h,v 1.20 1997/10/20 14:47:41 mickey Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff
@@ -125,9 +125,9 @@ struct EDD_CB {
};
typedef struct _bios_memmap {
- u_int32_t addr; /* Beginning of block */
- u_int32_t size; /* Size of block */
- int type; /* Type of block */
+ u_int64_t addr; /* Beginning of block */
+ u_int64_t size; /* Size of block */
+ u_int32_t type; /* Type of block */
} bios_memmap_t;
/* Info about disk from the bios, plus the mapping from
diff --git a/sys/arch/i386/stand/libsa/cmd_i386.c b/sys/arch/i386/stand/libsa/cmd_i386.c
index 9b087eda4ab..7568f0fd007 100644
--- a/sys/arch/i386/stand/libsa/cmd_i386.c
+++ b/sys/arch/i386/stand/libsa/cmd_i386.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd_i386.c,v 1.11 1997/10/17 18:46:55 weingart Exp $ */
+/* $OpenBSD: cmd_i386.c,v 1.12 1997/10/20 14:47:42 mickey Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff, Tobias Weingartner
@@ -150,8 +150,8 @@ Xmemory()
int count, total = 0;
for(count = 0; tm[count].type != BIOS_MAP_END; count++){
- printf("Region %d: type %u at 0x%x for %uKB\n", count,
- tm[count].type, tm[count].addr, tm[count].size/1024);
+ printf("Region %d: type %u at 0x%lx for %luKB\n", count,
+ tm[count].type, (long)tm[count].addr, (long)tm[count].size/1024);
if(tm[count].type == BIOS_MAP_FREE)
total += tm[count].size;
diff --git a/sys/arch/i386/stand/libsa/memprobe.c b/sys/arch/i386/stand/libsa/memprobe.c
index a8c0b51a683..b0b96b080a9 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.16 1997/10/17 18:46:58 weingart Exp $ */
+/* $OpenBSD: memprobe.c,v 1.17 1997/10/20 14:47:42 mickey Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -385,7 +385,7 @@ memprobe()
if(tm[count].type == BIOS_MAP_FREE) {
total += tm[count].size;
- printf(" %dKB", tm[count].size/1024);
+ printf(" %luKB", (long)tm[count].size/1024);
}
}
printf("\n");