From f78035819cf9c53c89555058e8909bf7ca962c0b Mon Sep 17 00:00:00 2001 From: "Artem Jerdev (art_zh)" Date: Wed, 1 May 2013 22:17:31 +0000 Subject: [PATCH] some kernel cleaning... git-svn-id: svn://kolibrios.org@3490 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/branches/Kolibri-A/trunk/const.inc | 31 +++-------- kernel/branches/Kolibri-A/trunk/kernel.asm | 4 +- kernel/branches/Kolibri-A/trunk/memmap.inc | 24 +++----- kernel/branches/Kolibri-A/trunk/vmodeint.inc | 58 -------------------- kernel/branches/Kolibri-A/trunk/vmodeld.inc | 35 ------------ 5 files changed, 20 insertions(+), 132 deletions(-) delete mode 100644 kernel/branches/Kolibri-A/trunk/vmodeint.inc delete mode 100644 kernel/branches/Kolibri-A/trunk/vmodeld.inc diff --git a/kernel/branches/Kolibri-A/trunk/const.inc b/kernel/branches/Kolibri-A/trunk/const.inc index 2ff1935591..84186ed5cd 100644 --- a/kernel/branches/Kolibri-A/trunk/const.inc +++ b/kernel/branches/Kolibri-A/trunk/const.inc @@ -199,26 +199,14 @@ TASK_BASE equ (OS_BASE+0x0003010) TASK_DATA equ (OS_BASE+0x0003020) TASK_EVENT equ (OS_BASE+0x0003020) +WIN_STACK equ (OS_BASE+0x0005000) +WIN_POS equ (OS_BASE+0x0005400) +idts equ (OS_BASE+0x0005800) +PUTPIXEL equ (OS_BASE+0x0006820) +GETPIXEL equ (OS_BASE+0x0006824) mouseunder equ (OS_BASE+0x0006900) -CDDataBuf equ (OS_BASE+0x0007000) -FLOPPY_BUFF equ (OS_BASE+0x0008000) -;ACTIVE_PROC_STACK equ (OS_BASE+0x000A400) ;unused -idts equ (OS_BASE+0x000B100) -WIN_STACK equ (OS_BASE+0x000C000) -WIN_POS equ (OS_BASE+0x000C400) -FDD_BUFF equ (OS_BASE+0x000D000) -;unused ? only one reference -;ENABLE_TASKSWITCH equ (OS_BASE+0x000E000) -PUTPIXEL equ (OS_BASE+0x000E020) -GETPIXEL equ (OS_BASE+0x000E024) - -;unused ? only one reference -; BANK_SWITCH equ (OS_BASE+0x000E030) ; VESA 1.2 - not used - -;unused ? store mousepointer -;MOUSE_PICTURE equ (OS_BASE+0x000F200) ; mousedrv.inc - not used MOUSE_VISIBLE equ (OS_BASE+0x000F204) WIN_TEMP_XY equ (OS_BASE+0x000F300) @@ -290,20 +278,19 @@ DRIVE_DATA equ (OS_BASE+0x0070000) SLOT_BASE equ (OS_BASE+0x0080000) ;unused -TMP_BUFF equ (OS_BASE+0x0090000) +;TMP_BUFF equ (OS_BASE+0x0090000) -VGABasePtr equ (OS_BASE+0x00A0000) +;VGABasePtr equ (OS_BASE+0x00A0000) RAMDISK equ (OS_BASE+0x0100000) RAMDISK_FAT equ (OS_BASE+0x0280000) -FLOPPY_FAT equ (OS_BASE+0x0282000) CLEAN_ZONE equ 0x280000 IDE_DMA equ 0x284000 BgrAuxTable equ (OS_BASE+0x0298000) ; unused? -SB16Buffer equ (OS_BASE+0x2A0000) +SB16Buffer equ (OS_BASE+0x02A0000) SB16_Status equ (OS_BASE+0x02B0000) BUTTON_INFO equ (OS_BASE+0x02C0000) @@ -317,7 +304,7 @@ eth_data_start equ (OS_BASE+0x0300000) stack_data equ (OS_BASE+0x0304000) stack_data_end equ (OS_BASE+0x031ffff) resendQ equ (OS_BASE+0x0320000) -VMODE_BASE equ (OS_BASE+0x0328000) +;VMODE_BASE equ (OS_BASE+0x0328000) skin_data equ (OS_BASE+0x0330000) draw_data equ (OS_BASE+0x0338000); diff --git a/kernel/branches/Kolibri-A/trunk/kernel.asm b/kernel/branches/Kolibri-A/trunk/kernel.asm index 9d6a6eafbf..e1f51e729a 100644 --- a/kernel/branches/Kolibri-A/trunk/kernel.asm +++ b/kernel/branches/Kolibri-A/trunk/kernel.asm @@ -533,7 +533,7 @@ include 'detect/disks.inc' ; LOAD VMODE DRIVER ;!!!!!!!!!!!!!!!!!!!!!!! -include 'vmodeld.inc' +;include 'vmodeld.inc' ;!!!!!!!!!!!!!!!!!!!!!!! @@ -1321,7 +1321,7 @@ no_set_lba_read: no_set_pci_access: ;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -include 'vmodeint.inc' +;include 'vmodeint.inc' ;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! sys_setup_err: diff --git a/kernel/branches/Kolibri-A/trunk/memmap.inc b/kernel/branches/Kolibri-A/trunk/memmap.inc index 41ee966ed8..10d3019476 100644 --- a/kernel/branches/Kolibri-A/trunk/memmap.inc +++ b/kernel/branches/Kolibri-A/trunk/memmap.inc @@ -64,26 +64,20 @@ ; 3c dword cpu usage in cpu timer tics ; ; -; 5000 -> 73FF << FLOPPY buffer (9k) - fs/fat12.inc +; 5000 -> 53FF window stack C000 no of windows - all in words +; 5402 -> 57FF window position in stack +; 5800 -> 5fff << IDT for int_0x00..int_0x40 + reserv -; 7400 -> 78ff << IDT for int_0x00..int_0x40 + reserv +; 6000 -> 68FF << free (2k5) -; 7900 -> 7EFF << saved picture under mouse pointer (1k5) +; 6900 -> 7EFF << saved picture under mouse pointer (1k5) ; -; 7F00 -> 7FFF << SB16_Status (256) +; 7F00 -> 7FFF << SB16_Status (256) \\ ; -; XX 8000 -> BFFF free (16k) XX +; 8000 -> 87FF free (2k) ; 0x80008000 -> 9FFF ramdisk fat (8k) -; 0x8000A000 -> BFFF floppy fat (8k) -; C000 -> C3FF window stack C000 no of windows - all in words -; C402 -> C7FF window position in stack -; D000 -> D1FF FDC controller -; D200 -> D3FF FDC controller for Fat12 -; - D201..D2A1 cleaned in fdc.init (fs/fdc.inc) -; D400 -> DFFF free (3k) - -; E000 -> F9FF free (6k5) +; A000 -> F9FF free (23k) ; FA00 byte no of keys in buffer ; FA01 byte 'buffer' @@ -102,7 +96,7 @@ ; FE00 -> FE0F mouse memory 00 chunk count, that includes: ; FE08 word -- mouse H-scroll ; FE0A word -- mouse x -; FE0C word -- mouse y +; FE0C word -- mouse y ; FE0E word -- mouse V-scroll ; FE10 -> FB17 mouse color mem diff --git a/kernel/branches/Kolibri-A/trunk/vmodeint.inc b/kernel/branches/Kolibri-A/trunk/vmodeint.inc deleted file mode 100644 index 80eb1c0430..0000000000 --- a/kernel/branches/Kolibri-A/trunk/vmodeint.inc +++ /dev/null @@ -1,58 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -$Revision$ - - -; -; Call of videomode driver's functions -; -; (Add in System function 21 (and/or 26) as a subfunction 13) -; -; Author: Trans -; Date: 19.07.2003 -; -; Include in MeOS kernel and compile with FASM -; - -uglobal - old_screen_width dd ? - old_screen_height dd ? -endg - -; cmp eax,13 ; CALL VIDEOMODE DRIVER FUNCTIONS - dec ebx - jnz .no_vmode_drv_access - pushd [Screen_Max_X] [Screen_Max_Y] - popd [old_screen_height] [old_screen_width] - or eax,-1 ; If driver is absent then eax does not change - call (VMODE_BASE+0x100) ; Entry point of video driver - mov [esp+36-4],eax - mov [esp+24-4],ebx - mov [esp+32-4],ecx -; mov [esp+28],edx - mov eax,[old_screen_width] - mov ebx,[old_screen_height] - sub eax,[Screen_Max_X] - jnz @f - sub ebx,[Screen_Max_Y] - jz .resolution_wasnt_changed - jmp .lp1 - @@: sub ebx,[Screen_Max_Y] - .lp1: sub [screen_workarea.right],eax - sub [screen_workarea.bottom],ebx - - call repos_windows - xor eax,eax - xor ebx,ebx - mov ecx, [Screen_Max_X] - mov edx, [Screen_Max_Y] - call calculatescreen - - .resolution_wasnt_changed: - ret - .no_vmode_drv_access: diff --git a/kernel/branches/Kolibri-A/trunk/vmodeld.inc b/kernel/branches/Kolibri-A/trunk/vmodeld.inc deleted file mode 100644 index 3c5e512a23..0000000000 --- a/kernel/branches/Kolibri-A/trunk/vmodeld.inc +++ /dev/null @@ -1,35 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -$Revision$ - - -; -; Load of videomode driver in memory -; -; (driver is located at VMODE_BASE - 32kb) // if this area not occuped anything -; -; Author: Trans -; Date: 19.07.2003 -; -; Include in MeOS kernel and compile with FASM -; - - -; LOAD VIDEOMODE DRIVER - ; If vmode.mdr file not found - or eax,-1 ; Driver ID = -1 (not present in system) - mov [VMODE_BASE],eax ; - mov [VMODE_BASE+0x100],byte 0xC3 ; Instruction RETN - driver loop - - stdcall read_file, vmode, VMODE_BASE, 0, 0x8000 ;{SPraid.simba} -; mov esi, vmode -; xor ebx, ebx -; mov ecx, 0x8000 ; size of memory area for driver -; mov edx, VMODE_BASE ; Memory position of driver -; xor ebp, ebp -; call fs_RamdiskRead