From 8236d216f24183532a59a10c8154661f0e9c383a Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 29 Jan 2009 10:18:49 +0000 Subject: Cleanups and version bump. --- src/emu/devcb.c | 36 ++++++++++++++++---------------- src/emu/devcb.h | 50 ++++++++++++++++++++++----------------------- src/emu/sound/disc_dev.c | 2 +- src/mame/audio/cps3.c | 2 +- src/mame/audio/mario.c | 4 ++-- src/mame/drivers/aerofgt.c | 6 +++--- src/mame/drivers/aristmk5.c | 2 +- src/mame/drivers/big10.c | 2 +- src/mame/drivers/cps3.c | 4 ++-- src/mame/drivers/ddenlovr.c | 2 +- src/mame/drivers/funworld.c | 2 +- src/mame/drivers/goldstar.c | 32 ++++++++++++++--------------- src/mame/drivers/magic10.c | 8 ++++---- src/mame/drivers/magicard.c | 30 +++++++++++++-------------- src/mame/drivers/merit.c | 24 +++++++++++----------- src/mame/drivers/nightgal.c | 4 ++-- src/mame/drivers/norautp.c | 8 ++++---- src/mame/drivers/seta2.c | 4 ++-- src/mame/drivers/system1.c | 4 ++-- src/mame/drivers/toaplan2.c | 16 +++++++-------- src/mame/video/system1.c | 2 +- src/mame/video/turbo.c | 4 ++-- src/version.c | 2 +- 23 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/emu/devcb.c b/src/emu/devcb.c index bcbf0e4ea34..cd63def7427 100644 --- a/src/emu/devcb.c +++ b/src/emu/devcb.c @@ -19,7 +19,7 @@ ***************************************************************************/ /*------------------------------------------------- - devcb_resolve_read_line - convert a static + devcb_resolve_read_line - convert a static read line definition to a live definition -------------------------------------------------*/ @@ -47,7 +47,7 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea fatalerror("devcb_resolve_read_line: unable to find input port '%s' (requested by %s '%s')", config->tag, device_get_name(device), device->tag); resolved->read = trampoline_read_port_to_read_line; } - + /* address space handlers */ else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL) { @@ -63,18 +63,18 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea fatalerror("devcb_resolve_read_line: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[space], device_get_name(device), device->tag); resolved->real.readspace = config->readspace; } - + /* device handlers */ else if (config->type != NULL && (config->readline != NULL || config->readdevice != NULL)) { resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->type, config->tag); if (resolved->target == NULL) fatalerror("devcb_resolve_read_line: unable to find %s '%s' (requested by %s '%s')", devtype_get_name(config->type), config->tag, device_get_name(device), device->tag); - + /* read_line to read_line is direct */ if (config->readline != NULL) resolved->read = config->readline; - + /* read_line to handler goes through a trampoline */ else { @@ -88,7 +88,7 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea /*------------------------------------------------- - devcb_resolve_write_line - convert a static + devcb_resolve_write_line - convert a static write line definition to a live definition -------------------------------------------------*/ @@ -118,18 +118,18 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w fatalerror("devcb_resolve_write_line: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[space], device_get_name(device), device->tag); resolved->real.writespace = config->writespace; } - + /* device handlers */ else if (config->type != NULL && (config->writeline != NULL || config->writedevice != NULL)) { resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->type, config->tag); if (resolved->target == NULL) fatalerror("devcb_resolve_write_line: unable to find %s '%s' (requested by %s '%s')", devtype_get_name(config->type), config->tag, device_get_name(device), device->tag); - + /* write_line to write_line is direct */ if (config->writeline != NULL) resolved->write = config->writeline; - + /* write_line to handler goes through a trampoline */ else { @@ -143,7 +143,7 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w /*------------------------------------------------- - devcb_resolve_read8 - convert a static + devcb_resolve_read8 - convert a static 8-bit read definition to a live definition -------------------------------------------------*/ @@ -171,7 +171,7 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf fatalerror("devcb_resolve_read8: unable to find input port '%s' (requested by %s '%s')", config->tag, device_get_name(device), device->tag); resolved->read = trampoline_read_port_to_read8; } - + /* address space handlers */ else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL) { @@ -185,18 +185,18 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf fatalerror("devcb_resolve_read8: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[space], device_get_name(device), device->tag); resolved->read = (read8_device_func)config->readspace; } - + /* device handlers */ else if (config->type != NULL && (config->readline != NULL || config->readdevice != NULL)) { resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->type, config->tag); if (resolved->target == NULL) fatalerror("devcb_resolve_read8: unable to find %s '%s' (requested by %s '%s')", devtype_get_name(config->type), config->tag, device_get_name(device), device->tag); - + /* read8 to read8 is direct */ if (config->readdevice != NULL) resolved->read = config->readdevice; - + /* read8 to read_line goes through a trampoline */ else { @@ -210,7 +210,7 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf /*------------------------------------------------- - devcb_resolve_write8 - convert a static + devcb_resolve_write8 - convert a static 8-bit write definition to a live definition -------------------------------------------------*/ @@ -238,18 +238,18 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c fatalerror("devcb_resolve_write8: unable to find CPU '%s' %s space (requested by %s '%s')", config->tag, address_space_names[space], device_get_name(device), device->tag); resolved->write = (write8_device_func)config->writespace; } - + /* device handlers */ else if (config->type != NULL && (config->writeline != NULL || config->writedevice != NULL)) { resolved->target = (config->type == DEVCB_TYPE_SELF) ? device : devtag_get_device(device->machine, config->type, config->tag); if (resolved->target == NULL) fatalerror("devcb_resolve_write8: unable to find %s '%s' (requested by %s '%s')", devtype_get_name(config->type), config->tag, device_get_name(device), device->tag); - + /* write8 to write8 is direct */ if (config->writedevice != NULL) resolved->write = config->writedevice; - + /* write8 to write_line goes through a trampoline */ else { diff --git a/src/emu/devcb.h b/src/emu/devcb.h index 99cce9be9c0..c17496770af 100644 --- a/src/emu/devcb.h +++ b/src/emu/devcb.h @@ -9,27 +9,27 @@ **************************************************************************** - These functions are used to adapt multiple read/write handler types - to be used with device I/O. In general, a device is expected to - declare its desired callback type, and these functions allow other - callback types to be adapted appropriately. - - The desired callback types currently supported include: - - read_line_device_func: (device) - write_line_device_func: (device, data) - read8_device_func: (device, offset) - write8_device_func: (device, offset, data) - - The adapted callback types supported are: - - input port (port) - read_line_device_func: (device) - write_line_device_func: (device, data) - read8_device_func: (device, offset) - write8_device_func: (device, offset, data) - read8_space_func: (space, offset) - write8_space_func: (space, offset, data) + These functions are used to adapt multiple read/write handler types + to be used with device I/O. In general, a device is expected to + declare its desired callback type, and these functions allow other + callback types to be adapted appropriately. + + The desired callback types currently supported include: + + read_line_device_func: (device) + write_line_device_func: (device, data) + read8_device_func: (device, offset) + write8_device_func: (device, offset, data) + + The adapted callback types supported are: + + input port (port) + read_line_device_func: (device) + write_line_device_func: (device, data) + read8_device_func: (device, offset) + write8_device_func: (device, offset, data) + read8_space_func: (space, offset) + write8_space_func: (space, offset, data) ***************************************************************************/ @@ -217,7 +217,7 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c ***************************************************************************/ /*------------------------------------------------- - devcb_call_read_line - call through a + devcb_call_read_line - call through a resolved read_line handler -------------------------------------------------*/ @@ -228,7 +228,7 @@ INLINE int devcb_call_read_line(const devcb_resolved_read_line *resolved) /*------------------------------------------------- - devcb_call_read8 - call through a + devcb_call_read8 - call through a resolved read8 handler -------------------------------------------------*/ @@ -239,7 +239,7 @@ INLINE int devcb_call_read8(const devcb_resolved_read8 *resolved, offs_t offset) /*------------------------------------------------- - devcb_call_write_line - call through a + devcb_call_write_line - call through a resolved write_line handler -------------------------------------------------*/ @@ -251,7 +251,7 @@ INLINE void devcb_call_write_line(const devcb_resolved_write_line *resolved, int /*------------------------------------------------- - devcb_call_write8 - call through a + devcb_call_write8 - call through a resolved write8 handler -------------------------------------------------*/ diff --git a/src/emu/sound/disc_dev.c b/src/emu/sound/disc_dev.c index 52179ee5a9a..49bed9eb22f 100644 --- a/src/emu/sound/disc_dev.c +++ b/src/emu/sound/disc_dev.c @@ -1583,7 +1583,7 @@ static DISCRETE_RESET(dsd_566) /* * The datasheet mentions a 600 ohm discharge. It also gives - * equivalent circuits for VI and VR. + * equivalent circuits for VI and VR. */ #define LS624_F1(x) (0.19 + 20.0/90.0*(x)) diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c index 065d334b6fe..dc564fb157b 100644 --- a/src/mame/audio/cps3.c +++ b/src/mame/audio/cps3.c @@ -105,7 +105,7 @@ CUSTOM_START( cps3_sh_start ) memset(&chip, 0, sizeof(chip)); chip.base = (INT8*)cps3_user5region; - + return auto_malloc(1); } diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 78a4950f89e..26202ada380 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -112,9 +112,9 @@ #define MR_C32 CAP_U(1) /* illegible on pcb */ #define MR_C39 CAP_N(4.7) /* not found */ #define MR_C40 CAP_N(22) /* verified */ -//#define MR_C41 CAP_U(4.7) /* verified, hard to read */ +//#define MR_C41 CAP_U(4.7) /* verified, hard to read */ /* The 60% adjustment is needed to bring this close to recordings */ -#define MR_C41 (CAP_U(4.7) * 0.6) +#define MR_C41 (CAP_U(4.7) * 0.6) #define MR_C43 CAP_U(3.3) /* verified */ #define MR_C44 CAP_U(3.3) /* verified */ diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 6f471b558d1..a882fc622da 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -136,8 +136,8 @@ static WRITE16_HANDLER( pspikesb_oki_banking_w ) /*TODO: sound banking. */ static WRITE16_HANDLER( aerfboo2_okim6295_banking_w ) { -// if(ACCESSING_BITS_8_15) -// okim6295_set_bank_base(0, 0x40000 * ((data & 0xf00)>>8)); +// if(ACCESSING_BITS_8_15) +// okim6295_set_bank_base(0, 0x40000 * ((data & 0xf00)>>8)); } static WRITE8_HANDLER( aerfboot_okim6295_banking_w ) @@ -366,7 +366,7 @@ static ADDRESS_MAP_START( aerfboo2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0fe006, 0x0fe007) AM_READ(okim6295_status_0_msb_r) AM_RANGE(0x0fe00e, 0x0fe00f) AM_WRITE(okim6295_data_0_msb_w) AM_RANGE(0x0fe01e, 0x0fe01f) AM_WRITE(aerfboo2_okim6295_banking_w) -// AM_RANGE(0x0fe010, 0x0fe011) AM_WRITENOP +// AM_RANGE(0x0fe010, 0x0fe011) AM_WRITENOP // AM_RANGE(0x0fe012, 0x0fe013) AM_WRITE(aerfboot_soundlatch_w) AM_RANGE(0x0fe400, 0x0fe401) AM_WRITENOP // data for a crtc? AM_RANGE(0x0fe402, 0x0fe403) AM_WRITENOP // address for a crtc? diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c index 3b00af713de..cdb35856382 100644 --- a/src/mame/drivers/aristmk5.c +++ b/src/mame/drivers/aristmk5.c @@ -3,7 +3,7 @@ Aristocrat MK5 / MKV hardware possibly 'Acorn Archimedes on a chip' hardware - Note: ARM250 mapping is not identical to + Note: ARM250 mapping is not identical to */ diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c index 0f7ce992d95..668105ecfe4 100644 --- a/src/mame/drivers/big10.c +++ b/src/mame/drivers/big10.c @@ -28,7 +28,7 @@ - Guessed and hooked the Yamaha VDP (SDIP64 IC). Same VDP used on MSX systems. - Added v9938 stuff, interrupts, video start, machine reset, input ports, DIP switch, ym2149 interface, pre-defined main Xtal and derivatives for - z80 and ym2149. + z80 and ym2149. - Added NVRAM, defined half of DIP switches bank (coinage & main game rate). Added inputs for coins A, B & C, payout, reset, and service mode. - Reorganized the driver. diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index ffd4eb5149c..42d353d0099 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -685,14 +685,14 @@ static void cps3_decrypt_bios(running_machine *machine) static DRIVER_INIT( cps3 ) { int i; - + // cache pointers to regions cps3_user4region = memory_region(machine,"user4"); cps3_user5region = memory_region(machine,"user5"); if (!cps3_user4region) cps3_user4region = auto_malloc(USER4REGION_LENGTH); if (!cps3_user5region) cps3_user5region = auto_malloc(USER5REGION_LENGTH); - + // set strict verify device_set_info_int(machine->cpu[0], CPUINFO_INT_SH2_DRC_OPTIONS, SH2DRC_STRICT_VERIFY); diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 1ec78457927..c1e3993bd95 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -4482,7 +4482,7 @@ static INPUT_PORTS_START( hkagerou ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // P2 t (Take) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // P2 w (W.Up) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2) // P2 f (Flip Flop) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_PLAYER(2) // P2 b (Big) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_PLAYER(2) // P2 b (Big) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(2) // P2 s (Small) PORT_START("KEY5") diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index 5445d975550..962e2aa82b2 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -1075,7 +1075,7 @@ static WRITE8_HANDLER(funworld_lamp_b_w) static WRITE8_HANDLER(pia1_ca2_w) { /* TAB and Impera games are writting 0x01 constantly, and 0x00 with each screen change */ -// popmessage("PIA1 CA2: %02X", data); +// popmessage("PIA1 CA2: %02X", data); } diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index c515d672d3c..c10d9838ee9 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -4489,7 +4489,7 @@ ROM_START( nfb96 ) // alt graphics.. different copyright? ROM_LOAD( "fbseh.bin", 0x00000, 0x10000, CRC(2fc10ce7) SHA1(a2418cfbe7ed217848ace8ea06587bcaa6b2c8f2) ) ROM_LOAD( "fbsel.bin", 0x10000, 0x10000, CRC(fb9d679a) SHA1(a4f6246bdbbf2e25f702006b30a62bc7873137de) ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x04000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x0c000, 0x04000, 0x4000 ) // 2 @@ -4571,7 +4571,7 @@ ROM_START( nfb96se ) ROM_CONTINUE(0xd000, 0x1000) ROM_CONTINUE(0xe000, 0x1000) ROM_CONTINUE(0xf000, 0x1000) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) @@ -4584,7 +4584,7 @@ ROM_START( nfb96se ) ROM_LOAD( "dogd2.rom", 0x4000, 0x2000, CRC(6ab19916) SHA1(f125365b3c5546d72662cf439311811ae761f225) ) ROM_LOAD( "dogd3.rom", 0x2000, 0x2000, CRC(5d4810a5) SHA1(8e9e50c6c7c13010ecb726041a1ac8eccead96ce) ) ROM_LOAD( "dogd4.rom", 0x0000, 0x2000, CRC(be31f6fa) SHA1(b522ff520b3fbb34c55c7bb1fe7dfeecd593d6be) ) - + // taken from new fruit bonus '96, might be wrong ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) @@ -4595,23 +4595,23 @@ ROM_START( nfb96se ) ROM_END -// this set has an encrypted program rom +// this set has an encrypted program rom ROM_START( nfb96sea ) ROM_REGION( 0x10000, "main", 0 ) ROM_LOAD( "dog_08.rom", 0x00000, 0x10000, CRC(357f13e8) SHA1(ca0872c9f7dc44a4c1c342f7f53c490f6342f1d2) ) - + /* the graphic roms on this set are a mess, the planes don't match up properly */ ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "dog_05.rom", 0x10000, 0x08000, CRC(c03b5632) SHA1(4f603ec5218adcbfce09ec6d3643ffb5006056dd) ) ROM_LOAD( "dog_06.rom", 0x08000, 0x08000, CRC(c48e5b5c) SHA1(9d79631b54d9915cd161b5028c1be7879254d9be) ) ROM_LOAD( "dog_07.rom", 0x00000, 0x08000, CRC(97033c70) SHA1(4d5746f43f8f4d374ba2f31d21defd21921d39bf) ) - + ROM_REGION( 0x8000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "dog_01.rom", 0x0000, 0x2000, CRC(26eb35ce) SHA1(564c775eda7a026841095b210257aea59288f042) ) ROM_LOAD( "dog_02.rom", 0x2000, 0x2000, CRC(0e220d8a) SHA1(f84145250785dae78ea5af6388d91ad24b42ff9c) ) ROM_LOAD( "dog_03.rom", 0x4000, 0x2000, CRC(01a7ff6f) SHA1(bfb4ad07d99807eadbb0cb85c5a6cf60a5875f2d) ) ROM_LOAD( "dog_04.rom", 0x6000, 0x2000, CRC(be31f6fa) SHA1(b522ff520b3fbb34c55c7bb1fe7dfeecd593d6be) ) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) // taken from new fruit bonus '96, might be wrong @@ -4640,7 +4640,7 @@ ROM_START( nfb96seb ) ROM_CONTINUE(0xc000, 0x1000) ROM_CONTINUE(0xd000, 0x1000) ROM_CONTINUE(0xe000, 0x1000) - ROM_CONTINUE(0xf000, 0x1000) + ROM_CONTINUE(0xf000, 0x1000) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) @@ -4648,13 +4648,13 @@ ROM_START( nfb96seb ) ROM_LOAD( "dogmx5", 0x10000, 0x08000, CRC(c03b5632) SHA1(4f603ec5218adcbfce09ec6d3643ffb5006056dd) ) ROM_LOAD( "dogmx6", 0x08000, 0x08000, CRC(c48e5b5c) SHA1(9d79631b54d9915cd161b5028c1be7879254d9be) ) ROM_LOAD( "dogmx7", 0x00000, 0x08000, CRC(97033c70) SHA1(4d5746f43f8f4d374ba2f31d21defd21921d39bf) ) // wagner video junk on this layer - + ROM_REGION( 0x8000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "dogmx1", 0x6000, 0x2000, CRC(b72d2c2c) SHA1(faf60ca0f522868e6dbf7c3ace5c84d8fd001df3) ) ROM_LOAD( "dogmx2", 0x4000, 0x2000, CRC(a85f5516) SHA1(1564e6c490883c96bffc561d9115eb53450945ce) ) ROM_LOAD( "dogmx3", 0x2000, 0x2000, CRC(f1a8aea8) SHA1(c20b779a73856d94e862d87ad337c9501da86691) ) ROM_LOAD( "dogmx4", 0x0000, 0x2000, CRC(be31f6fa) SHA1(b522ff520b3fbb34c55c7bb1fe7dfeecd593d6be) ) - + // taken from new fruit bonus '96, might be wrong ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) @@ -4686,7 +4686,7 @@ ROM_START( carb2002 ) ROM_CONTINUE(0xf000, 0x1000) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "dogtai5", 0x10000, 0x08000, CRC(0c8a4afb) SHA1(994295eea7964d60b6a1db911679739a10be9bbe) ) ROM_LOAD( "dogtai6", 0x08000, 0x08000, CRC(e9f5dc36) SHA1(6a4060c901f10202fe935701f1f1087c8477da56) ) @@ -4694,13 +4694,13 @@ ROM_START( carb2002 ) // alt. replacements for roms 5+6?, erases the word 'slot' on the title screen? ROM_LOAD( "dogdif5", 0x10000, 0x08000, CRC(a1986e44) SHA1(3178de9c6063c9f33878b6070db95b2eeb12ffea) ) ROM_LOAD( "dogdif6", 0x08000, 0x08000, CRC(a5d389fc) SHA1(3db570c938a387708974f24a110cf25b9b52ac22) ) - + ROM_REGION( 0x8000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "dogtai1", 0x6000, 0x2000, CRC(68ed1c26) SHA1(495a8b57c368b0b7c2a618d4f1e980d5187f411a) ) ROM_LOAD( "dogtai2", 0x4000, 0x2000, CRC(b5e25d9b) SHA1(9374f7662f92c10ca6d1af570eaa4d161173283f) ) ROM_LOAD( "dogtai3", 0x2000, 0x2000, CRC(df13aeb2) SHA1(942f742a722bab44dd3de270001b60d888c44111) ) ROM_LOAD( "dogtai4", 0x0000, 0x2000, CRC(170f07ce) SHA1(4b48841f9c5bdf7bfbc05113148666a5bcdd3d35) ) - + // taken from new fruit bonus '96, definitely wrong ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, BAD_DUMP CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) @@ -4729,12 +4729,12 @@ ROM_START( carb2003 ) ROM_CONTINUE(0xd000, 0x1000) ROM_CONTINUE(0xe000, 0x1000) ROM_CONTINUE(0xf000, 0x1000) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "timedog5.rom", 0x10000, 0x08000, CRC(cf05b66d) SHA1(a711a86f2a82dd685a379fda0cf7240b2ca2696e) ) ROM_LOAD( "timedog6.rom", 0x08000, 0x08000, CRC(2d81bdbe) SHA1(56eaa9347014340b902d8f0bc38b719acf56c314) ) ROM_LOAD( "timedog7.rom", 0x00000, 0x08000, CRC(f8e410e5) SHA1(1edc863902cfb1605aca08f6970f9bd24147ca0b) ) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE ) // these seem to contain mixed planes of different gfx sets.. not correct @@ -4744,7 +4744,7 @@ ROM_START( carb2003 ) ROM_LOAD( "timedog3.rom", 0x2000, 0x2000, CRC(6f305ac7) SHA1(55f0d73b783854584195658ab4e74770bc13ba0b) ) ROM_LOAD( "timedog4.rom", 0x0000, 0x2000, CRC(807a16fc) SHA1(111e7d171f9278abea666d6ad41b02f2c8bf98d8) ) ROM_IGNORE(0x2000) - + // taken from new fruit bonus '96, definitely wrong ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, BAD_DUMP CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 8159ac89d6f..34f91277a8e 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -67,7 +67,7 @@ - Dump/decap/trojan the MCU in the later games (magic102, suprpool, hotslot, mcolors). The MCU shares memory addresses at $500000-$50001f (in magic102) It can't be simulated with a high level of confidence because all the game logic is - in there, including rngs for the cards and combinations for the points. + in there, including rngs for the cards and combinations for the points. - Priorities,likely to be hardwired with the color writes (0=tile has the highest priority). @@ -166,9 +166,9 @@ static VIDEO_UPDATE( magic10 ) tilemap_set_scrolly(layer2_tilemap, 0, layer2_offset[1]); /* - 4 and 6 are y/x global register writes. - 0 and 2 are y/x writes for the scrolling layer. - */ + 4 and 6 are y/x global register writes. + 0 and 2 are y/x writes for the scrolling layer. + */ tilemap_set_scrolly(layer1_tilemap, 0, (magic10_vregs[0/2] - magic10_vregs[4/2])+0); tilemap_set_scrollx(layer1_tilemap, 0, (magic10_vregs[2/2] - magic10_vregs[6/2])+4); diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c index 8a30e6dfe7d..3fec8251fae 100644 --- a/src/mame/drivers/magicard.c +++ b/src/mame/drivers/magicard.c @@ -347,8 +347,8 @@ static READ16_HANDLER( philips_66470_r ) { switch(offset) { -// case 0/2: -// return mame_rand(space->machine); //TODO +// case 0/2: +// return mame_rand(space->machine); //TODO } printf("[%04x]\n",offset*2); @@ -361,15 +361,15 @@ static WRITE16_HANDLER( philips_66470_w ) { COMBINE_DATA(&pcab_vregs[offset]); -// if(offset == 0x10/2) -// { +// if(offset == 0x10/2) +// { //printf("%04x %04x %04x\n",data,pcab_vregs[0x12/2],pcab_vregs[0x14/2]); //pcab_vregs[0x12/2] = pcab_vregs[0x10/2]; -// } +// } } static ADDRESS_MAP_START( magicard_mem, ADDRESS_SPACE_PROGRAM, 16 ) -// ADDRESS_MAP_GLOBAL_MASK(0x1fffff) +// ADDRESS_MAP_GLOBAL_MASK(0x1fffff) AM_RANGE(0x000000, 0x0fffff) AM_RAM AM_BASE(&magicram) /*only 0-7ffff accessed in Magic Card*/ // AM_RANGE(0x100000, 0x17ffff) AM_RAM AM_REGION("main", 0) AM_RANGE(0x180000, 0x1ffbff) AM_ROM AM_REGION("main", 0) @@ -411,9 +411,9 @@ MACHINE_RESET( magicard ) /*Probably there's a mask somewhere if it REALLY uses irqs at all...irq vectors dynamically changes after some time.*/ static INTERRUPT_GEN( magicard_irq ) { -// if(input_code_pressed(KEYCODE_Z)) -// cpu_set_input_line(device->machine->cpu[0], 1, HOLD_LINE); -// magicram[0x2004/2]^=0xffff; +// if(input_code_pressed(KEYCODE_Z)) +// cpu_set_input_line(device->machine->cpu[0], 1, HOLD_LINE); +// magicram[0x2004/2]^=0xffff; } static MACHINE_DRIVER_START( magicard ) @@ -489,18 +489,18 @@ GAME( 199?, magicrda, 0, magicrda, 0, magicard, ROT0, "Impera", "Magi /*Below here there are CD-I bios defines,to be removed in the end*/ /* ROM_START( mcdi200 ) - ROM_REGION( 0x80000, "main", 0 ) - ROM_LOAD16_WORD( "mgvx200.rom", 0x000000, 0x80000, CRC(40c4e6b9) SHA1(d961de803c89b3d1902d656ceb9ce7c02dccb40a) ) + ROM_REGION( 0x80000, "main", 0 ) + ROM_LOAD16_WORD( "mgvx200.rom", 0x000000, 0x80000, CRC(40c4e6b9) SHA1(d961de803c89b3d1902d656ceb9ce7c02dccb40a) ) ROM_END ROM_START( pcdi490 ) - ROM_REGION( 0x80000, "main", 0 ) - ROM_LOAD16_WORD( "phlp490.rom", 0x000000, 0x80000, CRC(e115f45b) SHA1(f71be031a5dfa837de225081b2ddc8dcb74a0552) ) + ROM_REGION( 0x80000, "main", 0 ) + ROM_LOAD16_WORD( "phlp490.rom", 0x000000, 0x80000, CRC(e115f45b) SHA1(f71be031a5dfa837de225081b2ddc8dcb74a0552) ) ROM_END ROM_START( pcdi910m ) - ROM_REGION( 0x80000, "main", 0 ) - ROM_LOAD16_WORD( "cdi910.rom", 0x000000, 0x80000, CRC(8ee44ed6) SHA1(3fcdfa96f862b0cb7603fb6c2af84cac59527b05) ) + ROM_REGION( 0x80000, "main", 0 ) + ROM_LOAD16_WORD( "cdi910.rom", 0x000000, 0x80000, CRC(8ee44ed6) SHA1(3fcdfa96f862b0cb7603fb6c2af84cac59527b05) ) ROM_END GAME( 199?, mcdi200, 0, magicard, 0, magicard, ROT0, "Philips", "Magnavox CD-I 200 BIOS", GAME_NO_SOUND | GAME_NOT_WORKING ) diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index ef5de2da324..1c0b76073f8 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -822,11 +822,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( casino5 ) PORT_START("IN0") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Play") PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) @@ -848,7 +848,7 @@ static INPUT_PORTS_START( casino5 ) PORT_START("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* 0 causes "Unathorized conversion" */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) @@ -886,11 +886,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( bigappg ) PORT_START("IN0") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Play") PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) @@ -912,7 +912,7 @@ static INPUT_PORTS_START( bigappg ) PORT_START("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 11266864ec5..beb5c3e76cf 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -410,7 +410,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sexygal_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x807f) AM_RAM AM_SHARE(2) -// AM_RANGE(0xa000, 0xa000) AM_WRITE(nsc_latch_w) //??? +// AM_RANGE(0xa000, 0xa000) AM_WRITE(nsc_latch_w) //??? AM_RANGE(0xe000, 0xe03f) AM_RAM AM_SHARE(1) AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -419,7 +419,7 @@ static ADDRESS_MAP_START( sexygal_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00,0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w) AM_RANGE(0x01,0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w) -// AM_RANGE(0x10,0x10) AM_WRITE(output_w) +// AM_RANGE(0x10,0x10) AM_WRITE(output_w) AM_RANGE(0x10,0x10) AM_READ_PORT("DSWC") AM_RANGE(0x11,0x11) AM_READ_PORT("SYSA") AM_RANGE(0x12,0x12) AM_READ_PORT("DSWA") diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index c452dbc3fdd..4f76dd4eda1 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -45,9 +45,9 @@ Noraut Edge Connector (pinouts) - -------------------------------- + -------------------------------- Component PN Solder Side - -------------------------------- + -------------------------------- GND 01 GND 5v DC 02 5v DC 03 @@ -310,7 +310,7 @@ static ADDRESS_MAP_START( norautp_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xc0, 0xc0) AM_WRITE(vram_data_w) AM_RANGE(0xc1, 0xc1) AM_WRITE(vram_addr_w) AM_RANGE(0xc2, 0xc2) AM_READ(test_r) -// AM_RANGE(0xc0, 0xc3) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) +// AM_RANGE(0xc0, 0xc3) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) ADDRESS_MAP_END /* @@ -335,7 +335,7 @@ static ADDRESS_MAP_START( gtipoker_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xdc, 0xdc) AM_WRITE(vram_data_w) AM_RANGE(0xdd, 0xdd) AM_WRITE(vram_addr_w) AM_RANGE(0xde, 0xde) AM_READ(test_r) -// AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) +// AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) AM_RANGE(0xef, 0xef) AM_READ(test_r) ADDRESS_MAP_END diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 9051ad1b926..96ded849462 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -1010,7 +1010,7 @@ static READ8_HANDLER( funcube_serial_r ) static void funcube_debug_outputs(void) { #ifdef MAME_DEBUG -// popmessage("LED: %02x OUT: %02x", (int)*funcube_leds, (int)*funcube_outputs); +// popmessage("LED: %02x OUT: %02x", (int)*funcube_leds, (int)*funcube_outputs); #endif } @@ -1059,7 +1059,7 @@ static ADDRESS_MAP_START( funcube_sub_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE( H8_PORT_4, H8_PORT_4 ) AM_NOP // unused AM_RANGE( H8_PORT_A, H8_PORT_A ) AM_READWRITE( funcube_outputs_r, funcube_outputs_w ) AM_BASE( &funcube_outputs ) AM_RANGE( H8_PORT_B, H8_PORT_B ) AM_WRITE( funcube_leds_w ) AM_BASE( &funcube_leds ) -// AM_RANGE( H8_SERIAL_0, H8_SERIAL_0 ) // cabinets linking (jpunit) +// AM_RANGE( H8_SERIAL_0, H8_SERIAL_0 ) // cabinets linking (jpunit) AM_RANGE( H8_SERIAL_1, H8_SERIAL_1 ) AM_READ( funcube_serial_r ) ADDRESS_MAP_END diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index 3b71e92c0b7..0b117999ef7 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -344,7 +344,7 @@ static ADDRESS_MAP_START( nobb_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0d, 0x0d) AM_READ_PORT("DSW1") /* DIP1 some games read it from here... */ AM_RANGE(0x14, 0x14) AM_WRITE(system1_soundport_w) /* sound commands ? */ AM_RANGE(0x15, 0x15) AM_READWRITE(system1_videomode_r, brain_videomode_w) /* video control + bank switching */ - + /* protection on the bootleg */ AM_RANGE(0x16, 0x16) AM_READWRITE(nobb_inport16_r, nobb_outport16_w) /* Used - check code at 0x05cb */ AM_RANGE(0x17, 0x17) AM_WRITE(nobb_outport17_w) /* Not handled in emul. of other SS1/2 games */ @@ -4024,7 +4024,7 @@ ROM_START( nob ) ROM_REGION( 0x8000, "mcu", 0 ) ROM_LOAD( "8751.mcu", 0x00000, 0x8000, NO_DUMP ) - + ROM_REGION( 0x10000, "sound", 0 ) ROM_LOAD( "dm03.9h", 0x0000, 0x4000, CRC(415adf76) SHA1(fbd6f8921aa3246702983ba81fa9ae53fa10c19d) ) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index c2516aeaad3..d347f1b363f 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -4871,12 +4871,12 @@ ROM_END /* The region of Batrider is controlled by the first byte of rom prg0.u22 only sets which have been dumped from original PCBs are supported - + original ROM labels have no indication of the region. - + valid values are: ( * denotes that this set has been found on an original PCB ) - + 00 : Nippon * 01 : USA * 02 : Europe * @@ -4904,9 +4904,9 @@ ROM_END 18 : China * 19 : No Region? 1A+: Invalid - + For future reference, that would mean the following - + ROM_LOAD16_BYTE( "prg0_nippon.u22", 0x000000, 0x080000, CRC(4f3fc729) SHA1(b32d51c254741b82171a86c271679522a7aefd34) ) ROM_LOAD16_BYTE( "prg0_usa.u22", 0x000000, 0x080000, CRC(2049d007) SHA1(f2a43547a6fc5083b03c1d59a85abbf6e1ce4cd9) ) ROM_LOAD16_BYTE( "prg0_europe.u22", 0x000000, 0x080000, CRC(91d3e975) SHA1(682885fc17f2424d475c282f239f42faf1aae076) ) @@ -4933,9 +4933,9 @@ ROM_END ROM_LOAD16_BYTE( "prg0_korea.u22", 0x000000, 0x080000, CRC(d9d8c907) SHA1(69c197f2a41f288913f042de9eb8274c0df3ac27) ) ROM_LOAD16_BYTE( "prg0_china.u22", 0x000000, 0x080000, CRC(c3b91f7e) SHA1(6b2376c37808dccda296d90ccd7f577ccff4e4dc) ) ROM_LOAD16_BYTE( "prg0_none.u22", 0x000000, 0x080000, CRC(accf0850) SHA1(d93e4e80443a40c3a9575dbf21927ef0d1a039b9) ) - + */ - + ROM_START( batrid ) ROM_REGION( 0x200000, "main", 0 ) /* Main 68k code */ @@ -5035,7 +5035,7 @@ ROM_END ROM_START( batridk ) ROM_REGION( 0x200000, "main", 0 ) /* Main 68k code */ - ROM_LOAD16_BYTE( "prg0_korea.u22", 0x000000, 0x080000, CRC(d9d8c907) SHA1(69c197f2a41f288913f042de9eb8274c0df3ac27) ) + ROM_LOAD16_BYTE( "prg0_korea.u22", 0x000000, 0x080000, CRC(d9d8c907) SHA1(69c197f2a41f288913f042de9eb8274c0df3ac27) ) ROM_LOAD16_BYTE( "prg1.u23", 0x000001, 0x080000, CRC(8e70b492) SHA1(f84f2039826ae815afb058d71c1dbd190f9d524d) ) ROM_LOAD16_BYTE( "prg2.u21", 0x100000, 0x080000, CRC(bdaa5fbf) SHA1(abd72ac633c0c8e7b4b1d7902c0d6e014ba995fe) ) ROM_LOAD16_BYTE( "prg3.u24", 0x100001, 0x080000, CRC(7aa9f941) SHA1(99bdbad7a96d461073b06a53c50fc57c2fd6fc6d) ) diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c index beee2b9c707..a2022f10b8e 100644 --- a/src/mame/video/system1.c +++ b/src/mame/video/system1.c @@ -388,7 +388,7 @@ static void system1_draw_fg(running_machine *machine, bitmap_t *bitmap, const re } code %= machine->gfx[0]->total_elements; - + drawgfx(bitmap,machine->gfx[0], code, color, diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index 8356f8d061b..386584fe5a3 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -249,7 +249,7 @@ INLINE UINT32 sprite_xscale(UINT8 dacinput, double vr1, double vr2, double cext) vco_cv = 5.0; if (vco_cv < 0.0) vco_cv = 0.0; - if (cext < 1e-11) + if (cext < 1e-11) { if (vco_cv < 1.33) vco_freq = (0.68129 + pow(vco_cv + 0.6, 1.285)) * 1e6; @@ -266,7 +266,7 @@ INLINE UINT32 sprite_xscale(UINT8 dacinput, double vr1, double vr2, double cext) else { /* based on figure 6 of datasheet */ - vco_freq = -0.9892942 * log10(cext) - 0.0309697 * vco_cv * vco_cv + vco_freq = -0.9892942 * log10(cext) - 0.0309697 * vco_cv * vco_cv + 0.344079975 * vco_cv - 4.086395841; vco_freq = pow(10.0, vco_freq); } diff --git a/src/version.c b/src/version.c index f922b068635..66e245488f2 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.129u2 ("__DATE__")"; +const char build_version[] = "0.129u3 ("__DATE__")"; -- cgit v1.2.3