diff options
Diffstat (limited to 'memtestEDK/Memtest/Test1/memoryMap.h')
-rw-r--r-- | memtestEDK/Memtest/Test1/memoryMap.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/memtestEDK/Memtest/Test1/memoryMap.h b/memtestEDK/Memtest/Test1/memoryMap.h index e887a4a..23ff7e7 100644 --- a/memtestEDK/Memtest/Test1/memoryMap.h +++ b/memtestEDK/Memtest/Test1/memoryMap.h @@ -1,6 +1,12 @@ +typedef unsigned long ulong; -struct vars variables = {}; -struct vars * const vv = &variables; +#define MAX_MEM_SEGMENTS 127 + +struct mmap { + ulong pbase_addr; + ulong *start; // VA of segment start + ulong *end; // VA of the last dword within the segment. +}; /* Define common variables across relocations of memtest86 */ struct vars { @@ -15,9 +21,9 @@ struct vars { int total_ticks; int pptr; int tptr; - struct err_info erri; + // struct err_info erri; // PA ranges from e820 table: - struct pmap pmap[MAX_MEM_SEGMENTS]; + //struct pmap pmap[MAX_MEM_SEGMENTS]; // VA mappings: volatile struct mmap map[MAX_MEM_SEGMENTS]; ulong plim_lower; // phys page number @@ -29,7 +35,7 @@ struct vars { ulong snapl; int printmode; int numpatn; - struct pair patn [BADRAM_MAXPATNS]; + // struct pair patn [BADRAM_MAXPATNS]; ulong test_pages; ulong selected_pages; ulong reserved_pages; @@ -38,4 +44,8 @@ struct vars { int each_sec; int beepmode; int debugging; // Set in selftest only -};
\ No newline at end of file +}; + +struct vars variables = {}; +struct vars * const vv = &variables; + |