6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-23 04:30:10 +00:00
Code Issues Projects Releases Wiki Activity

Serial kernel: Fix driver lifecycle

Browse Source 
- 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
This commit is contained in:
Colin Leroy-Mira 2023-09-12 20:54:32 +02:00
parent aa5ee8423a
commit 3fc074014e
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/funcref.sgml
View File

@ -6693,7 +6693,8 @@ be used in presence of a prototype.
<tag/Function/Uninstall the currently loaded driver but do not unload it. <tag/Function/Uninstall the currently loaded driver but do not unload it.
<tag/Header/<tt/<ref id="serial.h" name="serial.h">/ <tag/Header/<tt/<ref id="serial.h" name="serial.h">/
<tag/Declaration/<tt/unsigned char ser_uninstall (void);/ <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/Availability/cc65
<tag/See also/Other serial functions. <tag/See also/Other serial functions.
<tag/Example/None. <tag/Example/None.

22
libsrc/serial/ser-kernel.s
View File

@ -7,6 +7,7 @@
.import return0, ser_libref .import return0, ser_libref
.importzp ptr1 .importzp ptr1
.interruptor ser_irq, 29 ; Export as high priority IRQ handler .interruptor ser_irq, 29 ; Export as high priority IRQ handler
.destructor _ser_uninstall
.include "ser-kernel.inc" .include "ser-kernel.inc"
.include "ser-error.inc" .include "ser-error.inc"
@ -44,7 +45,16 @@ ser_sig: .byte $73, $65, $72, SER_API_VERSION ; "ser", version
_ser_install: _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 sta ptr1
stx _ser_drv+1 stx _ser_drv+1
stx ptr1+1 stx ptr1+1
@ -107,7 +117,14 @@ copy: lda (ptr1),y
; */ ; */
_ser_uninstall: _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 lda #$60 ; RTS opcode
sta ser_irq ; Disable IRQ entry point sta ser_irq ; Disable IRQ entry point
@ -117,5 +134,6 @@ _ser_clear_ptr: ; External entry point
sta _ser_drv sta _ser_drv
sta _ser_drv+1 ; Clear the driver pointer sta _ser_drv+1 ; Clear the driver pointer
done:
tax tax
rts ; Return zero rts ; Return zero