remove unused code

git-svn-id: svn://kolibrios.org@2100 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2011-08-22 09:49:26 +00:00
parent 1b6b565701
commit 5a5c11b26d
4 changed files with 44 additions and 123 deletions

View File

@ -771,3 +771,27 @@ end virtual
virtual at 0 virtual at 0
CSYM COFF_SYM CSYM COFF_SYM
end virtual end virtual
struc LHEAD
{
.next dd ? ;next object in list
.prev dd ? ;prev object in list
.sizeof:
}
virtual at 0
LHEAD LHEAD
end virtual
struc IRQH
{
.list LHEAD
.handler dd ? ;handler roututine
.data dd ? ;user-specific data
.sizeof:
}
virtual at 0
IRQH IRQH
end virtual

View File

@ -44,12 +44,17 @@ proc attach_int_handler stdcall, irq:dword, handler:dword, access_rights:dword
ret ret
endp endp
align 4
proc get_int_handler stdcall, irq:dword proc get_int_handler stdcall, irq:dword
mov eax, [irq] mov eax, [irq]
cmp eax, 15
ja .fail
mov eax, [irq_tab + 4 * eax] mov eax, [irq_tab + 4 * eax]
ret ret
.fail:
xor eax, eax
ret
endp endp
align 4 align 4

View File

@ -40,11 +40,11 @@ iglobal
;interrupt handlers addresses (for interrupt gate construction) ;interrupt handlers addresses (for interrupt gate construction)
dd irq0, irq_serv.irq_1, irq_serv.irq_2 dd irq0, irq_serv.irq_1, irq_serv.irq_2
if USE_COM_IRQ ; if USE_COM_IRQ
dd irq_serv.irq_3, irq_serv.irq_4 dd irq_serv.irq_3, irq_serv.irq_4
else ; else
dd p_irq3, p_irq4 ;??? íåñòûêîâêà ; dd p_irq3, p_irq4 ;??? íåñòûêîâêà
end if ; end if
dd irq_serv.irq_5, irq_serv.irq_6, irq_serv.irq_7 dd irq_serv.irq_5, irq_serv.irq_6, irq_serv.irq_7
dd irq_serv.irq_8, irq_serv.irq_9, irq_serv.irq_10 dd irq_serv.irq_8, irq_serv.irq_9, irq_serv.irq_10
dd irq_serv.irq_11, irq_serv.irq_12, irqD, irq_serv.irq_14, irq_serv.irq_15 dd irq_serv.irq_11, irq_serv.irq_12, irqD, irq_serv.irq_14, irq_serv.irq_15
@ -190,6 +190,7 @@ unknown_interrupt:
iretd iretd
;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= ;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
; bl - error vector
show_error_parameters: show_error_parameters:
cmp bl, 0x06 cmp bl, 0x06
jnz .no_ud jnz .no_ud
@ -236,33 +237,8 @@ show_error_parameters:
restore reg_esi restore reg_esi
restore reg_edi restore reg_edi
; irq1 -> hid/keyboard.inc
macro irqh [num] {
p_irq#num :
mov edi, num
jmp irqhandler
}
ready_for_next_irq:
mov eax,5
mov [check_idle_semaphore],eax
; mov al, 0x20
add eax,(0x20-0x5)
out 0x20, al
ret
;destroy eax
ready_for_next_irq_1:
mov eax,5
mov [check_idle_semaphore],eax
; mov al, 0x20
add eax,(0x20-0x5)
out 0xa0,al
out 0x20, al
ret
align 4
irqD: irqD:
push eax push eax
xor eax,eax xor eax,eax
@ -274,75 +250,7 @@ irqD:
iret iret
irqh 2,3,4,5,6,7,8,9,10,11 align 4
irqhandler:
mov esi,edi ; 1
shl esi,6 ; 1
add esi,irq00read ; 1
shl edi,12 ; 1
add edi,IRQ_SAVE
mov ecx,16
irqnewread:
dec ecx
js irqover
movzx edx, word [esi] ; 2+
test edx, edx ; 1
jz irqover
mov ebx, [edi] ; address of begin of buffer in edi ; + 0x0 dword - data size
mov eax, 4000 ; + 0x4 dword - data begin offset
cmp ebx, eax
je irqfull
add ebx, [edi + 0x4] ; add data size to data begin offset
cmp ebx, eax ; if end of buffer, begin cycle again
jb @f
xor ebx, ebx
@@:
add ebx, edi
movzx eax, byte[esi + 3] ; get type of data being received 1 - byte, 2 - word
dec eax
jz irqbyte
dec eax
jnz noirqword
in ax,dx
cmp ebx, 3999 ; check for address odd in the end of buffer
jne .odd
mov [ebx + 0x10], ax
jmp .add_size
.odd:
mov [ebx + 0x10], al ; I could make mistake here :)
mov [edi + 0x10], ah
.add_size:
add dword [edi], 2
jmp nextport
irqbyte:
in al,dx
mov [ebx + 0x10],al
inc dword [edi]
nextport:
add esi,4
jmp irqnewread
noirqword:
irqfull:
irqover:
ret
set_application_table_status: set_application_table_status:
push eax push eax
@ -357,7 +265,7 @@ set_application_table_status:
ret ret
align 4
clear_application_table_status: clear_application_table_status:
push eax push eax
@ -383,6 +291,7 @@ clear_application_table_status:
; * eax = 0 - óñïåøíî ; * eax = 0 - óñïåøíî
; * eax = 1 - íåäîñòàòî÷íî ïàìÿòè ; * eax = 1 - íåäîñòàòî÷íî ïàìÿòè
align 4
sys_resize_app_memory: sys_resize_app_memory:
; ebx = 1 - resize ; ebx = 1 - resize
; ecx = new amount of memory ; ecx = new amount of memory
@ -404,6 +313,7 @@ endg
; param ; param
; esi= slot ; esi= slot
align 4
terminate: ; terminate application terminate: ; terminate application
.slot equ esp ;locals .slot equ esp ;locals

View File

@ -268,24 +268,6 @@ cur_saved_data rb 4096
fpu_data: rb 512 fpu_data: rb 512
; on irq read ports ; on irq read ports
irq00read rd 16
irq01read rd 16
irq02read rd 16
irq03read rd 16
irq04read rd 16
irq05read rd 16
irq06read rd 16
irq07read rd 16
irq08read rd 16
irq09read rd 16
irq10read rd 16
irq11read rd 16
irq12read rd 16
irq13read rd 16
irq14read rd 16
irq15read rd 16
irq_tab rd 16 irq_tab rd 16
mem_block_map rb 512 mem_block_map rb 512