From 3fc074014ef780b7e0ed9d48817fd3c1473afa0f Mon Sep 17 00:00:00 2001
From: Colin Leroy-Mira <colin@colino.net>
Date: Tue, 12 Sep 2023 20:54:32 +0200
Subject: [PATCH] Serial kernel: Fix driver lifecycle

- Make sure we don't install a driver on top of another one
- Make sure we don't uninstall a driver twice
- Make sure we uninstall a driver if needed at exit
---
 doc/funcref.sgml           |  3 ++-
 libsrc/serial/ser-kernel.s | 22 ++++++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 5fa1720e4..12b45db2b 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -6693,7 +6693,8 @@ be used in presence of a prototype.
 <tag/Function/Uninstall the currently loaded driver but do not unload it.
 <tag/Header/<tt/<ref id="serial.h" name="serial.h">/
 <tag/Declaration/<tt/unsigned char ser_uninstall (void);/
-<tag/Description/Uninstall the currently loaded driver but do not unload it.
+<tag/Description/Uninstall the currently loaded driver but do not unload it. This
+function returns SER_ERR_NO_DRIVER if no driver was installed, 0 otherwise.
 <tag/Availability/cc65
 <tag/See also/Other serial functions.
 <tag/Example/None.
diff --git a/libsrc/serial/ser-kernel.s b/libsrc/serial/ser-kernel.s
index b6c57a3b5..1514bcf77 100644
--- a/libsrc/serial/ser-kernel.s
+++ b/libsrc/serial/ser-kernel.s
@@ -7,6 +7,7 @@
         .import         return0, ser_libref
         .importzp       ptr1
         .interruptor    ser_irq, 29     ; Export as high priority IRQ handler
+        .destructor     _ser_uninstall
 
         .include        "ser-kernel.inc"
         .include        "ser-error.inc"
@@ -44,7 +45,16 @@ ser_sig:        .byte   $73, $65, $72, SER_API_VERSION  ; "ser", version
 
 
 _ser_install:
-        sta     _ser_drv
+        ldy     _ser_drv                ; Check no driver is installed
+        bne     ErrInstalled
+        ldy     _ser_drv+1
+        beq     :+
+ErrInstalled:
+        ldx     #$00
+        lda     #SER_ERR_INSTALLED
+        rts
+
+:       sta     _ser_drv
         sta     ptr1
         stx     _ser_drv+1
         stx     ptr1+1
@@ -107,7 +117,14 @@ copy:   lda     (ptr1),y
 ; */
 
 _ser_uninstall:
-        jsr     ser_uninstall           ; Call driver routine
+        ldx     _ser_drv                ; Check a driver is installed
+        bne     :+
+        ldx     _ser_drv+1
+        bne     :+
+        lda     #SER_ERR_NO_DRIVER
+        rts
+
+:       jsr     ser_uninstall           ; Call driver routine
 
         lda     #$60                    ; RTS opcode
         sta     ser_irq                 ; Disable IRQ entry point
@@ -117,5 +134,6 @@ _ser_clear_ptr:                         ; External entry point
         sta     _ser_drv
         sta     _ser_drv+1              ; Clear the driver pointer
 
+done:
         tax
         rts                             ; Return zero