WebSVN – Kolibri OS – Diff – /kernel/trunk/core/dll.inc

-$Revision: 431 $
+$Revision: 465 $
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                              ;;
 ;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-DRV_ENTRY    equ  1
-DRV_EXIT     equ -1
-DRV_COMPAT   equ  4  ;minimal required drivers version
+DRV_COMPAT   equ  5  ;minimal required drivers version
-DRV_CURRENT  equ  4  ;current drivers model version
+DRV_CURRENT  equ  5  ;current drivers model version
 DRV_VERSION equ (DRV_COMPAT shl 16) or DRV_CURRENT
 	   jmp .main
 align 16
 .main:
 	   save_ring3_context
-	   mov	 bx, os_data
+           mov   bx, app_data  ;os_data
 	   mov	 ds, bx
 	   mov	 es, bx
 align 4
 proc get_notify stdcall, p_ev:dword
-.wait:
-           mov ebx,[CURRENT_TASK]
+.wait:
-           shl ebx,8
+           mov ebx,[current_slot]
-           test dword [ebx+SLOT_BASE+0xA8],EVENT_NOTIFY
+           test dword [ebx+APPDATA.event_mask],EVENT_NOTIFY
 	   jz @f
-           and dword [ebx+SLOT_BASE+0xA8], not EVENT_NOTIFY
+           and dword [ebx+APPDATA.event_mask], not EVENT_NOTIFY
 	   mov edi, [p_ev]
 	   mov dword [edi], EV_INTR
-           mov eax, [ebx+SLOT_BASE+APPDATA.event]
+           mov eax, [ebx+APPDATA.event]
 	   mov dword [edi+4], eax
 	   ret
 @@:
 ; retval
 ;  eax= error code
 align 4
 srv_handlerEx:
-           test ebx, ebx
+           cmp ebx, OS_BASE
-           jz .fail
-           add ebx, new_app_base
+           jae .fail
            mov eax, [ebx+handle]
            cmp [eax+SRV.magic], ' SRV'
 	   jne .fail
-           cmp [eax+SRV.size], SRV_SIZE
-	   jne .fail
-           add [ebx+input], new_app_base
+           cmp [eax+SRV.size], SRV_SIZE
-           add [ebx+output], new_app_base
+	   jne .fail
            stdcall [eax+SRV.srv_proc], ebx
              name    dd ?
            endl
            xor eax, eax
            mov ebx, [file_name]
-           sub ebx, new_app_base
+    ;       sub ebx, new_app_base
            mov ecx, [info]
-           sub ecx, new_app_base
+    ;       sub ecx, new_app_base
            mov [cmd], 5
            mov [offset], eax
            mov byte [buff+4], al
            mov [name], ebx
            mov eax, 70
            lea ebx, [cmd]
-           sub ebx, new_app_base
+     ;      sub ebx, new_app_base
            int 0x40
            ret
 endp
            xor eax, eax
            mov ebx, [file_name]
            mov ecx, [off]
            mov edx, [bytes]
            mov esi, [buffer]
-           sub ebx, new_app_base
-           sub esi, new_app_base
            mov [cmd], eax
            mov [offset], ecx
            mov [offset+4], eax
            mov [name], ebx
            pushad
            push eax
-           lea eax, [cmd]
-           sub eax, new_app_base
+           lea eax, [cmd]
            call file_system_lfn
            pop eax
            popad
            ret
            jnz .copy
            add edi, [eax+CFS.SizeOfRawData]
            jmp .next
 .copy:
            add esi, edx
-           add edi, new_app_base
+    ;       add edi, new_app_base
            mov ecx, [eax+CFS.SizeOfRawData]
            cld
            rep movsb
 .next:
-           add edi, 15-new_app_base
+           add edi, 15 ;-new_app_base
-           and edi, not 15
+           and edi, -16
            add eax, COFF_SECTION_SIZE
            dec ebx
            jnz @B
            call malloc
            pop ebx
            test eax, eax
            jz .fail
-           mov ecx,[CURRENT_TASK]
-           shl ecx,8
+           mov ecx,[current_slot]
-           add ecx, SLOT_BASE+APP_OBJ_OFFSET
+           add ecx, APP_OBJ_OFFSET
            pushfd
            cli
            call free           ;release object memory
+           ret
+if 0
+irq:
-           ret
+.irq0:
+           pusfd
-;szSound        db 'SOUND',0
+           pushad
+           push IRQ_0
-;szInfinity     db 'INFINITY',0
+           jmp .master
-szHwMouse      db 'ATI2D',0
+.irq_1:
+           pusfd
-szSTART        db 'START',0
+           pushad
+           push IRQ_1
-szEXPORTS      db 'EXPORTS',0
+           jmp .master
-szIMPORTS      db 'IMPORTS',0
+.master:
+           mov ax, app_data
+           mov ds, eax
+           mov es, eax
+           mov ebx, [esp+4]  ;IRQ_xx
-msg_unresolved db 'unresolved ',0
+           mov eax, [irq_handlers+ebx+4]
+           call intr_handler
+           mov ecx, [esp+4]
+           cmp [irq_actids+ecx*4], 0
+           je @F
-msg_module     db 'in module ',0
+           in al, 0x21
+           bts eax, ecx
+           out 0x21, al
-msg_version    db 'incompatible driver version',13,10,0
+           mov al, 0x20
-msg_www        db 'please visit www.kolibrios.org',13,10,0
+           out 0x20, al
+           jmp .restart
+.slave:
+           mov ax, app_data
+           mov ds, eax
+           mov es, eax
+           mov ebx, [esp+4]  ;IRQ_xx
-msg_CR         db  13,10,0
+           mov eax, [irq_handlers+ebx+4]
+           call intr_handler
+           mov ecx, [esp+4]
+           sub ecx, 8
+           cmp [irq_actids+ecx*4], 0
+           je @F
+           in al, 0xA1
+           bts eax, ecx
+           out 0xA1, al
+           mov al, 0x20
+           out 0xA0, al
+           out 0x20, al
-align 4
+.restart:
+           mov ebx, [next_slot]
+           test ebx, ebx
+           jz @F
+           mov [next_task],0
+           mov esi, [prev_slot]
+           call do_change_task
+           add esp, 4
+           iretd
+end if

Subversion Repositories Kolibri OS

(root)/kernel/trunk/core/dll.inc – Rev 431 → 465