[haiku-commits] haiku: hrev48146 - src/apps/bootmanager
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 29 Oct 2014 12:52:28 +0100 (CET)
hrev48146 adds 2 changesets to branch 'master'
old head: 7ca277b9caaec8e873309354e3c7fe8453c34b64
new head: 7c5dfbad751d064607adfb947200426d16c04298
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7c5dfba+%5E7ca277b
----------------------------------------------------------------------------
74a1496: bootman: fix warning
macro `SECTION' exists, but not taking 0 parameters
7c5dfba: bootman: Fix warnings
warning: label alone on a line without a colon might be in error
Doesn't change the produced binary.
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 7 insertions(+), 7 deletions(-)
src/apps/bootmanager/bootman.S | 14 +++++++-------
############################################################################
Commit: 74a14969eca780b3182182044406a6934885a381
URL: http://cgit.haiku-os.org/haiku/commit/?id=74a1496
Author: François Revol <revol@xxxxxxx>
Date: Wed Oct 29 11:46:26 2014 UTC
bootman: fix warning
macro `SECTION' exists, but not taking 0 parameters
----------------------------------------------------------------------------
diff --git a/src/apps/bootmanager/bootman.S b/src/apps/bootmanager/bootman.S
index 7c17852..3705c08 100644
--- a/src/apps/bootmanager/bootman.S
+++ b/src/apps/bootmanager/bootman.S
@@ -153,7 +153,7 @@
%strlen SELECT_OS_MESSAGE_LENGTH SELECT_OS_MESSAGE
; 16 bit code
-SECTION
+SECTION .text
BITS 16
############################################################################
Revision: hrev48146
Commit: 7c5dfbad751d064607adfb947200426d16c04298
URL: http://cgit.haiku-os.org/haiku/commit/?id=7c5dfba
Author: François Revol <revol@xxxxxxx>
Date: Wed Oct 29 11:51:10 2014 UTC
bootman: Fix warnings
warning: label alone on a line without a colon might be in error
Doesn't change the produced binary.
----------------------------------------------------------------------------
diff --git a/src/apps/bootmanager/bootman.S b/src/apps/bootmanager/bootman.S
index 3705c08..b296035 100644
--- a/src/apps/bootmanager/bootman.S
+++ b/src/apps/bootmanager/bootman.S
@@ -204,7 +204,7 @@ cursorPosition equ cursorX
push dx
xor bh, bh
; write on page 0
jmp .loop_condition
-.loop
+.loop:
mov dx, [bp + cursorPosition]
mov ah, SET_CURSOR
int BIOS_VIDEO_SERVICES
@@ -214,7 +214,7 @@ cursorPosition equ cursorX
mov cx, 1
mov ah, WRITE_CHAR
int BIOS_VIDEO_SERVICES
-.loop_condition
+.loop_condition:
lodsb
cmp al, 0
jnz .loop
@@ -342,9 +342,9 @@ kStage1UnusedSpace equ 440 - ($-$$)
kDiskSignature:
dw 0, 0
-kReserved
+kReserved:
dw 0
-kPartitionTable
+kPartitionTable:
times 64 db 0
kMBRSignature:
@@ -506,7 +506,7 @@ updateMarker:
cmp cx, [bp + selection]
je .print
mov al, ' '
; Clear marker
-.print
+.print:
mov bl, WHITE
jmp printChar
; return from subroutine
@@ -523,7 +523,7 @@ bootSelectedPartition:
mov di, bootSectorDAP+AddressPacket.offset ; Copy start
sector
mov cx, 4
; It is stored in a quad word
-.copy_start_sector
+.copy_start_sector:
lodsw
stosw
loop .copy_start_sector
Other related posts:
- » [haiku-commits] haiku: hrev48146 - src/apps/bootmanager - revol
