From c5b8b35a47e6db0244b0b547eafe5014a05d89e4 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Sun, 9 Jun 2013 07:32:33 +0000 Subject: [PATCH] acpi: a hopeless attempt to optimize the kernel memory git-svn-id: svn://kolibrios.org@3629 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/branches/Kolibri-acpi/const.inc | 14 ++++++++- kernel/branches/Kolibri-acpi/data32.inc | 38 ++++++++++++++++++------- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/kernel/branches/Kolibri-acpi/const.inc b/kernel/branches/Kolibri-acpi/const.inc index 15e7dcfdb6..17707bada6 100644 --- a/kernel/branches/Kolibri-acpi/const.inc +++ b/kernel/branches/Kolibri-acpi/const.inc @@ -179,10 +179,22 @@ struct TSS _io_map_1 rb 4096 ends +PARTITION_COUNT equ 64 +DRIVE_DATA_SIZE equ (16+PARTITION_COUNT*100) + OS_BASE equ 0x80000000 +TASK_COUNT equ (CURRENT_TASK+0x04) +TASK_BASE equ (CURRENT_TASK+0x10) +TASK_DATA equ (CURRENT_TASK+0x20) +TASK_EVENT equ (CURRENT_TASK+0x20) +FDD_BUFF equ (OS_BASE+0x000D000) -sys_pgmap equ (OS_BASE+0x0324000) +sys_pgdir equ (OS_BASE+0x006F000) + +VGABasePtr equ (OS_BASE+0x00A0000) +CLEAN_ZONE equ (_CLEAN_ZONE-OS_BASE) +IDE_DMA equ (_IDE_DMA-OS_BASE) UPPER_KERNEL_PAGES equ (OS_BASE+0x0400000) diff --git a/kernel/branches/Kolibri-acpi/data32.inc b/kernel/branches/Kolibri-acpi/data32.inc index 1081c89b27..75070d8160 100644 --- a/kernel/branches/Kolibri-acpi/data32.inc +++ b/kernel/branches/Kolibri-acpi/data32.inc @@ -384,6 +384,10 @@ end if REDRAW_BACKGROUND rb 4 +draw_data: rb 16*256 +BPSLine_calc_area rd 1440 +d_width_calc_area rd 1140 + mouseunder rd 16*24 MOUSE_PICTURE rd 1 @@ -555,23 +559,41 @@ NumBiosDisks rd 1 BiosDisksData rb 200h BiosDiskCaches rb 80h*(cache_ide1-cache_ide0) BiosDiskPartitions rd 80h - align 16 DRIVE_DATA: rb DRIVE_DATA_SIZE +IncludeUGlobals + +uglobals_size = $ - endofcode + +if ~ lang eq sp +diff16 "end of .bss",0,$ +end if + +org (OS_BASE+0x0100000) + +RAMDISK: rb 2880*512 +RAMDISK_FAT: rb 2856*2 +FLOPPY_FAT: rb 2856*2 + +_CLEAN_ZONE: + +align 4096 +_IDE_DMA rb 16*512 +BgrAuxTable rb 32768 +BUTTON_INFO rb 64*1024 +RESERVED_PORTS: rb 64*1024 +BOOT_VAR: rb 64*1024 +sys_pgmap: rb 1024*1024/8 + align 4096 SLOT_BASE: rb 64*1024 -RESERVED_PORTS: rb 64*1024 FLOPPY_BUFF: rb 16*1024 -BUTTON_INFO: rb 16*1024 -BgrAuxTable: rb 32*1024 -;IDE_DMA: rb 32*1024 window_data: rb 8192 CURRENT_TASK: rb 8192 -draw_data: rb 4096 WIN_STACK: rb 0x400 WIN_POS: rb 0x800 @@ -579,8 +601,4 @@ CDDataBuf: rb 4096 idts rq 0x41 -RAMDISK_FAT: rb 2856*2 +16 -FLOPPY_FAT: rb 2856*2 +16 - -IncludeUGlobals