summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/mame/drivers/cv1k.cpp3
-rw-r--r--src/mame/drivers/naomi.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index ada42e2e459..b58e729c2d4 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -571,7 +571,8 @@ ROM_END
ROM_START( espgal2 )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF)
- ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(09c908bb) SHA1(7d6031fd3542b3e1d296ff218feb40502fd78694) ) /* (2005/11/14 MASTER VER) */
+ ROM_LOAD16_WORD_SWAP( "u4_alt", 0x000000, 0x200000, CRC(843608b8) SHA1(2f5fcd38e76df531a923cd9956104cef5185aaa9) ) // newer PCB revision, updated FPGA firmware, no changes in game code or data
+ ROM_LOAD16_WORD_SWAP( "u4", 0x000000, 0x200000, CRC(09c908bb) SHA1(7d6031fd3542b3e1d296ff218feb40502fd78694) ) /* (2005/11/14 MASTER VER) */
ROM_RELOAD(0x200000,0x200000)
ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF)
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp
index 250d4ee200e..1f5cf9a8365 100644
--- a/src/mame/drivers/naomi.cpp
+++ b/src/mame/drivers/naomi.cpp
@@ -585,7 +585,7 @@ Marvel Vs. Capcom 2 New Age of Heroes (Export, Rev A) 841-0007C-02 23085A
Marvel Vs. Capcom 2 New Age of Heroes (Korea, Rev A) 841-0007C-03 23085A 14 (64Mb)* present 317-5058-COM *(+2x 32Mb) have factory wire-mod connecting IC13S serial EEPROM CLK pin to IC11 ROM /OE pin
MushiKing The King of Beetles (2K3 2ND Ver. 1.003-, World) 840-0150C 24217 6 (64Mb) present 317-0394-COM requires 610-0669 barcode reader, 838-14245-92 "MAPLE/232C CONVERT BD" (MIE-based), 838-14243 "RFID CHIP R/W BD" and RFID chip
MushiKing The King of Beetles (2K3 2ND Ver. 1.002-, World) 840-0150C 24217 6 (64Mb) present 317-0394-COM requires 610-0669 barcode reader, 838-14245-92 "MAPLE/232C CONVERT BD" (MIE-based), 838-14243 "RFID CHIP R/W BD" and RFID chip
-MushiKing The King of Beetles (2K3 2ND Ver. 1.000-, Korea) 840-0155C none 6 (64Mb) present 317-0???-COM requires 610-0669 barcode reader, 838-14245-92 "MAPLE/232C CONVERT BD" (MIE-based), 838-14243 "RFID CHIP R/W BD" and RFID chip
+MushiKing The King of Beetles (2K3 2ND Ver. 1.000-, Korea) 840-0155C 24265 6 (64Mb) present 317-0394-COM requires 610-0669 barcode reader, 838-14245-92 "MAPLE/232C CONVERT BD" (MIE-based), 838-14243 "RFID CHIP R/W BD" and RFID chip
Quiz Ah Megamisama 840-0030C 23227 16 (64Mb) present 317-0280-JPN
Shootout Pool 840-0098C 23844 4 (64Mb) present 317-0336-COM requires regular 837-13551 and 837-13938 rotary JVS boards
/Shootout Pool Prize (Export) /
1'>| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fundamental change to show device delegates are configured. Device delegates are now aware of the current device during configuration and will resolve string tags relative to it. This means that device delegates need a device to be supplied on construction so they can find the machine configuration object. There's a one-dimensional array helper to make it easier to construct arrays of device delegates with the same owner. (I didn't make an n-dimensional one because I didn't hit a use case, but it would be a simple addition.) There's no more bind_relative_to member - just call resolve() like you would for a devcb. There's also no need to cast nullptr when creating a late bind device delegate. The flip side is that for an overloaded or non-capturing lambda you'll need to cast to the desired type. There is one less conditional branch in the hot path for calls for delegates bound to a function pointer of member function pointer. This comes at the cost of one additional unconditional branch in the hot path for calls to delegates bound to functoids (lambdas, functions that don't take an object reference, other callable objects). This applies to all delegates, not just device delegates. Address spaces will now print an error message if a late bind error is encountered while installing a handler. This will give the range and address range, hopefully making it easier to guess which memory map is faulty. For the simple case of allowing a device_delegate member to be configured, use a member like this: template <typename... T> void set_foo(T &&...args) { m_foo_cb.set(std::forward<T>(args)...); } For a case where different delegates need to be used depending on the function signature, see src/emu/screen.h (the screen update function setters). Device delegates now take a target specification and function pointer. The target may be: * Target omitted, implying the current device being configured. This can only be used during configuration. It will work as long as the current device is not removed/replaced. * A tag string relative to the current device being configured. This can only be used during configuration. It will not be callable until .resolve() is called. It will work as long as the current device is not removed/replaced. * A device finder (required_device/optional_device). The delegate will late bind to the current target of the device finder. It will not be callable until .resolve() is called. It will work properly if the target device is replaced, as long as the device finder's base object isn't removed/replaced. * A reference to an object. It will be callable immediately. It will work as long as the target object is not removed/replaced. The target types and restrictions are pretty similar to what you already have on object finders and devcb, so it shouldn't cause any surprises. Note that dereferencing a device finder will changes the effect. To illustrate this: ... required_device<some_device> m_dev; ... m_dev(*this, "dev") ... // will late bind to "dev" relative to *this // will work if "dev" hasn't been created yet or is replaced later // won't work if *this is removed/replaced // won't be callable until resolve() is called cb1.set(m_dev, FUNC(some_device::w)); ... // will bind to current target of m_dev // will not work if m_dev is not resolved // will not work if "dev" is replaced later // will be callable immediately cb2.set(*m_dev, FUNC(some_device::w)); ... The order of the target and name has been reversed for functoids (lambdas and other callable objects). This allows the NAME macro to be used on lambdas and functoids. For example: foo.set_something(NAME([this] (u8 data) { m_something = data; })); I realise the diagnostic messages get ugly if you use NAME on a large lambda. You can still give a literal name, you just have to place it after the lambda rather than before. This is uglier, but it's intentional. I'm trying to drive developers away from a certain style. While it's nice that you can put half the driver code in the memory map, it detracts from readability. It's hard to visualise the memory range mappings if the memory map functions are punctuated by large lambdas. There's also slightly higher overhead for calling a delegate bound to a functoid. If the code is prettier for trivial lambdas but uglier for non-trivial lambdas in address maps, it will hopefully steer people away from putting non-trivial lambdas in memory maps. There were some devices that were converted from using plain delegates without adding bind_relative_to calls. I fixed some of them (e.g. LaserDisc) but I probably missed some. These will likely crash on unresolved delegate calls. There are some devices that reset delegates at configuration complete or start time, preventing them from being set up during configuration (e.g. src/devices/video/ppu2c0x.cpp and src/devices/machine/68307.cpp). This goes against the design principles of how device delegates should be used, but I didn't change them because I don't trust myself to find all the places they're used. I've definitely broken some stuff with this (I know about asterix), so report issues and bear with me until I get it all fixed. * (nw) misc cleanup: Vas Crabb2019-10-112-15/+14 | | | | | * imagedev/cassette: add bitwise operators for cassette_state so a lot of ugly casts can go away * audio/leland.cpp, cubeqst.cpp: make better use of loops in machine configuration * -avivideo.cpp: Added an image device to provide looping uncompressed AVI ↵ mooglyguy2019-09-232-0/+185 | | | | | | frames as input. [Ryan Holtz] -vino.cpp: Adapted to support both avivideo_image_device and picture_image_device. [Ryan Holtz] * -vino: Implemented the majority of functionality, and hooked up to ↵ MooglyGuy2019-09-191-1/+1 | | | | picture_image_device. [Ryan Holtz] * (nw) misc cleanup: Vas Crabb2019-09-202-31/+23 | | | | | * get rid of most assert_always * get rid of a few MCFG_*_OVERRIDE * srcclean (nw) Vas Crabb2019-08-253-4/+4 | | | | I'm assuming atronic.cpp was supposed to be Windows-1252 with Euro currency symbol encoding. Everyone please use UTF-8 for source files. * harddriv.h: missed a spot earlier (nw) Justin Kerk2019-08-181-1/+1 | * harddriv: check for CHD by header string, allows files not named .chd that ↵ arbee2019-08-131-6/+7 | | | | are CHDs to be recognized (nw) * picture_image_device: clean up properly if the PNG load fails (nw) arbee2019-08-101-2/+6 | * apple2: save states and file manager hotloading image support for ↵ arbee2019-08-101-0/+5 | | | | ComputerEyes (nw) * Add still-frame PNG image device for use by digitizers/cameras/etc. [R. Belmont] arbee2019-08-092-0/+122 | | | | Other formats can be added, we already have libjpeg in 3rdparty/. * harddisk: Support hard disk images in HDI format [Justin Kerk] Justin Kerk2019-08-021-2/+16 | * snapquik: remove vestigial declaration (nw) Vas Crabb2019-08-031-2/+0 | * harddisk: Support non-CHD harddisk images in raw and 2MG format [R. Belmont] arbee2019-08-012-14/+44 | * steps towards some spectrum expansions - attempt 2 (resynced to AJRs ↵ David Haywood2019-07-314-6/+122 | | | | | | | | | | changes) (nw) (#5417) * steps towards some spectrum expansions - attempt 2 (nw) * (nw) * (nw) * microdrv: Change image type to magtape; default clock; move to imagedev (nw) AJR2019-07-302-0/+279 | * srcclean (nw) Vas Crabb2019-07-283-14/+14 | * (nw) cassette: cleanup, and fixed a few minor but annoying bugs Robbbert2019-07-211-55/+21 | | | | | | | - Create new tape, hit Reset: fatal error - internal error - Load empty file to record onto, same error - Randomly have to hit Play a number of times before it takes - Randomly tape "plays" silently with the motor off. * floppy: First stab at weak zones handling [O. Galibert] Olivier Galibert2019-07-012-23/+164 | * Missed a file, nw MooglyGuy2019-06-301-16/+0 | * -imagedev/harddriv: Removed MCFG macros. [Ryan Holtz] mooglyguy2019-06-304-12/+12 | | | | -generic/slot: Removed MCFG macros. [Ryan Holtz] * -snapquik: Modernized delegate and removed MCFG macros. [Ryan Holtz] MooglyGuy2019-06-302-39/+36 | * flopdrv: Eliminate floppy_get_count (nw) AJR2019-03-292-12/+0 | * (nw) Clean up the mess on master Vas Crabb2019-03-2614-130/+30 | | | | | | | | | | | | | This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release. * Revert "conflict resolution (nw)" andreasnaive2019-03-2514-30/+130 | | | | | This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. * mame\drivers: removed most MCFG and MACHINE_CONFIG macros from drivers ↵ Ivan Vangelista2019-03-011-1/+1 | | | | starting with j and k (nw) * mame\video: removed MACHINE_CONFIG macros (nw) Ivan Vangelista2019-02-141-33/+7 | | | | mame\drivers: mostly removed MACHINE_CONFIG macros from drivers starting with w, x, y and z (nw) * Make the delay for snapshot/quickload an attotime, and allow implicit zero. ↵ Vas Crabb2019-02-061-9/+11 | | | | Removing the MCFG macros properly requires changing the pattern for the delegates. (nw) * enable sub-second snapshot timers (nw) (#4493) Peter Ferrie2019-02-042-6/+4 | | | | | | | | | | | | | | * enable sub-second snapshot timers (nw) * switch to attotime, accept doubles * support LLVM extension in MSVC make vsllvm using extension from here: https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain * -devices/bus/bbc/1mhzbus/ieee488: Removed MACHINE_CONFIG macros, nw mooglyguy2019-02-031-0/+5 | | | | | | | | | | | | | | -devices/bus/cbmiec/interpod: Removed MACHINE_CONFIG macros, nw -devices/bus/ieee488/ieee488: Removed MCFG macros, nw -devices/bus/ieee488/softbox: Removed MACHINE_CONFIG macros, nw -devices/bus/imi7000/imi7000: Removed MCFG macro, nw -devices/imagedev/harddriv: Added constructor for setting interface tag, nw -gridcomp, hp_ipc, hp64k, sage2, softbox: Removed MACHINE_CONFIG macros, nw * imagedev\floppy: removed MCFG macros (nw) Ivan Vangelista2019-01-282-16/+2 | * magedev\cassette: removed MCFG macros (nw) Ivan Vangelista2019-01-221-21/+0 | * imagedev\printer: removed MCFG macro (nw) Ivan Vangelista2019-01-211-3/+1 | * imagedev\bitbngr: removed MCFG macros (nw) Ivan Vangelista2019-01-191-4/+0 | * imagedev\chd_cd, diablo: removed MCFG macros (nw)