From: H. Peter Anvin <hpa@zytor.com>
Date: Wed, 14 Nov 2007 17:43:28 +0000 (-0800)
Subject: ISOLINUX: Change DriveNo -> DriveNumber
X-Git-Tag: syslinux-3.53-pre5~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00472b0aa8083fafa0f27723c1a1a8a77d2542ed;p=profile%2Fivi%2Fsyslinux.git

ISOLINUX: Change DriveNo -> DriveNumber

Change DriveNo to DriveNumber in ISOLINUX, to match the other
derivatives.
---

diff --git a/bootsect.inc b/bootsect.inc
index 5775c5a..78ad12a 100644
--- a/bootsect.inc
+++ b/bootsect.inc
@@ -79,7 +79,7 @@ load_bootsec:
 		rep movsw
 		pop si			; DS:SI points to partition info
 %elif IS_ISOLINUX
-		mov dl,[DriveNo]
+		mov dl,[DriveNumber]
 %elif IS_PXELINUX
 		mov byte [KeepPXE],1	; Chainloading another NBP
 		call reset_pxe
diff --git a/comboot.inc b/comboot.inc
index d3177b2..33414bc 100644
--- a/comboot.inc
+++ b/comboot.inc
@@ -478,7 +478,7 @@ comapi_derinfo:
 		mov ax,[InitStack+2]
 		mov P_FS,ax
 %elif IS_ISOLINUX
-		mov al,[DriveNo]
+		mov al,[DriveNumber]
 		mov P_DL,al
 		mov P_ES,cs
 		mov P_BX,spec_packet
diff --git a/isolinux.asm b/isolinux.asm
index 7d454e2..4fbb772 100644
--- a/isolinux.asm
+++ b/isolinux.asm
@@ -119,7 +119,7 @@ InitStack	resd 1			; Initial stack pointer (SS:SP)
 DiskSys		resw 1			; Last INT 13h call
 ImageSectors	resw 1			; isolinux.bin size, sectors
 DiskError	resb 1			; Error code for disk I/O
-DriveNo		resb 1			; CD-ROM BIOS drive number
+DriveNumber		resb 1			; CD-ROM BIOS drive number
 ISOFlags	resb 1			; Flags for ISO directory search
 RetryCount      resb 1			; Used for disk access retries
 
@@ -268,7 +268,7 @@ initial_csum:	xor edi,edi
 		loop .loop
 		mov [FirstSecSum],edi
 
-		mov [DriveNo],dl
+		mov [DriveNumber],dl
 %ifdef DEBUG_MESSAGES
 		mov si,startup_msg
 		call writemsg
@@ -297,11 +297,11 @@ initial_csum:	xor edi,edi
 		; Note: use passed-in DL value rather than 7Fh because
 		; at least some BIOSes will get the wrong value otherwise
 		mov ax,4B01h			; Get disk emulation status
-		mov dl,[DriveNo]
+		mov dl,[DriveNumber]
 		mov si,spec_packet
 		call int13
 		jc award_hack			; changed for BrokenAwardHack
-		mov dl,[DriveNo]
+		mov dl,[DriveNumber]
 		cmp [sp_drive],dl		; Should contain the drive number
 		jne spec_query_failed
 
@@ -543,7 +543,7 @@ award_found:	mov	eax,[es:di+0eh]		; load possible int 13 addr
 		call	writestr		;
 %endif						;
 		mov	ax,4B01h		; try to read the spec packet
-		mov	dl,[DriveNo]		; now ... it should not fail
+		mov	dl,[DriveNumber]	; now ... it should not fail
 		mov	si,spec_packet		; any longer
 		int	13h			;
 		jc	award_fail2		;
@@ -588,14 +588,14 @@ spec_query_failed:
 		; Okay, good enough...
 		mov si,alright_msg
 		call writemsg
-		mov [DriveNo],dl
+		mov [DriveNumber],dl
 .found_drive:	jmp found_drive
 
 		; Award BIOS 4.51 apparently passes garbage in sp_drive,
 		; but if this was the drive number originally passed in
 		; DL then consider it "good enough"
 .maybe_broken:
-		cmp byte [DriveNo],dl
+		cmp byte [DriveNumber],dl
 		je .found_drive
 
 .still_broken:	dec dx
@@ -607,7 +607,7 @@ spec_query_failed:
 		; 4B01h, so we can't query a spec packet no matter
 		; what.  If we got a drive number in DL, then try to
 		; use it, and if it works, then well...
-		mov dl,[DriveNo]
+		mov dl,[DriveNumber]
 		cmp dl,81h			; Should be 81-FF at least
 		jb fatal_error			; If not, it's hopeless
 
@@ -708,7 +708,7 @@ getlinsec:
 .bp_ok:
 		mov [si+2],bp
 		push si
-		mov dl,[DriveNo]
+		mov dl,[DriveNumber]
 		mov ah,42h			; Extended Read
 		call xint13
 		pop si
@@ -1066,7 +1066,7 @@ is_disk_image:
 
 		mov ax,4C00h			; Enable emulation and boot
 		mov si,dspec_packet
-		mov dl,[DriveNo]
+		mov dl,[DriveNumber]
 		lss sp,[InitStack]
 		TRACER 'X'