narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define a struct memory_map with a fixed number of entries, rather than 

requiring each caller to decide how many entries it wants to permit.
pull/1/head
Michael Brown 2006-05-24 14:41:27 +00:00
parent edcf89e2b0
commit 986f6ffff1
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/arch/i386/firmware/pcbios/memmap.c
View File

@ -135,10 +135,9 @@ static unsigned int extmemsize ( void ) {
* Get e820 memory map * Get e820 memory map
* *
* @v memmap Memory map to fill in * @v memmap Memory map to fill in
* @v entries Maximum number of entries in memory map
* @ret rc Return status code * @ret rc Return status code
*/ */
static int meme820 ( struct memory_region *memmap, unsigned int entries ) { static int meme820 ( struct memory_map *memmap ) {
unsigned int index = 0; unsigned int index = 0;
uint32_t next = 0; uint32_t next = 0;
uint32_t smap; uint32_t smap;
@ -170,10 +169,12 @@ static int meme820 ( struct memory_region *memmap, unsigned int entries ) {
if ( e820buf.type != E820_TYPE_RAM ) if ( e820buf.type != E820_TYPE_RAM )
continue; continue;
memmap[index].start = e820buf.start; memmap->regions[index].start = e820buf.start;
memmap[index].end = e820buf.start + e820buf.len; memmap->regions[index].end = e820buf.start + e820buf.len;
index++; index++;
} while ( ( index < entries ) && ( next != 0 ) ); } while ( ( next != 0 ) &&
( index < ( sizeof ( memmap->regions ) /
sizeof ( memmap->regions[0] ) ) ) );
return 0; return 0;
} }
@ -181,25 +182,24 @@ static int meme820 ( struct memory_region *memmap, unsigned int entries ) {
* Get memory map * Get memory map
* *
* @v memmap Memory map to fill in * @v memmap Memory map to fill in
* @v entries Maximum number of entries in memory map (minimum 2)
*/ */
void get_memmap ( struct memory_region *memmap, unsigned int entries ) { void get_memmap ( struct memory_map *memmap ) {
unsigned int basemem, extmem; unsigned int basemem, extmem;
int rc; int rc;
/* Clear memory map */ /* Clear memory map */
memset ( memmap, 0, ( entries * sizeof ( *memmap ) ) ); memset ( memmap, 0, sizeof ( *memmap ) );
/* Get base and extended memory sizes */ /* Get base and extended memory sizes */
basemem = basememsize(); basemem = basememsize();
extmem = extmemsize(); extmem = extmemsize();
/* Try INT 15,e820 first */ /* Try INT 15,e820 first */
if ( ( rc = meme820 ( memmap, entries ) ) == 0 ) if ( ( rc = meme820 ( memmap ) ) == 0 )
return; return;
/* Fall back to constructing a map from basemem and extmem sizes */ /* Fall back to constructing a map from basemem and extmem sizes */
memmap[0].end = ( basemem * 1024 ); memmap->regions[0].end = ( basemem * 1024 );
memmap[1].start = 0x100000; memmap->regions[1].start = 0x100000;
memmap[1].end = 0x100000 + ( extmem * 1024 ); memmap->regions[1].end = 0x100000 + ( extmem * 1024 );
} }

10
src/arch/i386/include/memmap.h
View File

@ -18,6 +18,14 @@ struct memory_region {
uint64_t end; uint64_t end;
}; };
extern void get_memmap ( struct memory_region *memmap, unsigned int entries ); /** Maximum number of memory regions we expect to encounter */
#define MAX_MEMORY_REGIONS 8
/** A memory map */
struct memory_map {
struct memory_region regions[MAX_MEMORY_REGIONS];
};
extern void get_memmap ( struct memory_map *memmap );
#endif /* _MEMMAP_H */ #endif /* _MEMMAP_H */