Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 325 → Rev 326

/shark/trunk/kernel/kill.c
18,11 → 18,11
 
/**
------------
CVS : $Id: kill.c,v 1.4 2003-11-05 15:05:11 giacomo Exp $
CVS : $Id: kill.c,v 1.5 2003-11-12 17:28:20 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.4 $
Last update: $Date: 2003-11-05 15:05:11 $
Revision: $Revision: 1.5 $
Last update: $Date: 2003-11-12 17:28:20 $
------------
 
This file contains:
207,7 → 207,8
sys_end();
}
 
kern_epilogue_macro();
//DON'T REMOVE !!! BUG IF EXEC_SHADOW = -1
//kern_epilogue_macro();
/* there is no epilogue... */
scheduler();
/shark/trunk/kernel/mem.c
18,11 → 18,11
 
/**
------------
CVS : $Id: mem.c,v 1.1.1.1 2002-03-29 14:12:52 pj Exp $
CVS : $Id: mem.c,v 1.2 2003-11-12 17:28:20 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:52 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-11-12 17:28:20 $
------------
 
Basic Memory Manager Functions:
72,7 → 72,7
- all the other memory...
*/
lmm_add_region(&lmm, &region1M , (void*)0x00000000, 0x000FFFFF,
MEMORY_UNDER_16M, 0);
MEMORY_UNDER_1M, 0);
lmm_add_region(&lmm, &region16M, (void*)0x00100000, 0x00FFFFFF,
MEMORY_FROM_1M_TO_16M, 1);
lmm_add_region(&lmm, &region , (void*)0x01000000, 0xFEFFFFFF,
83,7 → 83,7
if (lowsize)
lmm_add_free(&lmm, (void *)lowp, lowsize-1);
if (highsize)
lmm_add_free(&lmm, (void *)highp, highsize);
lmm_add_free(&lmm, (void *)highp+0x100000, highsize-0x100000);
}
 
void *kern_alloc(DWORD s)
/shark/trunk/drivers/svga/lrmi.c
28,7 → 28,7
int
LRMI_init(void)
{
DOS_mem_init();
//DOS_mem_init();
return 0;
}
 
/shark/trunk/drivers/grx/gd.c
88,7 → 88,7
}
/* VESA driver needs the V86 Mode... */
vm86_init();
//vm86_init();
 
/* First, check VESA... */
if (vbe_getinfo() == 1) {