From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Tue, 26 Oct 2004 19:05:19 +0000 (+0000)
Subject: Use get_tv.inc
X-Git-Tag: V2.12.0~576
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7b13d79bde9fecc4e53b0d0f54345b844563bcb2;p=cc65

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 a9ee2604c..c62de3ead 100644
--- 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 b21b815b8..6f27e747c 100644
--- 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 1975293d8..0b9494ea6 100644
--- 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 712d8dfd1..84f09b12c 100644
--- 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 13c5c428a..f1e3260ae 100644
--- 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