Removed (pretty inconsistently used) tab chars from source code base.

[cc65] / libsrc / c128 / systime.s

diff --git a/libsrc/c128/systime.s b/libsrc/c128/systime.s
index eb19509061654d22a3bab2e67645cdb1046474f8..bea2164f58c53cae45ba19bd6e22e93a0ad9cbad 100644 (file)
--- a/libsrc/c128/systime.s
+++ b/libsrc/c128/systime.s
@@ -11,43 +11,43 @@
 
         .include        "time.inc"
         .include        "c128.inc"
+        .include        "get_tv.inc"
 
-       .importzp               tmp1, tmp2
+        .constructor    initsystime
+        .importzp       tmp1, tmp2
+        .import         _get_tv
 
+
+;----------------------------------------------------------------------------
 .code
 
-; Jan 1st 1970, CIA #1 TOD
-.proc  __systime
-
-       lda     #70
-       sta     TM + tm::tm_year
-       lda     #1
-       sta     TM + tm::tm_mday
-       lda     CIA1_TODHR
-       bpl     AM
-       and     #%01111111
-       sed
-       clc
-       adc     #$12
-       cld
-AM:    jsr     BCD2dec
-       sta     TM + tm::tm_hour
-       lda     CIA1_TODMIN
-       jsr     BCD2dec
-       sta     TM + tm::tm_min
-       lda     CIA1_TODSEC
-       jsr     BCD2dec
-       sta     TM + tm::tm_sec
-       lda     CIA1_TOD10              ; Dummy read to unfreeze
-       lda     #<TM
-       ldx     #>TM
-       jmp     _mktime
+.proc   __systime
+
+        lda     CIA1_TODHR
+        bpl     AM
+        and     #%01111111
+        sed
+        clc
+        adc     #$12
+        cld
+AM:     jsr     BCD2dec
+        sta     TM + tm::tm_hour
+        lda     CIA1_TODMIN
+        jsr     BCD2dec
+        sta     TM + tm::tm_min
+        lda     CIA1_TODSEC
+        jsr     BCD2dec
+        sta     TM + tm::tm_sec
+        lda     CIA1_TOD10              ; Dummy read to unfreeze
+        lda     #<TM
+        ldx     #>TM
+        jmp     _mktime
 
 ; dec = (((BCD>>4)*10) + (BCD&0xf))
 BCD2dec:tax
-       and     #%00001111
-       sta     tmp1
-       txa
+        and     #%00001111
+        sta     tmp1
+        txa
         and     #%11110000      ; *16
         lsr                     ; *8
         sta     tmp2
@@ -59,6 +59,37 @@ BCD2dec:tax
 
 .endproc
 
-.bss
+;----------------------------------------------------------------------------
+; Constructor that writes to the 1/10 sec register of the TOD to kick it
+; into action. If this is not done, the clock hangs. We will read the register
+; and write it again, ignoring a possible change in between.
+
+.proc   initsystime
+
+        lda     CIA1_TOD10
+        sta     CIA1_TOD10
+        jsr     _get_tv
+        cmp     #TV::PAL
+        bne     @60Hz
+        lda     CIA1_CRA
+        ora     #$80
+        sta     CIA1_CRA
+@60Hz:  rts
+
+.endproc
+
+
+;----------------------------------------------------------------------------
+; TM struct with date set to 1970-01-01
+.data
+
+TM:     .word           0       ; tm_sec
+        .word           0       ; tm_min
+        .word           0       ; tm_hour
+        .word           1       ; tm_mday
+        .word           0       ; tm_mon
+        .word           70      ; tm_year
+        .word           0       ; tm_wday
+        .word           0       ; tm_yday
+        .word           0       ; tm_isdst
 
-TM:    .tag    tm