WebSVN – Kolibri OS – Diff – /kernel/trunk/bootloader/uefi4kos/uefi64kos.asm

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                                                              ;;
+;; Copyright (C) KolibriOS team 2020. All rights reserved.      ;;
+;; Distributed under terms of the GNU General Public License    ;;
+;; Version 2, or (at your option) any later version.            ;;
+;;                                                              ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-format pe64 dll efi
+format pe64 efi
 entry main
 section '.text' code executable readable
 include '../../struct.inc'
+include '../../macros.inc'
+include '../../const.inc'
-include '../../macros.inc'
-include '../../const.inc'
+purge DQ
-include 'uefi.inc'
+include 'uefi64.inc'
 MEMORY_MAP_SIZE = 0x4000
         cmp     rax, EFI_SUCCESS
         jz      @f
         xor     eax, eax
         cmp     [.fatal], 1
         jnz     .done
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
-        eficall ConOut, OutputString, ConOut, msg_error_open_file
+                msg_error_open_file
+        mov     rbx, [efi_table]
-        eficall ConOut, OutputString, ConOut, [.name]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                [.name]
         jmp     $
 @@:
         lea     rax, [.size]
         ret
 skip_line:
         call    skip_until_newline
-        call    skip_newline
-.done:
+        call    skip_newline
         ret
 dec2bin:
         cmp     byte[rsi], 0
         jnz     .next_line
         ret     1*8
+read_options_from_config:
+        mov     rbx, [efi_table]
-read_options_from_config:
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
-        eficall BootServices, HandleProtocol, qword[efi_handler], lipuuid, \
+        eficall rbx, EFI_BOOT_SERVICES.HandleProtocol, [efi_handle], lipuuid, \
                 lip_interface
         cmp     eax, EFI_SUCCESS
         jnz     .error
+        mov     rax, [lip_interface]
-        mov     rax, [lip_interface]
+        mov     rbx, [efi_table]
         mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
-        eficall BootServices, HandleProtocol, \
+        eficall rbx, EFI_BOOT_SERVICES.HandleProtocol, \
                 [rax+EFI_LOADED_IMAGE_PROTOCOL.DeviceHandle], sfspguid, \
                 sfsp_interface
 @@:
 .error:
+        ret
+print_vmode:
+        push    rax rbx rcx rdx rsi rdi
+        mov     rbx, rcx
+        call    clearbuf
+        mov     eax, [rbx+EFI_GRAPHICS_OUTPUT_MODE_INFORMATION.HorizontalResolution]
+        mov     rdi, msg
+        call    num2dec
+        mov     eax, [rbx+EFI_GRAPHICS_OUTPUT_MODE_INFORMATION.VerticalResolution]
+        mov     rdi, msg+8*2
+        call    num2dec
+        mov     eax, [rbx+EFI_GRAPHICS_OUTPUT_MODE_INFORMATION.PixelFormat]
+        mov     rdi, msg+16*2
+        call    num2dec
+        mov     eax, [rbx+EFI_GRAPHICS_OUTPUT_MODE_INFORMATION.PixelsPerScanLine]
+        mov     rdi, msg+24*2
+        call    num2dec
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg
+        pop     rdi rsi rdx rcx rbx rax
         ret
 find_vmode_index_by_resolution:
         mov     [cfg_opt_used_resolution], 1
         mov     [cfg_opt_value_vmode], 0
-  .next_mode:
+.next_mode:
         movzx   eax, [cfg_opt_value_vmode]
         eficall [gop_interface], EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode, \
                 [gop_interface], rax, gop_info_size, gop_info
         cmp     rax, EFI_SUCCESS
+        jnz     .error
-        jnz     .error
+        mov     rcx, [gop_info]
-        mov     rcx, [gop_info]
+        call    print_vmode
         ; PixelBlueGreenRedReserved8BitPerColor
         cmp     [rcx+EFI_GRAPHICS_OUTPUT_MODE_INFORMATION.PixelFormat], 1
         jnz     .skip_mode
- .skip_mode:
+.skip_mode:
         inc     [cfg_opt_value_vmode]
         movzx   eax, [cfg_opt_value_vmode]
         mov     rcx, [gop_interface]
         mov     rdx, [rcx+EFI_GRAPHICS_OUTPUT_PROTOCOL.Mode]
-        cmp     eax, [rdx+EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE.MaxMode]
+        cmp     eax, 8;[rdx+EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE.MaxMode]
         jnz     .next_mode
         mov     [cfg_opt_used_resolution], 0
         mov     [cfg_opt_value_ask_params], 1
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                msg_error_no_such_vmode
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg_error
+        jmp     $
 .error:
 .done:
         ret
+ask_for_params:
+        ret
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
+        eficall rbx, EFI_BOOT_SERVICES.HandleProtocol, [rax], gopuuid, \
+                msg_ask_for_params
+        jmp     $
 ask_for_params:
         xor     ebx, ebx
-  .next_mode:
+.next_mode:
         call    clearbuf
         mov     eax, ebx
         call    num2dec
 ;        mov     eax, [rcx+EFI_GRAPHICS_OUTPUT_MODE_INFORMATION.PixelsPerScanLine]
 ;        lea     rdi, [msg+14*2]
 ;        call    num2dec
-  .skip:
+.skip:
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
-        eficall ConOut, OutputString, ConOut, msg
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg
         cmp     rax, EFI_SUCCESS
         jnz     .error
         pop     rbx
         mov     rdx, [rcx+EFI_GRAPHICS_OUTPUT_PROTOCOL.Mode]
         cmp     ebx, [rdx+EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE.MaxMode]
         jnz     .next_mode
+        mov     rbx, [efi_table]
         mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConIn]
-        eficall ConIn, Reset, ConIn, 1
+        eficall rbx, SIMPLE_INPUT_INTERFACE.Reset, rbx, 1
         cmp     rax, EFI_SUCCESS
         jnz     .error
         xor     ecx, ecx
+    @@:
+        push    rcx
-    @@:
+        mov     rbx, [efi_table]
-        push    rcx
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConIn]
-        eficall ConIn, ReadKeyStroke, ConIn, msg
+        eficall rbx, SIMPLE_INPUT_INTERFACE.ReadKeyStroke, rbx, msg
         pop     rcx
         mov     rdx, EFI_DEVICE_ERROR
         cmp     rax, rdx
 .error:
 .done:
         ret
-main:
-        sub     rsp, 0x38
-        ; initialize UEFI library
-        InitializeLib
-        jc      .error
-;        eficall ConOut, Reset, ConOut, 1
+main:
-;        cmp     rax, EFI_SUCCESS
-;        jnz     .error
-        eficall ConOut, ClearScreen, ConOut
+        mov     [efi_handle], rcx
-        cmp     rax, EFI_SUCCESS
+        mov     [efi_table], rdx
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.Reset, rbx, 1
+        test    eax, eax
+        jz      @f
+        jmp     $       ; what can I do here?
+@@:
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                msg_u4k_loaded
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
-        jnz     .error
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
                 msg_read_options
+        call    read_options_from_config
+        ; read kernel file
+        mov     rbx, [efi_table]
-        call    read_options_from_config
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
         eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
-        ; read kernel file
+                msg_load_kernel
         push    1
         push    -1
         push    KERNEL_BASE
         push    kernel_name
+        push    [esp_root]
+        call    load_file
+        ; read ramdisk image
-        push    [esp_root]
+        mov     rbx, [efi_table]
-        call    load_file
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
         eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
-        ; read ramdisk image
+                msg_load_ramdisk
         push    1
         push    -1
         push    RAMDISK_BASE
+        push    ramdisk_name
+        push    [esp_root]
-        push    ramdisk_name
+        call    load_file
+        ; alloc buffer for devices.dat
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
-        push    [esp_root]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                msg_alloc_devicesdat
-        call    load_file
+        mov     rbx, [efi_table]
         mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
-        ; alloc buffer for devices.dat
+        eficall rbx, EFI_BOOT_SERVICES.AllocatePages, \
+                EFI_ALLOCATE_MAX_ADDRESS, EFI_RESERVED_MEMORY_TYPE, 1, \
+                devicesdat_data
+        cmp     eax, EFI_SUCCESS
+        jnz     .error
-        eficall BootServices, AllocatePages, EFI_ALLOCATE_MAX_ADDRESS, \
+        ; read devices.dat
-                EFI_RESERVED_MEMORY_TYPE, 1, devicesdat_data
+        mov     rbx, [efi_table]
-        cmp     eax, EFI_SUCCESS
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
-        jnz     .error
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
                 msg_load_devicesdat
         ; read devices.dat
         push    0 ; not fatal
+        push    [devicesdat_size]
+        push    [devicesdat_data]
-        push    [devicesdat_size]
+        push    devicesdat_name
+        push    [esp_root]
+        call    load_file
+        mov     [devicesdat_size], rax
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                msg_locate_gop_handlers
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
+        eficall rbx, EFI_BOOT_SERVICES.LocateHandle, \
-        push    [devicesdat_data]
+                EFI_LOCATE_SEARCH_TYPE.ByProtocol, gopuuid, 0, \
+                gop_buffer_size, gop_buffer
+        mov     [status], rax
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                msg_gop_buffer_size
+        call    clearbuf
-        push    devicesdat_name
+        mov     rax, [gop_buffer_size]
+        mov     rdi, msg
-        push    [esp_root]
+        call    num2hex
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg
+        mov     rax, [status]
+        test    eax, eax
+        jz      @f
+        call    clearbuf
+        mov     rdi, msg
+        call    num2hex
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg_error
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg
+        jmp     $
-        call    load_file
+@@:
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                msg_look_for_gop_handler
+        mov     rbx, gop_buffer
+.next_gop_handle:
+        mov     rax, rbx
+        sub     rax, gop_buffer
+        cmp     rax, [gop_buffer_size]
+        jb      @f
+        push    rbx
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
-        mov     [devicesdat_size], rax
+                msg_error_out_of_handlers
+        pop     rbx
+        push    rbx
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg_error
+        pop     rbx
+        jmp     $
+@@:
+        push    rbx
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
-        eficall BootServices, LocateHandle, 2, gopuuid, 0, gop_buffer_size, \
+                msg_query_handler
-                gop_buffer
+        pop     rbx
+        mov     rax, rbx
-        cmp     eax, EFI_SUCCESS
+        push    rbx
-        jnz     .error
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
+        eficall rbx, EFI_BOOT_SERVICES.HandleProtocol, [rax], gopuuid, \
+                gop_interface
+        pop     rbx
+;mov rax, 0x8000_0000_0000_0003
+        test    eax, eax
+        jz      @f
+        call    clearbuf
+        mov     rdi, msg
+        call    num2hex
+        push    rbx
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
-        mov     rsi, gop_buffer
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg
+        pop     rbx
+        add     rbx, 8
+        jmp     .next_gop_handle
+@@:
-        lodsq
+        push    rbx
-        mov     [gop_handle], rax
+        mov     rbx, [efi_table]
-        eficall BootServices, HandleProtocol, qword[gop_handle], gopuuid, \
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
-                gop_interface
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
-        cmp     eax, EFI_SUCCESS
+                msg_look_for_rsdp
-  .not_acpi20:
+.not_acpi20:
         add     rdi, 24
         jmp     .next_table
-  .all_tables_done:
+.all_tables_done:
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                msg_acpi_tables_done
         cmp     [cfg_opt_used_resolution], 0
+        jz      .not_used_resolution
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
+                msg_opt_resolution
+        call    clearbuf
+        xor     edx, edx
+        movzx   eax, [rdx+BOOT_LO.x_res]
+        mov     rdi, msg
+        call    num2dec
+        xor     edx, edx
+        movzx   eax, [rdx+BOOT_LO.y_res]
+        mov     rdi, msg+8*2
+        call    num2dec
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
-        jz      .not_used_resolution
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg
         call    find_vmode_index_by_resolution
 .not_used_resolution:
         cmp     [cfg_opt_used_debug_print], 0
         jz      .not_used_debug_print
 @@:
         movzx   ecx, [cfg_opt_value_vmode]
         eficall [gop_interface], EFI_GRAPHICS_OUTPUT_PROTOCOL.SetMode, \
                 [gop_interface], rcx
-        cmp     eax, EFI_SUCCESS
+        test    eax, eax
+        jz      @f
+        call    clearbuf
+        mov     rdi, msg
+        call    num2hex
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, msg_error
+        jmp     $
-        jnz     .error
+@@:
         mov     rcx, [gop_interface]
         mov     rdx, [rcx+EFI_GRAPHICS_OUTPUT_PROTOCOL.Mode]
         mov     byte[rdx+BOOT_LO.pci_data+2], 0x10 ; PCI version
         mov     byte[rdx+BOOT_LO.pci_data+3], 0x02
         mov     dword[rdx+BOOT_LO.pci_data+4], 0xe3
+        mov     rbx, [efi_table]
         mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
-        eficall BootServices, AllocatePages, EFI_ALLOCATE_ANY_PAGES, \
+        eficall rbx, EFI_BOOT_SERVICES.AllocatePages, EFI_ALLOCATE_ANY_PAGES, \
                 EFI_RESERVED_MEMORY_TYPE, MEMORY_MAP_SIZE/0x1000, memory_map
+        cmp     eax, EFI_SUCCESS
+        jnz     .error
-        cmp     eax, EFI_SUCCESS
-        jnz     .error
+        mov     rbx, [efi_table]
         mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
-        eficall BootServices, GetMemoryMap, memory_map_size, [memory_map], \
+        eficall rbx, EFI_BOOT_SERVICES.GetMemoryMap, memory_map_size, \
-                memory_map_key, descriptor_size, descriptor_ver
+                [memory_map], memory_map_key, descriptor_size, descriptor_ver
         cmp     eax, EFI_SUCCESS
         ; ramdisk
 ;        eficall BootServices, AllocatePages, EFI_RESERVED_MEMORY_TYPE, \
+;                2880*512/0x1000, EFI_ALLOCATE_ADDRESS
-;                2880*512/0x1000, EFI_ALLOCATE_ADDRESS
+        mov     rbx, [efi_table]
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.BootServices]
         eficall rbx, EFI_BOOT_SERVICES.ExitBootServices, [efi_handle], \
-        eficall BootServices, ExitBootServices, [efi_handler], [memory_map_key]
+                [memory_map_key]
         cmp     eax, EFI_SUCCESS
         mov     ss, ax
         push    CODE_32_SELECTOR
         lea     rax, [.next]
-        push    rax
-;        push    .next
+        push    rax
         retf
 use32
 align 16
-  .next:
+.next:
         push    KERNEL_BASE
         retn
 use64
-  .error:
+.error:
-        eficall ConOut, OutputString, ConOut, msg_error
+        mov     rbx, [efi_table]
-        jmp     .quit
+        mov     rbx, [rbx+EFI_SYSTEM_TABLE.ConOut]
-  .quit:
+        eficall rbx, EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString, rbx, \
-        mov     rcx, -1
+                msg_error
-        loop    $
+        jmp     $
 ; linux/arch/x86/platform/efi/efi.c
 ; do_add_efi_memmap
 add_uefi_memmap:
-        push    rax rbx rcx rdx rsi rdi
+        push    rax rbx rcx rdx rsi rdi
-        mov     r10d, [rsi+0]
-        mov     r11, [rsi+8]
+        mov     r10d, [rsi+EFI_MEMORY_DESCRIPTOR.Type]
-;        mov     r12, [rsi+16]
+        mov     r11, [rsi+EFI_MEMORY_DESCRIPTOR.PhysicalStart]
-        mov     r13, [rsi+24]
+        mov     r13, [rsi+EFI_MEMORY_DESCRIPTOR.NumberOfPages]
-        mov     r14, [rsi+32]
+        mov     r14, [rsi+EFI_MEMORY_DESCRIPTOR.Attribute]
         rep stosw
         pop     rdi rsi rdx rcx rbx rax
         ret
+section '.data' data readable writeable
+efi_handle  dq 0
+efi_table   dq 0
-section '.data' data readable writeable
+uefi_rsptmp dq 0
 GDTR:
         dw 4*8-1
 sfspguid        db EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID
 sfsp_interface  dq 0
 esp_root        dq ?
 file_handle     dq ?
-file_name       du '\EFI\BOOT\KOLIBRI.INI',0
+file_name       du '\EFI\KOLIBRIOS\KOLIBRI.INI',0
-kernel_name     du '\EFI\BOOT\KOLIBRI.KRN',0
+kernel_name     du '\EFI\KOLIBRIOS\KOLIBRI.KRN',0
-ramdisk_name    du '\EFI\BOOT\KOLIBRI.IMG',0
+ramdisk_name    du '\EFI\KOLIBRIOS\KOLIBRI.IMG',0
-devicesdat_name du '\EFI\BOOT\DEVICES.DAT',0
+devicesdat_name du '\EFI\KOLIBRIOS\DEVICES.DAT',0
 file_buffer_size dq FILE_BUFFER_SIZE-1  ; leave the last byte for \0
 config_options  dq cfg_opt_name_resolution, cfg_opt_func_resolution, \
                    cfg_opt_cmnt_imgfrom, \
                    cfg_opt_name_syspath, cfg_opt_func_syspath, \
                    cfg_opt_cmnt_syspath, \
-cfg_opt_name_resolution db 'resolution',0
+cfg_opt_name_resolution     db "resolution",0
-cfg_opt_name_acpi db 'acpi',0
+cfg_opt_name_acpi           db "acpi",0
-cfg_opt_name_debug_print db 'debug_print',0
+cfg_opt_name_debug_print    db "debug_print",0
-cfg_opt_name_launcher_start db 'launcher_start',0
+cfg_opt_name_launcher_start db "launcher_start",0
-cfg_opt_name_mtrr db 'mtrr',0
+cfg_opt_name_mtrr           db "mtrr",0
-cfg_opt_name_ask_params db 'ask_params',0
+cfg_opt_name_ask_params     db "ask_params",0
-cfg_opt_name_imgfrom db 'imgfrom',0
+cfg_opt_name_imgfrom        db "imgfrom",0
-cfg_opt_name_syspath db 'syspath',0
+cfg_opt_name_syspath        db "syspath",0
-cfg_opt_cmnt_resolution db "# Graphic mode",0
+cfg_opt_cmnt_resolution     db "# Graphic mode",0
-cfg_opt_cmnt_acpi db "# ACPI settings",0xa, \
+cfg_opt_cmnt_acpi           db "# ACPI settings",0xa, \
-                     "#   0: don't use",0xa, \
+                               "#   0: don't use",0xa, \
-                     "#   1: parse ACPI tables",0xa, \
+                               "#   1: parse ACPI tables",0xa, \
-                     "#   2: + call _PIC method",0xa, \
+                               "#   2: + call _PIC method",0xa, \
-                     "#   3: + get APIC interrupts",0xa,0
+                               "#   3: + get APIC interrupts",0xa,0
-cfg_opt_cmnt_debug_print db "# Duplicate debug output to the screen",0
+cfg_opt_cmnt_debug_print    db "# Duplicate debug output to the screen",0
 cfg_opt_cmnt_launcher_start db "# Start LAUNCHER app after kernel is loaded",0
+cfg_opt_cmnt_mtrr           db "# Configure MTRR's",0
-cfg_opt_cmnt_mtrr db "# Configure MTRR's",0
+cfg_opt_cmnt_ask_params     db "# Interrupt booting to ask the user for boot", \
-cfg_opt_cmnt_ask_params db "# Interrupt booting to ask the user for boot params",0
+                               " params",0
-cfg_opt_cmnt_imgfrom db "# Where to load ramdisk image from",0
+cfg_opt_cmnt_imgfrom        db "# Where to load ramdisk image from",0
-cfg_opt_cmnt_syspath db "# Path to /sys directory",0
+cfg_opt_cmnt_syspath        db "# Path to /sys directory",0
-cfg_opt_value_vmode db 0
+cfg_opt_value_vmode          db 0
-cfg_opt_value_acpi db 0
+cfg_opt_value_acpi           db 0
-cfg_opt_value_debug_print db 0
+cfg_opt_value_debug_print    db 0
 cfg_opt_value_launcher_start db 1
-cfg_opt_value_mtrr db 0
+cfg_opt_value_mtrr           db 0
-cfg_opt_value_ask_params db 1
+cfg_opt_value_ask_params     db 0
-cfg_opt_value_imgfrom db RD_LOAD_FROM_MEMORY
+cfg_opt_value_imgfrom        db RD_LOAD_FROM_MEMORY
-cfg_opt_value_syspath db '/RD/1',0
+cfg_opt_value_syspath        db "/RD/1",0
-                      rb 20
+                             rb 20
 memory_map_key  dq 0
 descriptor_size dq 0
 descriptor_ver  dq 0
+memory_map_size dq MEMORY_MAP_SIZE
+msg_u4k_loaded            du "uefi64kos loaded",13,10,0
+msg_read_options          du "Read options from config file",13,10,0
+msg_load_kernel           du "Load kernel",13,10,0
+msg_load_ramdisk          du "Load ramdisk",13,10,0
+msg_load_devicesdat       du "Load DEVICES.DAT",13,10,0
+msg_alloc_devicesdat      du "Allocate memory for DEVICES.DAT",13,10,0
+msg_locate_gop_handlers   du "Locate GOP handlers",13,10,0
+msg_look_for_gop_handler  du "Look for GOP handler",13,10,0
+msg_query_handler         du "Query handler",13,10,0
+msg_query_vmode           du "Query vmode",13,10,0
+msg_vmode_found           du "Video mode found",13,10,0
+msg_look_for_rsdp         du "Look for RSDP",13,10,0
+msg_rsdp_found            du "RSDP found",13,10,0
+msg_acpi_tables_done      du "ACPI tables done",13,10,0
-memory_map_size dq MEMORY_MAP_SIZE
+msg_ask_for_params        du "Ask for params",13,10,0
+msg_set_graphic_mode      du "Set graphic mode",13,10,0
+msg_success               du "Success!",13,10,0
+msg_gop_buffer_size       du "GOP buffer size",13,10,0
-msg_success     du 'Success!',13,10,0
+msg_opt_resolution        du "option resolution: ",0
+msg_error                 du "Error!",13,10,0
-msg_error       du 'Error!',13,10,0
+msg_error_no_such_vmode   du "No such vmode",13,10,0
+msg_error_out_of_handlers du "Out of handlers",13,10,0
-msg             du 79 dup ' ',13,10,0
+msg_error_open_file       du "Error: can't open file ",0
-msg_error_open_file du "Error: can't open file ",0
+msg                       du 79 dup " ",13,10,0
-efi_fs_info_id db EFI_FILE_SYSTEM_INFO_ID
-efi_fs_info_size dq sizeof.EFI_FILE_SYSTEM_INFO
-efi_fs_info EFI_FILE_SYSTEM_INFO
+efi_fs_info_id db EFI_FILE_SYSTEM_INFO_ID
+efi_fs_info_size dq sizeof.EFI_FILE_SYSTEM_INFO
-;section '.bss' data readable writeable
 efi_fs_info EFI_FILE_SYSTEM_INFO
 memory_map      dq ?
+memory_map      dq ?
-gop_buffer      rb GOP_BUFFER_SIZE
+gop_buffer      rq GOP_BUFFER_SIZE/8

Subversion Repositories Kolibri OS

(root)/kernel/trunk/bootloader/uefi4kos/uefi64kos.asm – Rev 8092 → 8150