From: Jacob Potter Date: Fri, 7 Nov 2008 20:17:10 +0000 (-0500) Subject: Merge branch 'master' of /storage/git/netwatch X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/953ec70c3a5163eb13db4bf998c9b21a3964df9c?ds=sidebyside;hp=--cc Merge branch 'master' of /storage/git/netwatch --- 953ec70c3a5163eb13db4bf998c9b21a3964df9c diff --cc aseg-paging/pagingstub.c index 80ff55d,8969998..849c6dc --- a/aseg-paging/pagingstub.c +++ b/aseg-paging/pagingstub.c @@@ -111,18 -113,20 +112,21 @@@ void c_entry(void /* Turn paging on */ set_cr0(get_cr0() | CR0_PG); + serial_init(); + serial_tx('A'); outb(0x80, 0xAA); + + if (!entry_initialized) { + serial_tx('B'); outb(0x80, 0xAB); -/* for (bp = (void *)0x200000; (void *)bp < (void *)&_bss; bp++) *bp = *(bp + 0x100000); - for (bp = (void *)&_bss; (void *)bp < (void *)&_bssend; bp++) *bp = 0; - */ } - smi_entry(); + outb(0x80, 0xAC); + ps_switch_stack(smi_entry, 0x2FF000); + outb(0x80, 0xFA); }