From 60c9f806ea4d64b1f4602df134f0b2c6ee9e7aa8 Mon Sep 17 00:00:00 2001 From: MikeS11 Date: Sat, 18 Feb 2023 13:22:32 -0700 Subject: [PATCH] Video: Y/C Update (#743) Update Y/C Parser - Added the Y/C tuned phase inc's into the yc.txt file. - Fixed an issue with the parser handling spaces in the core name Removed force SOG on CVBS / SVIDEO Modes --- cfg.cpp | 2 +- user_io.cpp | 2 +- yc.txt | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 245 insertions(+), 5 deletions(-) diff --git a/cfg.cpp b/cfg.cpp index b2cc48a..a4e362a 100644 --- a/cfg.cpp +++ b/cfg.cpp @@ -590,7 +590,7 @@ static int yc_parse_mode(char* buf, yc_mode *mode) int i = 0; while (1) { - if (buf[i] == '=' || CHAR_IS_SPACE(buf[i])) + if (buf[i] == '=' || CHAR_IS_LINEEND(buf[i])) { buf[i] = 0; break; diff --git a/user_io.cpp b/user_io.cpp index 50fc48f..fa582b2 100644 --- a/user_io.cpp +++ b/user_io.cpp @@ -2729,7 +2729,7 @@ void user_io_send_buttons(char force) if (kbd_reset || kbd_reset_ovr) map |= BUTTON2; if (cfg.vga_scaler) map |= CONF_VGA_SCALER; - if (cfg.vga_sog || cfg.vga_mode_int >= 2) map |= CONF_VGA_SOG; + if (cfg.vga_sog) map |= CONF_VGA_SOG; if (cfg.csync) map |= CONF_CSYNC; if (cfg.vga_mode_int == 1) map |= CONF_YPBPR; if (cfg.forced_scandoubler) map |= CONF_FORCED_SCANDOUBLER; diff --git a/yc.txt b/yc.txt index 4a964e7..7571b04 100644 --- a/yc.txt +++ b/yc.txt @@ -1,14 +1,254 @@ ; ; PHASE_INC override per mode. -; It affects only CVBS video output. -; S-Video doesn't need this file. +; This eliminates dot crawl on CVBS and also Y/C (S-Video) ; +NES_60.1=91625968981 ;Alternative reduced Dot Crawl from real system:NES_60.1=91626225369 +NES_50.0=114532461227 SNES_60.1=91625968981 SNES_60.0i=91625968981 SNES_50.0=114532461227 SNES_49.9i=114532461227 +SMS_59.9=73300775185 +SMS_49.7=91625968981 +GENESIS_59.9=36650387593 +GENESIS_49.7=45812984490 +MEGACD_59.9=36650387593 +MEGACD_49.7=45812984490 +S32X_59.9=36650387593 +S32X_49.7=45812984490 +ATARI5200_59.9=68719476736 +ATARI7800_60.0=68719476736 +ATARI7800_50.4=85115683970 +TGFX16_60.1=45812984491 NEOGEO_59.2=81994830080 -NEOGEO_59.6=81425421603 NEOGEO_50.1=101558653516 +NEOGEO_59.6=81425421603 NEOGEO_50.4=100853152548 +PSX_59.8=73301061001 +PSX_49.7=91626311637 +PSX_59.9i=73301061969 +PSX_50.0i=91625866829 +PSX_59.3=91626480000 +PSX_59.4i=91626737000 +COLECOVISION_59.7=92245708315 +INTELLIVISION_59.9=91625968981 +INTELLIVISION_49.9=101558366540 +GAMEBOY_59.7=58647000448 +GAMEBOY2P_59.7=58647000448 +GBA_59.7=78199914915 +GBA2P_59.7=78199914915 +WONDERSWAN_59.4=106764120005 +ODYSSY2_59.5=91625968978 +ODYSSY2_49.7=68719476736 +ASTROCADE_60.0=68719476736 +C64_59.8=60129542165 +C64_50.1=77309411302 +APPLE-II_60.2=68719476736 +ATARI800_59.9=68719476736 +MSX_59.9=45812984491 +MSX1_59.9=91625969068 +MSX1_50.2=113487987583 +VIC20_60.3=60129542165 +VIC20_50.0=68719477111 +C16_59.9=68719476736 +C16_49.9=85899345254 +ADAM_49.7=92245708315 +PCXT_59.8=68875929271 +AMSTRAD_50.1=76169420985 +EG2000_50.0=137442831021 +ATARIST_60.0=40888921898 +ATARIST_=50644822720 +MINIMIG_59.4=34676280039 +MINIMIG_49.9=42949793920 +TSCONF_48.8=87049782922 +ZX81_50.6=93746345975 +COCO3_59.7=68719476017 +COCO2_58.7=91625969068 +TRS_59.9=92436659589 +SPMX_50.1=50779613734 +QL_60.4=46854362958 +QL_50.1=58033843975 +SAMCOUPE_50.1=50779614502 +RX78_60.1=87050531210 +CASIO_PV-2000_60.2=91625969068 +ORIC_49.9=101558939980 +ONDRA_SPO186_50.1=101559227980 +AQUARIUS_59.7=68719476273 +SORD M5_50.0=114252956558 +LYNX48_49.8=101558653516 +LASER_58.6=91625969004 +JUPITER_50.1=93746979831 +INTERACT_59.9=68719476529 +ACORNELECTRON_50.1=76169420881 +TATUNGEINSTEIN_59.7=92244938627 +PET2001_59.6=70281495261 +BL0011M_48.8=101559199308 +BBCMICRO_50.1=50779613990 +ACORNATOM_58.6=113487811455 +APOGEE_50.0=50779785510 +TI-99_60.2=113487861530 +SPECTRUM_50.1=87049782922 +ZXNEXT_50.1=87049782922 +A.GALAXN_59.2=81994830148 +A.ARKANOID_59.2=81994830148 +A.SEGASTS1_60.1=81317297222 +A.JOUST2_60.1=81994642597 +A.MYSTICMARATHON_60.1=81994642597 +A.CENTIPED_59.9=162687536733 +TERRA CRESTA_59.4=40997477092 +ARMED F_59.0=40997477092 +A.DKONGJ_60.6=160144797068 +A.DKONG_60.6=80079855233 +A.DIGDUG_60.8=160160364222 +A.PACMAN_60.0=80902786030 +AATETRIS_59.7=68719476738 +A.BERZERK_=98394094109 +A.BTIME_57.4=81995189032 +CAVE_57.4=140562244330 +CAVE_60.1=140562053354 +A.COSMIC_60.1=90970254800 +A.DFNDR_60.1=81995330760 +A.FOODFIGHT_60.8=80072697300 +GALAGA_59.2=81994830536 +A.MARIO_59.2=81994830024 +A.MR DO!_59.9=80322025171 +A.POPEYE_59.4=98393944317 +QBERT_61.4=98393412541 +A.RPATROL_59.2=81994830024 +SNK_TRIPLEZ80_61.5=73427991318 +A.TECMO_59.2=40997415076 +A.CANYON_59.9=81338324927 +A.DOMINOS_59.9=81338324927 +A.FINALIZR_61.1=80072998740 +A.FINALIZR_60.0=81513534047 +A.GAUNTLET_59.7=68719476736 +A.IRONHORSE_61.1=80072998740 +A.IRONHORSE_60.0=81513534047 +A.JACKAL_61.1=80072998740 +A.JACKAL_60.0=81513534047 +A.JACKAL_61.8=81995537608 +A.MOONPT_55.4=81995291720 +A.TIMEPLT_60.6=80073076340 +A.TIMEPLT_60.0=80869570271 +A.TP84_60.6=80073076340 +A.TP84_60.0=80869570271 +A.TURKEYSHOOT_60.1=81995330888 +XEVIOUS_59.2=81994830024 +A.ASTROCADE_60.0=68719476736 +A.BAGMAN_59.2=81994830148 +A.BLOCKADE_60.1=189309997932 +A.BMBJCK_59.2=81994830148 +A.BREAKOUT_63.4=68720085481 +A.BRUBBR_59.9=81995204296 +A.COMSPC_60.0=168428997867 +A.CRBALLOON_59.1=98521506322 +A.CCLIMB_59.2=81994830148 +A.CKONG_59.2=81994830148 +A.DKONG3_59.2=160146152359 +A.DRUGA_60.8=80079502017 +A.FRENZY_59.6=98393274845 +A.GAPLUS_60.8=80072697556 +A.GYRUSS_60.6=80869570271 +A.GYRUSS_60.0=80073076340 +A.IREMM62_55.4=81994657346 +A.JAILBREAK_60.6=80869570271 +A.JAILBREAK_60.0=80073076340 +A.LADYBG_61.2=98394178365 +A.MCR1_59.7=49196898139 +A.MCR2_59.7=49196898139 +A.MCR3_59.7=49196898139 +A.MCR3MONO_59.7=49196898139 +A.MCR3SCROLL_59.7=49196898139 +A.NINJAKUN_59.4=81994953928 +A.PENGO_59.2=81994830148 +A.PHNX_59.6=89448431462 +A.PLEIADS_59.6=89448431462 +A.POOYAN_59.4=81994954056 +A.NRALLYX_60.8=160145395111 +A.ROBTRN_60.1=81994642552 +A.RSHNATK_60.6=80079855105 +A.SSHOOTER_60.6=80869570271 +A.SSHOOTER_60.0=80073076340 +A.SCRMBL_60.6=80073076312 +A.SILVLAND_59.2=81994830148 +A.SOLMNSKEY_60.0=81994721356 +A.SPACERACE_60.1=68720053161 +A.SPRINT1_59.9=81343768238 +A.SPRINT2_59.9=81343768238 +A.SUBS_59.9=81343768238 +A.SBRKOUT_59.9=81338324927 +ULTRATNK_59.9=162687536733 +A.ZAXXON_59.2=81994830148 +A.ZIGZAG_59.2=163989660169 +BAKRAID_59.4=41648230652 +GAREGGA_59.4=41648230652 +BATRIDER_59.4=41648230652 +M72_55.2=122992763180 +VBALL_59.3=81995085016 +PREHISLE1930_54.1=54662994786 +PREHISLE1930_59.2=67706006731 +CHAMELEON_57.2=93708649884 +A.MISSLE_61.0=196786677370 +A.TROPICALANGEL_56.7=80073725512 +CONGOBONGO_59.2=81994830280 +A.EXERION_61.3=98552954757 +BOSCONIAN_59.2=81994829512 +SONSON_55.4=54663385470 +A.PERFORMAN_55.9=122992725292 +TOAPLAN V1_57.6=56225315217 +JTKICKER_60.6=81994830210 +JTPINPON_60.6=81994830210 +JTROADF_60.6=81994830210 +JTROC_60.6=81994830210 +JTSBASK_60.6=81994830210 +JTSBASKT_60.6=81994830210 +JTTRACK_60.6=81994830210 +JTYIEAR_60.6=81994830210 +JTMIKIE_60.6=80073076188 +JTCPS1_59.6=40997539300 +JTCPS15_59.6=40997539300 +JTCPS2_59.6=40997539300 +JTGNG_59.6=81995078596 +T1943_59.6=81995078596 +JT1942_59.6=81995078596 +JTBIOCOM_59.6=81995078596 +JTBTIGER_59.6=81995078596 +JTBUBL_59.2=81994819784 +JTCASTLE_59.2=81994830210 +JTCOMMND_59.6=81995078596 +JTCOMSC_59.2=81994830210 +JTCONTRA_59.2=81994830210 +JTCOP_57.4=81995189032 +JTDD_57.4=81995189032 +JTDD2_57.4=81995189032 +JTF1DRM_59.6=81995078596 +JTEXED_59.6=81995078596 +JTFLANE_59.2=81994830210 +JTGUNSMK_59.6=81995078596 +JTHIGE_59.6=81995078596 +JTKARNOV_57.4=81995189032 +JTKCHAMP_59.2=81994830210 +JTKIWI_59.2=81994819784 +JTNINIO_57.4=81995189032 +JTLABRUN_59.2=81994830210 +JTMIDRES_57.4=81995189032 +JTMX5K_59.2=81994830210 +JTNINJA_57.4=81995189032 +JTOUTRUN_60.1=78171027928 +JTPANG_57.4=81995189032 +JTRASTAN_59.8=73750556844 +JTRUMBLE_57.4=81995078596 +JTS16_60.1=78171027928 +JTS16B_60.1=78171027928 +JTSARMS_61.0=81995189068 +JTSECTNZ_55.4=81995291716 +JTSF_61.0=81995846596 +JTSHANON_60.1=78171027928 +JTSLYSPY_57.4=81995189032 +JTTORA_59.6=81995078596 +JTTROJAN_56.0=81995646588 +JTVIGIL_56.3=80073162204 +JTVULGUS_59.6=81995078596 +MENU_59.8=196786767482 +MENU_50.2=243746729900 \ No newline at end of file