Changeset 40 for trunk/BOOTCODE/REGULAR/DRIVEIO.ASM

Timestamp:

Apr 11, 2014, 9:58:17 PM (11 years ago)

Author:

Ben Rietbroek

Message:

Converting to JWasm -- phase 3 (not working) [2012-02-16]

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!!

Problems

o Problem with location of BSS
o Problem with segments

Info

o Adjusted DISCLAIM.TXT

File:

• trunk/BOOTCODE/REGULAR/DRIVEIO.ASM (modified) (10 diffs)

trunk/BOOTCODE/REGULAR/DRIVEIO.ASM

@@ -153 +153 @@
 
 DriveIO_GetHardDriveCount       Proc Near   Uses ds si
-   push    ds si
+   push    ds
+   push    si
       push    0040h
       pop     ds
       mov     si, 0075h
       mov     dh, ds:[si]                ; 40:75 -> POST: Total Harddiscs == DL
-   pop     si ds
+   pop     si
+   pop     ds
    mov     TotalHarddiscs, dh
    ret
@@ -173 +175 @@
    mov     dl, 80h
   DIOILUT_DriveLoop:
-      push    dx di
+      push    dx
+      push    di
          mov     ah, 08h
          int     13h            ; DISK - GET DRIVE PARAMETERS
@@ -190 +193 @@
                                 ;  bit 16-23 of the LBA address
         DIOILUT_Error:
-      pop     di dx
+      pop     di
+      pop     dx
       mov     bptr ds:[di], ah  ; Save that value
       inc     di                ; Go to next BYTE
@@ -206 +210 @@
 ; Rousseau: Enhanced to handle sector-numbers 127 and 255 besides 63 for LVM-info sectors.
 ;           Ugly, need to cleanup.
-DriveIO_LVMAdjustToInfoSector   Proc Near   Uses
+DriveIO_LVMAdjustToInfoSector   Proc Near
 
 
@@ -471 +475 @@
 DriveIO_LVMAdjustToInfoSector   EndP
 
-drive:                  db 'drive                    : ',0
-before_lvm_adjust:      db 'before lvm adjust        : ',0
-after_lvm_adjust:       db 'after lvm adjust         : ',0
-before_lvm_adjust_log:  db 'before lvm logical adjust: ',0
-after_lvm_adjust_log:   db 'after lvm logical adjust : ',0
-spt_used:               db 'spt used                 : ',0
+drive                   db 'drive                    : ',0
+before_lvm_adjust       db 'before lvm adjust        : ',0
+after_lvm_adjust        db 'after lvm adjust         : ',0
+before_lvm_adjust_log   db 'before lvm logical adjust: ',0
+after_lvm_adjust_log    db 'after lvm logical adjust : ',0
+spt_used                db 'spt used                 : ',0
 
 
@@ -551 +555 @@
 
 ; Keeps DS:SI for caller
-DriveIO_LoadTmpSector           Proc Near  Uses
+DriveIO_LoadTmpSector           Proc Near
    mov     si, offset TmpSector
    call    DriveIO_LoadSector                                                    ; Uses INT13X if needed
@@ -558 +562 @@
 
 ; Keeps DS:SI for caller
-DriveIO_SaveTmpSector           Proc Near  Uses
+DriveIO_SaveTmpSector           Proc Near
    mov     si, offset TmpSector
    call    DriveIO_SaveSector
@@ -626 +630 @@
 
 ; Memory-Block that holds information for LBA-access via INT 13h
-DriveIO_DAP:               db       10h  ; Size of paket
+DriveIO_DAP                db       10h  ; Size of paket
                            db        0   ; Reserved
 DriveIO_DAP_NumBlocks      dw        0   ; Number of blocks
@@ -652 +656 @@
    mov     bptr [si+5], dl
    call    MBR_Teletype
-   jmp     MBRLE_Halt
+
+   ; JWasm: cannot jump to local label in procedure.
+   ; Changed to halt here.
+   ;jmp     MBRLE_Halt
+  DriveIO_GotLoadError_halt:
+   jmp     DriveIO_GotLoadError_halt
 DriveIO_GotLoadError            EndP
 
@@ -1237 +1246 @@
 
 ; Values for sectors per track table corresponding to DriveIO_IsHugeDrive return value.
-secs_per_track_table:   db    63,127,255,255,255,255
+secs_per_track_table    db    63,127,255,255,255,255
 
 ;db_lmlvm:   db 'Load Master LVM -- disk: ',0