From 76f2b62b94e793c2fb0684de6956c3f0e3572466 Mon Sep 17 00:00:00 2001 From: "Iliya Mihailov (Ghost)" Date: Wed, 4 Apr 2007 10:14:06 +0000 Subject: [PATCH] CPUID 2.18 by Wildwest git-svn-id: svn://kolibrios.org@450 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/cpuid/trunk/CPUID.ASM | 74 +++++++++++++++---------- programs/system/cpuid/trunk/HISTORY.TXT | 11 ++-- 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/programs/system/cpuid/trunk/CPUID.ASM b/programs/system/cpuid/trunk/CPUID.ASM index d0d636b53f..d8adf5feea 100644 --- a/programs/system/cpuid/trunk/CPUID.ASM +++ b/programs/system/cpuid/trunk/CPUID.ASM @@ -1,9 +1,9 @@ ;****************************************************************************** ; project name: CPUID * ; target platform: KolibriOS, x86 (IA-32), x86-64 achitectures * -; compiler: flat assembler 1.67.5 * -; version: 2.17 * -; last update: 3rd February 2007 1st 2nd 3rd 4th * +; compiler: flat assembler 1.67.21 * +; version: 2.18 * +; last update: 1st April 2007 1st 2nd 3rd 4th * ; maintained by: Sergey Kuzmin aka Wildwest * ; e-mail: kuzmin_serg@list.ru * ; site: http://coolthemes.narod.ru/files.html * @@ -1572,11 +1572,47 @@ FREEZE: nop jmp FREEZE ; maybe we should close application or just made some Warning and jump to still: ;---------------- -still: - mov eax,10 - int 0x40 ; +still: + +; затем переходим в цикл ожидания событий +event_wait: + + ;================_RAM_============== + Number 205,360,0,4,dword [ram_size_a],0xFFFFFF + + mov eax, 18 + mov ebx, 16 + int 0x40 + + shr eax, 10 + + mov [ram_size_a], eax + + mov eax, 18 + mov ebx, 17 + int 0x40 + + shr eax, 10 + + mov [ram_size_t], eax + + Text 120,360,0x00000000,ram, ramlen-ram + + Number 205,360,0,4,dword [ram_size_a],0x000000 + + Number 275,360,0,4,dword [ram_size_t],0x000000 + Text 305,360,0x00000000,mb, mblen-mb + +;============================== + + mov ebx,50 ; ждемс 1 сек + mov eax,23 ; функция 23: ожидание события + int 0x40 + +; mov eax,10 +; int 0x40 ; cmp eax,1 ; - je red ; red + je red ; redraw cmp eax,2 ; je key ; key cmp eax,3 ; @@ -1600,6 +1636,7 @@ still: jne noclose + jmp event_wait vybor: Number 315,90,0,4,dword [rating],0xFFFFFF ; @@ -1894,30 +1931,7 @@ PutImage 20,350,93,24,img_area2+8 ; image "press for more" call newrating; !!!! cont: -;================_RAM_============== - mov eax, 18 - mov ebx, 16 - int 0x40 - shr eax, 10 - - mov [ram_size_a], eax - - mov eax, 18 - mov ebx, 17 - int 0x40 - - shr eax, 10 - - mov [ram_size_t], eax - - Text 120,360,0x00000000,ram, ramlen-ram - Number 205,360,0,4,dword [ram_size_a],0x000000 - - Number 275,360,0,4,dword [ram_size_t],0x000000 - Text 305,360,0x00000000,mb, mblen-mb - -;============================== Text 20,70,0x00000000,tsum, tsumlen-tsum ; Text 20,110,0x00000000,cpuname, cpunamelen-cpuname; diff --git a/programs/system/cpuid/trunk/HISTORY.TXT b/programs/system/cpuid/trunk/HISTORY.TXT index 39375994fd..e88bf2f4cb 100644 --- a/programs/system/cpuid/trunk/HISTORY.TXT +++ b/programs/system/cpuid/trunk/HISTORY.TXT @@ -2,10 +2,10 @@ ; project name: CPUID ; target platform: KolibriOS, x86 (IA-32), x86-64 achitectures ; compability: probably some functions would work in MenuetOS 32 and MenuetOS 64, may be even in Miraculix; -; CPUID works in MS Windows by means of emulator from Diamond (http://diamondz.land.ru) -; compiler: flat assembler 1.67.5 -; version: 2.17 -; last update: 3rd February 2007 +; CPUID works in MS Windows by means of emulator KlbrInWin from Diamond (http://diamondz.land.ru) +; compiler: flat assembler 1.67.21 +; version: 2.18 +; last update: 1st April 2007 ; maintained by: Sergey Kuzmin aka Wildwest ; e-mail: kuzmin_serg@list.ru ; site: http://coolthemes.narod.ru/files.html @@ -37,11 +37,12 @@ ; newest AMD/Intel codename detection ;****************************************************************************** ;HISTORY: -;3.0: CPUID 03/02/2007 (not finished) +;3.0: CPUID 01/04/2007 (not finished) ;Authors: Sergey Kuzmin aka Wildwest ; Iliya Mikhailov aka Ghost ; /^S0rG^\ ;Features: +; (+) real-time RAM monitoring (previous versions showed changed amount of available RAM only at redraw event or CPUID window activation); ; (+) fixed address of LAHF feature, added detection of CMPL, SVM, MOVCR8 technologies for AMD; ; (+) fixed L2 cache size detection for VIA (they changed format from 8 bits to 16 bits several years ago); ; (+) more macroses for Interface and Threads (from Menuett.inc written by /^S0rG^\, 2002), sources separated into several include files;