WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-A/trunk/kernel.asm

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 1508 $
+$Revision: 1551 $
         and     byte [BOOT_VAR+0x901e],0x0
         mov     eax,[BOOT_VAR+0x9018]
+        mov     [LFBAddress],eax
-        mov     [LFBAddress],eax
+;==
-;==        cmp     [SCR_MODE],word 0100000000000000b
-;        jge     setvesa20
+	cmp     [SCR_MODE],word 0100000000000000b
-;        cmp     [SCR_MODE],word 0x13
-;        je      v20ga32
-;        mov     [PUTPIXEL],dword Vesa12_putpixel24  ; Vesa 1.2
-;        mov     [GETPIXEL],dword Vesa12_getpixel24
+        jge     setvesa20
-;        cmp     [ScreenBPP],byte 24
-;        jz      ga24
+	mov	eax, 0xDEADBEEF
-;        mov     [PUTPIXEL],dword Vesa12_putpixel32
-;        mov     [GETPIXEL],dword Vesa12_getpixel32
-;      ga24:
+	hlt
-;        jmp     v20ga24
+;        ===  EGA, VGA & Vesa 1.2 modes not supported ===
       setvesa20:
-;        mov     [PUTPIXEL],dword Vesa20_putpixel24  ; Vesa 2.0
+;        mov     [PUTPIXEL],dword Vesa20_putpixel24  ; Vesa 2.0 24bpp modes
 ;        mov     [GETPIXEL],dword Vesa20_getpixel24
 ;        cmp     [ScreenBPP],byte 24
 ;        jz      v20ga24
       v20ga32:
-        mov     [PUTPIXEL],dword Vesa20_putpixel32
-        mov     [GETPIXEL],dword Vesa20_getpixel32
-;      v20ga24:
-;        cmp     [SCR_MODE],word 0x12                ; 16 C VGA 640x480
-;        jne     no_mode_0x12
-;        mov     [PUTPIXEL],dword VGA_putpixel
-;        mov     [GETPIXEL],dword Vesa20_getpixel32
+        mov     [PUTPIXEL],dword Vesa20_putpixel32
-      no_mode_0x12:
+        mov     [GETPIXEL],dword Vesa20_getpixel32
 ; -------- Fast System Call init ----------
 ; Intel SYSENTER/SYSEXIT (AMD CPU support it too)
-           bt [cpu_caps], CAPS_SEP
+;           bt [cpu_caps], CAPS_SEP
-           jnc .SEnP   ; SysEnter not Present
+;           jnc .SEnP   ; SysEnter not Present
-           xor edx, edx
+;           xor edx, edx
-           mov ecx, MSR_SYSENTER_CS
+;           mov ecx, MSR_SYSENTER_CS
-           mov eax, os_code
+;           mov eax, os_code
-           wrmsr
+;           wrmsr
-           mov ecx, MSR_SYSENTER_ESP
+;           mov ecx, MSR_SYSENTER_ESP
-;           mov eax, sysenter_stack ; Check it
+;;           mov eax, sysenter_stack ; Check it
-           xor     eax, eax
+;           xor     eax, eax
-           wrmsr
+;           wrmsr
-           mov ecx, MSR_SYSENTER_EIP
+;           mov ecx, MSR_SYSENTER_EIP
-           mov eax, sysenter_entry
+;           mov eax, sysenter_entry
-           wrmsr
+;           wrmsr
 .SEnP:
 ; AMD SYSCALL/SYSRET
-           cmp byte[cpu_vendor], 'A'
+;           cmp byte[cpu_vendor], 'A'
-           jne .noSYSCALL
+;          jne .noSYSCALL
-           mov eax, 0x80000001
+;           mov eax, 0x80000001
-           cpuid
+;           cpuid
-           test edx, 0x800  ; bit_11 - SYSCALL/SYSRET support
+;           test edx, 0x800  ; bit_11 - SYSCALL/SYSRET support
-           jz .noSYSCALL
+;           jz .noSYSCALL
            mov ecx, MSR_AMD_EFER
-           rdmsr
-           or eax, 1   ; bit_0 - System Call Extension (SCE)
+           rdmsr
-           wrmsr
+           or eax, 1   ; bit_0 - System Call Extension (SCE)
            wrmsr
         ; !!!! It`s dirty hack, fix it !!!
         ; Bits of EDX :
         ; Bit 3116 During the SYSRET instruction, this field is copied into the CS register
-        ;  and the contents of this field, plus 8, are copied into the SS register.
-        ; Bit 150 During the SYSCALL instruction, this field is copied into the CS register
+        ;  and the contents of this field, plus 8, are copied into the SS register.
-        ;  and the contents of this field, plus 8, are copied into the SS register.
+        ; Bit 150 During the SYSCALL instruction, this field is copied into the CS register
         ;  and the contents of this field, plus 8, are copied into the SS register.
         ; mov   edx, (os_code + 16) * 65536 + os_code
-           mov edx, 0x1B0008
+           mov edx, 0x1B000B	; RING3 task stack will be used for fast syscalls!
            mov eax, syscall_entry
            mov ecx, MSR_AMD_STAR
            wrmsr
 .noSYSCALL:
 ; -----------------------------------------
         stdcall alloc_page
            mov [tss._gs],app_data
            mov [tss._io],128
 ;Add IO access table - bit array of permitted ports
            mov edi, tss._io_map_0
            xor eax, eax
-           not eax
+	   mov ecx, 2047
-           mov ecx, 8192/4
+	   rep stosd		     ; access to 65504 ports granted
-           rep stosd                 ; access to 4096*8=65536 ports
+	   not eax		     ; the last 32 ports blocked
+	   stosd
            mov  ax,tss0
            ltr  ax
         mov   esi,boot_resirqports
         call  boot_log
-        call  reserve_irqs_ports
-; SET PORTS FOR IRQ HANDLERS
-        ;mov  esi,boot_setrports
-        ;call boot_log
+        call  reserve_irqs_ports
         ;call setirqreadports
   cmp ax,'r1'           ; if not rused ram disk - load network configuration from files {SPraid.simba}
   je  no_st_network
         call set_network_conf
   no_st_network:
-        call init_userDMA	; <<<<<<<<< ================ core/memory.inc ========================================
+        call init_userDMA	; <<<<<<<<< ============== core/memory.inc =================
+;	call pci_ext_config	; <<<<<<<<< bus/pci/pcie.inc
+;-------------------------------------------------------------------------------
-	  call pci_ext_config	; <<<<<<<<< bus/pci/pcie.inc
+        call rs7xx_pcie_init    ; <<<<<<<<< bus/ht.inc
 ; LOAD FIRST APPLICATION
 ;                       KERNEL FUNCTIONS                               ;
 ;                                                                      ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-reserve_irqs_ports:
-        push eax
-        xor	eax,eax
-		inc	eax
-        mov  byte [irq_owner+4*0],al		;1    ; timer
-        ;mov  [irq_owner+4*1], 1    ; keyboard
-        mov  byte [irq_owner+4*6],al		;1    ; floppy diskette
-        mov  byte [irq_owner+4*13],al	;1   ; math co-pros
-        mov  byte [irq_owner+4*14],al	;1   ; ide I
-        mov  byte [irq_owner+4*15],al	;1   ; ide II
-        pop  eax
-; RESERVE PORTS
-	push  4
-        pop   dword [RESERVED_PORTS]	;,edi
-	push  1
-        pop   dword [RESERVED_PORTS+16+0]	;,dword 1
-        and   dword [RESERVED_PORTS+16+4],0	;,dword 0x0
-        mov   dword [RESERVED_PORTS+16+8],0x2d	;,dword 0x2d
-	push  1
-        pop   dword [RESERVED_PORTS+32+0]	;,dword 1
-        push  0x30
-        pop   dword [RESERVED_PORTS+32+4]	;,dword 0x30
+reserve_irqs_ports:
-	push  0x4d
-        pop   dword [RESERVED_PORTS+32+8]	;,dword 0x4d
-	push  1
-        pop   dword [RESERVED_PORTS+48+0]	;,dword 1
-	push  0x50
-        pop   dword [RESERVED_PORTS+48+4]	;,dword 0x50
-        mov   dword [RESERVED_PORTS+48+8],0xdf	;,dword 0xdf
-	push  1
-        pop   dword [RESERVED_PORTS+64+0]	;,dword 1
-        mov   dword [RESERVED_PORTS+64+4],0xe5	;,dword 0xe5
-        mov   dword [RESERVED_PORTS+64+8],0xff	;,dword 0xff
 	; removed
         ret
-setirqreadports:
-        mov   [irq12read+0],dword 0x60 + 0x01000000  ; read port 0x60 , byte
-	    and   dword [irq12read+4],0                   ; end of port list
-;        mov   [irq12read+4],dword 0                  ; end of port list
-        ;mov   [irq04read+0],dword 0x3f8 + 0x01000000 ; read port 0x3f8 , byte
-        ;mov   [irq04read+4],dword 0                  ; end of port list
-        ;mov   [irq03read+0],dword 0x2f8 + 0x01000000 ; read port 0x2f8 , byte
-        ;mov   [irq03read+4],dword 0                  ; end of port list
+setirqreadports:
 	; removed
-        ret
+	ret
         ret
 align 4
 ;input  eax=43,bl-byte of output, ecx - number of port
-sys_outport:
+sys_outport:
-    mov   edi,ecx          ; separate flag for read / write
-    and   ecx,65535
-    mov   eax,[RESERVED_PORTS]
-    test  eax,eax
-    jnz   .sopl8
-    inc	  eax
-	mov   [esp+32],eax
-    ret
-  .sopl8:
-    mov   edx,[TASK_BASE]
-    mov   edx,[edx+0x4]
-    ;and   ecx,65535
-    ;cld - set on interrupt 0x40
-  .sopl1:
-    mov   esi,eax
-    shl   esi,4
-    add   esi,RESERVED_PORTS
-    cmp   edx,[esi+0]
-    jne   .sopl2
-    cmp   ecx,[esi+4]
-    jb    .sopl2
-    cmp   ecx,[esi+8]
-    jg    .sopl2
-.sopl3:
-    test  edi,0x80000000 ; read ?
-    jnz   .sopl4
-	mov	  eax,ebx
-    mov   dx,cx          ; write
-    out   dx,al
-    and   [esp+32],dword 0
-    ret
-	.sopl2:
-    dec   eax
-    jnz   .sopl1
-	inc	  eax
-    mov   [esp+32],eax
-    ret
-  .sopl4:
-    mov   dx,cx          ; read
-    in    al,dx
-    and   eax,0xff
-    and   [esp+32],dword 0
-    mov   [esp+20],eax
+     and   [esp+32],dword 1	; for backward compatibility: operation failed
     ret
 display_number:
-align 4
-sys_programirq:
-    mov   eax, [TASK_BASE]
-    add   ebx, [eax + TASKDATA.mem_start]
-    cmp   ecx, 16
-    jae   .not_owner
-    mov   edi, [eax + TASKDATA.pid]
-    cmp   edi, [irq_owner + 4 * ecx]
-    je    .spril1
-.not_owner:
-    xor   ecx, ecx
-    inc   ecx
-    jmp   .end
-  .spril1:
-    shl   ecx, 6
-    mov   esi, ebx
-    lea   edi, [irq00read + ecx]
-    push  16
-    pop   ecx
+align 4
-    cld
-    rep   movsd
+sys_programirq:
-  .end:
+	; removed
-    mov   [esp+32], ecx
+    mov   dword [esp+32], 1	; operation failed
-    ret
-align 4
-get_irq_data:
-     movzx esi, bh                       ; save number of subfunction, if bh = 1, return data size, otherwise, read data
-     xor   bh, bh
-     cmp   ebx, 16
-     jae   .not_owner
-     mov   edx, [4 * ebx + irq_owner]    ; check for irq owner
-     mov   eax,[TASK_BASE]
-     cmp   edx,[eax+TASKDATA.pid]
-     je    gidril1
-.not_owner:
-     xor   edx, edx
-     dec   edx
-     jmp   gid1
-  gidril1:
-     shl   ebx, 12
-     lea   eax, [ebx + IRQ_SAVE]         ; calculate address of the beginning of buffer + 0x0 - data size
-     mov   edx, [eax]                    ;                                              + 0x4 - data offset
-     dec   esi
-     jz    gid1
-     test  edx, edx                      ; check if buffer is empty
-     jz    gid1
-     mov   ebx, [eax + 0x4]
-     mov   edi, ecx
-     mov   ecx, 4000                     ; buffer size, used frequently
-     cmp   ebx, ecx                      ; check for the end of buffer, if end of buffer, begin cycle again
-     jb    @f
-     xor   ebx, ebx
-   @@:
-     lea   esi, [ebx + edx]              ; calculate data size and offset
-     cld
-     cmp   esi, ecx                      ; if greater than the buffer size, begin cycle again
-     jbe   @f
-     sub   ecx, ebx
-     sub   edx, ecx
-     lea   esi, [eax + ebx + 0x10]
-     rep   movsb
-     xor   ebx, ebx
+    ret
-   @@:
-     lea   esi, [eax + ebx + 0x10]
-     mov   ecx, edx
-     add   ebx, edx
-     rep   movsb
      mov   edx, [eax]
-     mov   [eax], ecx                    ; set data size to zero
+align 4
-     mov   [eax + 0x4], ebx              ; set data offset
-   gid1:
-     mov   [esp+32], edx                 ; eax
-     ret
-set_io_access_rights:
-      push edi eax
-      mov edi, tss._io_map_0
-;     mov   ecx,eax
-;     and   ecx,7    ; offset in byte
-;     shr   eax,3    ; number of byte
-;     add   edi,eax
-;     mov   ebx,1
-;     shl   ebx,cl
-     test  ebp,ebp
-;     cmp   ebp,0                ; enable access - ebp = 0
-     jnz   siar1
-;     not   ebx
-;     and   [edi],byte bl
-     btr [edi], eax
-     pop eax edi
-     ret
-siar1:
-     bts [edi], eax
-  ;  or    [edi],byte bl        ; disable access - ebp = 1
-     pop eax edi
-     ret
-;reserve/free group of ports
-;  * eax = 46 - number function
-;  * ebx = 0 - reserve, 1 - free
-;  * ecx = number start arrea of ports
-;  * edx = number end arrea of ports (include last number of port)
-;Return value:
-;  * eax = 0 - succesful
-;  * eax = 1 - error
-;  * The system has reserve this ports:
-;    0..0x2d, 0x30..0x4d, 0x50..0xdf, 0xe5..0xff (include last number of port).
-;destroys eax,ebx, ebp
-r_f_port_area:
-     test  ebx, ebx
-     jnz   free_port_area
-;     je    r_port_area
-;     jmp   free_port_area
-;   r_port_area:
-;     pushad
-     cmp   ecx,edx            ; beginning > end ?
-     ja    rpal1
-     cmp   edx,65536
-     jae   rpal1
-     mov   eax,[RESERVED_PORTS]
-     test  eax,eax            ; no reserved areas ?
-     je    rpal2
-     cmp   eax,255            ; max reserved
-     jae   rpal1
- rpal3:
-     mov   ebx,eax
-     shl   ebx,4
-     add   ebx,RESERVED_PORTS
-     cmp   ecx,[ebx+8]
-     ja    rpal4
-     cmp   edx,[ebx+4]
-     jae   rpal1
-;     jb    rpal4
-;     jmp   rpal1
- rpal4:
-     dec   eax
-     jnz   rpal3
-     jmp   rpal2
-   rpal1:
-;     popad
-;     mov   eax,1
-     xor    eax,eax
-     inc    eax
-     ret
-   rpal2:
-;     popad
-     ; enable port access at port IO map
-	cli
-	pushad                        ; start enable io map
-	cmp   edx,65536 ;16384
-	jae   no_unmask_io ; jge
-	mov   eax,ecx
-;	push	ebp
-	xor	ebp,ebp                ; enable - eax = port
-new_port_access:
-;     pushad
-	call	set_io_access_rights
-;     popad
-     inc   eax
-     cmp   eax,edx
-     jbe   new_port_access
-;	pop	ebp
-no_unmask_io:
-	popad                         ; end enable io map
-     sti
-     mov   eax,[RESERVED_PORTS]
-     add   eax,1
-     mov   [RESERVED_PORTS],eax
-     shl   eax,4
-     add   eax,RESERVED_PORTS
-     mov   ebx,[TASK_BASE]
-     mov   ebx,[ebx+TASKDATA.pid]
-     mov   [eax],ebx
-     mov   [eax+4],ecx
-     mov   [eax+8],edx
-     xor   eax, eax
-     ret
-free_port_area:
-;     pushad
-     mov   eax,[RESERVED_PORTS]     ; no reserved areas ?
-     test  eax,eax
-     jz    frpal2
-     mov   ebx,[TASK_BASE]
-     mov   ebx,[ebx+TASKDATA.pid]
-   frpal3:
-     mov   edi,eax
-     shl   edi,4
-     add   edi,RESERVED_PORTS
-     cmp   ebx,[edi]
-     jne   frpal4
-     cmp   ecx,[edi+4]
-     jne   frpal4
-     cmp   edx,[edi+8]
-     jne   frpal4
+get_irq_data:
-     jmp   frpal1
-   frpal4:
-     dec   eax
-     jnz   frpal3
-   frpal2:
-;     popad
-     inc   eax
-     ret
-   frpal1:
-	push	ecx
-	mov   ecx,256
-	sub   ecx,eax
-	shl   ecx,4
-	mov   esi,edi
-	add   esi,16
-	cld
-	rep   movsb
-	dec   dword [RESERVED_PORTS]
-;popad
-;disable port access at port IO map
+	; removed
-;     pushad                        ; start disable io map
-     pop	eax	;start port
-     cmp   edx,65536 ;16384
-     jge   no_mask_io
-;     mov   eax,ecx
-	xor	ebp,ebp
+     mov   dword [esp+32], -1
-	inc	ebp
-new_port_access_disable:
-;     pushad
+     ret
 ;     mov   ebp,1                  ; disable - eax = port
      call  set_io_access_rights

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-A/trunk/kernel.asm @ 1710 – Rev 1508 → 1551