greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use kernel virtual addresses for BIOS memory, etc.

Browse source
This commit is contained in:
Frans Kaashoek 2011-08-09 21:33:59 -04:00
parent b23d8329e7
commit 3a03810643
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mp.c
View file

@ -36,11 +36,11 @@ sum(uchar *addr, int len)
// Look for an MP structure in the len bytes at addr. // Look for an MP structure in the len bytes at addr.
static struct mp* static struct mp*
mpsearch1(uchar *addr, int len) mpsearch1(uint a, int len)
{ {
uchar *e, *p; uchar *e, *p, *addr;
addr = p2v((uint) addr); addr = p2v(a);
e = addr+len; e = addr+len;
for(p = addr; p < e; p += sizeof(struct mp)) for(p = addr; p < e; p += sizeof(struct mp))
if(memcmp(p, "_MP_", 4) == 0 && sum(p, sizeof(struct mp)) == 0) if(memcmp(p, "_MP_", 4) == 0 && sum(p, sizeof(struct mp)) == 0)
@ -60,16 +60,16 @@ mpsearch(void)
uint p; uint p;
struct mp *mp; struct mp *mp;
bda = (uchar*)0x400; bda = (uchar *) P2V(0x400);
if((p = ((bda[0x0F]<<8)|bda[0x0E]) << 4)){ if((p = ((bda[0x0F]<<8)| bda[0x0E]) << 4)){
if((mp = mpsearch1((uchar*)p, 1024))) if((mp = mpsearch1(p, 1024)))
return mp; return mp;
} else { } else {
p = ((bda[0x14]<<8)|bda[0x13])*1024; p = ((bda[0x14]<<8)|bda[0x13])*1024;
if((mp = mpsearch1((uchar*)p-1024, 1024))) if((mp = mpsearch1(p-1024, 1024)))
return mp; return mp;
} }
return mpsearch1((uchar*)0xF0000, 0x10000); return mpsearch1(0xF0000, 0x10000);
} }
// Search for an MP configuration table. For now, // Search for an MP configuration table. For now,