Changeset 46 for trunk/BOOTCODE/SPECIAL/LVM.ASM

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:

• trunk/BOOTCODE/SPECIAL/LVM.ASM (modified) (4 diffs)

trunk/BOOTCODE/SPECIAL/LVM.ASM

@@ -85 +85 @@
 LVM_GetSectorCRC                EndP
 
-; Checks DS:[SI], if a valid LVM Signature is found (sets carry in that case)
+; Checks ds:[SI], if a valid LVM Signature is found (sets carry in that case)
 ;  This does not check for valid LVM CRC (which also needs to be done)
 ;        In: DS:SI - Sector that needs to get checked...
@@ -91 +91 @@
 ; Destroyed: None
 LVM_CheckSectorSignature        Proc Near
-   test    [CFG_IgnoreLVM], 1            ; We are supposed to ignore LVM, so
+   test    byte ptr [CFG_IgnoreLVM], 1            ; We are supposed to ignore LVM, so
    jnz     LVMCSS_InvalidSignature       ;  any sector is bad!
-   cmp     wptr [si+LocLVM_SignatureStart], 5202h                                ; Rousseau: identify LVM sector
+   cmp     word ptr [si+LocLVM_SignatureStart], 5202h                                ; Rousseau: identify LVM sector
    jne     LVMCSS_InvalidSignature
-   cmp     wptr [si+LocLVM_SignatureStart+2], 'BM'
+   cmp     word ptr [si+LocLVM_SignatureStart+2], 'BM'
    jne     LVMCSS_InvalidSignature
-   cmp     wptr [si+LocLVM_SignatureStart+4], 'MP'
+   cmp     word ptr [si+LocLVM_SignatureStart+4], 'MP'
    jne     LVMCSS_InvalidSignature
-   cmp     wptr [si+LocLVM_SignatureStart+6], 'DF'
+   cmp     word ptr [si+LocLVM_SignatureStart+6], 'DF'
    jne     LVMCSS_InvalidSignature
    stc
@@ -115 +115 @@
 LVM_CheckSectorCRC              Proc Near   Uses ax dx
    call    LVM_GetSectorCRC
-   cmp     ax, wptr [si+LocLVM_CRC]
+   cmp     ax, word ptr [si+LocLVM_CRC]
    jne     LVMCSCRC_BadCRC
-   cmp     dx, wptr [si+LocLVM_CRC+2]
+   cmp     dx, word ptr [si+LocLVM_CRC+2]
    jne     LVMCSCRC_BadCRC
    stc
@@ -133 +133 @@
 LVM_UpdateSectorCRC            Proc Near   Uses ax dx
    call    LVM_GetSectorCRC
-   mov     wptr [si+LocLVM_CRC], ax
-   mov     wptr [si+LocLVM_CRC+2], dx
+   mov     word ptr [si+LocLVM_CRC], ax
+   mov     word ptr [si+LocLVM_CRC+2], dx
    ret
 LVM_UpdateSectorCRC            EndP