Changeset 37 for trunk/TOOLS/DOS

Timestamp:

Apr 11, 2014, 8:39:07 PM (11 years ago)

Author:

Ben Rietbroek

Message:

Reworked Build Environment [2012-02-15]

WARNING!!

All commits upto and including the commit of [2012-05-13] contain
a severe bug!! Building from these sources and then disabling
the 'force LBA' feature while also using the drive-letter feature or
editing the label can DESTROY THE MBR on ALL ATTACHED DISKS!!
DO NOT DISABLE 'FORCE LBA USAGE' WHEN BUILT FROM THE THESE COMMITS!!

Changes

o Reworked build environment
o Start made with coding FIXCODE in C
o Moved MBR protection image
o New overlap macro
o Protect type 0x35 from edit (user popup)
o Protect type 0x35 from adding to menu (user popup)
o More...
! No LVM Label change yet

Note

o Changed license to GPL v3

See file COPYING in trunk.

Location:

trunk/TOOLS/DOS

Files:

• INITHDD/INITHDD.ASM (modified) (3 diffs)
• INITHDD/MAKE.BAT (modified) (1 diff)
• INITHDD/MAKE.CMD (copied) (copied from trunk/TOOLS/DOS/INITHDD/MAKE.BAT ) (1 diff)
• SETABOOT/MAKE.CMD (added)
• SETABOOT/SETABOOT.ASM (modified) (5 diffs)

trunk/TOOLS/DOS/INITHDD/INITHDD.ASM

@@ -17 +17 @@
 ;
 
-JUMPS
+;JUMPS
 
-Include ..\..\..\include\asm.inc
-;include ..\..\..\include\dos\airboot.inc
+Include ../../../INCLUDE/ASM.INC
 
                 .386p
-                model large, basic
+                .model large, basic
 
 code_seg        segment public use16
@@ -30 +29 @@
 air_boot_setup: jmp     INITHDD_Start
 
-Introduction:           db 'INITHDD - AiR-BOOT Initialize HDD Utility (DOS) - (c) 2004 by M. Kiewitz',13,10
+Introduction            db 'INITHDD - AiR-BOOT Initialize HDD Utility (DOS) - (c) 2004 by M. Kiewitz',13,10
                         db 0
 
@@ -69 +68 @@
    dw 00000h, 00000h, 00000h, 0AA55h
 
-;   Include ..\..\..\include\DOS\Const.asm
+;   Include ../../../INCLUDE\DOS\CONST.ASM
 
 INITHDD_Start:  mov     ax, cs

trunk/TOOLS/DOS/INITHDD/MAKE.BAT

@@ -8 +8 @@
 %exe2bin% inithdd.exe inithdd.com >nul
 if errorlevel 1 goto Failed
-copy inithdd.com ..\..\..\RELEASE\DOS\inithdd.com
+copy inithdd.com ..\..\..\RELEASE\DOS\INITHDD.COM
+
+@ren inithdd.LST inithdd.TSL
+@ren inithdd.TSL INITHDD.LST
 
 rem Cleanup

trunk/TOOLS/DOS/INITHDD/MAKE.CMD

@@ -1 +1 @@
 @echo off
 rem Do actual build...
-call ..\..\..\env\dos.bat
+call ..\..\..\env\os2.cmd
 %assembler% inithdd.asm
 if errorlevel 1 goto Failed
-%linker% inithdd.obj >nul
+%linker% inithdd.obj; >nul
 if errorlevel 1 goto Failed
 %exe2bin% inithdd.exe inithdd.com >nul
 if errorlevel 1 goto Failed
-copy inithdd.com ..\..\..\RELEASE\DOS\inithdd.com
+copy inithdd.com ..\..\..\RELEASE\DOS\INITHDD.COM
+
+@ren inithdd.LST inithdd.TSL
+@ren inithdd.TSL INITHDD.LST
 
 rem Cleanup

trunk/TOOLS/DOS/SETABOOT/SETABOOT.ASM

@@ -19 +19 @@
 JUMPS
 
-Include ..\..\..\Include\asm.inc
-include ..\..\..\include\dos\airboot.inc
+Include ../../../INCLUDE/ASM.INC
+include ../../../INCLUDE/DOS/AIRBOOT.INC
 
                 .386p
@@ -60 +60 @@
                         db ' detected.', 13, 10, 0
 
-   Include ..\..\..\include\dos\Const.asm
+   Include ../../../INCLUDE/DOS/CONST.ASM
 
 AiRBOOTdetected         db 0
@@ -343 +343 @@
                 ;  DL holds total IPT entries to go
                 ;  DH holds current partition number (base 0)
-                push    cx es di
+                push    cx
+                push    es
+                push    di
                    mov     ax, ds
                    mov     es, ax        ; ES == DS for now
@@ -351 +353 @@
                    mov     di, offset TrackZero+6E00h ; Starting at sector 56
                   CmdLine_RebootToSearchLoop:
-                      push    si di
+                      push    si
+                      push    di
                          add     di, 4   ; Seek to "PartitionName" item
                          mov     cx, bx
                          rep     cmpsb
-                      pop     di si
+                      pop     di
+                      pop     si
                       je      CmdLine_RebootToSearchDone
                       add     di, 34     ; Length of IPT entry
@@ -363 +367 @@
                   CmdLine_RebootToSearchDone:
                    mov     bl, ds:[di+17] ; Get "Flags"
-                pop     di es cx
+                pop     di
+                pop     es
+                pop     cx
                 or      dl, dl           ; If no partitions left -> not found
                 jz      CmdLine_RebootToNotFound