From 1abce3a2a1d7df81a580e9120a34e1d697085b3e Mon Sep 17 00:00:00 2001 From: mrdudz Date: Mon, 17 Jul 2017 23:15:05 +0200 Subject: [PATCH] rename all waitvblank() to waitvsync() --- doc/funcref.sgml | 2 +- doc/nes.sgml | 4 ++-- doc/pce.sgml | 2 +- doc/supervision.sgml | 2 +- include/gamate.h | 4 ++-- include/nes.h | 4 ++-- include/pce.h | 4 ++-- libsrc/c128/{waitvblank.s => waitvsync.s} | 4 ++-- libsrc/c64/{waitvblank.s => waitvsync.s} | 4 ++-- libsrc/cbm510/{waitvblank.s => waitvsync.s} | 4 ++-- libsrc/gamate/{waitvblank.s => waitvsync.s} | 6 +++--- libsrc/nes/{waitvblank.s => waitvsync.s} | 6 +++--- libsrc/pce/{waitvblank.s => waitvsync.s} | 6 +++--- libsrc/vic20/{waitvblank.s => waitvsync.s} | 4 ++-- testcode/lib/conio.c | 4 ++-- testcode/lib/gamate/ctest.c | 2 +- testcode/lib/pce/conio.c | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) rename libsrc/c128/{waitvblank.s => waitvsync.s} (87%) rename libsrc/c64/{waitvblank.s => waitvsync.s} (75%) rename libsrc/cbm510/{waitvblank.s => waitvsync.s} (88%) rename libsrc/gamate/{waitvblank.s => waitvsync.s} (74%) rename libsrc/nes/{waitvblank.s => waitvsync.s} (73%) rename libsrc/pce/{waitvblank.s => waitvsync.s} (71%) rename libsrc/vic20/{waitvblank.s => waitvsync.s} (88%) diff --git a/doc/funcref.sgml b/doc/funcref.sgml index a2ccf6c73..b5295a63b 100644 --- a/doc/funcref.sgml +++ b/doc/funcref.sgml @@ -415,7 +415,7 @@ function. - + (incomplete) diff --git a/doc/nes.sgml b/doc/nes.sgml index 98c25b6af..31d1aa396 100644 --- a/doc/nes.sgml +++ b/doc/nes.sgml @@ -1,4 +1,4 @@ - +
@@ -69,7 +69,7 @@ Programs containing NES specific code may use the NES specific functions

-waitvblank - wait until the start of vblank +waitvsync - wait until the start of the next frame get_tv diff --git a/doc/pce.sgml b/doc/pce.sgml index ba59c31a7..124cb329e 100644 --- a/doc/pce.sgml +++ b/doc/pce.sgml @@ -77,7 +77,7 @@ Programs containing PCE specific code may use the PCE specific functions

-waitvblank +waitvsync get_tv (since all PCE systems are NTSC, this always returns TV_NTSC) diff --git a/doc/supervision.sgml b/doc/supervision.sgml index 97495dea5..2466aa480 100644 --- a/doc/supervision.sgml +++ b/doc/supervision.sgml @@ -66,7 +66,7 @@ Programs containing Supervision specific code may use the Supervision specific functions

-waitvblank +waitvsync diff --git a/include/gamate.h b/include/gamate.h index 82bca08b1..96c70c9bc 100644 --- a/include/gamate.h +++ b/include/gamate.h @@ -188,8 +188,8 @@ extern void gamate_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ #define JOY_START 6 #define JOY_SELECT 7 -void waitvblank (void); -/* Wait for the vertical blanking */ +void waitvsync (void); +/* Wait for start of next frame */ /* NOTE: all Gamate are "NTSC" */ #define get_tv() TV_NTSC diff --git a/include/nes.h b/include/nes.h index a472a0f3c..95e2fe93b 100644 --- a/include/nes.h +++ b/include/nes.h @@ -163,8 +163,8 @@ extern void nes_64_56_2_tgi[]; /* Referred to by tgi_static_stddrv[] */ -void waitvblank (void); -/* Wait for the vertical blanking */ +void waitvsync (void); +/* Wait for start of the next frame */ unsigned char get_tv (void); /* Return the video mode the machine is using. */ diff --git a/include/pce.h b/include/pce.h index 7700654c8..856a2fa1d 100644 --- a/include/pce.h +++ b/include/pce.h @@ -83,8 +83,8 @@ extern void pce_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ #define JOY_SELECT 6 #define JOY_RUN 7 -void waitvblank (void); -/* Wait for the vertical blanking */ +void waitvsync (void); +/* Wait for start of the next frame */ /* NOTE: all PCE are NTSC */ #define get_tv() TV_NTSC diff --git a/libsrc/c128/waitvblank.s b/libsrc/c128/waitvsync.s similarity index 87% rename from libsrc/c128/waitvblank.s rename to libsrc/c128/waitvsync.s index c144e11c2..1597e5fa0 100644 --- a/libsrc/c128/waitvblank.s +++ b/libsrc/c128/waitvsync.s @@ -1,9 +1,9 @@ - .export _waitvblank + .export _waitvsync .include "c128.inc" -_waitvblank: +_waitvsync: bit MODE bmi @c80 diff --git a/libsrc/c64/waitvblank.s b/libsrc/c64/waitvsync.s similarity index 75% rename from libsrc/c64/waitvblank.s rename to libsrc/c64/waitvsync.s index dd9087841..15ef61bb7 100644 --- a/libsrc/c64/waitvblank.s +++ b/libsrc/c64/waitvsync.s @@ -1,9 +1,9 @@ - .export _waitvblank + .export _waitvsync .include "c64.inc" -_waitvblank: +_waitvsync: @l1: bit VIC_CTRL1 bpl @l1 diff --git a/libsrc/cbm510/waitvblank.s b/libsrc/cbm510/waitvsync.s similarity index 88% rename from libsrc/cbm510/waitvblank.s rename to libsrc/cbm510/waitvsync.s index 975861f2c..bd631e4d6 100644 --- a/libsrc/cbm510/waitvblank.s +++ b/libsrc/cbm510/waitvsync.s @@ -1,5 +1,5 @@ - .export _waitvblank + .export _waitvsync .import PALFLAG .import sys_bank, restore_bank @@ -7,7 +7,7 @@ .include "cbm510.inc" -_waitvblank: +_waitvsync: rts ; FIXME jsr sys_bank ; Switch to the system bank diff --git a/libsrc/gamate/waitvblank.s b/libsrc/gamate/waitvsync.s similarity index 74% rename from libsrc/gamate/waitvblank.s rename to libsrc/gamate/waitvsync.s index 66686c08a..9b1199055 100644 --- a/libsrc/gamate/waitvblank.s +++ b/libsrc/gamate/waitvsync.s @@ -1,16 +1,16 @@ ; -; void waitvblank (void); +; void waitvsync (void); ; .include "gamate.inc" .include "extzp.inc" .forceimport ticktock - .export _waitvblank + .export _waitvsync ; FIXME: is this actually correct? -.proc _waitvblank +.proc _waitvsync lda tickcount @lp: cmp tickcount diff --git a/libsrc/nes/waitvblank.s b/libsrc/nes/waitvsync.s similarity index 73% rename from libsrc/nes/waitvblank.s rename to libsrc/nes/waitvsync.s index 408646904..11a231ac4 100644 --- a/libsrc/nes/waitvblank.s +++ b/libsrc/nes/waitvsync.s @@ -2,14 +2,14 @@ ; Written by Groepaz/Hitmen ; Cleanup by Ullrich von Bassewitz ; -; void waitvblank(void); +; void waitvsync(void); ; - .export _waitvblank + .export _waitvsync .include "nes.inc" -.proc _waitvblank +.proc _waitvsync wait: lda PPU_STATUS bpl wait diff --git a/libsrc/pce/waitvblank.s b/libsrc/pce/waitvsync.s similarity index 71% rename from libsrc/pce/waitvblank.s rename to libsrc/pce/waitvsync.s index b9f0f902f..f1eab36f8 100644 --- a/libsrc/pce/waitvblank.s +++ b/libsrc/pce/waitvsync.s @@ -1,14 +1,14 @@ ; -; void waitvblank (void); +; void waitvsync (void); ; .include "pce.inc" .include "extzp.inc" .forceimport ticktock - .export _waitvblank + .export _waitvsync -.proc _waitvblank +.proc _waitvsync lda tickcount @lp: cmp tickcount diff --git a/libsrc/vic20/waitvblank.s b/libsrc/vic20/waitvsync.s similarity index 88% rename from libsrc/vic20/waitvblank.s rename to libsrc/vic20/waitvsync.s index 246c44640..9f0d50565 100644 --- a/libsrc/vic20/waitvblank.s +++ b/libsrc/vic20/waitvsync.s @@ -1,4 +1,4 @@ - .export _waitvblank + .export _waitvsync .include "vic20.inc" @@ -7,7 +7,7 @@ ; it will have to be filled by a get_tv() constructor or so PALFLAG = $2A6 ; $01 = PAL, $00 = NTSC -_waitvblank: +_waitvsync: lda PALFLAG beq @ntsc ldx #(312-8)/2 diff --git a/testcode/lib/conio.c b/testcode/lib/conio.c index fe977ec08..13188d1cd 100644 --- a/testcode/lib/conio.c +++ b/testcode/lib/conio.c @@ -117,8 +117,8 @@ void main(void) gotoxy(7 + inpos,1); #if defined(__NES__) || defined(__PCE__) || defined(__GAMATE__) - /* not all targets have waitvblank */ - waitvblank(); + /* not all targets have waitvsync */ + waitvsync(); /* for targets that do not have a keyboard, read the first joystick */ joy = joy_read(JOY_1); diff --git a/testcode/lib/gamate/ctest.c b/testcode/lib/gamate/ctest.c index dfebd9bef..793770cee 100644 --- a/testcode/lib/gamate/ctest.c +++ b/testcode/lib/gamate/ctest.c @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) break; } - waitvblank(); + waitvsync(); (*((unsigned char*)LCD_XPOS)) = x; (*((unsigned char*)LCD_YPOS)) = y; diff --git a/testcode/lib/pce/conio.c b/testcode/lib/pce/conio.c index a4bd63b15..00ae3c157 100644 --- a/testcode/lib/pce/conio.c +++ b/testcode/lib/pce/conio.c @@ -123,7 +123,7 @@ void main(void) p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]); } - waitvblank(); + waitvsync(); ++n; } } -- 2.39.5