X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/035d7af7dd4727735ec57f8195a4842e31ffc997..8e106bffd631c8bae10efe153f893d80ad0be2df:/aseg/aseg.asm?ds=inline

diff --git a/aseg/aseg.asm b/aseg/aseg.asm
index 93b61d7..a6f71c2 100644
--- a/aseg/aseg.asm
+++ b/aseg/aseg.asm
@@ -1,9 +1,9 @@
 	org 0xA8000
 [bits 16]
 entry:
-	mov ax, 0xA800
-	mov ds, ax		; Take us out of flat unreal mode, and
-	mov es, ax		; put us in true real mode.
+	mov ax, 0xA800			; Take us out of flat unreal mode,
+	mov ds, ax			; and put us in true real mode.
+	mov es, ax
 	mov fs, ax
 	mov gs, ax
 	mov ss, ax
@@ -21,45 +21,32 @@ continue:
 	mov fs, ax
 	mov gs, ax
 	mov ss, ax
-	mov esp, [dataptr]
+	mov esp, [dataptr]		; Load stack pointer.
 
-	mov al, [needclear]
-	cmp al, 0
-	jz noclear
-	mov al, 0			; clear BSS
+	mov al, [needclear]		; Has the aseg been run before?
+	cmp al, 0			; If so,
+	jz noclear			; don't clear BSS.
+	mov al, 0			; Otherwise, clear BSS.
 	mov edi, [dataptr+4]
 	mov ecx, [dataptr+8]
 	rep stosb
 	mov [needclear], al
 	
 noclear:
-	mov eax, [dataptr+12]		; jump into C
-	call eax
-
-	mov al, 0x40			; ack the periodic IRQ
-	mov dx, 0x834
-	out dx, al
-	
-	mov dx, 0x830			; now ack the SMI itself
-	in al, dx
-	or al, 0x02
-	and al, 0xBF
-	out dx, al
-	or al, 0x40
-	out dx, al
+	mov eax, [dataptr+12]		; Load target jump address
+	call eax			; then jump into C.
 
 	rsm				; and leave SMM
 
 	align 0x4
 gdtr:
-	db 0x27, 0x00
+	db 0x17, 0x00
 	dd gdt
 	align 0x4
 gdt:
-	db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00	; initial null entry
 	db 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x93, 0xCF, 0x00	; data segment
 	db 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9B, 0xCF, 0x00	; code segment
-	db 0xFF, 0xFF, 0x00, 0x80, 0x0A, 0x9B, 0xCF, 0x00	; code segment for trampoline
 
 needclear:
 	db 0x01