Changeset 30 for trunk/BOOTCODE/REGULAR/PARTSCAN.ASM

Timestamp:

May 6, 2011, 4:25:19 AM (14 years ago)

Author:

Ben Rietbroek

Message:

AiR-BOOT v1.07 -- As released with eCS v2.1. [2011-05-06]
Signature-date: 2006-03-13. (incorrect)
Trunk contains buildable v1.07 version as distributed with eCS v2.1.
Directory 'tags' contains v1.06 & v1.07 reference versions
built for all languages. Note that language ID for 'Dutch' changed
from 'DT' to 'NL' in v1.07 and that the v1.06 reference version also
uses 'NL' for 'Dutch'.
Also note that helper programs like the installer and setaboot are
are only modified for the OS/2 versions in v1.07.
The signature-date for v1.07 incorrectly states the same
date as for v1.06. The signature-version is correct.
Removed other binaries. (cd-rom images, old releases, etc.)
The tags serve as reference versions:

• v1.06: rebuilt from source. (tags/v1.06r)
• v1.07: built as released with eCS v2.1. (tags/v1.07r)

File:

• trunk/BOOTCODE/REGULAR/PARTSCAN.ASM (modified) (21 diffs)

trunk/BOOTCODE/REGULAR/PARTSCAN.ASM

@@ -20 +20 @@
 ;---------------------------------------------------------------------------
 
+
+IFDEF ModuleNames
+DB 'PARTSCAN',0
+ENDIF
+
 ; Note: This is complex code. So make sure that you know what you are doing in
 ;        here.
@@ -48 +53 @@
    mov     si, offset NewPartTable
    mov     di, offset PartitionTable
-   movzx   ax, NewPartitions
+   ;movzx   ax, NewPartitions
+   mov   al,NewPartitions
+   mov   ah,0
+
    mov     CFG_Partitions, al
    mov     bl, LocIPT_LenOfIPT
@@ -58 +66 @@
    mov     si, offset NewDriveLetters
    mov     di, offset DriveLetters
-   mov     cx, LocIPT_MaxPartitions/2
-   rep     movsw
+   mov     cx, LocIPT_MaxPartitions
+   rep     movsb
 
 ; [Linux support removed since v1.02]
@@ -82 +90 @@
    or      dl, dl
    jz      PSSFP_NoAutoDriveLetter
-   movzx   cx, CFG_Partitions
+   ;movzx   cx, CFG_Partitions
+   mov   cl,CFG_Partitions
+   mov   ch,0
+
    or      cx, cx
    jz      PSSFP_NoAutoDriveLetter
@@ -118 +129 @@
    mov     wptr [ExtendedAbsPos+2], ax
   PSSDFP_LoadThisPartition:
-   call    DriveIO_LoadPartition
+
+   call    DriveIO_LoadPartition                                                 ; Rousseau: load a partition record
+
    jc      PSSDFP_InvalidPartition
+
    ; LVM Support - Reads LVM Information Sector
-   call    DriveIO_LoadLVMSector
+   call    DriveIO_LoadLVMSector                                                 ; Rousseau: load LVM sector
+
    call    PARTSCAN_ScanPartition
    IFDEF ReleaseCode
@@ -223 +238 @@
    add     ax, wptr [CurPartition_Location+0] ; +Partition-Absolute
    adc     bx, wptr [CurPartition_Location+2] ;  sectors
-   call    DriveIO_LoadTmpSector         ; Loads Boot record
+   call    DriveIO_LoadTmpSector         ; Loads Boot record                     ; Rousseau: LOAD PARTITION BOOT RECORD !!
    ; Sets up DS:SI - TmpSector
 
@@ -249 +264 @@
    cmp     PartSystemID, 07h          ; We got IFS here?
    jne     PCCTP_IFSdone
-   ; Check, if 'JFS ' is at DWORD offset 36h
+   ; Check, if 'JFS ' is at DWORD offset 36h                                     ; Rousseau: JFS check (LVM / IPT?)
    cmp     wptr [si+36h], 'FJ'
    jne     PCCTP_IFSnoJFS
@@ -284 +299 @@
      PCCTP_HasVolumeLetter:
       ; Save VolumeLetter in separate table
-      movzx   bx, NewPartitions          ; NewPartitions is one behind here, so
+      ;movzx   bx, NewPartitions          ; NewPartitions is one behind here, so
+      mov   bl,NewPartitions          ; NewPartitions is one behind here, so
+      mov   bh,0
+
       mov     [PartitionVolumeLetters+bx], al ; it's already a zero-based offset
       ; Now copy VolumeID and VolumeName to temporary space
@@ -291 +309 @@
       stosw
       mov     ax, [si+LocLVM_PartitionID+2]
-      stosw                              ; Set Serial-Field to LVM-VolumeID
+      stosw
+                              ; Set Serial-Field to LVM-VolumeID
+      push     di
       add     si, LocLVM_PartitionName
+
       mov     cx, 5
       rep     movsw                      ; Copy LVM-PartitionName to Temp Space
-      movsb                              ;  (11 bytes in total)
+      movsb                               ;  (11 bytes in total)
+
+      pop   di
+      cmp   PartSystemID, 0ah
+
+      jne   PCCTP_NoIbmBm
+      mov   si, offset ibm_bm_name
+      mov   cx,5
+      rep   movsw
+      movsb
+
+
+
+   PCCTP_NoIbmBm:
+
+
    pop     di si dx ax
    mov     si, offset MBR_NoName_Patched
@@ -304 +340 @@
    pop     di si dx ax
    test    ah, FileSysFlags_NoName       ; No-Name-Flag ? -> No Partition Name
-   jnz     PCCTP_ThereIsNoName           ;                    available
+
+   jz      PCCTP_ThereIsAName
+   jmp     PCCTP_ThereIsNoName           ;                    available
+
+   PCCTP_ThereIsAName:
+
       ; We check for NTFS (got detected a little bit earlier in this routine)
       cmp     PartSystemID, 08h          ; We got IFS/NTFS here?
@@ -312 +353 @@
       add     si, 2Bh                    ; DS:SI - Partition-Name
       test    ah, FileSysFlags_FAT32     ; FAT32 specific name getting ?
+
       jz      PCCTP_ResumeNormal
+
       add     si, 1Ch                    ; Fix for FAT 32, shiat
      PCCTP_ResumeNormal:
       mov     cx, 11                     ;         11 bytes length
       call    PART_CheckForValidPartName
-      jnc     PCCTP_ThereIsNoName
+      jc    PCCTP_ThereIsAName2
+
+      jmp     PCCTP_ThereIsNoName
+
+   PCCTP_ThereIsAName2:
+
       sub     si, 4                      ; DS:SI -> Serial&Name (15-Bytes)
       xor     ah, ah                     ; no Flags_NoPartName
@@ -343 +391 @@
             repz    cmpsb
          pop     di si
-         je      PCCTP_Match
+
+         jne   PCCTP_NoMatchYet
+
+         jmp      PCCTP_Match
+
+      PCCTP_NoMatchYet:
+
         PCCTP_SerialNameAlreadyFound:
          add     di, LocIPT_LenOfIPT
@@ -477 +531 @@
      PCCTP_LocCompFailed:
       jmp     PCCTP_CompareFailed
-      
+
    ; ==================================
    ; =MATCH=, found partition in IPT...
@@ -557 +611 @@
    ; Calculate Pointer to IPT
    mov     di, offset NewPartTable       ; ES:DI - NewPartTable
-   movzx   ax, NewPartitions
+   ;movzx   ax, NewPartitions
+   mov   al,NewPartitions
+   mov   ah,0
+
    mov     bl, LocIPT_LenOfIPT
    mul     bl
@@ -575 +632 @@
    stosb
    mov     al, cl                        ; Partition-Flags from register...
-   stosb 
+   stosb
    mov     ax, PartCRC                   ; BootRecordCRC...
    stosw
@@ -620 +677 @@
 
    ; Calculate Size of this partition and put it into separate table...
-   movzx   ax, NewPartitions
+   ;movzx   ax, NewPartitions
+   mov   al,NewPartitions
+   mov   ah,0
+
    dec     ax
    mov     bx, ax
@@ -658 +718 @@
 ; Destroyed: None
 PARTSCAN_DefXref                Proc Near   Uses ax bx cx dx si di
-   movzx   bx, dl
+   ;movzx   bx, dl
+   mov   bl,dl
+   mov   bh,0
+
    mov     bptr [PartitionXref+bx], dh      ; X-Reference
    ; Copy Hide-Config of IPT partition to new location in new table
@@ -673 +736 @@
    rep     movsb                            ; Copy Hide-Config to NewHideTable
    ; Process Logical-Drive-Letter table as well...
-   movzx   bx, dl
+   ;movzx   bx, dl
+   mov   bl,dl
+   mov   bh,0
+
    mov     al, bptr [DriveLetters+bx]       ; Get Drv-Letter from org. pos
-   movzx   bx, dh
+   ;movzx   bx, dh
+   mov   bl,dl
+   mov   bh,0
+
    mov     bptr [NewDriveLetters+bx], al    ; Put Drv-Letter to new pos
    ret
@@ -684 +753 @@
 ; Destroyed: None
 PARTSCAN_GetXref                Proc Near   Uses bx
-   movzx   bx, dl
+   ;movzx   bx, dl
+   mov   bl,dl
+   mov   bh,0
+
    mov     dh, bptr [PartitionXref+bx]      ; X-Reference
    ret
@@ -702 +774 @@
          cmp     al, 0FFh
          je      PSSHCWX_SyncEmpty
-         movzx   bx, al
+         ;movzx   bx, al
+         mov   bl,al
+         mov   bh,0
+
          mov     al, [PartitionXref+bx]     ; Translate it
          cmp     al, 0FFh
@@ -729 +804 @@
    ret
 PARTSCAN_SyncHideConfigWithXref EndP
+
+ibm_bm_name:   db 'IBM BootMan',0