rename all waitvblank() to waitvsync()

This commit is contained in:
mrdudz
2017-07-17 23:15:05 +02:00
parent 3ff4a1333c
commit 1abce3a2a1
17 changed files with 32 additions and 32 deletions

View File

@@ -415,7 +415,7 @@ function.
<!-- <itemize> --> <!-- <itemize> -->
<!-- <item><ref id="get_tv" name="get_tv"> --> <!-- <item><ref id="get_tv" name="get_tv"> -->
<!-- <item><ref id="waitvblank" name="waitvblank"> --> <!-- <item><ref id="waitvsync" name="waitvsync"> -->
<!-- </itemize> --> <!-- </itemize> -->
(incomplete) (incomplete)

View File

@@ -1,4 +1,4 @@
<!doctype linuxdoc system> <!-- <!doctype linuxdoc system> //-->
<article> <article>
@@ -69,7 +69,7 @@ Programs containing NES specific code may use the <tt/nes.h/ header file.
<sect1>NES specific functions<p> <sect1>NES specific functions<p>
<itemize> <itemize>
<item>waitvblank - wait until the start of vblank <item>waitvsync - wait until the start of the next frame
<item>get_tv <item>get_tv
</itemize> </itemize>

View File

@@ -77,7 +77,7 @@ Programs containing PCE specific code may use the <tt/pce.h/ header file.
<sect1>PCE specific functions<p> <sect1>PCE specific functions<p>
<itemize> <itemize>
<item>waitvblank</item> <item>waitvsync</item>
<item>get_tv (since all PCE systems are NTSC, this always returns TV_NTSC)</item> <item>get_tv (since all PCE systems are NTSC, this always returns TV_NTSC)</item>
</itemize> </itemize>

View File

@@ -66,7 +66,7 @@ Programs containing Supervision specific code may use the <tt/supervision.h/ hea
<sect1>Supervision specific functions<p> <sect1>Supervision specific functions<p>
<itemize> <itemize>
<item>waitvblank <item>waitvsync
</itemize> </itemize>

View File

@@ -188,8 +188,8 @@ extern void gamate_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
#define JOY_START 6 #define JOY_START 6
#define JOY_SELECT 7 #define JOY_SELECT 7
void waitvblank (void); void waitvsync (void);
/* Wait for the vertical blanking */ /* Wait for start of next frame */
/* NOTE: all Gamate are "NTSC" */ /* NOTE: all Gamate are "NTSC" */
#define get_tv() TV_NTSC #define get_tv() TV_NTSC

View File

@@ -163,8 +163,8 @@ extern void nes_64_56_2_tgi[]; /* Referred to by tgi_static_stddrv[] */
void waitvblank (void); void waitvsync (void);
/* Wait for the vertical blanking */ /* Wait for start of the next frame */
unsigned char get_tv (void); unsigned char get_tv (void);
/* Return the video mode the machine is using. */ /* Return the video mode the machine is using. */

View File

@@ -83,8 +83,8 @@ extern void pce_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
#define JOY_SELECT 6 #define JOY_SELECT 6
#define JOY_RUN 7 #define JOY_RUN 7
void waitvblank (void); void waitvsync (void);
/* Wait for the vertical blanking */ /* Wait for start of the next frame */
/* NOTE: all PCE are NTSC */ /* NOTE: all PCE are NTSC */
#define get_tv() TV_NTSC #define get_tv() TV_NTSC

View File

@@ -1,9 +1,9 @@
.export _waitvblank .export _waitvsync
.include "c128.inc" .include "c128.inc"
_waitvblank: _waitvsync:
bit MODE bit MODE
bmi @c80 bmi @c80

View File

@@ -1,9 +1,9 @@
.export _waitvblank .export _waitvsync
.include "c64.inc" .include "c64.inc"
_waitvblank: _waitvsync:
@l1: @l1:
bit VIC_CTRL1 bit VIC_CTRL1
bpl @l1 bpl @l1

View File

@@ -1,5 +1,5 @@
.export _waitvblank .export _waitvsync
.import PALFLAG .import PALFLAG
.import sys_bank, restore_bank .import sys_bank, restore_bank
@@ -7,7 +7,7 @@
.include "cbm510.inc" .include "cbm510.inc"
_waitvblank: _waitvsync:
rts ; FIXME rts ; FIXME
jsr sys_bank ; Switch to the system bank jsr sys_bank ; Switch to the system bank

View File

@@ -1,16 +1,16 @@
; ;
; void waitvblank (void); ; void waitvsync (void);
; ;
.include "gamate.inc" .include "gamate.inc"
.include "extzp.inc" .include "extzp.inc"
.forceimport ticktock .forceimport ticktock
.export _waitvblank .export _waitvsync
; FIXME: is this actually correct? ; FIXME: is this actually correct?
.proc _waitvblank .proc _waitvsync
lda tickcount lda tickcount
@lp: cmp tickcount @lp: cmp tickcount

View File

@@ -2,14 +2,14 @@
; Written by Groepaz/Hitmen <groepaz@gmx.net> ; Written by Groepaz/Hitmen <groepaz@gmx.net>
; Cleanup by Ullrich von Bassewitz <uz@cc65.org> ; Cleanup by Ullrich von Bassewitz <uz@cc65.org>
; ;
; void waitvblank(void); ; void waitvsync(void);
; ;
.export _waitvblank .export _waitvsync
.include "nes.inc" .include "nes.inc"
.proc _waitvblank .proc _waitvsync
wait: lda PPU_STATUS wait: lda PPU_STATUS
bpl wait bpl wait

View File

@@ -1,14 +1,14 @@
; ;
; void waitvblank (void); ; void waitvsync (void);
; ;
.include "pce.inc" .include "pce.inc"
.include "extzp.inc" .include "extzp.inc"
.forceimport ticktock .forceimport ticktock
.export _waitvblank .export _waitvsync
.proc _waitvblank .proc _waitvsync
lda tickcount lda tickcount
@lp: cmp tickcount @lp: cmp tickcount

View File

@@ -1,4 +1,4 @@
.export _waitvblank .export _waitvsync
.include "vic20.inc" .include "vic20.inc"
@@ -7,7 +7,7 @@
; it will have to be filled by a get_tv() constructor or so ; it will have to be filled by a get_tv() constructor or so
PALFLAG = $2A6 ; $01 = PAL, $00 = NTSC PALFLAG = $2A6 ; $01 = PAL, $00 = NTSC
_waitvblank: _waitvsync:
lda PALFLAG lda PALFLAG
beq @ntsc beq @ntsc
ldx #(312-8)/2 ldx #(312-8)/2

View File

@@ -117,8 +117,8 @@ void main(void)
gotoxy(7 + inpos,1); gotoxy(7 + inpos,1);
#if defined(__NES__) || defined(__PCE__) || defined(__GAMATE__) #if defined(__NES__) || defined(__PCE__) || defined(__GAMATE__)
/* not all targets have waitvblank */ /* not all targets have waitvsync */
waitvblank(); waitvsync();
/* for targets that do not have a keyboard, read the first /* for targets that do not have a keyboard, read the first
joystick */ joystick */
joy = joy_read(JOY_1); joy = joy_read(JOY_1);

View File

@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
break; break;
} }
waitvblank(); waitvsync();
(*((unsigned char*)LCD_XPOS)) = x; (*((unsigned char*)LCD_XPOS)) = x;
(*((unsigned char*)LCD_YPOS)) = y; (*((unsigned char*)LCD_YPOS)) = y;

View File

@@ -123,7 +123,7 @@ void main(void)
p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]); p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
} }
waitvblank(); waitvsync();
++n; ++n;
} }
} }