Use get_tv.inc

git-svn-id: svn://svn.cc65.org/cc65/trunk@3259 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/c128/get_tv.s b/libsrc/c128/get_tv.s
index a9ee2604c45848ea20db413ebd640cdf8f22eeea..c62de3ead163e6beeb74930d33f1a30ccc0533e0 100644 (file)
--- a/libsrc/c128/get_tv.s
+++ b/libsrc/c128/get_tv.s
@@ -5,8 +5,7 @@
 ; /* Return the video mode the machine is using */
 ;
 
-        .export         _get_tv
-
+       .include        "get_tv.inc"
         .include        "c128.inc"
 
 
@@ -15,7 +14,7 @@
 
 .proc   _get_tv
 
-        ldx     #$01            ; Assume PAL
+        ldx     #TV::PAL       ; Assume PAL
         lda     PALFLAG
         bne     pal
         dex                     ; NTSC

diff --git a/libsrc/c16/get_tv.s b/libsrc/c16/get_tv.s
index b21b815b8c6d0d4da2376bd13c8d733befc8d0d1..6f27e747ce5835e7a892f8e754ca8cdfa388fff2 100644 (file)
--- a/libsrc/c16/get_tv.s
+++ b/libsrc/c16/get_tv.s
@@ -5,9 +5,8 @@
 ; /* Return the video mode the machine is using */
 ;
 
-        .export         _get_tv
-
         .include        "../plus4/plus4.inc"
+       .include        "get_tv.inc"
 
 
 ;--------------------------------------------------------------------------
@@ -15,7 +14,7 @@
 
 .proc   _get_tv
 
-        ldx     #$01            ; Assume PAL
+        ldx     #TV::PAL       ; Assume PAL
         bit     TED_MULTI1      ; Test bit 6
         bvc     pal
         dex                     ; NTSC

diff --git a/libsrc/c64/get_tv.s b/libsrc/c64/get_tv.s
index 1975293d8781025e990a0edc9a10bd5c82ecb202..0b9494ea68d5d037d399e66cdaffac76ea57be80 100644 (file)
--- a/libsrc/c64/get_tv.s
+++ b/libsrc/c64/get_tv.s
@@ -5,10 +5,8 @@
 ; /* Return the video mode the machine is using */
 ;
 
-        .export         _get_tv
-
         .include        "c64.inc"
-
+       .include        "get_tv.inc"
 
 ;--------------------------------------------------------------------------
 ; _get_tv
@@ -21,4 +19,4 @@
 
 .endproc
 
-           
+

diff --git a/libsrc/plus4/get_tv.s b/libsrc/plus4/get_tv.s
index 712d8dfd16833c31709995cd7cf0e7e643886de4..84f09b12cf6247e0b93b2bd0d8d54daf419f22ab 100644 (file)
--- a/libsrc/plus4/get_tv.s
+++ b/libsrc/plus4/get_tv.s
@@ -5,9 +5,8 @@
 ; /* Return the video mode the machine is using */
 ;
 
-        .export         _get_tv
-
         .include        "plus4.inc"
+       .include        "get_tv.inc"
 
 
 ;--------------------------------------------------------------------------
@@ -15,7 +14,7 @@
 
 .proc   _get_tv
 
-        ldx     #$01            ; Assume PAL
+        ldx     #TV::PAL       ; Assume PAL
         bit     TED_MULTI1      ; Test bit 6
         bvc     pal
         dex                     ; NTSC

diff --git a/libsrc/vic20/get_tv.s b/libsrc/vic20/get_tv.s
index 13c5c428ab68b96683840b189d0a1271c6c89a46..f1e3260ae0d13f3282113ca662290ef25eda19f5 100644 (file)
--- a/libsrc/vic20/get_tv.s
+++ b/libsrc/vic20/get_tv.s
@@ -6,10 +6,8 @@
 ; /* Return the video mode the machine is using */
 ;
 
-       .export         _get_tv
-
        .include        "vic20.inc"
-
+       .include        "get_tv.inc"
 
 ;--------------------------------------------------------------------------
 ; _get_tv
@@ -18,7 +16,7 @@
 
 NTSC_LINES = 261
        ; detect the system
-       lda     #0
+       lda     #TV::NTSC
        tax
 @L0:   ldy     VIC_HLINE
        cpy     #1
@@ -27,7 +25,7 @@ NTSC_LINES = 261
        beq     @L2             ; line 0 reached -> NTSC
        cpy     #NTSC_LINES/2+2
        bne     @L1
-       lda     #1
+       lda     #TV::PAL
 @L2:   rts                     ; system detected: 0 for NTSC, 1 for PAL
 
 .endproc