Ignore:
Timestamp:
Apr 12, 2014, 8:23:32 AM (11 years ago)
Author:
Ben Rietbroek
Message:

Various Changes [2012-04-14]

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 Added BLDLEVEL support
o Enhanced Master Make
o Sanitized sources
o Support for Wasm and Masm6 (experimental)
o Renamed MBR_PROT.ASM to MBR-PROT.ASM
o Merged bitfield code Into Installer
o First steps for cross platform Installer
o More...

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/BOOTCODE/REGULAR/PARTMAIN.ASM

    r45 r46  
    8181   cmp     dl, 0FEh                      ; Resume-BIOS?
    8282   ja      PFUPN_SpecialSelectionFloppy
    83    cmp     CFG_ResumeBIOSbootSeq, 0
     83   cmp     byte ptr [CFG_ResumeBIOSbootSeq], 0
    8484   je      PFUPN_SelectionGone
    8585   jmp     PFUPN_Found
    8686  PFUPN_SpecialSelectionFloppy:
    87    cmp     CFG_IncludeFloppy, 0
     87   cmp     byte ptr [CFG_IncludeFloppy], 0
    8888   je      PFUPN_SelectionGone
    8989   jmp     PFUPN_Found
    … …  
    192192   mov     si, offset PartitionTable
    193193   mov     bx, offset PartitionPointers
    194    test    CFG_IncludeFloppy, 1
     194   test    byte ptr [CFG_IncludeFloppy], 1
    195195   jz      PCMPP_NoFloppyInclude
    196196   mov     ax, offset FloppyIPTentry
    … …  
    199199  PCMPP_NoFloppyInclude:
    200200
    201    test    CFG_ResumeBIOSbootSeq, 0FFh
     201   test    byte ptr [CFG_ResumeBIOSbootSeq], 0FFh
    202202   jz      PCMPP_NoResumeBootSeqInclude
    203203   mov     ax, offset BIOScontIPTentry
    … …  
    920920   ; BX:AX -> Absolute End-Position of Partition
    921921
    922    test    CFG_ForceLBAUsage, 1
     922   test    byte ptr [CFG_ForceLBAUsage], 1
    923923   jnz     PSP_ForceI13X
    924924   ; LBA-boundary at 16450560 (FB0400h) (16320x16x63)
    … …  
    942942        ; Insert signature
    943943        xor     di, di
    944         mov     wptr es:[di+00], '1I'
    945         mov     wptr es:[di+02], 'X3'
     944        mov     word ptr es:[di+00], '1I'
     945        mov     word ptr es:[di+02], 'X3'
    946946
    947947        ;mov     wptr es:[di], 0
    … …  
    949949
    950950        ; Insert LBA address.
    951         mov     ax, wptr [si+LocIPT_AbsoluteBegin+0]
    952         mov     wptr es:[di+04], ax
    953         mov     ax, wptr [si+LocIPT_AbsoluteBegin+2]
    954         mov     wptr es:[di+06], ax
     951        mov     ax, [si+LocIPT_AbsoluteBegin+0]
     952        mov     es:[di+04], ax
     953        mov     ax, [si+LocIPT_AbsoluteBegin+2]
     954        mov     es:[di+06], ax
    955955
    956956        pop     si
    … …  
    10301030  PSP_NoHideFeature:
    10311031   ; Check, if we are supposed to ignore LVM altogether...
    1032    test    [CFG_IgnoreLVM], 1
     1032   test    byte ptr [CFG_IgnoreLVM], 1
    10331033   jnz     PSP_NoLVMReassignment
    10341034   ; --------------------------------------------------------- LVM REASSIGNMENT
    … …  
    10561056   call    MSHACK_ProcessPartTables
    10571057
    1058    test    CFG_BootMenuActive, 0FFh
     1058   test    byte ptr [CFG_BootMenuActive], 0FFh
    10591059   jz      PSP_NoMenuNoSound
    10601060
    … …  
    10651065   ; -------------------------------------------------- SPECIAL BOOT PROCESSING
    10661066   ; Check here, if the Boot shall be done via resume to BIOS...
    1067    mov     al, bptr [si+LocIPT_SystemID]
     1067   mov     al, byte ptr [si+LocIPT_SystemID]
    10681068   cmp     al, 0FEh                      ; Via BIOS ? (aka resume BIOS boot sequence)
    10691069   je      PSP_ResumeBIOSbootSeq
    … …  
    11411141  is_harddisk:
    11421142
    1143    test    CFG_DetectVIBR, 1
     1143   test    byte ptr [CFG_DetectVIBR], 1
    11441144   jz      PSP_NoVIBR
    11451145   test    byte ptr [si+LocIPT_Flags], Flags_VIBR_Detection
    … …  
    11661166
    11671167 PSP_NoVIBR:
    1168    test    CFG_ProtectMBR, 1
     1168   test    byte ptr [CFG_ProtectMBR], 1
    11691169   jz      PSP_NoMBRprotect
    11701170   ; -------------------------------------------------- INSTALLS MBR-PROTECTION
Note: See TracChangeset for help on using the changeset viewer.