From 0e02132b9ffc32fa62b78ef7e732fda0210617f7 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Wed, 20 Dec 2017 01:07:10 +0000 Subject: [PATCH] Replace 'equ' macros with '=' ones. They appear in symbols file. They don't require parentheses. They are shorter. git-svn-id: svn://kolibrios.org@7136 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/blkdev/cd_drv.inc | 10 +- kernel/trunk/blkdev/flp_drv.inc | 16 +- kernel/trunk/boot/bootvesa.inc | 8 +- kernel/trunk/bootloader/boot_fat12.asm | 10 +- kernel/trunk/bootloader/grub4kos.asm | 4 +- kernel/trunk/bus/pci/PCIe.inc | 4 +- kernel/trunk/bus/pci/pci32.inc | 2 +- kernel/trunk/const.inc | 512 +++++++++++++------------ kernel/trunk/core/apic.inc | 42 +- kernel/trunk/core/dll.inc | 8 +- kernel/trunk/core/heap.inc | 30 +- kernel/trunk/core/irq.inc | 4 +- kernel/trunk/core/mtrrtest.asm | 18 +- kernel/trunk/core/sync.inc | 4 +- kernel/trunk/core/taskman.inc | 10 +- kernel/trunk/data32.inc | 1 + kernel/trunk/docs/events_subsystem.txt | 18 +- kernel/trunk/fs/fat.inc | 2 +- kernel/trunk/gui/event.inc | 8 +- kernel/trunk/init.inc | 33 +- kernel/trunk/kernel.asm | 28 +- kernel/trunk/posix/pipe.inc | 8 +- kernel/trunk/posix/posix.inc | 20 +- kernel/trunk/video/blitter.inc | 16 +- kernel/trunk/video/cursors.inc | 8 +- kernel/trunk/video/vesa12.inc | 6 +- 26 files changed, 414 insertions(+), 416 deletions(-) diff --git a/kernel/trunk/blkdev/cd_drv.inc b/kernel/trunk/blkdev/cd_drv.inc index b3c0a5e612..3ed22996e8 100644 --- a/kernel/trunk/blkdev/cd_drv.inc +++ b/kernel/trunk/blkdev/cd_drv.inc @@ -15,12 +15,12 @@ $Revision$ ; Адаптация, доработка и разработка Mario79, ; Максимальное количество повторений операции чтения -MaxRetr equ 10 +MaxRetr = 10 ; Предельное время ожидания готовности к приему команды ; (в тиках) -BSYWaitTime equ 1000 ;2 -NoTickWaitTime equ 0xfffff -CDBlockSize equ 2048 +BSYWaitTime = 1000 ;2 +NoTickWaitTime = 0xfffff +CDBlockSize = 2048 ;******************************************** ;* ЧТЕНИЕ СЕКТОРА С ПОВТОРАМИ * ;* Многократное повторение чтения при сбоях * @@ -159,7 +159,7 @@ align 4 ; Максимально допустимое время ожидания реакции ; устройства на пакетную команду (в тиках) ;----------------------------------------------------------------------------- -MaxCDWaitTime equ 1000 ;200 ;10 секунд +MaxCDWaitTime = 1000 ;200 ;10 секунд uglobal ; Область памяти для формирования пакетной команды PacketCommand: diff --git a/kernel/trunk/blkdev/flp_drv.inc b/kernel/trunk/blkdev/flp_drv.inc index 5c73ece13b..446f0f5e1a 100644 --- a/kernel/trunk/blkdev/flp_drv.inc +++ b/kernel/trunk/blkdev/flp_drv.inc @@ -37,18 +37,18 @@ take_data_from_application_1: ret ; Коды завершения операции с контроллером (FDC_Status) -FDC_Normal equ 0 ;нормальное завершение -FDC_TimeOut equ 1 ;ошибка тайм-аута -FDC_DiskNotFound equ 2 ;в дисководе нет диска -FDC_TrackNotFound equ 3 ;дорожка не найдена -FDC_SectorNotFound equ 4 ;сектор не найден +FDC_Normal = 0 ;нормальное завершение +FDC_TimeOut = 1 ;ошибка тайм-аута +FDC_DiskNotFound = 2 ;в дисководе нет диска +FDC_TrackNotFound = 3 ;дорожка не найдена +FDC_SectorNotFound = 4 ;сектор не найден ; Максимальные значения координат сектора (заданные ; значения соответствуют параметрам стандартного ; трехдюймового гибкого диска объемом 1,44 Мб) -MAX_Track equ 79 -MAX_Head equ 1 -MAX_Sector equ 18 +MAX_Track = 79 +MAX_Head = 1 +MAX_Sector = 18 uglobal ; Счетчик тиков таймера diff --git a/kernel/trunk/boot/bootvesa.inc b/kernel/trunk/boot/bootvesa.inc index e5eb5fa751..181a33887a 100644 --- a/kernel/trunk/boot/bootvesa.inc +++ b/kernel/trunk/boot/bootvesa.inc @@ -84,9 +84,9 @@ home_cursor dw 0 ;current shows rows a table end_cursor dw 0 ;end of position current shows rows a table scroll_start dw 0 ;start position of scroll bar scroll_end dw 0 ;end position of scroll bar -long_v_table equ 9 ;long of visible video table -size_of_step equ 10 -scroll_area_size equ (long_v_table-2) +long_v_table = 9 ;long of visible video table +size_of_step = 10 +scroll_area_size = long_v_table - 2 int2str: dec bl jz @f @@ -754,7 +754,7 @@ set_vmode: mov eax, [es:mi.PhysBasePtr];di+0x28] mov [es:BOOT_LO.lfb], eax ; ---- vbe voodoo - BytesPerLine equ 0x10 + BytesPerLine = 0x10 mov ax, [es:di+BytesPerLine] mov [es:BOOT_LO.pitch], ax ; BPP diff --git a/kernel/trunk/bootloader/boot_fat12.asm b/kernel/trunk/bootloader/boot_fat12.asm index 8cee5c84cf..ebdb5af5ff 100644 --- a/kernel/trunk/bootloader/boot_fat12.asm +++ b/kernel/trunk/bootloader/boot_fat12.asm @@ -17,12 +17,12 @@ include "lang.inc" -lf equ 0ah -cr equ 0dh +lf = 0ah +cr = 0dh -pos_read_tmp equ 0700h ;position for temporary read -boot_program equ 07c00h ;position for boot code -seg_read_kernel equ 01000h ;segment to kernel read +pos_read_tmp = 0700h ;position for temporary read +boot_program = 07c00h ;position for boot code +seg_read_kernel = 01000h ;segment to kernel read jmp start_program nop diff --git a/kernel/trunk/bootloader/grub4kos.asm b/kernel/trunk/bootloader/grub4kos.asm index c5f40e4bfa..7d81ab0a7f 100644 --- a/kernel/trunk/bootloader/grub4kos.asm +++ b/kernel/trunk/bootloader/grub4kos.asm @@ -16,8 +16,8 @@ ; ; Version 1.0 -lf equ 0x0A -cr equ 0x0D +lf = 0x0A +cr = 0x0D use32 diff --git a/kernel/trunk/bus/pci/PCIe.inc b/kernel/trunk/bus/pci/PCIe.inc index e6ab54d3eb..9fada67d53 100644 --- a/kernel/trunk/bus/pci/PCIe.inc +++ b/kernel/trunk/bus/pci/PCIe.inc @@ -28,8 +28,8 @@ $Revision: 1463 $ ; ;*************************************************************************** -PCIe_CONFIG_SPACE equ 0xF0000000 ; to be moved to const.inc -mmio_pcie_cfg_addr dd 0x0 ; intel pcie space may be defined here +PCIe_CONFIG_SPACE = 0xF0000000 ; to be moved to const.inc +mmio_pcie_cfg_addr dd 0x0 ; intel pcie space may be defined here mmio_pcie_cfg_lim dd 0x0 ; upper pcie space address diff --git a/kernel/trunk/bus/pci/pci32.inc b/kernel/trunk/bus/pci/pci32.inc index 1d8f92ee3a..132cc92b20 100644 --- a/kernel/trunk/bus/pci/pci32.inc +++ b/kernel/trunk/bus/pci/pci32.inc @@ -30,7 +30,7 @@ $Revision$ ; Description ; entry point for system PCI calls ;*************************************************************************** -;mmio_pci_addr equ 0x400 ; set actual PCI address here to activate user-MMIO +;mmio_pci_addr = 0x400 ; set actual PCI address here to activate user-MMIO iglobal align 4 diff --git a/kernel/trunk/const.inc b/kernel/trunk/const.inc index 7b5e12fea2..e454517772 100644 --- a/kernel/trunk/const.inc +++ b/kernel/trunk/const.inc @@ -8,177 +8,177 @@ $Revision$ -dpl0 equ 10010000b ; data read dpl0 -drw0 equ 10010010b ; data read/write dpl0 -drw3 equ 11110010b ; data read/write dpl3 -cpl0 equ 10011010b ; code read dpl0 -cpl3 equ 11111010b ; code read dpl3 +dpl0 = 10010000b ; data read dpl0 +drw0 = 10010010b ; data read/write dpl0 +drw3 = 11110010b ; data read/write dpl3 +cpl0 = 10011010b ; code read dpl0 +cpl3 = 11111010b ; code read dpl3 -D32 equ 01000000b ; 32bit segment -G32 equ 10000000b ; page gran +D32 = 01000000b ; 32bit segment +G32 = 10000000b ; page gran ;;;;;;;;;;;;cpu_caps flags;;;;;;;;;;;;;;;; -CPU_386 equ 3 -CPU_486 equ 4 -CPU_PENTIUM equ 5 -CPU_P6 equ 6 -CPU_PENTIUM4 equ 0x0F +CPU_386 = 3 +CPU_486 = 4 +CPU_PENTIUM = 5 +CPU_P6 = 6 +CPU_PENTIUM4 = 0x0F -CAPS_FPU equ 00 ;on-chip x87 floating point unit -CAPS_VME equ 01 ;virtual-mode enhancements -CAPS_DE equ 02 ;debugging extensions -CAPS_PSE equ 03 ;page-size extensions -CAPS_TSC equ 04 ;time stamp counter -CAPS_MSR equ 05 ;model-specific registers -CAPS_PAE equ 06 ;physical-address extensions -CAPS_MCE equ 07 ;machine check exception -CAPS_CX8 equ 08 ;CMPXCHG8B instruction -CAPS_APIC equ 09 ;on-chip advanced programmable - ; interrupt controller -; 10 ;unused -CAPS_SEP equ 11 ;SYSENTER and SYSEXIT instructions -CAPS_MTRR equ 12 ;memory-type range registers -CAPS_PGE equ 13 ;page global extension -CAPS_MCA equ 14 ;machine check architecture -CAPS_CMOV equ 15 ;conditional move instructions -CAPS_PAT equ 16 ;page attribute table +CAPS_FPU = 00 ;on-chip x87 floating point unit +CAPS_VME = 01 ;virtual-mode enhancements +CAPS_DE = 02 ;debugging extensions +CAPS_PSE = 03 ;page-size extensions +CAPS_TSC = 04 ;time stamp counter +CAPS_MSR = 05 ;model-specific registers +CAPS_PAE = 06 ;physical-address extensions +CAPS_MCE = 07 ;machine check exception +CAPS_CX8 = 08 ;CMPXCHG8B instruction +CAPS_APIC = 09 ;on-chip advanced programmable + ;interrupt controller +; 10 ;unused +CAPS_SEP = 11 ;SYSENTER and SYSEXIT instructions +CAPS_MTRR = 12 ;memory-type range registers +CAPS_PGE = 13 ;page global extension +CAPS_MCA = 14 ;machine check architecture +CAPS_CMOV = 15 ;conditional move instructions +CAPS_PAT = 16 ;page attribute table -CAPS_PSE36 equ 17 ;page-size extensions -CAPS_PSN equ 18 ;processor serial number -CAPS_CLFLUSH equ 19 ;CLFUSH instruction +CAPS_PSE36 = 17 ;page-size extensions +CAPS_PSN = 18 ;processor serial number +CAPS_CLFLUSH = 19 ;CLFUSH instruction -CAPS_DS equ 21 ;debug store -CAPS_ACPI equ 22 ;thermal monitor and software - ;controlled clock supported -CAPS_MMX equ 23 ;MMX instructions -CAPS_FXSR equ 24 ;FXSAVE and FXRSTOR instructions -CAPS_SSE equ 25 ;SSE instructions -CAPS_SSE2 equ 26 ;SSE2 instructions -CAPS_SS equ 27 ;self-snoop -CAPS_HTT equ 28 ;hyper-threading technology -CAPS_TM equ 29 ;thermal monitor supported -CAPS_IA64 equ 30 ;IA64 capabilities -CAPS_PBE equ 31 ;pending break enable +CAPS_DS = 21 ;debug store +CAPS_ACPI = 22 ;thermal monitor and software + ;controlled clock supported +CAPS_MMX = 23 ;MMX instructions +CAPS_FXSR = 24 ;FXSAVE and FXRSTOR instructions +CAPS_SSE = 25 ;SSE instructions +CAPS_SSE2 = 26 ;SSE2 instructions +CAPS_SS = 27 ;self-snoop +CAPS_HTT = 28 ;hyper-threading technology +CAPS_TM = 29 ;thermal monitor supported +CAPS_IA64 = 30 ;IA64 capabilities +CAPS_PBE = 31 ;pending break enable ;ecx -CAPS_SSE3 equ 32 ;SSE3 instructions -; 33 -; 34 -CAPS_MONITOR equ 35 ;MONITOR/MWAIT instructions -CAPS_DS_CPL equ 36 ; -CAPS_VMX equ 37 ;virtual mode extensions -; 38 ; -CAPS_EST equ 39 ;enhansed speed step -CAPS_TM2 equ 40 ;thermal monitor2 supported -; 41 -CAPS_CID equ 42 ; -; 43 -; 44 -CAPS_CX16 equ 45 ;CMPXCHG16B instruction -CAPS_xTPR equ 46 ; -CAPS_XSAVE equ (32 + 26) ; XSAVE and XRSTOR instructions -CAPS_OSXSAVE equ (32 + 27) +CAPS_SSE3 = 32 ;SSE3 instructions +; 33 +; 34 +CAPS_MONITOR = 35 ;MONITOR/MWAIT instructions +CAPS_DS_CPL = 36 ; +CAPS_VMX = 37 ;virtual mode extensions +; 38 ; +CAPS_EST = 39 ;enhansed speed step +CAPS_TM2 = 40 ;thermal monitor2 supported +; 41 +CAPS_CID = 42 ; +; 43 +; 44 +CAPS_CX16 = 45 ;CMPXCHG16B instruction +CAPS_xTPR = 46 ; +CAPS_XSAVE = 32 + 26 ; XSAVE and XRSTOR instructions +CAPS_OSXSAVE = 32 + 27 ; A value of 1 indicates that the OS has set CR4.OSXSAVE[bit 18] to enable ; XSETBV/XGETBV instructions to access XCR0 and to support processor extended ; state management using XSAVE/XRSTOR. -CAPS_AVX equ (32 + 28) ; not AVX2 +CAPS_AVX = 32 + 28 ; not AVX2 ; ;reserved ; ;ext edx /ecx -CAPS_SYSCAL equ 64 ; -CAPS_XD equ 65 ;execution disable -CAPS_FFXSR equ 66 ; -CAPS_RDTSCP equ 67 ; -CAPS_X64 equ 68 ; -CAPS_3DNOW equ 69 ; -CAPS_3DNOWEXT equ 70 ; -CAPS_LAHF equ 71 ; -CAPS_CMP_LEG equ 72 ; -CAPS_SVM equ 73 ;secure virual machine -CAPS_ALTMOVCR8 equ 74 ; +CAPS_SYSCAL = 64 ; +CAPS_XD = 65 ;execution disable +CAPS_FFXSR = 66 ; +CAPS_RDTSCP = 67 ; +CAPS_X64 = 68 ; +CAPS_3DNOW = 69 ; +CAPS_3DNOWEXT = 70 ; +CAPS_LAHF = 71 ; +CAPS_CMP_LEG = 72 ; +CAPS_SVM = 73 ;secure virual machine +CAPS_ALTMOVCR8 = 74 ; ; CPU MSR names -MSR_SYSENTER_CS equ 0x174 -MSR_SYSENTER_ESP equ 0x175 -MSR_SYSENTER_EIP equ 0x176 -MSR_CR_PAT equ 0x277 -MSR_MTRR_DEF_TYPE equ 0x2FF +MSR_SYSENTER_CS = 0x174 +MSR_SYSENTER_ESP = 0x175 +MSR_SYSENTER_EIP = 0x176 +MSR_CR_PAT = 0x277 +MSR_MTRR_DEF_TYPE = 0x2FF -MSR_AMD_EFER equ 0xC0000080 ; Extended Feature Enable Register -MSR_AMD_STAR equ 0xC0000081 ; SYSCALL/SYSRET Target Address Register +MSR_AMD_EFER = 0xC0000080 ; Extended Feature Enable Register +MSR_AMD_STAR = 0xC0000081 ; SYSCALL/SYSRET Target Address Register -CR0_PE equ 0x00000001 ;protected mode -CR0_MP equ 0x00000002 ;monitor fpu -CR0_EM equ 0x00000004 ;fpu emulation -CR0_TS equ 0x00000008 ;task switch -CR0_ET equ 0x00000010 ;extension type hardcoded to 1 -CR0_NE equ 0x00000020 ;numeric error -CR0_WP equ 0x00010000 ;write protect -CR0_AM equ 0x00040000 ;alignment check -CR0_NW equ 0x20000000 ;not write-through -CR0_CD equ 0x40000000 ;cache disable -CR0_PG equ 0x80000000 ;paging +CR0_PE = 0x00000001 ;protected mode +CR0_MP = 0x00000002 ;monitor fpu +CR0_EM = 0x00000004 ;fpu emulation +CR0_TS = 0x00000008 ;task switch +CR0_ET = 0x00000010 ;extension type hardcoded to 1 +CR0_NE = 0x00000020 ;numeric error +CR0_WP = 0x00010000 ;write protect +CR0_AM = 0x00040000 ;alignment check +CR0_NW = 0x20000000 ;not write-through +CR0_CD = 0x40000000 ;cache disable +CR0_PG = 0x80000000 ;paging -CR4_VME equ 0x000001 -CR4_PVI equ 0x000002 -CR4_TSD equ 0x000004 -CR4_DE equ 0x000008 -CR4_PSE equ 0x000010 -CR4_PAE equ 0x000020 -CR4_MCE equ 0x000040 -CR4_PGE equ 0x000080 -CR4_PCE equ 0x000100 -CR4_OSFXSR equ 0x000200 -CR4_OSXMMEXPT equ 0x000400 -CR4_OSXSAVE equ 0x040000 +CR4_VME = 0x000001 +CR4_PVI = 0x000002 +CR4_TSD = 0x000004 +CR4_DE = 0x000008 +CR4_PSE = 0x000010 +CR4_PAE = 0x000020 +CR4_MCE = 0x000040 +CR4_PGE = 0x000080 +CR4_PCE = 0x000100 +CR4_OSFXSR = 0x000200 +CR4_OSXMMEXPT = 0x000400 +CR4_OSXSAVE = 0x040000 -XCR0_FPU_MMX equ 0x0001 -XCR0_SSE equ 0x0002 -XCR0_AVX equ 0x0004 -XCR0_MPX equ 0x0018 -XCR0_AVX512 equ 0x00e0 +XCR0_FPU_MMX = 0x0001 +XCR0_SSE = 0x0002 +XCR0_AVX = 0x0004 +XCR0_MPX = 0x0018 +XCR0_AVX512 = 0x00e0 -MXCSR_IE equ 0x0001 -MXCSR_DE equ 0x0002 -MXCSR_ZE equ 0x0004 -MXCSR_OE equ 0x0008 -MXCSR_UE equ 0x0010 -MXCSR_PE equ 0x0020 -MXCSR_DAZ equ 0x0040 -MXCSR_IM equ 0x0080 -MXCSR_DM equ 0x0100 -MXCSR_ZM equ 0x0200 -MXCSR_OM equ 0x0400 -MXCSR_UM equ 0x0800 -MXCSR_PM equ 0x1000 -MXCSR_FZ equ 0x8000 +MXCSR_IE = 0x0001 +MXCSR_DE = 0x0002 +MXCSR_ZE = 0x0004 +MXCSR_OE = 0x0008 +MXCSR_UE = 0x0010 +MXCSR_PE = 0x0020 +MXCSR_DAZ = 0x0040 +MXCSR_IM = 0x0080 +MXCSR_DM = 0x0100 +MXCSR_ZM = 0x0200 +MXCSR_OM = 0x0400 +MXCSR_UM = 0x0800 +MXCSR_PM = 0x1000 +MXCSR_FZ = 0x8000 -MXCSR_INIT equ (MXCSR_IM+MXCSR_DM+MXCSR_ZM+MXCSR_OM+MXCSR_UM+MXCSR_PM) +MXCSR_INIT = MXCSR_IM + MXCSR_DM + MXCSR_ZM + MXCSR_OM + MXCSR_UM + MXCSR_PM -EFLAGS_CF equ 0x000001 ; carry flag -EFLAGS_PF equ 0x000004 ; parity flag -EFLAGS_AF equ 0x000010 ; auxiliary flag -EFLAGS_ZF equ 0x000040 ; zero flag -EFLAGS_SF equ 0x000080 ; sign flag -EFLAGS_TF equ 0x000100 ; trap flag -EFLAGS_IF equ 0x000200 ; interrupt flag -EFLAGS_DF equ 0x000400 ; direction flag -EFLAGS_OF equ 0x000800 ; overflow flag -EFLAGS_IOPL equ 0x003000 ; i/o priviledge level -EFLAGS_NT equ 0x004000 ; nested task flag -EFLAGS_RF equ 0x010000 ; resume flag -EFLAGS_VM equ 0x020000 ; virtual 8086 mode flag -EFLAGS_AC equ 0x040000 ; alignment check flag -EFLAGS_VIF equ 0x080000 ; virtual interrupt flag -EFLAGS_VIP equ 0x100000 ; virtual interrupt pending -EFLAGS_ID equ 0x200000 ; id flag +EFLAGS_CF = 0x000001 ; carry flag +EFLAGS_PF = 0x000004 ; parity flag +EFLAGS_AF = 0x000010 ; auxiliary flag +EFLAGS_ZF = 0x000040 ; zero flag +EFLAGS_SF = 0x000080 ; sign flag +EFLAGS_TF = 0x000100 ; trap flag +EFLAGS_IF = 0x000200 ; interrupt flag +EFLAGS_DF = 0x000400 ; direction flag +EFLAGS_OF = 0x000800 ; overflow flag +EFLAGS_IOPL = 0x003000 ; i/o priviledge level +EFLAGS_NT = 0x004000 ; nested task flag +EFLAGS_RF = 0x010000 ; resume flag +EFLAGS_VM = 0x020000 ; virtual 8086 mode flag +EFLAGS_AC = 0x040000 ; alignment check flag +EFLAGS_VIF = 0x080000 ; virtual interrupt flag +EFLAGS_VIP = 0x100000 ; virtual interrupt pending +EFLAGS_ID = 0x200000 ; id flag -IRQ_PIC equ 0 -IRQ_APIC equ 1 +IRQ_PIC = 0 +IRQ_APIC = 1 struct TSS _back rw 2 @@ -213,156 +213,158 @@ struct TSS _io_map_1 rb 4096 ends -DRIVE_DATA_SIZE equ 16 +DRIVE_DATA_SIZE = 16 -OS_BASE equ 0x80000000 +OS_BASE = 0x80000000 -window_data equ (OS_BASE+0x0001000) +window_data = OS_BASE + 0x0001000 -CURRENT_TASK equ (OS_BASE+0x0003000) -TASK_COUNT equ (OS_BASE+0x0003004) -TASK_BASE equ (OS_BASE+0x0003010) -TASK_DATA equ (OS_BASE+0x0003020) -TASK_EVENT equ (OS_BASE+0x0003020) +CURRENT_TASK = OS_BASE + 0x0003000 +TASK_COUNT = OS_BASE + 0x0003004 +TASK_BASE = OS_BASE + 0x0003010 +TASK_DATA = OS_BASE + 0x0003020 +TASK_EVENT = OS_BASE + 0x0003020 -CDDataBuf equ (OS_BASE+0x0005000) +CDDataBuf = OS_BASE + 0x0005000 ;unused 0x6000 - 0x8fff -BOOT_VARS equ 0x9000 +BOOT_VARS = 0x9000 -idts equ (OS_BASE+0x000B100) -WIN_STACK equ (OS_BASE+0x000C000) -WIN_POS equ (OS_BASE+0x000C400) -FDD_BUFF equ (OS_BASE+0x000D000) ;512 +idts = OS_BASE + 0x000B100 +WIN_STACK = OS_BASE + 0x000C000 +WIN_POS = OS_BASE + 0x000C400 +FDD_BUFF = OS_BASE + 0x000D000 ;512 -WIN_TEMP_XY equ (OS_BASE+0x000F300) -KEY_COUNT equ (OS_BASE+0x000F400) -KEY_BUFF equ (OS_BASE+0x000F401) ; 120*2 + 2*2 = 244 bytes, actually 255 bytes +WIN_TEMP_XY = OS_BASE + 0x000F300 +KEY_COUNT = OS_BASE + 0x000F400 +KEY_BUFF = OS_BASE + 0x000F401 ; 120*2 + 2*2 = 244 bytes, actually 255 bytes -BTN_COUNT equ (OS_BASE+0x000F500) -BTN_BUFF equ (OS_BASE+0x000F501) +BTN_COUNT = OS_BASE + 0x000F500 +BTN_BUFF = OS_BASE + 0x000F501 -BTN_ADDR equ (OS_BASE+0x000FE88) -MEM_AMOUNT equ (OS_BASE+0x000FE8C) +BTN_ADDR = OS_BASE + 0x000FE88 +MEM_AMOUNT = OS_BASE + 0x000FE8C -SYS_SHUTDOWN equ (OS_BASE+0x000FF00) -TASK_ACTIVATE equ (OS_BASE+0x000FF01) +SYS_SHUTDOWN = OS_BASE + 0x000FF00 +TASK_ACTIVATE = OS_BASE + 0x000FF01 -TMP_STACK_TOP equ 0x006CC00 +TMP_STACK_TOP = 0x006CC00 -sys_proc equ (OS_BASE+0x006F000) +sys_proc = OS_BASE + 0x006F000 -SLOT_BASE equ (OS_BASE+0x0080000) +SLOT_BASE = OS_BASE + 0x0080000 -VGABasePtr equ (OS_BASE+0x00A0000) +VGABasePtr = OS_BASE + 0x00A0000 -CLEAN_ZONE equ (_CLEAN_ZONE-OS_BASE) +UPPER_KERNEL_PAGES = OS_BASE + 0x0400000 -UPPER_KERNEL_PAGES equ (OS_BASE+0x0400000) - -virtual at (OS_BASE+0x05FFF80) +virtual at OS_BASE + 0x05FFF80 tss TSS end virtual -HEAP_BASE equ (OS_BASE+0x0800000) -HEAP_MIN_SIZE equ 0x01000000 +HEAP_BASE = OS_BASE + 0x0800000 +HEAP_MIN_SIZE = 0x01000000 -page_tabs equ 0xFDC00000 -app_page_tabs equ 0xFDC00000 -kernel_tabs equ (page_tabs+ (OS_BASE shr 10)) ;0xFDE00000 -master_tab equ (page_tabs+ (page_tabs shr 10)) ;0xFDFF70000 +page_tabs = 0xFDC00000 +app_page_tabs = 0xFDC00000 +kernel_tabs = page_tabs + (OS_BASE shr 10) ;0xFDE00000 +master_tab = page_tabs + (page_tabs shr 10) ;0xFDFF70000 -LFB_BASE equ 0xFE000000 +LFB_BASE = 0xFE000000 -new_app_base equ 0; +new_app_base = 0; -twdw equ 0x2000 ;(CURRENT_TASK-window_data) +twdw = 0x2000 ; CURRENT_TASK - window_data -std_application_base_address equ new_app_base -RING0_STACK_SIZE equ 0x2000 +std_application_base_address = new_app_base +RING0_STACK_SIZE = 0x2000 -REG_SS equ (RING0_STACK_SIZE-4) -REG_APP_ESP equ (RING0_STACK_SIZE-8) -REG_EFLAGS equ (RING0_STACK_SIZE-12) -REG_CS equ (RING0_STACK_SIZE-16) -REG_EIP equ (RING0_STACK_SIZE-20) -REG_EAX equ (RING0_STACK_SIZE-24) -REG_ECX equ (RING0_STACK_SIZE-28) -REG_EDX equ (RING0_STACK_SIZE-32) -REG_EBX equ (RING0_STACK_SIZE-36) -REG_ESP equ (RING0_STACK_SIZE-40) ;RING0_STACK_SIZE-20 -REG_EBP equ (RING0_STACK_SIZE-44) -REG_ESI equ (RING0_STACK_SIZE-48) -REG_EDI equ (RING0_STACK_SIZE-52) -REG_RET equ (RING0_STACK_SIZE-56) ;irq0.return +REG_SS = RING0_STACK_SIZE - 4 +REG_APP_ESP = RING0_STACK_SIZE - 8 +REG_EFLAGS = RING0_STACK_SIZE - 12 +REG_CS = RING0_STACK_SIZE - 16 +REG_EIP = RING0_STACK_SIZE - 20 +REG_EAX = RING0_STACK_SIZE - 24 +REG_ECX = RING0_STACK_SIZE - 28 +REG_EDX = RING0_STACK_SIZE - 32 +REG_EBX = RING0_STACK_SIZE - 36 +REG_ESP = RING0_STACK_SIZE - 40 ;RING0_STACK_SIZE-20 +REG_EBP = RING0_STACK_SIZE - 44 +REG_ESI = RING0_STACK_SIZE - 48 +REG_EDI = RING0_STACK_SIZE - 52 +REG_RET = RING0_STACK_SIZE - 56 ;irq0.return -PAGE_SIZE equ 4096 +PAGE_SIZE = 4096 -PG_UNMAP equ 0x000 -PG_READ equ 0x001 -PG_WRITE equ 0x002 -PG_USER equ 0x004 -PG_PCD equ 0x008 -PG_PWT equ 0x010 -PG_ACCESSED equ 0x020 -PG_DIRTY equ 0x040 -PG_PAT equ 0x080 -PG_GLOBAL equ 0x100 -PG_SHARED equ 0x200 +PG_UNMAP = 0x000 +PG_READ = 0x001 +PG_WRITE = 0x002 +PG_USER = 0x004 +PG_PCD = 0x008 +PG_PWT = 0x010 +PG_ACCESSED = 0x020 +PG_DIRTY = 0x040 +PG_PAT = 0x080 +PG_GLOBAL = 0x100 +PG_SHARED = 0x200 -PG_SWR equ 0x003 ; (PG_WRITE+PG_READ) -PG_UR equ 0x005 ; (PG_USER+PG_READ) -PG_UWR equ 0x007 ; (PG_USER+PG_WRITE+PG_READ) -PG_NOCACHE equ 0x018 ; (PG_PCD+PG_PWT) +PG_SWR = 0x003 ; PG_WRITE + PG_READ +PG_UR = 0x005 ; PG_USER + PG_READ +PG_UWR = 0x007 ; PG_USER + PG_WRITE + PG_READ +PG_NOCACHE = 0x018 ; PG_PCD + PG_PWT -PDE_LARGE equ 0x080 +PDE_LARGE = 0x080 -PAT_WB equ 0x000 -PAT_WC equ 0x008 -PAT_UCM equ 0x010 -PAT_UC equ 0x018 +MEM_WB = 6 ; write-back memory +MEM_WC = 1 ; write combined memory +MEM_UC = 0 ; uncached memory -PAT_TYPE_UC equ 0 -PAT_TYPE_WC equ 1 -PAT_TYPE_WB equ 6 -PAT_TYPE_UCM equ 7 +PAT_WB = 0x000 +PAT_WC = 0x008 +PAT_UCM = 0x010 +PAT_UC = 0x018 -PAT_VALUE equ 0x00070106; (UC<<24)|(UCM<<16)|(WC<<8)|WB +PAT_TYPE_UC = 0 +PAT_TYPE_WC = 1 +PAT_TYPE_WB = 6 +PAT_TYPE_UCM = 7 -MAX_MEMMAP_BLOCKS equ 32 +PAT_VALUE = 0x00070106; (UC<<24)|(UCM<<16)|(WC<<8)|WB -TMP_FILE_NAME equ 0 -TMP_CMD_LINE equ 1024 -TMP_ICON_OFFS equ 1280 +MAX_MEMMAP_BLOCKS = 32 + +TMP_FILE_NAME = 0 +TMP_CMD_LINE = 1024 +TMP_ICON_OFFS = 1280 -EVENT_REDRAW equ 0x00000001 -EVENT_KEY equ 0x00000002 -EVENT_BUTTON equ 0x00000004 -EVENT_BACKGROUND equ 0x00000010 -EVENT_MOUSE equ 0x00000020 -EVENT_IPC equ 0x00000040 -EVENT_NETWORK equ 0x00000080 -EVENT_DEBUG equ 0x00000100 -EVENT_NETWORK2 equ 0x00000200 -EVENT_EXTENDED equ 0x00000400 +EVENT_REDRAW = 0x00000001 +EVENT_KEY = 0x00000002 +EVENT_BUTTON = 0x00000004 +EVENT_BACKGROUND = 0x00000010 +EVENT_MOUSE = 0x00000020 +EVENT_IPC = 0x00000040 +EVENT_NETWORK = 0x00000080 +EVENT_DEBUG = 0x00000100 +EVENT_NETWORK2 = 0x00000200 +EVENT_EXTENDED = 0x00000400 -EV_INTR equ 1 +EV_INTR = 1 -STDIN_FILENO equ 0 -STDOUT_FILENO equ 1 -STDERR_FILENO equ 2 +STDIN_FILENO = 0 +STDOUT_FILENO = 1 +STDERR_FILENO = 2 -SYSTEM_SHUTDOWN equ 2 -SYSTEM_REBOOT equ 3 -SYSTEM_RESTART equ 4 +SYSTEM_SHUTDOWN = 2 +SYSTEM_REBOOT = 3 +SYSTEM_RESTART = 4 -BLIT_CLIENT_RELATIVE equ 0x20000000 +BLIT_CLIENT_RELATIVE = 0x20000000 struct SYSCALL_STACK _eip dd ? @@ -408,10 +410,10 @@ struct FUTEX flags dd ? ends -FUTEX_INIT equ 0 -FUTEX_DESTROY equ 1 -FUTEX_WAIT equ 2 -FUTEX_WAKE equ 3 +FUTEX_INIT = 0 +FUTEX_DESTROY = 1 +FUTEX_WAIT = 2 +FUTEX_WAKE = 3 struct FILED list LHEAD @@ -536,8 +538,8 @@ struct APPDATA in_schedule LHEAD ;+236 ends -APP_OBJ_OFFSET equ 48 -APP_EV_OFFSET equ 40 +APP_OBJ_OFFSET = 48 +APP_EV_OFFSET = 40 struct TASKDATA event_mask dd ? @@ -886,8 +888,8 @@ struct USBFUNC device_disconnect dd ? ends -DRV_ENTRY equ 1 -DRV_EXIT equ -1 +DRV_ENTRY = 1 +DRV_EXIT = -1 struct COFF_HEADER machine dw ? diff --git a/kernel/trunk/core/apic.inc b/kernel/trunk/core/apic.inc index 698e2e7b9e..bb462b0c23 100644 --- a/kernel/trunk/core/apic.inc +++ b/kernel/trunk/core/apic.inc @@ -18,30 +18,30 @@ IOAPIC_base rd 1 LAPIC_BASE rd 1 endg -APIC_ID equ 0x20 -APIC_TPR equ 0x80 -APIC_EOI equ 0xb0 -APIC_LDR equ 0xd0 -APIC_DFR equ 0xe0 -APIC_SVR equ 0xf0 -APIC_ISR equ 0x100 -APIC_ESR equ 0x280 -APIC_ICRL equ 0x300 -APIC_ICRH equ 0x310 -APIC_LVT_LINT0 equ 0x350 -APIC_LVT_LINT1 equ 0x360 -APIC_LVT_err equ 0x370 +APIC_ID = 0x20 +APIC_TPR = 0x80 +APIC_EOI = 0xb0 +APIC_LDR = 0xd0 +APIC_DFR = 0xe0 +APIC_SVR = 0xf0 +APIC_ISR = 0x100 +APIC_ESR = 0x280 +APIC_ICRL = 0x300 +APIC_ICRH = 0x310 +APIC_LVT_LINT0 = 0x350 +APIC_LVT_LINT1 = 0x360 +APIC_LVT_err = 0x370 ; APIC timer -APIC_LVT_timer equ 0x320 -APIC_timer_div equ 0x3e0 -APIC_timer_init equ 0x380 -APIC_timer_cur equ 0x390 +APIC_LVT_timer = 0x320 +APIC_timer_div = 0x3e0 +APIC_timer_init = 0x380 +APIC_timer_cur = 0x390 ; IOAPIC -IOAPIC_ID equ 0x0 -IOAPIC_VER equ 0x1 -IOAPIC_ARB equ 0x2 -IOAPIC_REDTBL equ 0x10 +IOAPIC_ID = 0x0 +IOAPIC_VER = 0x1 +IOAPIC_ARB = 0x2 +IOAPIC_REDTBL = 0x10 align 4 APIC_init: diff --git a/kernel/trunk/core/dll.inc b/kernel/trunk/core/dll.inc index e737cb6b04..cb0f7244c7 100644 --- a/kernel/trunk/core/dll.inc +++ b/kernel/trunk/core/dll.inc @@ -8,11 +8,11 @@ $Revision$ -DRV_COMPAT equ 5 ;minimal required drivers version -DRV_CURRENT equ 6 ;current drivers model version +DRV_COMPAT = 5 ;minimal required drivers version +DRV_CURRENT = 6 ;current drivers model version -DRV_VERSION equ (DRV_COMPAT shl 16) or DRV_CURRENT -PID_KERNEL equ 1 ;os_idle thread +DRV_VERSION = (DRV_COMPAT shl 16) or DRV_CURRENT +PID_KERNEL = 1 ;os_idle thread diff --git a/kernel/trunk/core/heap.inc b/kernel/trunk/core/heap.inc index 18d324580a..be7a04484b 100644 --- a/kernel/trunk/core/heap.inc +++ b/kernel/trunk/core/heap.inc @@ -18,9 +18,9 @@ struct MEM_BLOCK handle dd ? ;+28 ends -FREE_BLOCK equ 4 -USED_BLOCK equ 8 -DONT_FREE_BLOCK equ 10h +FREE_BLOCK = 4 +USED_BLOCK = 8 +DONT_FREE_BLOCK = 10h block_next equ MEM_BLOCK.next_block @@ -560,7 +560,7 @@ restore block_flags ;;;;;;;;;;;;;; USER HEAP ;;;;;;;;;;;;;;;;; -HEAP_TOP equ 0x80000000 +HEAP_TOP = 0x80000000 align 4 proc init_heap @@ -1265,21 +1265,21 @@ destroy_smap: ret -E_NOTFOUND equ 5 -E_ACCESS equ 10 -E_NOMEM equ 30 -E_PARAM equ 33 +E_NOTFOUND = 5 +E_ACCESS = 10 +E_NOMEM = 30 +E_PARAM = 33 -SHM_READ equ 0 -SHM_WRITE equ 1 +SHM_READ = 0 +SHM_WRITE = 1 -SHM_ACCESS_MASK equ 3 +SHM_ACCESS_MASK = 3 -SHM_OPEN equ (0 shl 2) -SHM_OPEN_ALWAYS equ (1 shl 2) -SHM_CREATE equ (2 shl 2) +SHM_OPEN = 0 shl 2 +SHM_OPEN_ALWAYS = 1 shl 2 +SHM_CREATE = 2 shl 2 -SHM_OPEN_MASK equ (3 shl 2) +SHM_OPEN_MASK = 3 shl 2 align 4 proc shmem_open stdcall name:dword, size:dword, access:dword diff --git a/kernel/trunk/core/irq.inc b/kernel/trunk/core/irq.inc index a70bccbc20..351040fd1b 100644 --- a/kernel/trunk/core/irq.inc +++ b/kernel/trunk/core/irq.inc @@ -8,9 +8,9 @@ $Revision$ -IRQ_RESERVED equ 24 +IRQ_RESERVED = 24 -IRQ_POOL_SIZE equ 48 +IRQ_POOL_SIZE = 48 uglobal diff --git a/kernel/trunk/core/mtrrtest.asm b/kernel/trunk/core/mtrrtest.asm index d1c8884f39..dede91186a 100644 --- a/kernel/trunk/core/mtrrtest.asm +++ b/kernel/trunk/core/mtrrtest.asm @@ -115,15 +115,15 @@ macro movi r,i } include '../kglobals.inc' -CAPS_MTRR equ 12 -MSR_MTRR_DEF_TYPE equ 0x2FF -CAPS_PGE equ 13 -CAPS_PAT equ 16 -MSR_CR_PAT equ 0x277 -PAT_VALUE equ 0x00070106 ; (UC<<24)|(UCM<<16)|(WC<<8)|WB -MEM_WB equ 6 ;write-back memory -MEM_WC equ 1 ;write combined memory -MEM_UC equ 0 ;uncached memory +CAPS_MTRR = 12 +MSR_MTRR_DEF_TYPE = 0x2FF +CAPS_PGE = 13 +CAPS_PAT = 16 +MSR_CR_PAT = 0x277 +PAT_VALUE = 0x00070106 ; (UC<<24)|(UCM<<16)|(WC<<8)|WB +MEM_WB = 6 ;write-back memory +MEM_WC = 1 ;write combined memory +MEM_UC = 0 ;uncached memory include 'mtrr.inc' BOOT_VARS = 0 diff --git a/kernel/trunk/core/sync.inc b/kernel/trunk/core/sync.inc index 64a08e0cb9..ec48cc3d86 100644 --- a/kernel/trunk/core/sync.inc +++ b/kernel/trunk/core/sync.inc @@ -11,8 +11,8 @@ $Revision$ -RWSEM_WAITING_FOR_WRITE equ 0 -RWSEM_WAITING_FOR_READ equ 1 +RWSEM_WAITING_FOR_WRITE = 0 +RWSEM_WAITING_FOR_READ = 1 ;void __fastcall mutex_init(struct mutex *lock) diff --git a/kernel/trunk/core/taskman.inc b/kernel/trunk/core/taskman.inc index 3e6f20fe8b..5a2c60a28a 100644 --- a/kernel/trunk/core/taskman.inc +++ b/kernel/trunk/core/taskman.inc @@ -8,7 +8,7 @@ $Revision$ -GREEDY_KERNEL equ 0 +GREEDY_KERNEL = 0 struct APP_HEADER_00_ banner dq ? @@ -889,10 +889,10 @@ common_app_entry: popad iretd -EFL_IF equ 0x0200 -EFL_IOPL1 equ 0x1000 -EFL_IOPL2 equ 0x2000 -EFL_IOPL3 equ 0x3000 +EFL_IF = 0x0200 +EFL_IOPL1 = 0x1000 +EFL_IOPL2 = 0x2000 +EFL_IOPL3 = 0x3000 align 4 proc set_app_params stdcall,slot:dword, params:dword, flags:dword diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index 68d42e9034..6efaa3993d 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -512,6 +512,7 @@ RAMDISK: rb RAMDISK_CAPACITY*512 _CLEAN_ZONE: +CLEAN_ZONE = _CLEAN_ZONE - OS_BASE BgrAuxTable rb 32768 align 65536 diff --git a/kernel/trunk/docs/events_subsystem.txt b/kernel/trunk/docs/events_subsystem.txt index ffd2f83913..8479b520d9 100644 --- a/kernel/trunk/docs/events_subsystem.txt +++ b/kernel/trunk/docs/events_subsystem.txt @@ -25,17 +25,17 @@ struc EVENT События реального времени получили класс 0хFF. Пока определёны только: EVENT.code= ;(Используется в звуковой подсистеме). - RT_INP_EMPTY equ 0xFF000001 - RT_OUT_EMPTY equ 0xFF000002 - RT_INP_FULL equ 0xFF000003 - RT_OUT_FULL equ 0xFF000004 + RT_INP_EMPTY = 0xFF000001 + RT_OUT_EMPTY = 0xFF000002 + RT_INP_FULL = 0xFF000003 + RT_OUT_FULL = 0xFF000004 Флаги поля EVENT.state определены в gui/event.inc. - EVENT_SIGNALED equ 0x20000000 ;Бит 29 событие активно/неактивно; - EVENT_WATCHED equ 0x10000000 ;бит 28, поток-владелец ожидает активации события; - MANUAL_RESET equ 0x40000000 ;бит 30, не деактивировать событие автоматически по получении; - MANUAL_DESTROY equ 0x80000000 ;бит 31, не возвращать событие в список свободных по получении. + EVENT_SIGNALED = 0x20000000 ;бит 29 событие активно/неактивно; + EVENT_WATCHED = 0x10000000 ;бит 28, поток-владелец ожидает активации события; + MANUAL_RESET = 0x40000000 ;бит 30, не деактивировать событие автоматически по получении; + MANUAL_DESTROY = 0x80000000 ;бит 31, не возвращать событие в список свободных по получении. На момент ревизии 3732 (и далее по тексту то же) определение находится в \kernel\trunk\const.inc и выглядит так: @@ -229,4 +229,4 @@ GetEvent: сигнала (5*dword), формат которых определяется первым dword-ом. Портит: eax . ---------------------------------------------------------------------------------------------- \ No newline at end of file +--------------------------------------------------------------------------------------------- diff --git a/kernel/trunk/fs/fat.inc b/kernel/trunk/fs/fat.inc index e55cae2905..14b1959678 100644 --- a/kernel/trunk/fs/fat.inc +++ b/kernel/trunk/fs/fat.inc @@ -33,7 +33,7 @@ fat_user_functions: fat_user_functions_end: endg -cache_max equ 1919 ; max. is 1919*512+0x610000=0x6ffe00 +cache_max = 1919 ; max. is 1919*512+0x610000=0x6ffe00 PUSHAD_EAX equ [esp+28] PUSHAD_ECX equ [esp+24] diff --git a/kernel/trunk/gui/event.inc b/kernel/trunk/gui/event.inc index 0b8a1365b0..22cb4aca3f 100644 --- a/kernel/trunk/gui/event.inc +++ b/kernel/trunk/gui/event.inc @@ -49,10 +49,10 @@ align 4 .fail: ret ;----------------------------------------------------------------------------- -EVENT_WATCHED equ 0x10000000 ;бит 28 -EVENT_SIGNALED equ 0x20000000 ;бит 29 -MANUAL_RESET equ 0x40000000 ;бит 30 -MANUAL_DESTROY equ 0x80000000 ;бит 31 +EVENT_WATCHED = 0x10000000 ; bit 28 +EVENT_SIGNALED = 0x20000000 ; bit 29 +MANUAL_RESET = 0x40000000 ; bit 30 +MANUAL_DESTROY = 0x80000000 ; bit 31 ;----------------------------------------------------------------------------- align 4 create_event: ;; EXPORT use diff --git a/kernel/trunk/init.inc b/kernel/trunk/init.inc index fefd0074d5..36d8e7f9e4 100644 --- a/kernel/trunk/init.inc +++ b/kernel/trunk/init.inc @@ -7,11 +7,6 @@ $Revision$ - -MEM_WB equ 6 ;write-back memory -MEM_WC equ 1 ;write combined memory -MEM_UC equ 0 ;uncached memory - align 4 proc mem_test ; if we have BIOS with fn E820, skip the test @@ -444,13 +439,13 @@ cpu_count rd 1 smpt rd 16 endg -ACPI_HI_RSDP_WINDOW_START equ 0x000E0000 -ACPI_HI_RSDP_WINDOW_END equ 0x00100000 -ACPI_RSDP_CHECKSUM_LENGTH equ 20 +ACPI_HI_RSDP_WINDOW_START = 0x000E0000 +ACPI_HI_RSDP_WINDOW_END = 0x00100000 +ACPI_RSDP_CHECKSUM_LENGTH = 20 -ACPI_HPET_SIGN equ 'HPET' -ACPI_MADT_SIGN equ 'APIC' -ACPI_FADT_SIGN equ 'FACP' +ACPI_HPET_SIGN = 'HPET' +ACPI_MADT_SIGN = 'APIC' +ACPI_FADT_SIGN = 'FACP' acpi_locate: @@ -623,15 +618,15 @@ check_acpi: mov [acpi_ioapic_base-OS_BASE], eax jmp .next -HPET_PERIOD equ 0x0004 -HPET_CFG_ENABLE equ 0x0001 -HPET_CFG equ 0x0010 -HPET_COUNTER equ 0x00f0 -HPET_T0_CFG equ 0x0100 +HPET_PERIOD = 0x0004 +HPET_CFG_ENABLE = 0x0001 +HPET_CFG = 0x0010 +HPET_COUNTER = 0x00f0 +HPET_T0_CFG = 0x0100 -HPET_TN_LEVEL equ 0x0002 -HPET_TN_ENABLE equ 0x0004 -HPET_TN_FSB equ 0x4000 +HPET_TN_LEVEL = 0x0002 +HPET_TN_ENABLE = 0x0004 +HPET_TN_FSB = 0x4000 align 4 init_hpet: diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index f54d59f7fe..02d3ff7bd0 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -74,11 +74,11 @@ include 'struct.inc' $Revision$ -USE_COM_IRQ equ 1 ; make irq 3 and irq 4 available for PCI devices -VESA_1_2_VIDEO equ 0 ; enable vesa 1.2 bank switch functions +USE_COM_IRQ = 1 ; make irq 3 and irq 4 available for PCI devices +VESA_1_2_VIDEO = 0 ; enable vesa 1.2 bank switch functions ; Enabling the next line will enable serial output console -;debug_com_base equ 0x3f8 ; 0x3f8 is com1, 0x2f8 is com2, 0x3e8 is com3, 0x2e8 is com4, no irq's are used +;debug_com_base = 0x3f8 ; 0x3f8 is com1, 0x2f8 is com2, 0x3e8 is com3, 0x2e8 is com4, no irq's are used include "proc32.inc" include "kglobals.inc" @@ -94,18 +94,18 @@ debug_direct_print db 0 launcher_start db 1 endg -max_processes equ 255 -tss_step equ (128+8192) ; tss & i/o - 65535 ports, * 256=557056*4 +max_processes = 255 +tss_step = 128 + 8192 ; tss & i/o - 65535 ports, * 256=557056*4 -os_stack equ (os_data_l-gdts) ; GDTs -os_code equ (os_code_l-gdts) -graph_data equ (3+graph_data_l-gdts) -tss0 equ (tss0_l-gdts) -app_code equ (3+app_code_l-gdts) -app_data equ (3+app_data_l-gdts) -app_tls equ (3+tls_data_l-gdts) -pci_code_sel equ (pci_code_32-gdts) -pci_data_sel equ (pci_data_32-gdts) +os_stack = os_data_l - gdts ; GDTs +os_code = os_code_l - gdts +graph_data = 3 + graph_data_l - gdts +tss0 = tss0_l - gdts +app_code = 3 + app_code_l - gdts +app_data = 3 + app_data_l - gdts +app_tls = 3 + tls_data_l - gdts +pci_code_sel = pci_code_32-gdts +pci_data_sel = pci_data_32-gdts ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/kernel/trunk/posix/pipe.inc b/kernel/trunk/posix/pipe.inc index 292b36fbef..63e76edfcd 100644 --- a/kernel/trunk/posix/pipe.inc +++ b/kernel/trunk/posix/pipe.inc @@ -7,11 +7,11 @@ $Revision: 6917 $ -F_READ equ 0x0001 ; file opened for reading -F_WRITE equ 0x0002 ; file opened for writing +F_READ = 0x0001 ; file opened for reading +F_WRITE = 0x0002 ; file opened for writing -O_CLOEXEC equ 0x40000 -PIPE_BUFFER_SIZE equ 4096 +O_CLOEXEC = 0x40000 +PIPE_BUFFER_SIZE = 4096 iglobal diff --git a/kernel/trunk/posix/posix.inc b/kernel/trunk/posix/posix.inc index 744828c6bd..5bf103bbf8 100644 --- a/kernel/trunk/posix/posix.inc +++ b/kernel/trunk/posix/posix.inc @@ -7,17 +7,17 @@ $Revision: 6917 $ -ENOENT equ 2 -EBADF equ 9 -EFAULT equ 14 -;EINVAL equ 22 11 defined in stack.inc -ENFILE equ 23 -EMFILE equ 24 -EPIPE equ 32 +ENOENT = 2 +EBADF = 9 +EFAULT = 14 +;EINVAL = 22 11 defined in stack.inc +ENFILE = 23 +EMFILE = 24 +EPIPE = 32 -FILEOP_CLOSE equ 0 -FILEOP_READ equ 1 -FILEOP_WRITE equ 2 +FILEOP_CLOSE = 0 +FILEOP_READ = 1 +FILEOP_WRITE = 2 include "futex.inc" diff --git a/kernel/trunk/video/blitter.inc b/kernel/trunk/video/blitter.inc index 8d8c4d2135..b543220137 100644 --- a/kernel/trunk/video/blitter.inc +++ b/kernel/trunk/video/blitter.inc @@ -98,15 +98,15 @@ blit_clip: ;return code: ;CF= 0 - draw, 1 - don't draw -.sx0 equ 8 -.sy0 equ 12 -.sx1 equ 16 -.sy1 equ 20 +.sx0 = 8 +.sy0 = 12 +.sx1 = 16 +.sy1 = 20 -.dx0 equ 24 -.dy0 equ 28 -.dx1 equ 32 -.dy1 equ 36 +.dx0 = 24 +.dy0 = 28 +.dx1 = 32 +.dy1 = 36 push edi diff --git a/kernel/trunk/video/cursors.inc b/kernel/trunk/video/cursors.inc index a0db648c49..436ef0ecac 100644 --- a/kernel/trunk/video/cursors.inc +++ b/kernel/trunk/video/cursors.inc @@ -8,10 +8,10 @@ $Revision$ -LOAD_FROM_FILE equ 0 -LOAD_FROM_MEM equ 1 -LOAD_INDIRECT equ 2 -LOAD_SYSTEM equ 3 +LOAD_FROM_FILE = 0 +LOAD_FROM_MEM = 1 +LOAD_INDIRECT = 2 +LOAD_SYSTEM = 3 struct BITMAPINFOHEADER Size dd ? diff --git a/kernel/trunk/video/vesa12.inc b/kernel/trunk/video/vesa12.inc index 369c523d71..ca855d4bd9 100644 --- a/kernel/trunk/video/vesa12.inc +++ b/kernel/trunk/video/vesa12.inc @@ -18,9 +18,9 @@ $Revision$ -TRIDENT equ 0 -S3_VIDEO equ 0 -INTEL_VIDEO equ 0 +TRIDENT = 0 +S3_VIDEO = 0 +INTEL_VIDEO = 0 if TRIDENT if S3_VIDEO or INTEL_VIDEO