Previous

199869 Revisions

Next

r34498 Monday 19th January, 2015 at 19:14:05 UTC by Couriersud
Merge branch 'master' of https://github.com/mamedev/mame.git

[src/emu]	emuopts.c
[src/emu/cpu/tms0980]	tms0980.c
[src/emu/machine]	6522via.c
[src/emu/ui]	ui.c
[src/mame/drivers]	bogeyman.c hikaru.c m58.c mappy.c pacman.c
[src/mame/includes]	bogeyman.h m58.h pacman.h
[src/mame/video]	bogeyman.c m58.c
[src/mess/drivers]	ngen.c pasogo.c splitsec.c
[src/mess/layout]	splitsec.lay
[src/mess/machine]	amstrad.c

trunk/src/emu/cpu/tms0980/tms0980.c

r243009	r243010
638	638	tms1100_cpu_device::device_reset();
639	639
640	640	// small differences in 00-3f area
641		m_fixed_decode[0x09] = F_COMX;
642	641	m_fixed_decode[0x0b] = F_TPC;
643	642	}
644	643

trunk/src/emu/emuopts.c

r243009	r243010
278	278	}
279	279	}
280	280	}
	281	while (add_slot_options(false));
	282	add_device_options(false);
281	283	}
282	284
283	285
r243009	r243010
365	367	do {
366	368	num = options_count();
367	369	update_slot_options();
368		while (add_slot_options(false));
369		add_device_options(false);
370	370	result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string);
371	371	} while (num != options_count());
372	372
r243009	r243010
502	502	do {
503	503	num = options_count();
504	504	update_slot_options();
505		while (add_slot_options(false));
506		add_device_options(false);
507	505	} while(num != options_count());
508	506	}
509	507	}

trunk/src/emu/machine/6522via.c

r243009	r243010
223	223	save_item(NAME(m_acr));
224	224	save_item(NAME(m_ier));
225	225	save_item(NAME(m_ifr));
	226	save_item(NAME(m_time1));
226	227	save_item(NAME(m_t1_active));
227	228	save_item(NAME(m_t1_pb7));
	229	save_item(NAME(m_time2));
228	230	save_item(NAME(m_t2_active));
229	231	save_item(NAME(m_shift_counter));
230	232	}

trunk/src/emu/ui/ui.c

r243009	r243010
310	310	const int maxstate = 4;
311	311	int str = machine().options().seconds_to_run();
312	312	bool show_gameinfo = !machine().options().skip_gameinfo();
313		bool show_warnings = true;
	313	bool show_warnings = true, show_mandatory_fileman = true;
314	314	int state;
315	315
316	316	// disable everything if we are using -str for 300 or fewer seconds, or if we're the empty driver,
317	317	// or if we are debugging
318	318	if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
319		show_gameinfo = show_warnings = show_disclaimer = FALSE;
	319	show_gameinfo = show_warnings = show_disclaimer = show_mandatory_fileman = FALSE;
320	320
321	321	#ifdef SDLMAME_EMSCRIPTEN
322	322	// also disable for the JavaScript port since the startup screens do not run asynchronously
r243009	r243010
355	355	break;
356	356
357	357	case 3:
358		if (image_mandatory_scan(machine(), messagebox_text).len() > 0)
	358	if (show_mandatory_fileman && image_mandatory_scan(machine(), messagebox_text).len() > 0)
359	359	{
360	360	astring warning;
361	361	warning.cpy("This driver requires images to be loaded in the following device(s): ").cat(messagebox_text.substr(0, messagebox_text.len() - 2));

trunk/src/mame/drivers/bogeyman.c

r243009	r243010
13	13
14	14	#include "emu.h"
15	15	#include "cpu/m6502/m6502.h"
16		#include "sound/ay8910.h"
17	16	#include "includes/bogeyman.h"
18	17
19	18
r243009	r243010
21	20
22	21	// Sound section is copied from Mysterious Stones driver by Nicola, Mike, Brad
23	22
24		WRITE8_MEMBER(bogeyman_state::bogeyman_8910_latch_w)
	23	WRITE8_MEMBER(bogeyman_state::ay8910_latch_w)
25	24	{
26	25	m_psg_latch = data;
27	26	}
28	27
29		WRITE8_MEMBER(bogeyman_state::bogeyman_8910_control_w)
	28	WRITE8_MEMBER(bogeyman_state::ay8910_control_w)
30	29	{
31	30	// bit 0 is flipscreen
32	31	flip_screen_set(data & 0x01);
33	32
34	33	// bit 5 goes to 8910 #0 BDIR pin
35	34	if ((m_last_write & 0x20) == 0x20 && (data & 0x20) == 0x00)
36		machine().device<ay8910_device>("ay1")->data_address_w(space, m_last_write >> 4, m_psg_latch);
	35	m_ay1->data_address_w(space, m_last_write >> 4, m_psg_latch);
37	36
38	37	// bit 7 goes to 8910 #1 BDIR pin
39	38	if ((m_last_write & 0x80) == 0x80 && (data & 0x80) == 0x00)
40		machine().device<ay8910_device>("ay2")->data_address_w(space, m_last_write >> 6, m_psg_latch);
	39	m_ay2->data_address_w(space, m_last_write >> 6, m_psg_latch);
41	40
42	41	m_last_write = data;
43	42	}
r243009	r243010
46	45
47	46	static ADDRESS_MAP_START( bogeyman_map, AS_PROGRAM, 8, bogeyman_state )
48	47	AM_RANGE(0x0000, 0x17ff) AM_RAM
49		AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(bogeyman_videoram2_w) AM_SHARE("videoram2")
50		AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(bogeyman_colorram2_w) AM_SHARE("colorram2")
51		AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(bogeyman_videoram_w) AM_SHARE("videoram")
52		AM_RANGE(0x2100, 0x21ff) AM_RAM_WRITE(bogeyman_colorram_w) AM_SHARE("colorram")
	48	AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(videoram2_w) AM_SHARE("videoram2")
	49	AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(colorram2_w) AM_SHARE("colorram2")
	50	AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram")
	51	AM_RANGE(0x2100, 0x21ff) AM_RAM_WRITE(colorram_w) AM_SHARE("colorram")
53	52	AM_RANGE(0x2800, 0x2bff) AM_RAM AM_SHARE("spriteram")
54		AM_RANGE(0x3000, 0x300f) AM_RAM_WRITE(bogeyman_paletteram_w) AM_SHARE("palette")
55		AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1") AM_WRITE(bogeyman_8910_control_w)
56		AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2") AM_WRITE(bogeyman_8910_latch_w)
	53	AM_RANGE(0x3000, 0x300f) AM_RAM_WRITE(paletteram_w) AM_SHARE("palette")
	54	AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1") AM_WRITE(ay8910_control_w)
	55	AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2") AM_WRITE(ay8910_latch_w)
57	56	AM_RANGE(0x3802, 0x3802) AM_READ_PORT("DSW1")
58	57	AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW2") AM_WRITENOP // ??? sound
59	58	AM_RANGE(0x4000, 0xffff) AM_ROM
r243009	r243010
205	204	{
206	205	save_item(NAME(m_psg_latch));
207	206	save_item(NAME(m_last_write));
	207	save_item(NAME(m_colbank));
208	208	}
209	209
210	210	void bogeyman_state::machine_reset()
211	211	{
212	212	m_psg_latch = 0;
213	213	m_last_write = 0;
	214	m_colbank = 0;
214	215	}
215	216
216		WRITE8_MEMBER(bogeyman_state::bogeyman_colbank_w)
	217	WRITE8_MEMBER(bogeyman_state::colbank_w)
217	218	{
218	219	if((data & 1) != (m_colbank & 1))
219	220	{
r243009	r243010
237	238	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
238	239	MCFG_SCREEN_SIZE(32*8, 32*8)
239	240	MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
240		MCFG_SCREEN_UPDATE_DRIVER(bogeyman_state, screen_update_bogeyman)
	241	MCFG_SCREEN_UPDATE_DRIVER(bogeyman_state, screen_update)
241	242	MCFG_SCREEN_PALETTE("palette")
242	243
243	244	MCFG_GFXDECODE_ADD("gfxdecode", "palette", bogeyman)
r243009	r243010
249	250	MCFG_SPEAKER_STANDARD_MONO("mono")
250	251
251	252	MCFG_SOUND_ADD("ay1", AY8910, 1500000)  /* Verified */
252		MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(bogeyman_state, bogeyman_colbank_w))
	253	MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(bogeyman_state, colbank_w))
253	254	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
254	255
255	256	MCFG_SOUND_ADD("ay2", AY8910, 1500000)  /* Verified */

trunk/src/mame/drivers/hikaru.c

r243009	r243010
738	738	ROM_LOAD32_WORD( "mpr-23483.ic32", 0xc000002, 0x1000000, CRC(c37adebe) SHA1(e84f6d2cc364c743f7f3b73d8c8d0271952bb093) )
739	739	ROM_LOAD32_WORD( "mpr-23480.ic33", 0xe000000, 0x1000000, CRC(f517b8b3) SHA1(c04740adb612473c4c9f8186e7e93d2f73d1bb1a) )
740	740	ROM_LOAD32_WORD( "mpr-23484.ic34", 0xe000002, 0x1000000, CRC(2ebe1aa1) SHA1(16b39f7422da1a334dde27169c2949e1d95bddb3) )
	741
	742	// 317-0283-COM Actel A54SX32
	743	// ID 0x4252
	744	ROM_REGION( 4, "rom_key", 0 )
	745	ROM_LOAD( "sgnascar-key.bin", 0x000000, 0x000004, CRC(f1452f9e) SHA1(86fb0f278a2eb0aba66a24032fb683f7a516b32b) )
741	746	ROM_END
742	747
743	748	GAME( 2000, hikaru,   0,        hikaru,   hikaru, driver_device,   0, ROT0, "Sega",            "Hikaru Bios", GAME_NO_SOUND|GAME_NOT_WORKING|GAME_IS_BIOS_ROOT )

trunk/src/mame/drivers/m58.c

r243009	r243010
26	26
27	27	static ADDRESS_MAP_START( yard_map, AS_PROGRAM, 8, m58_state )
28	28	AM_RANGE(0x0000, 0x5fff) AM_ROM
29		AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(yard_videoram_w) AM_SHARE("videoram")
30		AM_RANGE(0x9000, 0x9fff) AM_WRITE(yard_scroll_panel_w)
	29	AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(videoram_w) AM_SHARE("videoram")
	30	AM_RANGE(0x9000, 0x9fff) AM_WRITE(scroll_panel_w)
31	31	AM_RANGE(0xc820, 0xc87f) AM_RAM AM_SHARE("spriteram")
32	32	AM_RANGE(0xa000, 0xa000) AM_RAM AM_SHARE("scroll_x_low")
33	33	AM_RANGE(0xa200, 0xa200) AM_RAM AM_SHARE("scroll_x_high")
34	34	AM_RANGE(0xa400, 0xa400) AM_RAM AM_SHARE("scroll_y_low")
35	35	AM_RANGE(0xa800, 0xa800) AM_RAM AM_SHARE("score_disable")
36	36	AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("irem_audio", irem_audio_device, cmd_w)
37		AM_RANGE(0xd001, 0xd001) AM_WRITE(yard_flipscreen_w)    /* + coin counters */
	37	AM_RANGE(0xd001, 0xd001) AM_WRITE(flipscreen_w)    /* + coin counters */
38	38	AM_RANGE(0xd000, 0xd000) AM_READ_PORT("IN0")
39	39	AM_RANGE(0xd001, 0xd001) AM_READ_PORT("IN1")
40	40	AM_RANGE(0xd002, 0xd002) AM_READ_PORT("IN2")
r243009	r243010
203	203
204	204	MCFG_SCREEN_ADD("screen", RASTER)
205	205	MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 256, 282, 42, 266)
206		MCFG_SCREEN_UPDATE_DRIVER(m58_state, screen_update_yard)
	206	MCFG_SCREEN_UPDATE_DRIVER(m58_state, screen_update)
207	207	MCFG_SCREEN_PALETTE("palette")
208	208
209	209	/* sound hardware */

trunk/src/mame/drivers/mappy.c

r243009	r243010
2462	2462
2463	2463	/* 3x6809, static tilemap, 2bpp sprites (Gaplus type) */
2464	2464	GAME( 1983, phozon,   0,        phozon,   phozon, mappy_state,   phozon,        ROT90, "Namco", "Phozon (Japan)", GAME_SUPPORTS_SAVE )
2465		GAME( 1983, phozons,  phozon,   phozon,   phozon, mappy_state,   phozon,        ROT90, "bootleg? (Sidam)", "Phozon (Sidam)", GAME_SUPPORTS_SAVE )
	2465	GAME( 1983, phozons,  phozon,   phozon,   phozon, mappy_state,   phozon,        ROT90, "Namco (Sidam license)", "Phozon (Sidam)", GAME_SUPPORTS_SAVE )
2466	2466
2467	2467	/* 2x6809, scroling tilemap, 4bpp sprites (Super Pacman type) */
2468	2468	GAME( 1983, mappy,    0,        mappy,    mappy, mappy_state,   mappy,        ROT90, "Namco", "Mappy (US)", GAME_SUPPORTS_SAVE )

trunk/src/mame/drivers/pacman.c

r243009	r243010
6616	6616	membank("bank1")->set_entry(1);
6617	6617	}
6618	6618
	6619	DRIVER_INIT_MEMBER(pacman_state, mschamp)
	6620	{
	6621	save_item(NAME(m_counter));
	6622	}
	6623
6619	6624	DRIVER_INIT_MEMBER(pacman_state,woodpek)
6620	6625	{
6621	6626	int i, len;
r243009	r243010
6844	6849	GAME( 1981, mspacii2, mspacman, woodpek,  mspacman, pacman_state,  mspacii,  ROT90,  "bootleg (Orca)", "Ms. Pac-Man II (Orca bootleg set 2)", GAME_SUPPORTS_SAVE )
6845	6850	GAME( 1981, pacgal,   mspacman, woodpek,  mspacman, driver_device, 0,        ROT90,  "hack", "Pac-Gal", GAME_SUPPORTS_SAVE )
6846	6851	GAME( 1981, mspacpls, mspacman, woodpek,  mspacpls, driver_device, 0,        ROT90,  "hack", "Ms. Pac-Man Plus", GAME_SUPPORTS_SAVE )
6847		GAME( 1992, mschamp,  mspacman, mschamp,  mschamp,  driver_device, 0,        ROT90,  "hack", "Ms. Pacman Champion Edition / Zola-Puc Gal", GAME_SUPPORTS_SAVE ) /* Rayglo version */
6848		GAME( 1995, mschamps, mspacman, mschamp,  mschamp,  driver_device, 0,        ROT90,  "hack", "Ms. Pacman Champion Edition / Super Zola-Puc Gal", GAME_SUPPORTS_SAVE )
	6852	GAME( 1992, mschamp,  mspacman, mschamp,  mschamp,  pacman_state,  mschamp,  ROT90,  "hack", "Ms. Pacman Champion Edition / Zola-Puc Gal", GAME_SUPPORTS_SAVE ) /* Rayglo version */
	6853	GAME( 1995, mschamps, mspacman, mschamp,  mschamp,  pacman_state,  mschamp,  ROT90,  "hack", "Ms. Pacman Champion Edition / Super Zola-Puc Gal", GAME_SUPPORTS_SAVE )
6849	6854
6850	6855	// These bootlegs have MADE IN GREECE clearly visible and etched into the PCBs. They were very common in Spain with several operators having their own versions.
6851	6856	// Based on the PCBs and copyright dates shown they  were produced late 80s / early 90s. Usually they run a version of Ms. Pacman, but were sometimes converted back to regular Pac-Man

trunk/src/mame/includes/bogeyman.h

r243009	r243010
4	4
5	5	*************************************************************************/
6	6
	7	#include "sound/ay8910.h"
	8
7	9	class bogeyman_state : public driver_device
8	10	{
9	11	public:
10	12	bogeyman_state(const machine_config &mconfig, device_type type, const char *tag)
11	13	: driver_device(mconfig, type, tag),
	14	m_maincpu(*this, "maincpu"),
	15	m_gfxdecode(*this, "gfxdecode"),
	16	m_palette(*this, "palette"),
	17	m_ay1(*this, "ay1"),
	18	m_ay2(*this, "ay2"),
12	19	m_videoram(*this, "videoram"),
13	20	m_videoram2(*this, "videoram2"),
14	21	m_colorram(*this, "colorram"),
15	22	m_colorram2(*this, "colorram2"),
16		m_spriteram(*this, "spriteram"),
17		m_maincpu(*this, "maincpu"),
18		m_gfxdecode(*this, "gfxdecode"),
19		m_palette(*this, "palette") { }
20
	23	m_spriteram(*this, "spriteram")  { }
	24
	25	/* devices */
	26	required_device<cpu_device> m_maincpu;
	27	required_device<gfxdecode_device> m_gfxdecode;
	28	required_device<palette_device> m_palette;
	29	required_device<ay8910_device> m_ay1;
	30	required_device<ay8910_device> m_ay2;
	31
21	32	/* memory pointers */
22	33	required_shared_ptr<UINT8> m_videoram;
23	34	required_shared_ptr<UINT8> m_videoram2;
r243009	r243010
34	45	int        m_psg_latch;
35	46	int        m_last_write;
36	47	int        m_colbank;
37		DECLARE_WRITE8_MEMBER(bogeyman_8910_latch_w);
38		DECLARE_WRITE8_MEMBER(bogeyman_8910_control_w);
39		DECLARE_WRITE8_MEMBER(bogeyman_videoram_w);
40		DECLARE_WRITE8_MEMBER(bogeyman_colorram_w);
41		DECLARE_WRITE8_MEMBER(bogeyman_videoram2_w);
42		DECLARE_WRITE8_MEMBER(bogeyman_colorram2_w);
43		DECLARE_WRITE8_MEMBER(bogeyman_paletteram_w);
44		DECLARE_WRITE8_MEMBER(bogeyman_colbank_w);
	48
	49	DECLARE_WRITE8_MEMBER(ay8910_latch_w);
	50	DECLARE_WRITE8_MEMBER(ay8910_control_w);
	51	DECLARE_WRITE8_MEMBER(videoram_w);
	52	DECLARE_WRITE8_MEMBER(colorram_w);
	53	DECLARE_WRITE8_MEMBER(videoram2_w);
	54	DECLARE_WRITE8_MEMBER(colorram2_w);
	55	DECLARE_WRITE8_MEMBER(paletteram_w);
	56	DECLARE_WRITE8_MEMBER(colbank_w);
	57
45	58	TILE_GET_INFO_MEMBER(get_bg_tile_info);
46	59	TILE_GET_INFO_MEMBER(get_fg_tile_info);
	60
47	61	virtual void machine_start();
48	62	virtual void machine_reset();
49	63	virtual void video_start();
	64
50	65	DECLARE_PALETTE_INIT(bogeyman);
51		UINT32 screen_update_bogeyman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
52		void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
53		required_device<cpu_device> m_maincpu;
54		required_device<gfxdecode_device> m_gfxdecode;
55		required_device<palette_device> m_palette;
	66	UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
	67	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
56	68	};

trunk/src/mame/includes/m58.h

r243009	r243010
3	3	public:
4	4	m58_state(const machine_config &mconfig, device_type type, const char *tag)
5	5	: driver_device(mconfig, type, tag),
6		m_videoram(*this, "videoram"),
7		m_spriteram(*this, "spriteram"),
8		m_yard_scroll_x_low(*this, "scroll_x_low"),
9		m_yard_scroll_x_high(*this, "scroll_x_high"),
10		m_yard_scroll_y_low(*this, "scroll_y_low"),
11		m_yard_score_panel_disabled(*this, "score_disable"),
12	6	m_maincpu(*this, "maincpu"),
13	7	m_gfxdecode(*this, "gfxdecode"),
14	8	m_screen(*this, "screen"),
15		m_palette(*this, "palette") { }
16
	9	m_palette(*this, "palette"),
	10	m_videoram(*this, "videoram"),
	11	m_spriteram(*this, "spriteram"),
	12	m_scroll_x_low(*this, "scroll_x_low"),
	13	m_scroll_x_high(*this, "scroll_x_high"),
	14	m_scroll_y_low(*this, "scroll_y_low"),
	15	m_score_panel_disabled(*this, "score_disable") { }
	16
	17	/* devices */
	18	required_device<cpu_device> m_maincpu;
	19	required_device<gfxdecode_device> m_gfxdecode;
	20	required_device<screen_device> m_screen;
	21	required_device<palette_device> m_palette;
	22
17	23	/* memory pointers */
18	24	required_shared_ptr<UINT8> m_videoram;
19	25	required_shared_ptr<UINT8> m_spriteram;
	26	required_shared_ptr<UINT8> m_scroll_x_low;
	27	required_shared_ptr<UINT8> m_scroll_x_high;
	28	required_shared_ptr<UINT8> m_scroll_y_low;
	29	required_shared_ptr<UINT8> m_score_panel_disabled;
20	30
21	31	/* video-related */
22	32	tilemap_t*             m_bg_tilemap;
23
24		required_shared_ptr<UINT8> m_yard_scroll_x_low;
25		required_shared_ptr<UINT8> m_yard_scroll_x_high;
26		required_shared_ptr<UINT8> m_yard_scroll_y_low;
27		required_shared_ptr<UINT8> m_yard_score_panel_disabled;
28		bitmap_ind16             *m_scroll_panel_bitmap;
29		DECLARE_WRITE8_MEMBER(yard_videoram_w);
30		DECLARE_WRITE8_MEMBER(yard_scroll_panel_w);
31		DECLARE_WRITE8_MEMBER(yard_flipscreen_w);
	33	bitmap_ind16             m_scroll_panel_bitmap;
	34
	35	DECLARE_WRITE8_MEMBER(videoram_w);
	36	DECLARE_WRITE8_MEMBER(scroll_panel_w);
	37	DECLARE_WRITE8_MEMBER(flipscreen_w);
	38
32	39	DECLARE_DRIVER_INIT(yard85);
33		TILE_GET_INFO_MEMBER(yard_get_bg_tile_info);
34		TILEMAP_MAPPER_MEMBER(yard_tilemap_scan_rows);
35	40	virtual void video_start();
36	41	DECLARE_PALETTE_INIT(m58);
37		UINT32 screen_update_yard(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
	42
	43	TILE_GET_INFO_MEMBER(get_bg_tile_info);
	44	TILEMAP_MAPPER_MEMBER(tilemap_scan_rows);
	45
	46	UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
38	47	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
39	48	void draw_panel( bitmap_ind16 &bitmap, const rectangle &cliprect );
40		required_device<cpu_device> m_maincpu;
41		required_device<gfxdecode_device> m_gfxdecode;
42		required_device<screen_device> m_screen;
43		required_device<palette_device> m_palette;
44	49	};

trunk/src/mame/includes/pacman.h

r243009	r243010
125	125	DECLARE_DRIVER_INIT(8bpm);
126	126	DECLARE_DRIVER_INIT(porky);
127	127	DECLARE_DRIVER_INIT(mspacman);
	128	DECLARE_DRIVER_INIT(mschamp);
128	129	TILEMAP_MAPPER_MEMBER(pacman_scan_rows);
129	130	TILE_GET_INFO_MEMBER(pacman_get_tile_info);
130	131	TILE_GET_INFO_MEMBER(s2650_get_tile_info);

trunk/src/mame/video/bogeyman.c

r243009	r243010
36	36	}
37	37	}
38	38
39		WRITE8_MEMBER(bogeyman_state::bogeyman_videoram_w)
	39	WRITE8_MEMBER(bogeyman_state::videoram_w)
40	40	{
41	41	m_videoram[offset] = data;
42	42	m_bg_tilemap->mark_tile_dirty(offset);
43	43	}
44	44
45		WRITE8_MEMBER(bogeyman_state::bogeyman_colorram_w)
	45	WRITE8_MEMBER(bogeyman_state::colorram_w)
46	46	{
47	47	m_colorram[offset] = data;
48	48	m_bg_tilemap->mark_tile_dirty(offset);
49	49	}
50	50
51		WRITE8_MEMBER(bogeyman_state::bogeyman_videoram2_w)
	51	WRITE8_MEMBER(bogeyman_state::videoram2_w)
52	52	{
53	53	m_videoram2[offset] = data;
54	54	m_fg_tilemap->mark_tile_dirty(offset);
55	55	}
56	56
57		WRITE8_MEMBER(bogeyman_state::bogeyman_colorram2_w)
	57	WRITE8_MEMBER(bogeyman_state::colorram2_w)
58	58	{
59	59	m_colorram2[offset] = data;
60	60	m_fg_tilemap->mark_tile_dirty(offset);
61	61	}
62	62
63		WRITE8_MEMBER(bogeyman_state::bogeyman_paletteram_w)
	63	WRITE8_MEMBER(bogeyman_state::paletteram_w)
64	64	{
65	65	/* RGB output is inverted */
66	66	m_palette->write(space, offset, UINT8(~data));
r243009	r243010
94	94	m_fg_tilemap->set_transparent_pen(0);
95	95	}
96	96
97		void bogeyman_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect )
	97	void bogeyman_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
98	98	{
99		int offs;
100
101		for (offs = 0; offs < m_spriteram.bytes(); offs += 4)
	99	for (int offs = 0; offs < m_spriteram.bytes(); offs += 4)
102	100	{
103	101	int attr = m_spriteram[offs];
104	102
r243009	r243010
139	137	}
140	138	}
141	139
142		UINT32 bogeyman_state::screen_update_bogeyman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	140	UINT32 bogeyman_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
143	141	{
144	142	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
145	143	draw_sprites(bitmap, cliprect);

trunk/src/mame/video/m58.c

r243009	r243010
102	102	*
103	103	*************************************/
104	104
105		WRITE8_MEMBER(m58_state::yard_videoram_w)
	105	WRITE8_MEMBER(m58_state::videoram_w)
106	106	{
107	107	m_videoram[offset] = data;
108	108	m_bg_tilemap->mark_tile_dirty(offset / 2);
109	109	}
110	110
111	111
112		WRITE8_MEMBER(m58_state::yard_scroll_panel_w)
	112	WRITE8_MEMBER(m58_state::scroll_panel_w)
113	113	{
114	114	int sx,sy,i;
115	115
r243009	r243010
128	128	col = (data >> i) & 0x11;
129	129	col = ((col >> 3) | col) & 3;
130	130
131		m_scroll_panel_bitmap->pix16(sy, sx + i) = RADAR_PALETTE_BASE + (sy & 0xfc) + col;
	131	m_scroll_panel_bitmap.pix16(sy, sx + i) = RADAR_PALETTE_BASE + (sy & 0xfc) + col;
132	132	}
133	133	}
134	134
r243009	r243010
140	140	*
141	141	*************************************/
142	142
143		TILE_GET_INFO_MEMBER(m58_state::yard_get_bg_tile_info)
	143	TILE_GET_INFO_MEMBER(m58_state::get_bg_tile_info)
144	144	{
145	145	int offs = tile_index * 2;
146	146	int attr = m_videoram[offs + 1];
r243009	r243010
152	152	}
153	153
154	154
155		TILEMAP_MAPPER_MEMBER(m58_state::yard_tilemap_scan_rows)
	155	TILEMAP_MAPPER_MEMBER(m58_state::tilemap_scan_rows)
156	156	{
157	157	/* logical (col,row) -> memory offset */
158	158	if (col >= 32)
r243009	r243010
175	175	int height = m_screen->height();
176	176	const rectangle &visarea = m_screen->visible_area();
177	177
178		m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m58_state::yard_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(m58_state::yard_tilemap_scan_rows),this),  8, 8, 64, 32);
	178	m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(m58_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(m58_state::tilemap_scan_rows),this),  8, 8, 64, 32);
179	179	m_bg_tilemap->set_scrolldx(visarea.min_x, width - (visarea.max_x + 1));
180	180	m_bg_tilemap->set_scrolldy(visarea.min_y - 8, height + 16 - (visarea.max_y + 1));
181	181
182		m_scroll_panel_bitmap = auto_bitmap_ind16_alloc(machine(), SCROLL_PANEL_WIDTH, height);
	182	//m_scroll_panel_bitmap = auto_bitmap_ind16_alloc(machine(), SCROLL_PANEL_WIDTH, height);
	183	m_screen->register_screen_bitmap(m_scroll_panel_bitmap);
	184	save_item(NAME(m_scroll_panel_bitmap));
183	185	}
184	186
185	187
r243009	r243010
190	192	*
191	193	*************************************/
192	194
193		WRITE8_MEMBER(m58_state::yard_flipscreen_w)
	195	WRITE8_MEMBER(m58_state::flipscreen_w)
194	196	{
195	197	/* screen flip is handled both by software and hardware */
196	198	flip_screen_set((data & 0x01) ^ (~ioport("DSW2")->read() & 0x01));
r243009	r243010
265	267
266	268	void m58_state::draw_panel( bitmap_ind16 &bitmap, const rectangle &cliprect )
267	269	{
268		if (!*m_yard_score_panel_disabled)
	270	if (!*m_score_panel_disabled)
269	271	{
270	272	const rectangle clippanel(26*8, 32*8-1, 1*8, 31*8-1);
271	273	const rectangle clippanelflip(0*8, 6*8-1, 1*8, 31*8-1);
r243009	r243010
278	280	clip.max_y += visarea.max_y + yoffs;
279	281	clip &= cliprect;
280	282
281		copybitmap(bitmap, *m_scroll_panel_bitmap, flip_screen(), flip_screen(),
	283	copybitmap(bitmap, m_scroll_panel_bitmap, flip_screen(), flip_screen(),
282	284	sx, visarea.min_y + yoffs, clip);
283	285	}
284	286	}
r243009	r243010
291	293	*
292	294	*************************************/
293	295
294		UINT32 m58_state::screen_update_yard(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	296	UINT32 m58_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
295	297	{
296		m_bg_tilemap->set_scrollx(0, (*m_yard_scroll_x_high * 0x100) + *m_yard_scroll_x_low);
297		m_bg_tilemap->set_scrolly(0, *m_yard_scroll_y_low);
	298	m_bg_tilemap->set_scrollx(0, (*m_scroll_x_high * 0x100) + *m_scroll_x_low);
	299	m_bg_tilemap->set_scrolly(0, *m_scroll_y_low);
298	300
299	301	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
300	302	draw_sprites(bitmap, cliprect);

trunk/src/mess/drivers/ngen.c

r243009	r243010
67	67	#include "machine/pit8253.h"
68	68	#include "machine/z80dart.h"
69	69	#include "machine/wd_fdc.h"
	70	#include "machine/wd2010.h"
70	71	#include "bus/rs232/rs232.h"
71	72	#include "machine/ngen_kb.h"
72	73	#include "machine/clock.h"
	74	#include "imagedev/harddriv.h"
73	75
74	76	class ngen_state : public driver_device
75	77	{
r243009	r243010
89	91	m_fdc(*this,"fdc"),
90	92	m_fd0(*this,"fdc:0"),
91	93	m_fdc_timer(*this,"fdc_timer"),
92		m_hdc_timer(*this,"hdc_timer")
	94	m_hdc(*this,"hdc"),
	95	m_hdc_timer(*this,"hdc_timer"),
	96	m_hd_buffer(*this,"hd_buffer_ram")
93	97	{}
94	98
95	99	DECLARE_WRITE_LINE_MEMBER(pit_out0_w);
r243009	r243010
129	133	DECLARE_READ8_MEMBER(irq_cb);
130	134	DECLARE_WRITE8_MEMBER(hdc_control_w);
131	135	DECLARE_WRITE8_MEMBER(disk_addr_ext);
	136	DECLARE_READ8_MEMBER(hd_buffer_r);
	137	DECLARE_WRITE8_MEMBER(hd_buffer_w);
132	138
133	139	protected:
134	140	virtual void machine_reset();
	141	virtual void machine_start();
135	142
136	143	private:
137	144	required_device<i80186_cpu_device> m_maincpu;
r243009	r243010
147	154	optional_device<wd2797_t> m_fdc;
148	155	optional_device<floppy_connector> m_fd0;
149	156	optional_device<pit8253_device> m_fdc_timer;
	157	optional_device<wd2010_device> m_hdc;
150	158	optional_device<pit8253_device> m_hdc_timer;
	159	optional_shared_ptr<UINT8> m_hd_buffer;
151	160
152	161	void set_dma_channel(int channel, int state);
153	162
r243009	r243010
470	479	case 0x0a:
471	480	case 0x0b:
472	481	if(mem_mask & 0x00ff)
473		m_fdc_timer->write(space,offset,data & 0xff);
	482	m_fdc_timer->write(space,offset-0x08,data & 0xff);
474	483	break;
475	484	case 0x10:
476	485	case 0x11:
r243009	r243010
480	489	case 0x15:
481	490	case 0x16:
482	491	case 0x17:
	492	if(mem_mask & 0x00ff)
	493	m_hdc->write(space,offset-0x10,data & 0xff);
483	494	logerror("WD1010 register %i write %02x mask %04x\n",offset-0x10,data & 0xff,mem_mask);
484	495	break;
485	496	case 0x18:
r243009	r243010
487	498	case 0x1a:
488	499	case 0x1b:
489	500	if(mem_mask & 0x00ff)
490		m_hdc_timer->write(space,offset,data & 0xff);
	501	m_hdc_timer->write(space,offset-0x18,data & 0xff);
491	502	break;
492	503	}
493	504	}
r243009	r243010
510	521	case 0x0a:
511	522	case 0x0b:
512	523	if(mem_mask & 0x00ff)
513		ret = m_fdc_timer->read(space,offset);
	524	ret = m_fdc_timer->read(space,offset-0x08);
514	525	break;
515	526	case 0x10:
516	527	case 0x11:
r243009	r243010
520	531	case 0x15:
521	532	case 0x16:
522	533	case 0x17:
	534	if(mem_mask & 0x00ff)
	535	ret = m_hdc->read(space,offset-0x10);
523	536	logerror("WD1010 register %i read, mask %04x\n",offset-0x10,mem_mask);
524	537	break;
525	538	case 0x18:
r243009	r243010
527	540	case 0x1a:
528	541	case 0x1b:
529	542	if(mem_mask & 0x00ff)
530		ret = m_hdc_timer->read(space,offset);
	543	ret = m_hdc_timer->read(space,offset-0x18);
531	544	break;
532	545	}
533	546
r243009	r243010
585	598	m_disk_page = data & 0x7f;
586	599	}
587	600
	601	READ8_MEMBER(ngen_state::hd_buffer_r)
	602	{
	603	return m_hd_buffer[offset];
	604	}
	605
	606	WRITE8_MEMBER(ngen_state::hd_buffer_w)
	607	{
	608	m_hd_buffer[offset] = data;
	609	}
	610
588	611	WRITE_LINE_MEMBER( ngen_state::dma_hrq_changed )
589	612	{
590	613	m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE);
r243009	r243010
603	626	{
604	627	if(state)
605	628	{
606		if(m_hdc_control & 0x04) // ROM transfer?
	629	if(m_hdc_control & 0x04) // ROM transfer
607	630	m_hdc_control &= ~0x04;  // switch it off when done
608	631	}
609	632	}
r243009	r243010
689	712	return m_pic->acknowledge();
690	713	}
691	714
	715	void ngen_state::machine_start()
	716	{
	717	m_hd_buffer.allocate(1024*8);  // 8kB buffer RAM for HD controller
	718	}
	719
692	720	void ngen_state::machine_reset()
693	721	{
694	722	m_port00 = 0;
r243009	r243010
837	865	MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu",i80186_cpu_device,drq1_w))
838	866	MCFG_WD_FDC_FORCE_READY
839	867	MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0)
840		MCFG_PIT8253_CLK0(XTAL_20MHz / 20)
841		MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w))
	868	MCFG_PIT8253_CLK0(XTAL_20MHz / 20)
	869	MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w))  // clocked on FDC data register access
842	870	MCFG_PIT8253_CLK1(XTAL_20MHz / 20)
843		MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w))
844		MCFG_PIT8253_CLK2(XTAL_20MHz / 20)
845		MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w))
846		// TODO: WD1010 HDC (not implemented)
	871	MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w))  // 1MHz
	872	MCFG_PIT8253_CLK2(XTAL_20MHz / 10)
	873	MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w))
	874	// TODO: WD1010 HDC (not implemented), use WD2010 for now
	875	MCFG_DEVICE_ADD("hdc", WD2010, XTAL_20MHz / 4)
	876	MCFG_WD2010_IN_BCS_CB(READ8(ngen_state,hd_buffer_r))
	877	MCFG_WD2010_OUT_BCS_CB(WRITE8(ngen_state,hd_buffer_w))
	878	MCFG_WD2010_IN_DRDY_CB(VCC)
	879	MCFG_WD2010_IN_INDEX_CB(VCC)
	880	MCFG_WD2010_IN_WF_CB(VCC)
	881	MCFG_WD2010_IN_TK000_CB(VCC)
	882	MCFG_WD2010_IN_SC_CB(VCC)
847	883	MCFG_DEVICE_ADD("hdc_timer", PIT8253, 0)
	884	MCFG_PIT8253_CLK2(XTAL_20MHz / 10)  // 2MHz
848	885	MCFG_FLOPPY_DRIVE_ADD("fdc:0", ngen_floppies, "525qd", floppy_image_device::default_floppy_formats)
	886	MCFG_HARDDISK_ADD("hard0")
849	887
850	888	MACHINE_CONFIG_END
851	889

trunk/src/mess/drivers/pasogo.c

r243009	r243010
679	679	void pasogo_state::machine_reset()
680	680	{
681	681	astring region_tag;
	682	m_maincpu_rom = memregion("maincpu");
682	683	m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
683		m_maincpu_rom = memregion("maincpu");
	684	if (!m_cart_rom)   // this should never happen, since we make carts mandatory!
	685	m_cart_rom = memregion("maincpu");
684	686
685	687	membank("bank27")->set_base(m_cart_rom->base());
686	688	membank("bank28")->set_base(m_maincpu_rom->base() + 0xb8000/*?*/);

trunk/src/mess/drivers/splitsec.c

r243009	r243010
4	4
5	5	Parker Brothers Split Second
6	6	* TMS1400NLL MP7314-N2 (die labeled MP7314)
	7
	8	This is an electronic handheld reflex gaming device, it's straightforward
	9	to use. The included mini-games are:
	10	1, 2, 3: Mad Maze*
	11	4, 5: Space Attack*
	12	6: Auto Cross
	13	7: Stomp
	14	8: Speedball
	15
	16	*: higher number indicates harder difficulty
7	17
8	18
	19	TODO:
	20	- MCU clock is unknown
	21
9	22	***************************************************************************/
10	23
11	24	#include "emu.h"
r243009	r243010
14	27
15	28	#include "splitsec.lh"
16	29
17		// master clock is a single stage RC oscillator: R=24K, C=100pf,
18		// according to the TMS 1000 series data manual this is around 375kHz
19		#define MASTER_CLOCK (375000)
	30	// The master clock is a single stage RC oscillator: R=24K, C=100pf,
	31	// according to the TMS 1000 series data manual this is around 375kHz.
	32	// However, this sounds too low-pitched and runs too slow when compared
	33	// to recordings, maybe the RC osc curve is different for TMS1400?
20	34
	35	// so for now, the value below is an approximation
	36	#define MASTER_CLOCK (485000)
21	37
	38
22	39	class splitsec_state : public driver_device
23	40	{
24	41	public:
r243009	r243010
160	177
161	178	static INPUT_PORTS_START( splitsec )
162	179	PORT_START("IN.0") // R9
163		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
164		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
165		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
	180	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY
	181	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_16WAY
	182	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_16WAY
166	183	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
167	184
168	185	PORT_START("IN.1") // R10
169		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
	186	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_16WAY
170	187	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Select")
171	188	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Start")
172	189	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
r243009	r243010
230	247
231	248	ROM_START( splitsec )
232	249	ROM_REGION( 0x1000, "maincpu", 0 )
233		ROM_LOAD( "tms1400nll_mp7314", 0x0000, 0x1000, CRC(0cccdf59) SHA1(06a533134a433aaf856b80f0ca239d0498b98d5f) )
	250	ROM_LOAD( "tms1400nll_mp7314", 0x0000, 0x1000, CRC(e94b2098) SHA1(f0fc1f56a829252185592a2508740354c50bedf8) )
234	251
235	252	ROM_REGION( 867, "maincpu:mpla", 0 )
236	253	ROM_LOAD( "tms1100_default_mpla.pla", 0, 867, CRC(62445fc9) SHA1(d6297f2a4bc7a870b76cc498d19dbb0ce7d69fec) )
r243009	r243010
239	256	ROM_END
240	257
241	258
242		CONS( 1980, splitsec, 0, 0, splitsec, splitsec, driver_device, 0, "Parker Brothers", "Split Second", GAME_SUPPORTS_SAVE | GAME_NOT_WORKING )
	259	CONS( 1980, splitsec, 0, 0, splitsec, splitsec, driver_device, 0, "Parker Brothers", "Split Second", GAME_SUPPORTS_SAVE )

trunk/src/mess/layout/splitsec.lay

r243009	r243010
25	25
26	26	<!-- maze of lamps -->
27	27
28		<bezel name="lamp6" element="lamp_rect"><bounds x="2" y="1" width="4" height="1" /></bezel>
29		<bezel name="lamp4" element="lamp_rect"><bounds x="7" y="1" width="4" height="1" /></bezel>
30		<bezel name="lamp2" element="lamp_rect"><bounds x="12" y="1" width="4" height="1" /></bezel>
	28	<bezel name="lamp0" element="lamp_rect"><bounds x="2" y="1" width="4" height="1" /></bezel>
	29	<bezel name="lamp2" element="lamp_rect"><bounds x="7" y="1" width="4" height="1" /></bezel>
	30	<bezel name="lamp4" element="lamp_rect"><bounds x="12" y="1" width="4" height="1" /></bezel>
31	31
32		<bezel name="lamp16" element="lamp_rect"><bounds x="1" y="2" width="1" height="4" /></bezel>
33		<bezel name="lamp5" element="lamp_disk"><bounds x="3" y="3" width="2" height="2" /></bezel>
34		<bezel name="lamp14" element="lamp_rect"><bounds x="6" y="2" width="1" height="4" /></bezel>
	32	<bezel name="lamp10" element="lamp_rect"><bounds x="1" y="2" width="1" height="4" /></bezel>
	33	<bezel name="lamp1" element="lamp_disk"><bounds x="3" y="3" width="2" height="2" /></bezel>
	34	<bezel name="lamp12" element="lamp_rect"><bounds x="6" y="2" width="1" height="4" /></bezel>
35	35	<bezel name="lamp3" element="lamp_disk"><bounds x="8" y="3" width="2" height="2" /></bezel>
36		<bezel name="lamp12" element="lamp_rect"><bounds x="11" y="2" width="1" height="4" /></bezel>
37		<bezel name="lamp1" element="lamp_disk"><bounds x="13" y="3" width="2" height="2" /></bezel>
38		<bezel name="lamp10" element="lamp_rect"><bounds x="16" y="2" width="1" height="4" /></bezel>
	36	<bezel name="lamp14" element="lamp_rect"><bounds x="11" y="2" width="1" height="4" /></bezel>
	37	<bezel name="lamp5" element="lamp_disk"><bounds x="13" y="3" width="2" height="2" /></bezel>
	38	<bezel name="lamp16" element="lamp_rect"><bounds x="16" y="2" width="1" height="4" /></bezel>
39	39
40		<bezel name="lamp15" element="lamp_rect"><bounds x="2" y="6" width="4" height="1" /></bezel>
	40	<bezel name="lamp11" element="lamp_rect"><bounds x="2" y="6" width="4" height="1" /></bezel>
41	41	<bezel name="lamp13" element="lamp_rect"><bounds x="7" y="6" width="4" height="1" /></bezel>
42		<bezel name="lamp11" element="lamp_rect"><bounds x="12" y="6" width="4" height="1" /></bezel>
	42	<bezel name="lamp15" element="lamp_rect"><bounds x="12" y="6" width="4" height="1" /></bezel>
43	43
44		<bezel name="lamp26" element="lamp_rect"><bounds x="1" y="7" width="1" height="4" /></bezel>
45		<bezel name="lamp25" element="lamp_disk"><bounds x="3" y="8" width="2" height="2" /></bezel>
46		<bezel name="lamp24" element="lamp_rect"><bounds x="6" y="7" width="1" height="4" /></bezel>
	44	<bezel name="lamp20" element="lamp_rect"><bounds x="1" y="7" width="1" height="4" /></bezel>
	45	<bezel name="lamp21" element="lamp_disk"><bounds x="3" y="8" width="2" height="2" /></bezel>
	46	<bezel name="lamp22" element="lamp_rect"><bounds x="6" y="7" width="1" height="4" /></bezel>
47	47	<bezel name="lamp23" element="lamp_disk"><bounds x="8" y="8" width="2" height="2" /></bezel>
48		<bezel name="lamp22" element="lamp_rect"><bounds x="11" y="7" width="1" height="4" /></bezel>
49		<bezel name="lamp21" element="lamp_disk"><bounds x="13" y="8" width="2" height="2" /></bezel>
50		<bezel name="lamp20" element="lamp_rect"><bounds x="16" y="7" width="1" height="4" /></bezel>
	48	<bezel name="lamp24" element="lamp_rect"><bounds x="11" y="7" width="1" height="4" /></bezel>
	49	<bezel name="lamp25" element="lamp_disk"><bounds x="13" y="8" width="2" height="2" /></bezel>
	50	<bezel name="lamp26" element="lamp_rect"><bounds x="16" y="7" width="1" height="4" /></bezel>
51	51
52		<bezel name="lamp35" element="lamp_rect"><bounds x="2" y="11" width="4" height="1" /></bezel>
	52	<bezel name="lamp31" element="lamp_rect"><bounds x="2" y="11" width="4" height="1" /></bezel>
53	53	<bezel name="lamp33" element="lamp_rect"><bounds x="7" y="11" width="4" height="1" /></bezel>
54		<bezel name="lamp31" element="lamp_rect"><bounds x="12" y="11" width="4" height="1" /></bezel>
	54	<bezel name="lamp35" element="lamp_rect"><bounds x="12" y="11" width="4" height="1" /></bezel>
55	55
56		<bezel name="lamp36" element="lamp_rect"><bounds x="1" y="12" width="1" height="4" /></bezel>
57		<bezel name="lamp45" element="lamp_disk"><bounds x="3" y="13" width="2" height="2" /></bezel>
58		<bezel name="lamp34" element="lamp_rect"><bounds x="6" y="12" width="1" height="4" /></bezel>
	56	<bezel name="lamp30" element="lamp_rect"><bounds x="1" y="12" width="1" height="4" /></bezel>
	57	<bezel name="lamp41" element="lamp_disk"><bounds x="3" y="13" width="2" height="2" /></bezel>
	58	<bezel name="lamp32" element="lamp_rect"><bounds x="6" y="12" width="1" height="4" /></bezel>
59	59	<bezel name="lamp43" element="lamp_disk"><bounds x="8" y="13" width="2" height="2" /></bezel>
60		<bezel name="lamp32" element="lamp_rect"><bounds x="11" y="12" width="1" height="4" /></bezel>
61		<bezel name="lamp41" element="lamp_disk"><bounds x="13" y="13" width="2" height="2" /></bezel>
62		<bezel name="lamp30" element="lamp_rect"><bounds x="16" y="12" width="1" height="4" /></bezel>
	60	<bezel name="lamp34" element="lamp_rect"><bounds x="11" y="12" width="1" height="4" /></bezel>
	61	<bezel name="lamp45" element="lamp_disk"><bounds x="13" y="13" width="2" height="2" /></bezel>
	62	<bezel name="lamp36" element="lamp_rect"><bounds x="16" y="12" width="1" height="4" /></bezel>
63	63
64		<bezel name="lamp55" element="lamp_rect"><bounds x="2" y="16" width="4" height="1" /></bezel>
	64	<bezel name="lamp51" element="lamp_rect"><bounds x="2" y="16" width="4" height="1" /></bezel>
65	65	<bezel name="lamp53" element="lamp_rect"><bounds x="7" y="16" width="4" height="1" /></bezel>
66		<bezel name="lamp51" element="lamp_rect"><bounds x="12" y="16" width="4" height="1" /></bezel>
	66	<bezel name="lamp55" element="lamp_rect"><bounds x="12" y="16" width="4" height="1" /></bezel>
67	67
68		<bezel name="lamp46" element="lamp_rect"><bounds x="1" y="17" width="1" height="4" /></bezel>
69		<bezel name="lamp65" element="lamp_disk"><bounds x="3" y="18" width="2" height="2" /></bezel>
70		<bezel name="lamp44" element="lamp_rect"><bounds x="6" y="17" width="1" height="4" /></bezel>
	68	<bezel name="lamp40" element="lamp_rect"><bounds x="1" y="17" width="1" height="4" /></bezel>
	69	<bezel name="lamp61" element="lamp_disk"><bounds x="3" y="18" width="2" height="2" /></bezel>
	70	<bezel name="lamp42" element="lamp_rect"><bounds x="6" y="17" width="1" height="4" /></bezel>
71	71	<bezel name="lamp63" element="lamp_disk"><bounds x="8" y="18" width="2" height="2" /></bezel>
72		<bezel name="lamp42" element="lamp_rect"><bounds x="11" y="17" width="1" height="4" /></bezel>
73		<bezel name="lamp61" element="lamp_disk"><bounds x="13" y="18" width="2" height="2" /></bezel>
74		<bezel name="lamp40" element="lamp_rect"><bounds x="16" y="17" width="1" height="4" /></bezel>
	72	<bezel name="lamp44" element="lamp_rect"><bounds x="11" y="17" width="1" height="4" /></bezel>
	73	<bezel name="lamp65" element="lamp_disk"><bounds x="13" y="18" width="2" height="2" /></bezel>
	74	<bezel name="lamp46" element="lamp_rect"><bounds x="16" y="17" width="1" height="4" /></bezel>
75	75
76		<bezel name="lamp75" element="lamp_rect"><bounds x="2" y="21" width="4" height="1" /></bezel>
	76	<bezel name="lamp71" element="lamp_rect"><bounds x="2" y="21" width="4" height="1" /></bezel>
77	77	<bezel name="lamp73" element="lamp_rect"><bounds x="7" y="21" width="4" height="1" /></bezel>
78		<bezel name="lamp71" element="lamp_rect"><bounds x="12" y="21" width="4" height="1" /></bezel>
	78	<bezel name="lamp75" element="lamp_rect"><bounds x="12" y="21" width="4" height="1" /></bezel>
79	79
80		<bezel name="lamp56" element="lamp_rect"><bounds x="1" y="22" width="1" height="4" /></bezel>
81		<bezel name="lamp66" element="lamp_disk"><bounds x="3" y="23" width="2" height="2" /></bezel>
82		<bezel name="lamp54" element="lamp_rect"><bounds x="6" y="22" width="1" height="4" /></bezel>
83		<bezel name="lamp64" element="lamp_disk"><bounds x="8" y="23" width="2" height="2" /></bezel>
84		<bezel name="lamp52" element="lamp_rect"><bounds x="11" y="22" width="1" height="4" /></bezel>
85		<bezel name="lamp62" element="lamp_disk"><bounds x="13" y="23" width="2" height="2" /></bezel>
86		<bezel name="lamp50" element="lamp_rect"><bounds x="16" y="22" width="1" height="4" /></bezel>
	80	<bezel name="lamp50" element="lamp_rect"><bounds x="1" y="22" width="1" height="4" /></bezel>
	81	<bezel name="lamp60" element="lamp_disk"><bounds x="3" y="23" width="2" height="2" /></bezel>
	82	<bezel name="lamp52" element="lamp_rect"><bounds x="6" y="22" width="1" height="4" /></bezel>
	83	<bezel name="lamp62" element="lamp_disk"><bounds x="8" y="23" width="2" height="2" /></bezel>
	84	<bezel name="lamp54" element="lamp_rect"><bounds x="11" y="22" width="1" height="4" /></bezel>
	85	<bezel name="lamp64" element="lamp_disk"><bounds x="13" y="23" width="2" height="2" /></bezel>
	86	<bezel name="lamp56" element="lamp_rect"><bounds x="16" y="22" width="1" height="4" /></bezel>
87	87
88		<bezel name="lamp76" element="lamp_rect"><bounds x="2" y="26" width="4" height="1" /></bezel>
89		<bezel name="lamp74" element="lamp_rect"><bounds x="7" y="26" width="4" height="1" /></bezel>
90		<bezel name="lamp72" element="lamp_rect"><bounds x="12" y="26" width="4" height="1" /></bezel>
	88	<bezel name="lamp70" element="lamp_rect"><bounds x="2" y="26" width="4" height="1" /></bezel>
	89	<bezel name="lamp72" element="lamp_rect"><bounds x="7" y="26" width="4" height="1" /></bezel>
	90	<bezel name="lamp74" element="lamp_rect"><bounds x="12" y="26" width="4" height="1" /></bezel>
91	91
92	92	</view>
93	93	</mamelayout>

trunk/src/mess/machine/amstrad.c

r243009	r243010
2842	2842	int i;
2843	2843	bool slot3 = false,slot7 = false;
2844	2844
2845		if(m_system_type == SYSTEM_PLUS || m_system_type == SYSTEM_GX4000)
	2845	if (m_system_type == SYSTEM_PLUS || m_system_type == SYSTEM_GX4000)
2846	2846	{
2847	2847	UINT8 *crt = m_region_cart->base();
2848	2848	int bank_mask = (m_cart->get_rom_size() / 0x4000) - 1;
r243009	r243010
3034	3034
3035	3035	astring region_tag;
3036	3036	m_region_cart = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
	3037	if (!m_region_cart)   // this should never happen, since we make carts mandatory!
	3038	m_region_cart = memregion("maincpu");
3037	3039	}
3038	3040
3039	3041
r243009	r243010
3076	3078
3077	3079	astring region_tag;
3078	3080	m_region_cart = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
	3081	if (!m_region_cart)   // this should never happen, since we make carts mandatory!
	3082	m_region_cart = memregion("maincpu");
3079	3083	}
3080	3084
3081	3085	MACHINE_RESET_MEMBER(amstrad_state,gx4000)

https://github.com/mamedev/mame/commit/f07d274ac73cf5bffe1512f675d9696ac95c7d9c

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team