XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

fixed a bug in sched.inc (speaker)

Browse Source 
fixed exception handlers - shows correct EIP of a terminated process

some corrections to memmap.inc

git-svn-id: svn://kolibrios.org@22 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Poddubny 2005-11-10 17:59:41 +00:00
parent 128676fe2c
commit 182a9c6899
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trunk/core/sched.inc
View File

@ -18,6 +18,8 @@ irq0:
inc dword [timer_ticks] inc dword [timer_ticks]
mov eax, [timer_ticks] mov eax, [timer_ticks]
call playNote ; <<<--- Speaker driver
cmp eax,[next_usage_update] cmp eax,[next_usage_update]
jb .nocounter jb .nocounter
add eax,100 add eax,100
@ -25,8 +27,6 @@ irq0:
call updatecputimes call updatecputimes
.nocounter: .nocounter:
call playNote ; <<<--- Speaker driver
mov edi, [0x3010] mov edi, [0x3010]
mov ebx, [edi+0x18] ; time stamp counter add mov ebx, [edi+0x18] ; time stamp counter add

21
kernel/trunk/core/sys32.inc
View File

@ -168,7 +168,7 @@ endg
unknown_interrupt: unknown_interrupt:
iret iret
macro exceptions [num] macro exc_wo_code [num]
{ {
forward forward
e#num : e#num :
@ -176,7 +176,18 @@ macro exceptions [num]
jmp exc_c jmp exc_c
} }
exceptions 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 macro exc_w_code [num]
{
forward
e#num :
add esp, 4
mov bl, num
jmp exc_c
}
exc_wo_code 0, 1, 2, 3, 4, 5, 6, 9, 15, 16 ; 18, 19
exc_w_code 8, 10, 11, 12, 13, 14, 17
exc_c: exc_c:
mov ax, os_data mov ax, os_data
mov ds, ax mov ds, ax
@ -334,8 +345,10 @@ p_irq6:
mov es, ax mov es, ax
call fdc_irq call fdc_irq
mov edi,6 ;mov edi,6
call irqhandler ;call irqhandler
mov al, 0x20
out 0x20, al
pop es ds pop es ds
popad popad

8
kernel/trunk/memmap.inc
View File

@ -119,7 +119,9 @@
; 3EC00 -> 3F5FF basic text font II ; 3EC00 -> 3F5FF basic text font II
; 3F600 -> 3FFFF basic text font I ; 3F600 -> 3FFFF basic text font I
; 40000 -> 4FFFF data of retrieved disks and partitions (Mario79) ; 40000 -> 4FFFF data of retrieved disks and partitions (Mario79)
; 50000 -> 5FFFF free
; 50000 -> 5FFFF free (64 Kb)
; 60000 -> 7FFFF paging tables ; 60000 -> 7FFFF paging tables
; 80000 -> 8FFFF additional app info, in 256 byte steps - 256 entries ; 80000 -> 8FFFF additional app info, in 256 byte steps - 256 entries
; ;
@ -164,6 +166,8 @@
; +000A word y size ; +000A word y size
; +000C word button id number : bits 16-31 ; +000C word button id number : bits 16-31
; ;
; 2C4000 -> 2CFFFF free (48Kb)
;
; 2D0000 -> 2DFFFF reserved port area ; 2D0000 -> 2DFFFF reserved port area
; ;
; 0000 dword no of port areas reserved ; 0000 dword no of port areas reserved
@ -175,7 +179,7 @@
; 2E0000 -> 2EFFFF irq data area ; 2E0000 -> 2EFFFF irq data area
; 2F0000 -> 2FFFFF low memory save ; 2F0000 -> 2FFFFF low memory save
; ;
; 300000 -> 45FFFF background image, max 1 M ; 300000 -> 45FFFF background image, max 1,375 M
; ;
; 460000 -> 5FFFFF display info ; 460000 -> 5FFFFF display info
; ;