Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

PCIDEV - fixes for previous revisions.

Browse Source 
git-svn-id: svn://kolibrios.org@1995 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2011-07-01 21:54:21 +00:00
parent 07698af914
commit 2d6dc1b704
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
programs/system/pcidev/trunk/PCIDEV.ASM
View File

@ -234,6 +234,15 @@ nomo: ;done drawing bars here
movzx ecx, byte [total] ; number to draw movzx ecx, byte [total] ; number to draw
mcall 47, 0x00020000,,150 * 65536 + 65, 0x224466 mcall 47, 0x00020000,,150 * 65536 + 65, 0x224466
mov ebx,ecx
mov ecx,2
mov edi,[store_text_area_start]
add edi,157
push edi
call binary_to_hex_string
pop edi
mov [edi+2],byte 'h'
mov ah, [MMIO_allowed] mov ah, [MMIO_allowed]
or ah, ah or ah, ah
jz @f jz @f
@ -653,7 +662,9 @@ store_NA:
mov edi,[store_text_area_end] mov edi,[store_text_area_end]
mov ax,[edx] mov ax,[edx]
mov [edi+1],ax mov [edi+1],ax
jmp store_2_digits.1 add [store_text_area_end],dword 5
popa
ret
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
store_2_digits: store_2_digits:
pusha pusha
@ -662,7 +673,6 @@ store_2_digits:
mov ecx,2 mov ecx,2
mov edi,[store_text_area_end] mov edi,[store_text_area_end]
call binary_to_hex_string call binary_to_hex_string
.1:
add [store_text_area_end],dword 4 add [store_text_area_end],dword 4
popa popa
ret ret
@ -717,7 +727,7 @@ PCIWin mls \
'',\ '',\
'PCI Version = x.xx; Last PCI Bus = x',\ 'PCI Version = x.xx; Last PCI Bus = x',\
'User MMIO channel = 0F.F:F ',\ 'User MMIO channel = 0F.F:F ',\
'Number of PCI units =',\ 'Number of PCI units = ',\
'',\ '',\
'VenID DevID Bus# Dev# Fnc Rev Class Subclass/ IRQ Company Description',\ 'VenID DevID Bus# Dev# Fnc Rev Class Subclass/ IRQ Company Description',\
' Interface',\ ' Interface',\
@ -733,7 +743,7 @@ text_save_button:
.1: db '(Press S key)',0 .1: db '(Press S key)',0
text_NA: text_NA:
db 'NA',0 db '--',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
system_dir_ProcLib db '/sys/lib/proc_lib.obj',0 system_dir_ProcLib db '/sys/lib/proc_lib.obj',0

5
programs/system/pcidev/trunk/history.txt
View File

@ -10,11 +10,12 @@ to-do:
Full device detection (like "ATI Radeon 9200") will increase app Full device detection (like "ATI Radeon 9200") will increase app
size a lot and probably it is function of particular drivers size a lot and probably it is function of particular drivers
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
2.3: PCIDEV 01/07/2011 2.3: PCIDEV 02/07/2011
Author: Marat Zakiyanov aka Mario79 <mario79@bk.ru> Author: Marat Zakiyanov aka Mario79 <mario79@bk.ru>
Features: Features:
fixed fixed
* Show the message "NA" if the IRQ is not assigned * Show the message "--" if the IRQ is not assigned
* Show number of PCI units for saving device list
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
2.3: PCIDEV 26/06/2011 2.3: PCIDEV 26/06/2011