Changeset 566 in xtideuniversalbios for trunk/Assembly_Library

Timestamp:

Aug 29, 2013, 12:49:15 AM (11 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes to XTIDE Universal BIOS:

• Fixed a very old bug (from r150) in IdeError.asm where GetBiosErrorCodeToAHfromStatusAndErrorRegistersInAX would return RET_HD_SEEK_FAIL instead of RET_HD_STATUSERR.
• Optimizations and other fixes.

Location:

trunk/Assembly_Library

Files:

• Inc/Macros.inc (modified) (1 diff)
• Src/Serial/SerialServer.asm (modified) (6 diffs)

trunk/Assembly_Library/Inc/Macros.inc

@@ -1 +1 @@
 ; Project name  :   Assembly Library
 ; Description   :   This is the place to put various generic macros.
-;                   Should be included immediately after emulate.inc
+;                   Should be included immediately after Emulate.inc
 %ifndef MACROS_INC
 %define MACROS_INC

trunk/Assembly_Library/Src/Serial/SerialServer.asm

@@ -92 +92 @@
 
         mov     al,047h
-        inc     dx              ;  fifo
+        inc     dx              ; fifo
         out     dx,al
 
         mov     al,03h
-        inc     dx              ;  linecontrol
+        inc     dx              ; linecontrol
         out     dx,al
 
         mov     al,0bh
-        inc     dx              ;  modemcontrol
-        out     dx,al
-
-        inc     dx              ;  linestatus (no output now, just setting up BH for later use)
+        inc     dx              ; modemcontrol
+        out     dx,al
+
+        inc     dx              ; linestatus (no output now, just setting up BH for later use)
         mov     bh,dl
 
@@ -158 +158 @@
         mov     cx,0101h        ; writing 256 words (plus 1)
 
-        shr     ah,1            ; command byte, are we doing a write?
+        sahf                    ; command byte, are we doing a write?
         jnc     .readEntry
 
@@ -285 +285 @@
 ; taken care of this, but I have seen cases where this is not true.
 ;
-        xor     cx,cx                   ; timeout this clearing routine, in case the UART isn't there
+        xor     cx,cx           ; timeout this clearing routine, in case the UART isn't there
 .clearBuffer:
         mov     dl,bh
@@ -294 +294 @@
         test    al,1
         in      al,dx
-        loopnz  .clearBuffer            ; note ZF from test above
+        loopnz  .clearBuffer    ; note ZF from test above
 
 .clearBufferComplete:
-        mov     al, 3           ;  error return code and CF (low order bit)
+        mov     al, 1           ; error return code
 
 ALIGN JUMP_ALIGN
 SerialServer_OutputWithParameters_ReturnCodeInAL:
 %if 0
-        sti                     ;  all paths here will already have interrupts turned back on
-%endif
-        mov     ah, al          ;  for success, AL will already be zero
-
-        pop     bx              ;  recover "ax" (command and count) from stack
-        pop     cx              ;  recover saved sector count
+        sti                     ; all paths here will already have interrupts turned back on
+%endif
+        mov     ah, al          ; for success, AL will already be zero
+
+        pop     bx              ; recover "ax" (command and count) from stack
+        pop     cx              ; recover saved sector count
         xor     ch, ch
         sub     cl, bl          ; subtract off the number of sectors that remained
@@ -315 +315 @@
         pop     si
 
-        shr     ah, 1           ; shift down return code and CF
+        sahf                    ; error return code to CF
 
         ret
@@ -440 +440 @@
 ;
         sti
+%ifndef SERIALSERVER_TIMER_LOCATION
         mov     cl,SerialServer_WaitAndPoll_SoftDelayTicks
-%ifndef SERIALSERVER_TIMER_LOCATION
         call    Timer_InitializeTimeoutWithTicksInCL
 %else