Merge remote-tracking branch 'upstream/master'

[cc65] / libsrc / serial / ser_unload.s

diff --git a/libsrc/serial/ser_unload.s b/libsrc/serial/ser_unload.s
index 70e8abbd51f278c395c2b4f6d5f88a90acf158f6..bf7201255cd5bec0c82ce09ec1d4ff7eca475bc3 100644 (file)
--- a/libsrc/serial/ser_unload.s
+++ b/libsrc/serial/ser_unload.s
@@ -1,36 +1,37 @@
 ;
 ; Ullrich von Bassewitz, 2003-04-15
 ;
-; unsigned char __fastcall__ ser_unload (void);
+; unsigned char ser_unload (void);
 ; /* Unload the currently loaded driver. */
 
 
-        .import         ser_clear_ptr
-
         .include        "ser-kernel.inc"
         .include        "ser-error.inc"
         .include        "modload.inc"
 
+        .import         ser_clear_ptr
+        .import         return0
+
+
 
 _ser_unload:
-       lda     _ser_drv
-       ora     _ser_drv+1
-               beq     no_driver               ; No driver
-
-       lda     _ser_drv
-       pha
-       lda     _ser_drv+1
-       pha                             ; Save pointer to driver
-
-               jsr     _ser_uninstall          ; Deinstall the driver
-                
-       pla
-       tax     
-       pla                             ; Get pointer to driver
-        jmp    _mod_free               ; Free the driver
+        lda     _ser_drv
+        pha                             ; Save pointer to driver
+        ora     _ser_drv+1
+        beq     no_driver               ; No driver
+        lda     _ser_drv+1
+        pha
 
-no_driver:
-               tax                             ; X = 0
-       lda     #<SER_ERR_NO_DRIVER
-       rts
+        jsr     _ser_uninstall          ; Uninstall the driver
 
+        pla
+        tax
+        pla                             ; Get pointer to driver
+        jsr     _mod_free               ; Free the driver
+        jmp     return0                 ; Return SER_ERR_OK
+
+no_driver:
+        tax                             ; X = 0
+        pla                             ; Remove pushed junk
+        lda     #<SER_ERR_NO_DRIVER
+        rts