From 8f4c12f4c5aee5471aa554d8637b84c8cc225463 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 1 Jul 2011 18:30:18 +0000 Subject: [PATCH] PCIDEV - Show the message "NA" if the IRQ is not assigned git-svn-id: svn://kolibrios.org@1993 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/pcidev/trunk/PCIDEV.ASM | 43 ++++++++++++++++-------- programs/system/pcidev/trunk/history.txt | 7 ++++ 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/programs/system/pcidev/trunk/PCIDEV.ASM b/programs/system/pcidev/trunk/PCIDEV.ASM index d15f5ed0a9..fdacdcd7a8 100644 --- a/programs/system/pcidev/trunk/PCIDEV.ASM +++ b/programs/system/pcidev/trunk/PCIDEV.ASM @@ -3,7 +3,7 @@ ; target platform: KolibriOS ; compiler: flat assembler 1.68 ; version: 2.3 -; last update: June 2011 +; last update: Jule 2011 ; maintained by: Jason Delozier ; Sergey Kuzmin ; Mihailov Ilia @@ -450,17 +450,19 @@ no_ummio_here: ; ; from Ghost april 2007 ;***************************************** + and edx, 0xFFFF + or edx, 310 * 65536 ; X start becomes 310 movzx ecx, [PCI_IRQ] ; get Interface cmp cl, 0x0f ; IRQ between 0..15 ja @f - - and edx, 0xFFFF - or edx, 310 * 65536 ; X start becomes 310 + mcall - + call store_2_digits - -@@: + jmp .PCI_Vendor +@@: + call store_NA +.PCI_Vendor: ;Write Names movzx ebx, dx ; Set y position or ebx, 340 * 65536 ; set Xposition to 340 @@ -644,15 +646,14 @@ store_text: popa ret ;----------------------------------------------------------------------------- -store_4_digits: +store_NA: pusha - mov ebx,ecx - mov ecx,4 + mov ebx,edx + mcall 4,,0x80000000,text_NA mov edi,[store_text_area_end] - call binary_to_hex_string - add [store_text_area_end],dword 6 - popa - ret + mov ax,[edx] + mov [edi+1],ax + jmp store_2_digits.1 ;----------------------------------------------------------------------------- store_2_digits: pusha @@ -661,10 +662,21 @@ store_2_digits: mov ecx,2 mov edi,[store_text_area_end] call binary_to_hex_string +.1: add [store_text_area_end],dword 4 popa ret ;----------------------------------------------------------------------------- +store_4_digits: + pusha + mov ebx,ecx + mov ecx,4 + mov edi,[store_text_area_end] + call binary_to_hex_string + add [store_text_area_end],dword 6 + popa + ret +;----------------------------------------------------------------------------- ; ebx - value ; ecx - digits ; edi - output string @@ -719,6 +731,9 @@ bar_rom db 'BAR6: Expansion ROM', 0 text_save_button: db 'Save PCI list',0 .1: db '(Press S key)',0 + +text_NA: + db 'NA',0 ;--------------------------------------------------------------------- system_dir_ProcLib db '/sys/lib/proc_lib.obj',0 diff --git a/programs/system/pcidev/trunk/history.txt b/programs/system/pcidev/trunk/history.txt index dc70e33ed2..a7cfad9bdc 100644 --- a/programs/system/pcidev/trunk/history.txt +++ b/programs/system/pcidev/trunk/history.txt @@ -10,6 +10,13 @@ to-do: Full device detection (like "ATI Radeon 9200") will increase app size a lot and probably it is function of particular drivers ;----------------------------------------------------------------------------- +2.3: PCIDEV 01/07/2011 +Author: Marat Zakiyanov aka Mario79 +Features: + fixed + * Show the message "NA" if the IRQ is not assigned + + ;----------------------------------------------------------------------------- 2.3: PCIDEV 26/06/2011 Author: Marat Zakiyanov aka Mario79 Features: