WebSVN – Kolibri OS – Diff – /programs/system/gmon/gmon.asm

 ;      14/07/2006 - èñïðàâëåííû ïîêàçàíèÿ -12V äëÿ Winbond, îñòàëàñü ïðîáëåíìà ñ -5V
 ;      17/07/2006 - èñïðàâëåííà îøèáêà îïðåäåëåíèÿ ìíîæèòåëÿ äëÿ P6, äîáàâëåííû ìíîæèòåëè
 ;      18/07/2006 - Óëè÷øèë âûâîä ìíîæèòåëÿ, èñïðàâëåííû ìíîæèòåëè äëÿ P6 Tualatin, config.inc
 ;      22/07/2006 - P6 multiplier bugfix
 ;      30/07/2006 - P6 multiplier bugfix
+;               --- v 0.4 ---
+;      10/08/2006 - íà÷àòà ðàáîòà ïî ïîääåðæêå SMBus, ïåðåïèñàíû ôóíêöèè äëÿ ÷èïîâ ìîíèòîðèíãà
+;      24/08/2006 - äîáàâëåííà ÷àñòîòà ïðîöåññîðà
+;      10/09/2006 - bugfix
+;      25/11/2006 - äîáàâëåí ABIT uGuru
+;
 ;    Ýé! Ó ìåíÿ íåò ìíîãî âðåìåíè.
 ; Âíåøíèå ôàéëû :
 ;	hwm*.inc	- ïðîöåäóðû ðàáîòû ñ äàò÷èêàìè ìîíèòîðèíãà
 ;	system.inc	- âû÷èñëåíèå çàãðóçêè ïðîöåññîðà, çàâåðøåíèå òåñòà, etc...
 ;	tests.inc	- òåñòû ;-)
 ;	diag.inc	- ïîääåðæêà äèàãðàì
-;	*_tab.inc	- ïðîöåäóðû îòðèñîâêè ñîîòâåòñòâóþøèõ âêëàäîê
+;	tab_*.inc	- ïðîöåäóðû îòðèñîâêè ñîîòâåòñòâóþøèõ âêëàäîê
 	jg	no_change_color
 	sub	ah, 13
 	movzx	ecx, ah
 	mov	esi, [d_colors + ecx * 4]
 	mov	eax, [esi]
-	call	next_color
-	mov	[esi], ebx
-	jmp	draw_window
-no_change_color:
-	jmp	wait_for_event
-;---------------------------------------------------------------------
-; Öâåòà ãðàôèêîâ
-colors:	dd	0xff0000, 0xff00, 0xff, 0xffffff, tcol, 0xFF7E23, 0x8BA169, 0xff0000	; ïåðâûé è ïîñëåäíèé ðàâíû
-next_color:
-	mov	ecx, (next_color - colors) / 4	; êîëè÷åñòâî öâåòîâ
+	mov	ecx, (colors_end - colors) / 4	; êîëè÷åñòâî öâåòîâ
 @@:	dec	ecx
 	cmp	eax, [colors + ecx * 4]
 	jne	@b
 	mov	ebx, [colors + ecx * 4 - 4]
+	mov	[esi], ebx
+	jmp	draw_window
+no_change_color:
-	ret
+	jmp	wait_for_event
 ;---------------------------------------------------------------------
 draw_window:
 	mov	eax,12
 	mov	ebx,1
 	int	0x40
 	; Ñîçäà¸ì îêíî
 	xor	eax, eax
 	mov	ebx, 300 * 65536 + 309
-	mov	ecx, 150 * 65536 + 430
+	mov	ecx, 150 * 65536 + 450
 	mov	edx, tcol + 0x3000000	; color of work area RRGGBB,8->color
 	mov	esi, 0x805080d0		; color of grab bar  RRGGBB,8->color
 	mov	edi, 0x005080d0		; color of frames    RRGGBB
 	int	0x40
 	; Ñîçäà¸ì ðàìêó ãðàôèêà
 	mov	eax, 13
 	mov	ebx, 10 * 65536 + 290
-	mov	ecx, 118 * 65536 + 105
+	mov	ecx, 138 * 65536 + 105
 	mov	edx, atcol
 	int	0x40
 	mov	ebx, 12 * 65536 + 286
-	mov	ecx, 120 * 65536 + 101
+	mov	ecx, 140 * 65536 + 101
 	mov	edx, tcol
 	int	0x40
 	mov	eax, 38
 	mov	edx, atcol
 	mov	ebx, 12 * 65536 + 286 + 12
-	mov	ecx, 120 * 65536 + 120
+	mov	ecx, 140 * 65536 + 140
 @@:	add	ecx, 10 * 65536 + 10
 	int	0x40
-	cmp	cx, 210			; ïðèâÿçàíî ê êîîðäèíàòàì îêíà
+	cmp	cx, 230			; ïðèâÿçàíî ê êîîðäèíàòàì îêíà
 	jl	@b
 	; Ïèøèì çàãîëîâîê
 	mov	eax, 4
 	mov	ebx, 8 * 65536 + 8
 	mov	edx, title
 	int	0x40
 	cmp	byte[hwm_enable], 0
 	jne	show_mon
 	; Íåò äàò÷èêîâ - ïèøåì NO
-	mov	ecx, 6	;<- êîëè÷åñòâî ïàðàìåòðîâ
+	mov	ecx, 8	;<- êîëè÷åñòâî ïàðàìåòðîâ
 	mov	eax, 4
 	mov	ebx, 121 * 65536 + 50
 	mov	edx, msg_no
 	mov	esi, 3
 	;Åñòü äàò÷èêè ïèøèì èíôó
 	call	hwm_get_params
 	;---------------------------
 	; Òåìïåðàòóðó
 	mov	ecx, 3
-	mov	esi, temps
+	mov	esi, hwm_temps
 	mov	edx, 121 * 65536 + 50
 	xor	eax, eax
 sh_temp:push	ecx
 	lodsw
 	push	esi
 	sub	edx, 15 * 65536 - 10
 	pop	esi
 	pop	ecx
 	loop	sh_temp
 	;;--- äîáàâëÿåì íà ãðàôèê temp1 ---
-	movzx	eax, word[temps]
+	movzx	eax, word[hwm_temps]
 	mov	esi, d_temp1
 	call	d_add
 	call	d_show
 	;;--- äîáàâëÿåì íà ãðàôèê temp2 ---
-	movzx	eax, word[temps + 2]
+	movzx	eax, word[hwm_temps + 2]
 	mov	esi, d_temp2
 	call	d_add
 	call	d_show
 	;;--- äîáàâëÿåì íà ãðàôèê temp3 ---
-	movzx	eax, word[temps + 4]
+	movzx	eax, word[hwm_temps + 4]
 	mov	esi, d_temp3
 	call	d_add
 	call	d_show
 	;---------------------------
 	; Ñêîðîñòè âðàøåíèÿ âåíòèëåé
-	mov	ecx, 3
+	mov	ecx, 5
-	mov	esi, rpms
+	mov	esi, hwm_rpms
 	mov	edx, 121 * 65536 + 80
 sh_fan:	push	ecx
 	lodsd
 	push	esi
 	pop	ecx
 	loop	sh_fan
 	;---------------------------
 	; Íàïðóãè
-	mov	esi, Vcore
+	mov	esi, hwm_voltages
 	mov	edi, old_volts
 	mov	ecx, 7
 	mov	ebx, 260 * 65536 + 30
 	mov	edx, Data_String
 	loop	volt_nxt
 no_monitor:
 	;---------------------------
 	; Ñîçäà¸ì êíîïêè âêëàäîê
-	mov	edi, 230 * 65536 + 25
+	mov	edi, 250 * 65536 + 25
 	mov	ecx, 4
 	mov	eax, 8
 	mov	ebx, 10 * 65536 + 70
 	mov	edx, 2
 	add	ebx, 73 * 65536
 	pop	ecx
 	loop	n_bt
 	; Ïèøèì íàçâàíèÿ âêëàäîê
 	mov	eax, 4
-	mov	ebx, 35 * 65536 + 240
+	mov	ebx, 35 * 65536 + 260
 	mov	edx, tab_lab
 	mov	ecx, 0x10000000
 	mov	esi, 39
 	int	0x40
 	; ñîçäà¸ì ðàìêó âíèçó ýêðàíà
 	mov	eax, 13
 	mov	ebx, 10 * 65536 + 290
-	mov	ecx, 255 * 65536 + 160
+	mov	ecx, 275 * 65536 + 160
 	mov	edx, atcol
 	int	0x40
 	mov	ebx, 12 * 65536 + 286
-	mov	ecx, 257 * 65536 + 156
+	mov	ecx, 277 * 65536 + 156
 	mov	edx, tcol
 	int	0x40
 	; ðèñóåì âûáðàííóþ âêëàäêó
 	mov	al, [act_tab]
 	cmp	al, 2
 	mov	ebx, 2
 	int	0x40
 	jmp	wait_for_event
 ;--- Drow Info tab ---------------
 info_tab:
-	include	"info_tab.inc"
+	include	"tab_info.inc"
 ;--- Drow test tab ---------------
 test_tab:
-	include "test_tab.inc"
+	include "tab_test.inc"
 ;--- Drow Config tab -------------
 config_tab:
-	include "conf_tab.inc"
+	include "tab_conf.inc"
 ;--- Drow About tab --------------
 about_tab:
-	include "abou_tab.inc"
+	include "tab_about.inc"
 ;---------------------------------------------------------------------
 	include	"system.inc"
 	include "hwm.inc"
 	include "diag.inc"
 DATA
 act_tab		db	2 			; Íîìåð àêòèâíîé âêëàäêè
 tab_lab		db	'Info       Tests      Configs     About'
-title		db	'Ghost Monitor v0.3 [30/07/06]'
+title		db	'Ghost Monitor v0.4 [25/11/06]'
 msgs_mon mls \
 	'CPU Load (%)',\
 	'Mem Usage(%)',\
 	'Temp1',\
 	'Temp2',\
+	'Temp3',\
+	'Fan1',\
-	'Temp3',\
+	'Fan2',\
-	'Fan1',\
+	'Fan3',\
-	'Fan2',\
+	'Fan4',\
-	'Fan3'
+	'Fan5'
 msg_no		db	'N/A'
 update_time	dd	300			; ïåðèîä îáíîâëåíèÿ â ñîòûõ äîëÿõ ñåêóíäû
 d_colors	dd	d_cpu_load, d_mem_usage, d_temp1, d_temp2, d_temp3
+c_eps		dd	0.01
+; Öâåòà ãðàôèêîâ
+colors:		dd	0xff0000, 0xff00, 0xff, 0xffffff, tcol, 0xFF7E23, 0x8BA169, 0xff0000	; ïåðâûé è ïîñëåäíèé ðàâíû
-c_eps		dd	0.01
+colors_end:
 ;---------------------------------------------------------------------
 UDATA

Subversion Repositories Kolibri OS

(root)/programs/system/gmon/gmon.asm – Rev 205 → 223