[syslinux:master] core: extend conventional memory warning with amount seen

syslinux-bot for H. Peter Anvin hpa at zytor.com
Tue May 24 09:42:51 PDT 2011


Commit-ID:  d8818718986348fc14fd6478f9b164b634d568c9
Gitweb:     http://syslinux.zytor.com/commit/d8818718986348fc14fd6478f9b164b634d568c9
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Tue, 24 May 2011 09:40:12 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Tue, 24 May 2011 09:40:12 -0700

core: extend conventional memory warning with amount seen

Extend the conventional memory warning with the amount actually seen.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>


---
 core/init.inc |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/core/init.inc b/core/init.inc
index e06ca96..8c6a178 100644
--- a/core/init.inc
+++ b/core/init.inc
@@ -69,9 +69,15 @@ check_escapes:
 		shr edx,10
 		cmp ax,dx
 		jae enough_ram
-		mov ax,dx
 		mov si,err_noram
 		mov cl,10
+		push dx
+		div cl
+		add [si+err_noram.need-err_noram+2],ah
+		cbw
+		div cl
+		add [si+err_noram.need-err_noram],ax
+		pop ax
 		div cl
 		add [si+err_noram.size-err_noram+2],ah
 		cbw
@@ -83,15 +89,15 @@ enough_ram:
 skip_checks:
 
 		section .data16
-err_noram	db 'It appears your computer has less than '
+err_noram	db 'It appears your computer has only '
 .size		db '000'
-		db 'K of low ("DOS")'
-		db CR, LF
-		db 'RAM.  Syslinux needs at least this amount to boot.  If you get'
-		db CR, LF
-		db 'this message in error, hold down the Ctrl key while'
-		db CR, LF
-		db 'booting, and I will take your word for it.', CR, LF, 0
+		db 'K of low ("DOS") RAM.', CR, LF
+		db 'This version of Syslinux needs '
+.need		db '000'
+		db 'K to boot.  If you get this', CR, LF
+		db 'message in error, hold down the Ctrl key while'
+		db 'booting, and I', CR, LF
+		db 'will take your word for it.', CR, LF, 0
 
 		section .text16
 ;



More information about the Syslinux-commits mailing list