Changeset 294 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device


Ignore:
Timestamp:
Mar 4, 2012, 1:35:10 AM (13 years ago)
Author:
krille_n_@…
google:author:
krille_n_@hotmail.com
Message:

Commit 2/2 (BIOS):

  • Fixed a bug in AH1h_HStatus.asm.
  • Minor optimizations.
  • Fixed spelling and did some cleaning.
Location:
trunk/XTIDE_Universal_BIOS/Src/Device
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/XTIDE_Universal_BIOS/Src/Device/Device.asm

    r268 r294  
    66
    77
    8 %macro TEST_USIGN_DPT_AND_JUMP_IF_SERIAL_DEVICE 1
     8%macro TEST_USING_DPT_AND_JUMP_IF_SERIAL_DEVICE 1
    99    test    BYTE [di+DPT.bFlagsHigh], FLGH_DPT_SERIAL_DEVICE
    1010    jnz     SHORT %1
     
    4242    CMP_USING_IDEVARS_IN_CSBP_AND_JUMP_IF DEVICE_SERIAL_PORT, .FinalizeDptForSerialPortDevice
    4343    jmp     IdeDPT_Finalize
    44 .FinalizeDptForSerialPortDevice: 
     44.FinalizeDptForSerialPortDevice:
    4545    jmp     SerialDPT_Finalize
    4646
     
    6363    %ifdef MODULE_SERIAL                ; IDE + JR-IDE/ISA + Serial
    6464    Device_ResetMasterAndSlaveController:
    65         TEST_USIGN_DPT_AND_JUMP_IF_SERIAL_DEVICE ReturnSuccessForSerialPort
     65        TEST_USING_DPT_AND_JUMP_IF_SERIAL_DEVICE ReturnSuccessForSerialPort
    6666        CMP_USING_DPT_AND_JUMP_IF_JRIDE_DEVICE .ResetJrIDE
    6767        jmp     IdeCommand_ResetMasterAndSlaveController
     
    7575%elifdef MODULE_SERIAL                  ; IDE + Serial
    7676Device_ResetMasterAndSlaveController:
    77     TEST_USIGN_DPT_AND_JUMP_IF_SERIAL_DEVICE ReturnSuccessForSerialPort
     77    TEST_USING_DPT_AND_JUMP_IF_SERIAL_DEVICE ReturnSuccessForSerialPort
    7878    jmp     IdeCommand_ResetMasterAndSlaveController
    7979
     
    152152    %ifdef MODULE_SERIAL                ; IDE + JR-IDE/ISA + Serial
    153153    Device_OutputCommandWithParameters:
    154         TEST_USIGN_DPT_AND_JUMP_IF_SERIAL_DEVICE .OutputCommandToSerialPort
     154        TEST_USING_DPT_AND_JUMP_IF_SERIAL_DEVICE .OutputCommandToSerialPort
    155155        CMP_USING_DPT_AND_JUMP_IF_JRIDE_DEVICE .OutputCommandToJrIDE
    156156        jmp     IdeCommand_OutputWithParameters
     
    164164%elifdef MODULE_SERIAL                  ; IDE + Serial
    165165Device_OutputCommandWithParameters:
    166     TEST_USIGN_DPT_AND_JUMP_IF_SERIAL_DEVICE .OutputCommandToSerialPort
     166    TEST_USING_DPT_AND_JUMP_IF_SERIAL_DEVICE .OutputCommandToSerialPort
    167167    jmp     IdeCommand_OutputWithParameters
    168168
     
    198198    %ifdef MODULE_SERIAL                ; IDE + JR-IDE/ISA + Serial
    199199    Device_SelectDrive:
    200         TEST_USIGN_DPT_AND_JUMP_IF_SERIAL_DEVICE ReturnSuccessForSerialPort
     200        TEST_USING_DPT_AND_JUMP_IF_SERIAL_DEVICE ReturnSuccessForSerialPort
    201201        CMP_USING_DPT_AND_JUMP_IF_JRIDE_DEVICE .SelectJrIdeDrive
    202202        jmp     IdeCommand_SelectDrive
     
    210210%elifdef MODULE_SERIAL                  ; IDE + Serial
    211211Device_SelectDrive:
    212     TEST_USIGN_DPT_AND_JUMP_IF_SERIAL_DEVICE ReturnSuccessForSerialPort
     212    TEST_USING_DPT_AND_JUMP_IF_SERIAL_DEVICE ReturnSuccessForSerialPort
    213213    jmp     IdeCommand_SelectDrive
    214214
  • trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeCommand.asm

    r285 r294  
    130130    ; Output Sector Address High (only used by LBA48)
    131131%ifdef MODULE_EBIOS
    132     eMOVZX  ax, BYTE [bp+IDEPACK.bLbaLowExt]    ; Zero sector count
     132    eMOVZX  ax, [bp+IDEPACK.bLbaLowExt]     ; Zero sector count
    133133    mov     cx, [bp+IDEPACK.wLbaMiddleAndHighExt]
    134134    call    IDEDEVICE%+OutputSectorCountAndAddress
  • trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeError.asm

    r267 r294  
    2323
    2424%ifndef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS    ; JR-IDE/ISA
    25     jmp     ContinueFromMemIdeError
     25    jmp     ContinueFromMemIdeError     ; What's this supposed to do? *FIXME*
    2626%else
    2727ContinueFromMemIdeError:
  • trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeTransfer.asm

    r251 r294  
    5454;       AH:     BIOS Error code
    5555;       CX:     Number of successfully transferred sectors
    56 ;       CF:     0 if transfer succesfull
     56;       CF:     0 if transfer successful
    5757;               1 if any error
    5858;   Corrupts registers:
     
    121121;       AH:     BIOS Error code
    122122;       CX:     Number of successfully transferred sectors
    123 ;       CF:     0 if transfer succesfull
     123;       CF:     0 if transfer successful
    124124;               1 if any error
    125125;   Corrupts registers:
  • trunk/XTIDE_Universal_BIOS/Src/Device/MemoryMappedIDE/MemIdeTransfer.asm

    r267 r294  
    6464;       AH:     BIOS Error code
    6565;       CX:     Number of successfully transferred sectors
    66 ;       CF:     0 if transfer succesfull
     66;       CF:     0 if transfer successful
    6767;               1 if any error
    6868;   Corrupts registers:
     
    125125;       AH:     BIOS Error code
    126126;       CX:     Number of successfully transferred sectors
    127 ;       CF:     0 if transfer succesfull
     127;       CF:     0 if transfer successful
    128128;               1 if any error
    129129;   Corrupts registers:
Note: See TracChangeset for help on using the changeset viewer.