From 2d6dc1b70410b7d58ce5680654604f4f7e58e1de Mon Sep 17 00:00:00 2001
From: "Marat Zakiyanov (Mario79)" <mario79@bk.ru>
Date: Fri, 1 Jul 2011 21:54:21 +0000
Subject: [PATCH] PCIDEV - fixes for previous revisions.

git-svn-id: svn://kolibrios.org@1995 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/system/pcidev/trunk/PCIDEV.ASM  | 18 ++++++++++++++----
 programs/system/pcidev/trunk/history.txt |  5 +++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/programs/system/pcidev/trunk/PCIDEV.ASM b/programs/system/pcidev/trunk/PCIDEV.ASM
index fdacdcd7a8..bf4bc9614a 100644
--- a/programs/system/pcidev/trunk/PCIDEV.ASM
+++ b/programs/system/pcidev/trunk/PCIDEV.ASM
@@ -234,6 +234,15 @@ nomo:					;done drawing bars here
 	movzx	ecx, byte [total]	; number to draw
 	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]
 	or 	ah, ah
 	jz 	@f
@@ -653,7 +662,9 @@ store_NA:
 	mov	edi,[store_text_area_end]
 	mov	ax,[edx]
 	mov	[edi+1],ax
-	jmp	store_2_digits.1
+	add	[store_text_area_end],dword 5
+	popa
+	ret
 ;-----------------------------------------------------------------------------
 store_2_digits:
 	pusha
@@ -662,7 +673,6 @@ 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
@@ -717,7 +727,7 @@ PCIWin mls \
 	'',\
 	'PCI Version  = x.xx; Last PCI Bus = x',\
 	'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',\
 	'                                      Interface',\
@@ -733,7 +743,7 @@ text_save_button:
 .1:	db '(Press S key)',0
 
 text_NA:
-	db 'NA',0
+	db '--',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 a7cfad9bdc..d1039dc2f2 100644
--- a/programs/system/pcidev/trunk/history.txt
+++ b/programs/system/pcidev/trunk/history.txt
@@ -10,11 +10,12 @@ 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
+2.3: PCIDEV   02/07/2011
 Author:    Marat Zakiyanov aka Mario79 <mario79@bk.ru>
 Features:
            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