Changeset 26 for trunk/AIR-BOOT/SOURCE/REGULAR

Timestamp:

Mar 12, 2003, 8:51:14 AM (23 years ago)

Author:

kiewitz

Message:

Updated several Sources.
Note: This comment was created after rebuilding the repo. [2011-07]

Location:

trunk/AIR-BOOT/SOURCE/REGULAR

Files:

• DRIVEIO.ASM (modified) (6 diffs)
• PARTSCAN.ASM (modified) (4 diffs)

trunk/AIR-BOOT/SOURCE/REGULAR/DRIVEIO.ASM

@@ -118 +118 @@
 ; =============================================================================
 ;  The following routines are used for harddisc/floppy access.
-;  The access is done via BIOS INT 13h or BIOS/Extensions.
-;  Access will be done prefered by INT 13h, because it's (I wonder!) much
+;  The access is done via INT 13h/CHS or INT 13h/LBA.
+;  Access will be done prefered by INT 13h/CHS, because it's (I wonder!) much
 ;   faster, than the LBA-method. I don't know, why LBA is so slow. Perhaps BIOS.
 ;
-;  Internal access (to AiR-BOOT) is always done via INT 13h.
+;  Internal access (to AiR-BOOT) is always done via INT 13h/CHS.
 
 Comment *ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
@@ -133 +133 @@
  ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ*
 DriveIO_LoadPartition           Proc Near  Uses ds si
+   int 3
    mov     wptr cs:[CurPartition_Location+0], ax
    mov     wptr cs:[CurPartition_Location+2], bx
@@ -139 +140 @@
    push    ExecBaseSeg
    pop     ds
-   mov     si, ExecBasePtr           ; DS:SI - ExecBase
+   mov     si, ExecBasePtr               ; DS:SI - ExecBase
    call    DriveIO_LoadSector
    clc
    cmp     word ptr ds:[si+LocBR_Magic], 0AA55h
    je      DIOLP_Success
-   stc
+   ; We check, if we are scanning partitions. In that case, if CHS is not 0/0/1
+   ;  we will display a "bad partition table" message and halt the system.
+   cmp     cx, 0001h
+   jne     DIOLP_Failed
+   or      dh, dh
+   jnz     DIOLP_Failed
+   stc                                   ; Set carry, so no partition table
   DIOLP_Success:
    ret
+  DIOLP_Failed:
+   jmp     DriveIO_GotLoadError
 DriveIO_LoadPartition           EndP
 
@@ -193 +202 @@
 DriveIO_DAP_Absolute       dd        0   ; Absolute Sector
                            dd        0   ; Second Part of QWORD
+
+; Special error message instead of "LOAD ERROR" during partition scanning,
+;  so users will notice that something is bad with their partition table(s)
+DriveIO_GotLoadError            Proc Near
+   test    cs:CurIO_Scanning, 1          ; Must be CS:, cause DS!=CS here
+   jnz     InScanMode
+   jmp     MBR_LoadError
+  InScanMode:   
+   mov     si, offset TXT_BrokenPartitionTable
+   push    cs
+   pop     ds
+   call    MBR_Teletype
+   jmp     MBRLE_Halt
+DriveIO_GotLoadError            EndP
 
 Comment *ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
@@ -223 +246 @@
       dec     di
       jnz     DIOLS_ErrorLoop
-      call    MBR_LoadError
+      ; Sector load failed...
+      jmp     DriveIO_GotLoadError
 
   DIOLS_UseExtension:
@@ -240 +264 @@
    pop     cx
    jnc     DIOLS_Success
-   call    MBR_LoadError
+   ; Sector load failed...
+   jmp     DriveIO_GotLoadError
 
   DIOLS_Success:

trunk/AIR-BOOT/SOURCE/REGULAR/PARTSCAN.ASM

@@ -20 +20 @@
 ;---------------------------------------------------------------------------
 
-; Note: This is complex code. Also some of this functions have DS != CS, so
+; Note: This is complex code. Also some of these functions have DS != CS, so
 ;        make sure that you know what you are doing in here.
 
@@ -37 +37 @@
    mov     NewPartitions, al
 
+   mov     CurIO_Scanning, 1             ; Set flag due scanning partitions
    mov     dl, 80h                       ; is first harddisc
   PSSFP_HarddiscLoop:
@@ -45 +46 @@
    dec     dh
    jnz     PSSFP_HarddiscLoop
+   mov     CurIO_Scanning, 0             ; Reset flag due scanning complete
 
    ; Use X-Reference to sync NewPartitionTable with Hide-Config
@@ -79 +81 @@
    loop    PSSFP_LinuxLoop
   PSSFP_NoPartitions:
-   mov     GotLinux, dl             ; Set Flag
+   mov     GotLinux, dl                  ; Set Flag
 
    ; ...and finally check, if we need to set a Drive-Letter