diff options
| author | hpa <hpa> | 2003-04-16 05:12:32 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2003-04-16 05:12:32 +0000 |
| commit | 4aa7cdf63902a08079f8336541325d99f4e45e48 (patch) | |
| tree | 148a60e318bcabeba0299668c9fb228ec9f29845 | |
| parent | 982c6afbdf0ad55822c1ed43003f23226c1eafae (diff) | |
| download | syslinux-4aa7cdf63902a08079f8336541325d99f4e45e48.tar.gz | |
Make the e820test program work again
| -rw-r--r-- | memdisk/e820test.c | 7 | ||||
| -rw-r--r-- | memdisk/testdata3 | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/memdisk/e820test.c b/memdisk/e820test.c index 813893cb..eefdf517 100644 --- a/memdisk/e820test.c +++ b/memdisk/e820test.c @@ -36,7 +36,7 @@ void printranges(void) { int i; for ( i = 0 ; i < nranges ; i++ ) { - printf("%016Lx %016Lx %d\n", + printf("%016llx %016llx %d\n", ranges[i].start, ranges[i+1].start - ranges[i].start, ranges[i].type); @@ -48,11 +48,12 @@ int main(int argc, char *argv[]) uint64_t start, len; uint32_t type; + e820map_init(); printranges(); - while ( scanf("%Lx %Lx %d", &start, &len, &type) == 3 ) { + while ( scanf("%llx %llx %d", &start, &len, &type) == 3 ) { putchar('\n'); - printf("%016Lx %016Lx %d <-\n", start, len, type); + printf("%016llx %016llx %d <-\n", start, len, type); putchar('\n'); insertrange(start, len, type); printranges(); diff --git a/memdisk/testdata3 b/memdisk/testdata3 new file mode 100644 index 00000000..38a45021 --- /dev/null +++ b/memdisk/testdata3 @@ -0,0 +1,14 @@ +0000000000000000 000000000009bc00 1 +000000000009bc00 0000000000004400 2 +00000000000e9800 0000000000016800 2 +0000000000100000 0000000006ee0000 1 +0000000006fe0000 000000000000fc00 3 +0000000006fefc00 0000000000000400 4 +0000002000000000 0000001000000000 1 +0000000006ff0000 0000000000002000 2 +0000000006ff2000 000000000000e000 1 +0000000007000000 0000000000100000 2 +00000000fff00000 0000000000100000 2 + +0000000000586000 0000000000168000 2 +000000000009ba00 0000000000000200 2 |