1
0
mirror of https://github.com/cc65/cc65.git synced 2024-12-23 04:30:10 +00:00

Straighten checking of the initialized flag in both, the C64 and C128

versions of rs232.s.
New include file common/rs232.inc, use the constants from this file instead
of defining them separately in each platform specific rs232 module.


git-svn-id: svn://svn.cc65.org/cc65/trunk@1208 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2002-03-25 06:06:52 +00:00
parent f709fd679b
commit 7d11fa012c
4 changed files with 128 additions and 146 deletions

View File

@ -29,6 +29,7 @@
.include "atari.inc"
.include "../common/errno.inc"
.include "../common/rs232.inc"
.rodata
@ -130,17 +131,13 @@ cioerr: jsr fddecusage ; decrement usage counter of fd as open failed
; using 8 bit word size. So only 8 bit is currently tested.
;
; shouldn't this come from a "rs232.inc" ??
ErrNotInitialized = $01
ErrNoData = $04
.proc _rs232_params
sta tmp2
lda rshand
cmp #$ff
bne work ; work only if initialized
lda #ErrNotInitialized
lda #RS_ERR_NOT_INITIALIZED
bne done
work: lda rshand
ldx #0
@ -241,7 +238,7 @@ done: rts
ldy rshand
cpy #$ff
bne work ; work only if initialized
lda #ErrNotInitialized
lda #RS_ERR_NOT_INITIALIZED
bne nierr
work: sta ptr1
@ -286,7 +283,7 @@ go: ; check whether there is any input available
nierr: ldx #0
rts
nix_da: lda #ErrNoData
nix_da: lda #RS_ERR_NO_DATA
ldx #0
rts
@ -307,7 +304,7 @@ nix_da: lda #ErrNoData
ldy rshand
cpy #$ff
bne work ; work only if initialized
lda #ErrNotInitialized
lda #RS_ERR_NOT_INITIALIZED
bne nierr
work: pha

View File

@ -28,6 +28,7 @@
.export _rs232_put, _rs232_pause, _rs232_unpause, _rs232_status
.include "c128.inc"
.include "../common/rs232.inc"
NmiExit = $ff33 ;exit address for nmi
@ -73,12 +74,6 @@ RegCommand = 2 ; Command register
RegControl = 3 ; Control register
RegClock = 7 ; Turbo232 external baud-rate generator
; Error codes. Beware: The codes must match the codes in the C header file
ErrNotInitialized = $01
ErrBaudTooFast = $02
ErrBaudNotAvail = $03
ErrNoData = $04
ErrOverflow = $05
.code
@ -170,11 +165,12 @@ _rs232_init:
lda #$06
sta BaudCode
;** return
lda #$ff
sta Initialized
lda #$00
tax
; Done
ldx #$ff
stx Initialized
inx ; X = 0
txa ; A = 0
rts
;----------------------------------------------------------------------------
@ -197,9 +193,9 @@ _rs232_init:
;
_rs232_params:
jsr CheckInitialized ;** check initialized
bcc @L1
rts
bit Initialized
bmi @L1
jmp NotInitialized ; Return an error code
; Save new parity
@ -221,7 +217,7 @@ _rs232_params:
beq @L3
cpx #4
bcs @L3
@L2: lda #ErrBaudTooFast
@L2: lda #RS_ERR_BAUD_TOO_FAST
bne @L9
; Set baud/parameters
@ -235,7 +231,7 @@ _rs232_params:
lda HackBauds,x
@L4: cmp #$ff
bne @L5
lda #ErrBaudNotAvail
lda #RS_ERR_BAUD_NOT_AVAIL
bne @L9
@L5: tax
@ -243,7 +239,7 @@ _rs232_params:
beq @L6
bit Turbo232
bmi @L6
lda #ErrBaudNotAvail
lda #RS_ERR_BAUD_NOT_AVAIL
bne @L9
@L6: lda tmp1
@ -334,9 +330,8 @@ _rs232_done:
;
_rs232_get:
jsr CheckInitialized ; Check if initialized
bcc @L1
rts
bit Initialized
bpl NotInitialized ; Jump if not initialized
; Check for bytes to send
@ -353,7 +348,7 @@ _rs232_get:
@L2: lda RecvFreeCnt
cmp #$ff
bne @L3
lda #ErrNoData
lda #RS_ERR_NO_DATA
ldx #0
rts
@ -380,6 +375,15 @@ _rs232_get:
txa ; Return code = 0
rts
;----------------------------------------------------------------------------
;
; RS232 module not initialized
NotInitialized:
lda #<RS_ERR_NOT_INITIALIZED
ldx #>RS_ERR_NOT_INITIALIZED
rts
;----------------------------------------------------------------------------
;
; unsigned char __fastcall__ rs232_put (char B);
@ -390,9 +394,8 @@ _rs232_get:
;
_rs232_put:
jsr CheckInitialized ; Check initialized
bcc @L1
rts
bit Initialized
bpl NotInitialized ; Jump if not initialized
; Try to send
@ -408,7 +411,7 @@ _rs232_put:
@L2: ldx SendFreeCnt
bne @L3
lda #ErrOverflow
lda #RS_ERR_OVERFLOW
ldx #$00
rts
@ -429,10 +432,8 @@ _rs232_put:
;
_rs232_pause:
; Check initialized
jsr CheckInitialized
bcc @L1
rts
bit Initialized
bpl NotInitialized ; Jump if not initialized
; Assert flow control
@ -472,10 +473,8 @@ PauseTimes:
;
_rs232_unpause:
; Check initialized
jsr CheckInitialized
bcc @L1
rts
bit Initialized
bpl NotInitialized ; Jump if not initialized
; Re-enable rx interrupts & release flow control
@ -505,12 +504,13 @@ _rs232_status:
jsr popax
sta ptr1
stx ptr1+1
jsr CheckInitialized
bcs @L9
bit Initialized
bmi @L1
jmp NotInitialized
; Get status
lda ACIA+RegStatus
@L1: lda ACIA+RegStatus
ldy #0
sta (ptr1),y
jsr PollReceive ; bug-recovery hack
@ -584,24 +584,6 @@ NmiHandler:
.code
;----------------------------------------------------------------------------
;
; CheckInitialized - internal check if initialized
; Set carry and an error code if not initialized, clear carry and do not
; change any registers if initialized.
;
CheckInitialized:
bit Initialized
bmi @L1
lda #ErrNotInitialized
ldx #0
sec
rts
@L1: clc
rts
;----------------------------------------------------------------------------
; Try to send a byte. Internal routine. A = TryHard

View File

@ -28,6 +28,7 @@
.export _rs232_put, _rs232_pause, _rs232_unpause, _rs232_status
.include "c64.inc"
.include "../common/rs232.inc"
NmiExit = $febc ;exit address for nmi
@ -73,12 +74,6 @@ RegCommand = 2 ; Command register
RegControl = 3 ; Control register
RegClock = 7 ; Turbo232 external baud-rate generator
; Error codes. Beware: The codes must match the codes in the C header file
ErrNotInitialized = $01
ErrBaudTooFast = $02
ErrBaudNotAvail = $03
ErrNoData = $04
ErrOverflow = $05
.code
@ -167,11 +162,12 @@ _rs232_init:
lda #$06
sta BaudCode
;** return
lda #$ff
sta Initialized
lda #$00
tax
; Done
ldx #$ff
stx Initialized
inx ; X = 0
txa ; A = 0
rts
;----------------------------------------------------------------------------
@ -194,9 +190,9 @@ _rs232_init:
;
_rs232_params:
jsr CheckInitialized ;** check initialized
bcc @L1
rts
bit Initialized
bmi @L1
jmp NotInitialized ; Return an error code
; Save new parity
@ -218,7 +214,7 @@ _rs232_params:
beq @L3
cpx #4
bcs @L3
@L2: lda #ErrBaudTooFast
@L2: lda #RS_ERR_BAUD_TOO_FAST
bne @L9
; Set baud/parameters
@ -232,7 +228,7 @@ _rs232_params:
lda HackBauds,x
@L4: cmp #$ff
bne @L5
lda #ErrBaudNotAvail
lda #RS_ERR_BAUD_NOT_AVAIL
bne @L9
@L5: tax
@ -240,7 +236,7 @@ _rs232_params:
beq @L6
bit Turbo232
bmi @L6
lda #ErrBaudNotAvail
lda #RS_ERR_BAUD_NOT_AVAIL
bne @L9
@L6: lda tmp1
@ -331,13 +327,12 @@ _rs232_done:
;
_rs232_get:
jsr CheckInitialized ; Check if initialized
bcc @L1
rts
bit Initialized
bpl NotInitialized ; Jump if not initialized
; Check for bytes to send
@L1: sta ptr1
sta ptr1
stx ptr1+1 ; Store pointer to received char
ldx SendFreeCnt
cpx #$ff
@ -350,7 +345,7 @@ _rs232_get:
@L2: lda RecvFreeCnt
cmp #$ff
bne @L3
lda #ErrNoData
lda #RS_ERR_NO_DATA
ldx #0
rts
@ -377,6 +372,15 @@ _rs232_get:
txa ; Return code = 0
rts
;----------------------------------------------------------------------------
;
; RS232 module not initialized
NotInitialized:
lda #<RS_ERR_NOT_INITIALIZED
ldx #>RS_ERR_NOT_INITIALIZED
rts
;----------------------------------------------------------------------------
;
; unsigned char __fastcall__ rs232_put (char B);
@ -387,13 +391,12 @@ _rs232_get:
;
_rs232_put:
jsr CheckInitialized ; Check initialized
bcc @L1
rts
bit Initialized
bpl NotInitialized ; Jump if not initialized
; Try to send
@L1: ldx SendFreeCnt
ldx SendFreeCnt
cpx #$ff
beq @L2
pha
@ -405,7 +408,7 @@ _rs232_put:
@L2: ldx SendFreeCnt
bne @L3
lda #ErrOverflow
lda #RS_ERR_OVERFLOW
ldx #$00
rts
@ -426,14 +429,12 @@ _rs232_put:
;
_rs232_pause:
; Check initialized
jsr CheckInitialized
bcc @L1
rts
bit Initialized
bpl NotInitialized ; Jump if not initialized
; Assert flow control
@L1: lda RtsOff
lda RtsOff
sta Stopped
sta ACIA+RegCommand
@ -469,10 +470,8 @@ PauseTimes:
;
_rs232_unpause:
; Check initialized
jsr CheckInitialized
bcc @L1
rts
bit Initialized
bpl NotInitialized ; Jump if not initialized
; Re-enable rx interrupts & release flow control
@ -502,12 +501,13 @@ _rs232_status:
jsr popax
sta ptr1
stx ptr1+1
jsr CheckInitialized
bcs @L9
bit Initialized
bmi @L1
jmp NotInitialized
; Get status
lda ACIA+RegStatus
@L1: lda ACIA+RegStatus
ldy #0
sta (ptr1),y
jsr PollReceive ; bug-recovery hack
@ -564,7 +564,7 @@ NmiHandler:
; Drop this char
@L3: inc DropCnt+0 ;not time-critical
@L3: inc DropCnt+0 ; not time-critical
bne @L4
inc DropCnt+1
bne @L4
@ -576,24 +576,6 @@ NmiHandler:
@L9: pla
jmp NmiContinue
;----------------------------------------------------------------------------
;
; CheckInitialized - internal check if initialized
; Set carry and an error code if not initialized, clear carry and do not
; change any registers if initialized.
;
CheckInitialized:
bit Initialized
bmi @L1
lda #ErrNotInitialized
ldx #0
sec
rts
@L1: clc
rts
;----------------------------------------------------------------------------
; Try to send a byte. Internal routine. A = TryHard

21
libsrc/common/rs232.inc Normal file
View File

@ -0,0 +1,21 @@
;
; rs232.inc
;
; (C) Copyright 2002 Ullrich von Bassewitz (uz@cc65.org)
;
; Assembler include file that makes the constants and structures from rs232.h
; available for asm code.
; Error codes returned by all functions
RS_ERR_OK = $00 ; Not an error - relax
RS_ERR_NOT_INITIALIZED = $01 ; Module not initialized
RS_ERR_BAUD_TOO_FAST = $02 ; Cannot handle baud rate
RS_ERR_BAUD_NOT_AVAIL = $03 ; Baud rate not available
RS_ERR_NO_DATA = $04 ; Nothing to read
RS_ERR_OVERFLOW = $05 ; No room in send buffer