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

 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 include 'macros.inc'
-$Revision: 1952 $
+$Revision: 2014 $
 	   bts [cpu_caps-OS_BASE], CAPS_TSC	;force use rdtsc
 	   call init_BIOS32	; (init.inc - to be removed later)
+; PCIe extended config space access
-; PCIe extended config space access
+	display '** Platform chosen (const.inc): '
+if PLATFORM>PLATFORM_RS780
+	call fusion_pcie_init	; (bus/HT.inc)
+	display 'RS880/Fusion '
+else
+	call rs7xx_pcie_init	; (bus/HT.inc)
+	display 'RS780 '
+end if
-;           call rs7xx_pcie_init ; (bus/HT.inc)
+	display 10,13
 	   call fusion_pcie_init	; (bus/HT.inc)
 align 4
 bios32_entry	dd ?
 tmp_page_tabs	dd ?
-use16
+;use16
-org $-0x10000
+;org $-0x10000
+;include "boot/shutdown.inc" ; shutdown or restart
-include "boot/shutdown.inc" ; shutdown or restart
+;org $+0x10000
 org $+0x10000
 use32
 ;!!!!!!!!!!!!!!!!!!!!!!!
 include 'vmodeld.inc'
-;!!!!!!!!!!!!!!!!!!!!!!!
-if 0
-  mov ax,[OS_BASE+0x10000+bx_from_load]
-  cmp ax,'r1'		; if using not ram disk, then load librares and parameters {SPraid.simba}
-  je  no_lib_load
-; LOADING LIBRARES
-   stdcall dll.Load,@IMPORT		    ; loading librares for kernel (.obj files)
-   call load_file_parse_table		    ; prepare file parse table
-   call set_kernel_conf 		    ; configure devices and gui
-no_lib_load:
+;!!!!!!!!!!!!!!!!!!!!!!!
 end if
 ; LOAD FONTS I and II
 	stdcall read_file, char, FONT_I, 0, 2304
 	stdcall read_file, char2, FONT_II, 0, 2560
-	mov   esi,boot_fonts
+;        mov   esi,boot_fonts
-	call  boot_log
+;        call  boot_log
 ; PRINT AMOUNT OF MEMORY
 ; BUILD SCHEDULER
 	call   build_scheduler ; sys32.inc
-	mov    esi,boot_devices
+;        mov    esi,boot_devices
 	call  boot_log
 	call  set_window_defaults
 ; SET BACKGROUND DEFAULTS
-	mov   esi,boot_bgr
+;        mov   esi,boot_bgr
-	call  boot_log
+;        call  boot_log
 	call  init_background	;
 	call  calculatebackground
 ; SET UP OS TASK
-	mov  esi,boot_setostask
+;        mov  esi,boot_setostask
-	call boot_log
+;        call boot_log
 	mov [SLOT_BASE+APPDATA.cursor+256],eax
   ; READ TSC / SECOND
-	mov   esi,boot_tsc
+;        mov   esi,boot_tsc
-	call  boot_log
+;        call  boot_log
 	cli
 	rdtsc ;call  _rdtsc
 ; SET MOUSE
 	;call   detect_devices
 	stdcall load_driver, szPS2MDriver
-	mov   esi,boot_setmouse
+;        mov   esi,boot_setmouse
-	call  boot_log
+;        call  boot_log
 ;       call  setmouse
 ;     mov     [MOUSE_PICTURE],dword mousepointer
 	   stdcall map_page,tss._io_map_1,\
 		   [SLOT_BASE+256+APPDATA.io_map+4], PG_MAP
 	call init_userDMA	; <<<<<<<<< ============== core/memory.inc =================
-	mov	esi, boot_uDMA_ok
+;        mov     esi, boot_uDMA_ok
-	call	boot_log
+;        call    boot_log
 ;        cmp   eax,2                  ; continue if a process has been loaded
 	sub   eax,2
 	jz    first_app_found
-	mov	esi, boot_failed
+;        mov     esi, boot_failed
-	call	boot_log
+;        call    boot_log
 ; START MULTITASKING
-if preboot_blogesc
+;if preboot_blogesc
-	mov	esi, boot_tasking
+;        mov     esi, boot_tasking
-	call	boot_log
+;        call    boot_log
-.bll1:	in	al, 0x60	; wait for ESC key press
+;.bll1:  in      al, 0x60        ; wait for ESC key press
-	cmp	al, 129
+;        cmp     al, 129
 	   call stop_all_services
 yes_shutdown_param:
-	   cli
-	   mov	eax, kernel_file ; load kernel.mnt to 0x7000:0
-	   push 12
-	   pop	esi
-	   xor	ebx,ebx
-	   or	ecx,-1
-	   mov	edx, OS_BASE+0x70000
-	   call fileread
-	   mov	esi, restart_kernel_4000+OS_BASE+0x10000 ; move kernel re-starter to 0x4000:0
-	   mov	edi,OS_BASE+0x40000
-	   mov	ecx,1000
-	   rep	movsb
-	   mov	esi,OS_BASE+0x2F0000	; restore 0x0 - 0xffff
-	   mov	edi, OS_BASE
-	   mov	ecx,0x10000/4
-	   cld
-	   rep movsd
 	   cli
-	   call restorefatchain
+	   mov al, 0xFF
+	   out 0x21, al 	;IntrCntrl1Reg2
-	   mov al, 0xFF
+	   out 0xA1, al 	;IntrCntrl2Reg2
-	   out 0x21, al
-	   out 0xA1, al
-if 0
-	   mov	word [OS_BASE+0x467+0],pr_mode_exit
-	   mov	word [OS_BASE+0x467+2],0x1000
-	   mov	al,0x0F
-	   out	0x70,al
-	   mov	al,0x05
-	   out	0x71,al
-	   mov	al,0xFE
-	   out	0x64,al
-	   hlt
-	   jmp $-1
-else
-	cmp	byte [OS_BASE + 0x9030], 2
-	jnz	no_acpi_power_off
-; scan for RSDP
-; 1) The first 1 Kb of the Extended BIOS Data Area (EBDA).
-	movzx	eax, word [OS_BASE + 0x40E]
-	shl	eax, 4
-	jz	@f
-	mov	ecx, 1024/16
-	call	scan_rsdp
-	jnc	.rsdp_found
-@@:
-; 2) The BIOS read-only memory space between 0E0000h and 0FFFFFh.
-	mov	eax, 0xE0000
-	mov	ecx, 0x2000
-	call	scan_rsdp
-	jc	no_acpi_power_off
-.rsdp_found:
-	mov	esi, [eax+16]	; esi contains physical address of the RSDT
-	mov	ebp, [ipc_tmp]
-	stdcall map_page, ebp, esi, PG_MAP
-	lea	eax, [esi+1000h]
-	lea	edx, [ebp+1000h]
-	stdcall map_page, edx, eax, PG_MAP
-	and	esi, 0xFFF
-	add	esi, ebp
-	cmp	dword [esi], 'RSDT'
-	jnz	no_acpi_power_off
-	mov	ecx, [esi+4]
-	sub	ecx, 24h
-	jbe	no_acpi_power_off
-	shr	ecx, 2
+	cmp	byte [BOOT_VAR + 0x9030], 2
-	add	esi, 24h
-.scan_fadt:
-	lodsd
-	mov	ebx, eax
-	lea	eax, [ebp+2000h]
-	stdcall map_page, eax, ebx, PG_MAP
-	lea	eax, [ebp+3000h]
-	add	ebx, 0x1000
-	stdcall map_page, eax, ebx, PG_MAP
-	and	ebx, 0xFFF
-	lea	ebx, [ebx+ebp+2000h]
-	cmp	dword [ebx], 'FACP'
-	jz	.fadt_found
-	loop	.scan_fadt
-	jmp	no_acpi_power_off
-.fadt_found:
-; ebx is linear address of FADT
-	mov	edi, [ebx+40] ; physical address of the DSDT
-	lea	eax, [ebp+4000h]
-	stdcall map_page, eax, edi, PG_MAP
-	lea	eax, [ebp+5000h]
-	lea	esi, [edi+0x1000]
-	stdcall map_page, eax, esi, PG_MAP
-	and	esi, 0xFFF
-	sub	edi, esi
-	cmp	dword [esi+ebp+4000h], 'DSDT'
-	jnz	no_acpi_power_off
-	mov	eax, [esi+ebp+4004h] ; DSDT length
-	sub	eax, 36+4
-	jbe	no_acpi_power_off
-	add	esi, 36
-.scan_dsdt:
-	cmp	dword [esi+ebp+4000h], '_S5_'
-	jnz	.scan_dsdt_cont
-	cmp	byte [esi+ebp+4000h+4], 12h ; DefPackage opcode
-	jnz	.scan_dsdt_cont
-	mov	dl, [esi+ebp+4000h+6]
-	cmp	dl, 4 ; _S5_ package must contain 4 bytes
-		      ; ...in theory; in practice, VirtualBox has 2 bytes
-	ja	.scan_dsdt_cont
-	cmp	dl, 1
-	jb	.scan_dsdt_cont
-	lea	esi, [esi+ebp+4000h+7]
-	xor	ecx, ecx
-	cmp	byte [esi], 0 ; 0 means zero byte, 0Ah xx means byte xx
-	jz	@f
-	cmp	byte [esi], 0xA
-	jnz	no_acpi_power_off
-	inc	esi
-	mov	cl, [esi]
-@@:
-	inc	esi
-	cmp	dl, 2
-	jb	@f
-	cmp	byte [esi], 0
-	jz	@f
-	cmp	byte [esi], 0xA
-	jnz	no_acpi_power_off
-	inc	esi
-	mov	ch, [esi]
+	jnz	pm_restart
-@@:
-	jmp	do_acpi_power_off
-.scan_dsdt_cont:
-	inc	esi
-	cmp	esi, 0x1000
-	jb	@f
-	sub	esi, 0x1000
-	add	edi, 0x1000
-	push	eax
-	lea	eax, [ebp+4000h]
-	stdcall map_page, eax, edi, PG_MAP
-	push	PG_MAP
-	lea	eax, [edi+1000h]
-	push	eax
-	lea	eax, [ebp+5000h]
-	push	eax
-	stdcall map_page
-	pop	eax
-@@:
-	dec	eax
+if 0
-	jnz	.scan_dsdt
-	jmp	no_acpi_power_off
-do_acpi_power_off:
-	mov	edx, [ebx+48]
+	mov	al, SB_PM_CTRL_BLK
-	test	edx, edx
-	jz	.nosmi
+	mov	ah, al
-	mov	al, [ebx+52]
+	inc	ah
-	out	dx, al
+	mov	dx, 0x0CD6
-	mov	edx, [ebx+64]
+	out	dx, al
-@@:
-	in	ax, dx
+	inc	dl
-	test	al, 1
+	in	al, dx
-	jz	@b
+	mov	cl, al
-.nosmi:
-	and	cx, 0x0707
+	dec	dl
-	shl	cx, 2
-	or	cx, 0x2020
+	mov	al, ah
-	mov	edx, [ebx+64]
+	out	dx, al
-	in	ax, dx
+	inc	dl
-	and	ax, 203h
-	or	ah, cl
-	out	dx, ax
-	mov	edx, [ebx+68]
+	in	al, dx
-	test	edx, edx
-	jz	@f
+	mov	ch, al
-	in	ax, dx
+end if
-	and	ax, 203h
+	mov	dx, 0x0804	;cx
-	or	ah, ch
+	mov	ax, 0x03400
-	out	dx, ax
-@@:
-	jmp	$
+	out	dx, ax
+; THE END...
 	jmp	$	; just to be absolutely sure
-no_acpi_power_off:
-	   mov	word [OS_BASE+0x467+0],pr_mode_exit
+pm_restart:
-	   mov	word [OS_BASE+0x467+2],0x1000
 	   mov	al,0x0F
-	   mov	al,0x0F
+	   out	0x70,al 	; NmiEnable
-	   out	0x70,al
-	   mov	al,0x05
-	   out	0x71,al
-	   mov	al,0xFE
-	   out	0x64,al
-	   hlt
-	   jmp $-1
-scan_rsdp:
-	add	eax, OS_BASE
-.s:
-	cmp	dword [eax], 'RSD '
-	jnz	.n
-	cmp	dword [eax+4], 'PTR '
-	jnz	.n
-	xor	edx, edx
-	xor	esi, esi
-@@:
-	add	dl, [eax+esi]
-	inc	esi
-	cmp	esi, 20
-	jnz	@b
+	   mov	al,0x05
-	test	dl, dl
+	   out	0x71,al 	; RtcData

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-A/trunk/kernel.asm – Rev 1952 → 2014