MAME SVN History

199869 Revisions

r33409 Sunday 16th November, 2014 at 06:57:47 UTC by Miodrag Milanović
Merge pull request #48 from evadot/fix_acan_name Add chip name for confirmed acan dumps

[src/emu]	tilemap.h
[src/emu/machine]	pla.h
[src/lib/util]	plaparse.c
[src/mame]	mame.lst mame.mak
[src/mame/drivers]	alinvade.c dooyong.c meritm.c naomi.c prehisle.c
[src/mame/includes]	dooyong.h prehisle.h
[src/mame/layout]	alinvade.lay*
[src/mame/machine]	naomim4.c naomim4.h
[src/mame/video]	dooyong.c prehisle.c
[src/mess/drivers]	mc1502.c

trunk/src/emu/machine/pla.h
r241920	r241921
54	54	// macros for known (and used) devices
55	55
56	56	// 82S100, 82S101, PLS100, PLS101
57		// 16x48x8 PLA, 28-pin
	57	// 16x48x8 PLA, 28-pin:
	58	/* _____ _____
	59	FE 1 \|* \_/ \| 28 Vcc
	60	I7 2 \| \| 27 I8
	61	I6 3 \| \| 26 I9
	62	I5 4 \| \| 25 I10
	63	I4 5 \| \| 24 I11
	64	I3 6 \| 82S100 \| 23 I12
	65	I2 7 \| 82S101 \| 22 I13
	66	I1 8 \| PLS100 \| 21 I14
	67	I0 9 \| PLS101 \| 20 I15
	68	F7 10 \| \| 19 _CE
	69	F6 11 \| \| 18 F0
	70	F5 12 \| \| 17 F1
	71	F4 13 \| \| 16 F2
	72	GND 14 \|_____________\| 15 F3
	73	*/
58	74	#define MCFG_PLS100_ADD(_tag) \
59	75	MCFG_PLA_ADD(_tag, 16, 8, 48)
60	76

trunk/src/emu/tilemap.h
r241920	r241921
36	36
37	37	category (optional): specifies one of 16 categories for the
38	38	pixels in the tile; the category controls which tiles are
39		rendered during a tilemap_draw() call
	39	rendered during a tilemap::draw() call
40	40
41	41	group (optional): specifies one of 256 groups for pen mapping;
42	42	each pen in the tile is looked up in a table to determine
r241920	r241921
81	81	all tiles rendered.
82	82
83	83	Flagsmap = an 8bpp bitmap containing per-pixel flags,
84		specifically the category (specified in bits 0-3) and
85		the layer (specified in bits 4-6).
	84	specifically the category (specified in bits 0-3) and the
	85	layer (specified in bits 4-6).
86	86
87	87	****************************************************************************
88	88
89	89	How to use a tilemap:
90	90
91		1. First create a new tilemap by calling tilemap_create(). The
92		parameters are as follows:
	91	1. First create a new tilemap by calling tilemap_manager::create().
	92	The parameters are as follows:
93	93
94		tile_get_info = pointer to a callback function which accepts a
95		memory index and in return fills in a tile_info structure
96		that describes the characteristics of a tile; this function
97		will be called whenever a dirty tile needs to be rendered
	94	decoder = reference to your device_gfx_interface
98	95
99		mapper = pointer to a callback function which maps the logical
100		column and row to a memory index; several standard mappers
101		are provided, with tilemap_scan_rows being the most common
	96	tile_get_info = callback function which accepts a memory index
	97	and in return fills in a tile_data structure that describes
	98	the characteristics of a tile; this function will be called
	99	whenever a dirty tile needs to be rendered
102	100
	101	mapper = callback function which maps the logical column and row
	102	to a memory index; several standard mappers are provided,
	103	with TILEMAP_SCAN_ROWS being the most common
	104
103	105	tilewidth = the width, in pixels, of each individual tile
104	106
105	107	tileheight = the height, in pixels, of each individual tile
r241920	r241921
112	114	Common configuration tasks include:
113	115
114	116	* marking one of the pens as transparent via
115		tilemap_set_transparent_pen()
	117	tilemap_t::set_transparent_pen()
116	118
117	119	* performing more complex pen-to-layer mapping via
118		tilemap_map_pen_to_layer() or
119		tilemap_map_pens_to_layer()
	120	tilemap_t::map_pen_to_layer() or
	121	tilemap_t::map_pens_to_layer()
120	122
121	123	* configuring global scroll offsets via
122		tilemap_set_scrolldx() and tilemap_set_scrolldy()
	124	tilemap_t::set_scrolldx() and tilemap_t::set_scrolldy()
123	125
124		* specifying a pointer that is passed to your tile_get_info
125		callback via tilemap_set_user_data()
	126	* specifying a pointer that can be read back later (e.g. in
	127	your tile_get_info callback) via
	128	tilemap_t::set_user_data()
126	129
127	130	* setting a global palette offset via
128		tilemap_set_palette_offset()
	131	tilemap_t::set_palette_offset()
129	132
130	133	3. In your memory write handlers for the tile memory, anytime tile
131	134	data is modified, you need to mark the tile dirty so that it is
132	135	re-rendered with the new data the next time the tilemap is drawn.
133		Use tilemap_mark_tile_dirty() and pass in the memory index.
	136	Use tilemap_t::mark_tile_dirty() and pass in the memory index.
134	137
135	138	4. In your handlers for scrolling, update the scroll values for the
136		tilemap via tilemap_set_scrollx() and tilemap_set_scrolly().
	139	tilemap via tilemap_t::set_scrollx() and tilemap_t::set_scrolly().
137	140
138	141	5. If any other major characteristics of the tilemap change (generally
139	142	any global state that is used by the tile_get_info callback but
140	143	which is not reported via other calls to the tilemap code), you
141	144	should invalidate the entire tilemap. You can do this by calling
142		tilemap_mark_all~~_tiles~~_dirty().
	145	tilemap_t::mark_all_dirty().
143	146
144	147	6. In your VIDEO_UPDATE callback, render the tiles by calling
145		tilemap_draw() or tilemap_draw_roz(). If you need to do custom
146		rendering and want access to the raw pixels, call
147		tilemap_get_pixmap() to get a pointer to the updated bitmap_ind16
	148	tilemap_t::draw() or tilemap_t::draw_roz(). If you need to do
	149	custom rendering and want access to the raw pixels, call
	150	tilemap_t::pixmap() to get a reference to the updated bitmap_ind16
148	151	containing the tilemap graphics.
149	152
150	153	****************************************************************************
r241920	r241921
157	160
158	161	tilemap_t *tmap;
159	162	UINT16 *my_tmap_memory;
	163	required_device<gfxdecode_device> gfxdecode;
160	164
161		TILE_GET_INFO( my_get_info )
	165	TILE_GET_INFO_MEMBER( my_state::my_get_info )
162	166	{
163		UINT8 tiledata = my_tmap_memory[tile_index];
	167	UINT16 tiledata = my_tmap_memory[tile_index];
164	168	UINT8 code = tiledata & 0xff;
165	169	UINT8 color = (tiledata >> 8) & 0x1f;
166	170	UINT8 flipx = (tiledata >> 13) & 1;
r241920	r241921
168	172	UINT8 category = (tiledata >> 15) & 1;
169	173
170	174	// set the common info for the tile
171		SET_TILE_INFO(
172		1, // use m_gfxdecode->gfx(1) for tile graphics
	175	tileinfo.set(
	176	1, // use gfxdecode->gfx(1) for tile graphics
173	177	code, // the index of the graphics for this tile
174	178	color, // the color to use for this tile
175	179	(flipx ? TILE_FLIPX : 0) \| // flags for this tile; also
176		(flipy ? TILE_FLIPY : 0); // see the FLIP_YX macro
	180	(flipy ? TILE_FLIPY : 0) // see the FLIP_YX macro
177	181	);
178	182
179	183	// set the category of each tile based on the high bit; this
r241920	r241921
181	185	tileinfo.category = category;
182	186	}
183	187
184		VIDEO_START( mydriver )
	188	VIDEO_START_MEMBER( my_state, my_driver )
185	189	{
186	190	// first create the tilemap
187		tmap = tilemap_create(machine,
188		my_get_info, // pointer to your get_info
189		tilemap_scan_rows, // standard row-major mapper
	191	tmap = &machine().tilemap().create(
	192	gfxdecode,
	193	tilemap_get_info_delegate(FUNC(my_state::my_get_info), this),
	194	TILEMAP_SCAN_ROWS, // standard row-major mapper
190	195	8,8, // 8x8 tiles
191	196	64,32); // 64 columns, 32 rows
192	197
193	198	// then set the transparent pen; all other pens will default
194	199	// to being part of layer 0
195		t~~ile~~map_set_transparent_pen(~~tmap,~~ 0);
	200	tmap.set_transparent_pen(0);
196	201	}
197	202
198		SCREEN_UPDATE( mydriver )
	203	UINT32 my_state::screen_update_mydriver(
	204	screen_device &screen,
	205	bitmap_ind16 &bitmap,
	206	const rectangle &cliprect)
199	207	{
200	208	// draw the tilemap first, fully opaque since it needs to
201	209	// erase all previous pixels
202		tilemap_draw(
	210	tmap->draw(
	211	screen, // destination screen
203	212	bitmap, // destination bitmap
204	213	cliprect, // clipping rectangle
205		tmap, // tilemap to draw
206		TILEMAP_DRAW_OPAQUE, // flags
207		0); // don't use priority_bitmap
	214	TILEMAP_DRAW_OPAQUE); // flags
208	215
209	216	// next draw the sprites
210	217	my_draw_sprites();
211	218
212	219	// then draw the tiles which have priority over sprites
213		tilemap_draw(
	220	tmap->draw(
	221	screen, // destination screen
214	222	bitmap, // destination bitmap
215	223	cliprect, // clipping rectangle
216		tmap, // tilemap to draw
217		TILEMAP_DRAW_CATEGORY(1),// flags: draw category 1
218		0); // don't use priority_bitmap
	224	TILEMAP_DRAW_CATEGORY(1));// flags: draw category 1
219	225
220	226	return 0;
221	227	}
r241920	r241921
237	243
238	244	TILEMAP_TRANSPARENT: This described a tilemap with a single
239	245	transparent pen. To create the same effect, call
240		tilemap_set_transparent_pen() to specify which pen is
	246	tilemap_t::set_transparent_pen() to specify which pen is
241	247	transparent; all other pens will map to layer 0.
242	248
243	249	TILEMAP_BITMASK: This type is no longer special; with the new
r241920	r241921
250	256	also allowed for you to choose one of 4 mappings on a per-tile
251	257	basis. All of this functionality is now expanded: you can
252	258	specify one of 3 layers and can choose from one of 256 mappings
253		on a per-tile basis. You just call tilemap_set_transmask(),
	259	on a per-tile basis. You just call tilemap_t::set_transmask(),
254	260	which still exists but maps onto the new behavior. The "front"
255	261	layer is now "layer 0" and the "back" layer is now "layer 1".
256	262
r241920	r241921
275	281	TILEMAP_DRAW_LAYER0 is assumed.
276	282
277	283	* If you want to render with alpha blending, you can call
278		tilemap_draw() with the TILEMAP_DRAW_ALPHA flag.
	284	tilemap_t::draw() with the TILEMAP_DRAW_ALPHA flag.
279	285
280	286	* To configure more complex pen-to-layer mapping, use the
281		tilemap_map_pens_to_layer() call. This call takes a group number
282		so that you can configure 1 of the 256 groups independently.
283		It also takes a pen and a mask; the mapping is updated for all
284		pens where ((pennum & mask) == pen). To set all the pens in a
285		group to the same value, pass a mask of 0. To set a single pen in
286		a group, pass a mask of ~0. The helper function
287		tilemap_map_pen_to_layer() does this for you.
	287	tilemap_t::map_pens_to_layer() call. This call takes a group
	288	number so that you can configure 1 of the 256 groups
	289	independently. It also takes a pen and a mask; the mapping is
	290	updated for all pens where ((pennum & mask) == pen). To set all
	291	the pens in a group to the same value, pass a mask of 0. To set
	292	a single pen in a group, pass a mask of ~0. The helper function
	293	tilemap_t::map_pen_to_layer() does this for you.
288	294
289	295	***************************************************************************/
290	296
r241920	r241921
306	312	#define TILEMAP_NUM_GROUPS 256
307	313
308	314
309		// these flags control tilemap_draw() behavior
	315	// these flags control tilemap_t::draw() behavior
310	316	const UINT32 TILEMAP_DRAW_CATEGORY_MASK = 0x0f; // specify the category to draw
311	317	const UINT32 TILEMAP_DRAW_LAYER0 = 0x10; // draw layer 0
312	318	const UINT32 TILEMAP_DRAW_LAYER1 = 0x20; // draw layer 1
r241920	r241921
329	335	const UINT8 TILE_FORCE_LAYER1 = TILEMAP_PIXEL_LAYER1; // force all pixels to be layer 1 (no transparency)
330	336	const UINT8 TILE_FORCE_LAYER2 = TILEMAP_PIXEL_LAYER2; // force all pixels to be layer 2 (no transparency)
331	337
332		// tilemap global flags, used by tilemap_set_flip()
	338	// tilemap global flags, used by tilemap_t::set_flip()
333	339	const UINT32 TILEMAP_FLIPX = TILE_FLIPX; // draw the tilemap horizontally flipped
334	340	const UINT32 TILEMAP_FLIPY = TILE_FLIPY; // draw the tilemap vertically flipped
335	341
r241920	r241921
767	773	// MACROS
768	774	//**************************************************************************
769	775
770		// macros to help form flags for tilemap_draw
	776	// macros to help form flags for tilemap_t::draw
771	777	#define TILEMAP_DRAW_CATEGORY(x) (x) // specify category to draw
772	778	#define TILEMAP_DRAW_ALPHA(x) (TILEMAP_DRAW_ALPHA_FLAG \| (rgb_t::clamp(x) << 24))
773	779

trunk/src/lib/util/plaparse.c
r241920	r241921
4	4
5	5	plaparse.h
6	6
7		Parser for Berkeley standard PLA files into raw fusemaps.
	7	Simple parser for Berkeley standard PLA files into raw fusemaps.
	8	It supports no more than one output matrix, and is limited to
	9	keywords: i, o, p, phase, e
8	10
9	11	***************************************************************************/
10	12
r241920	r241921
31	33
32	34	struct parse_info
33	35	{
34		UINT32 inputs;
35		UINT32 outputs;
36		UINT32 terms;
	36	UINT32 inputs; /* number of input columns */
	37	UINT32 outputs; /* number of output columns */
	38	UINT32 terms; /* number of terms */
	39	UINT32 xorval[JED_MAX_FUSES/64]; /* output polarity */
	40	UINT32 xorptr;
37	41	};
38	42
39	43
r241920	r241921
57	61	character stream
58	62	-------------------------------------------------*/
59	63
60		static UINT32 suck_number(const UINT8 **psrc)
	64	static UINT32 suck_number(const UINT8 *cursrc, const UINT8 srcend)
61	65	{
62		const UINT8 src = psrc;
63	66	UINT32 value = 0;
	67	(*cursrc)++;
	68
	69	// find first digit
	70	while (cursrc < srcend && !iscrlf(cursrc) && !isdigit(*cursrc))
	71	(*cursrc)++;
	72	if (*cursrc >= srcend)
	73	return 0;
64	74
65	75	// loop over and accumulate digits
66		while (isdigit(*src))
	76	while (isdigit(**cursrc))
67	77	{
68		value = value * 10 + *src - '0';
69		src++;
	78	value = value * 10 + (**cursrc) - '0';
	79	(*cursrc)++;
70	80	}
71	81
72		// return a pointer to the string afterwards
73		*psrc = src;
74	82	return value;
75	83	}
76	84
r241920	r241921
81	89	***************************************************************************/
82	90
83	91	/*-------------------------------------------------
84		process_field - process ~~a s~~in~~gle~~ fi~~eld~~
	92	process_terms - process input/output matrix
85	93	-------------------------------------------------*/
86	94
87		static void process_field(jed_data data, const UINT8 cursrc, const UINT8 srcend, parse_info pinfo)
	95	static bool process_terms(jed_data data, const UINT8 cursrc, const UINT8 srcend, parse_info *pinfo)
88	96	{
89		cursrc++;
	97	UINT32 curinput = 0;
	98	UINT32 curoutput = 0;
	99	bool outputs = false;
90	100
91		// switch off of the field type
92		switch (*cursrc)
	101	while (cursrc < srcend && cursrc != '.' && *cursrc != '#')
93	102	{
94		// number of inputs
95		case 'i':
96		cursrc += 2;
97		pinfo->inputs = suck_number(&cursrc);
98		if (LOG_PARSE) printf("Inputs: %u\n", pinfo->inputs);
99		break;
100
101		// number of outputs
102		case 'o':
103		cursrc += 2;
104		pinfo->outputs = suck_number(&cursrc);
105		if (LOG_PARSE) printf("Outputs: %u\n", pinfo->outputs);
106		break;
107
108		// number of product terms
109		case 'p':
	103	switch (**cursrc)
110	104	{
111		cursrc += 2;
112		pinfo->terms = suck_number(&cursrc);
113		if (LOG_PARSE) printf("Terms: %u\n", pinfo->terms);
	105	case '-':
	106	if (!outputs)
	107	{
	108	curinput++;
	109	jed_set_fuse(data, data->numfuses++, 1);
	110	jed_set_fuse(data, data->numfuses++, 1);
114	111
115		UINT32 curfuse = 0;
116		bool outputs = false;
	112	if (LOG_PARSE) printf("11");
	113	}
	114	break;
117	115
118		cursrc++;
119		while (cursrc < srcend && *cursrc != '.')
120		{
121		switch (*cursrc)
	116	case '~':
	117	if (!outputs)
122	118	{
123		case '-':
124		if (!outputs)
125		{
126		jed_set_fuse(data, curfuse++, 1);
127		jed_set_fuse(data, curfuse++, 1);
	119	curinput++;
	120	// this product term is inhibited
	121	jed_set_fuse(data, data->numfuses++, 0);
	122	jed_set_fuse(data, data->numfuses++, 0);
128	123
129		if (LOG_PARSE) printf("11");
130		}
131		break;
	124	if (LOG_PARSE) printf("00");
	125	}
	126	break;
132	127
133		case '1':
134		if (outputs)
135		{
136		jed_set_fuse(data, curfuse++, 0);
	128	case '1':
	129	if (outputs)
	130	{
	131	curoutput++;
	132	jed_set_fuse(data, data->numfuses++, 0);
137	133
138		if (LOG_PARSE) printf("0");
139		}
140		else
141		{
142		jed_set_fuse(data, curfuse++, 1);
143		jed_set_fuse(data, curfuse++, 0);
	134	if (LOG_PARSE) printf("0");
	135	}
	136	else
	137	{
	138	curinput++;
	139	jed_set_fuse(data, data->numfuses++, 1);
	140	jed_set_fuse(data, data->numfuses++, 0);
144	141
145		if (LOG_PARSE) printf("10");
146		}
147		break;
	142	if (LOG_PARSE) printf("10");
	143	}
	144	break;
148	145
149		case '0':
150		if (outputs)
151		{
152		jed_set_fuse(data, curfuse++, 1);
	146	case '0':
	147	if (outputs)
	148	{
	149	curoutput++;
	150	jed_set_fuse(data, data->numfuses++, 1);
153	151
154		if (LOG_PARSE) printf("1");
155		}
156		else
157		{
158		jed_set_fuse(data, curfuse++, 0);
159		jed_set_fuse(data, curfuse++, 1);
	152	if (LOG_PARSE) printf("1");
	153	}
	154	else
	155	{
	156	curinput++;
	157	jed_set_fuse(data, data->numfuses++, 0);
	158	jed_set_fuse(data, data->numfuses++, 1);
160	159
161		if (LOG_PARSE) printf("01");
162		}
163		break;
	160	if (LOG_PARSE) printf("01");
	161	}
	162	break;
164	163
165		case ' ':
	164	case ' ': case '\t':
	165	if (curinput > 0 && !outputs)
	166	{
166	167	outputs = true;
167	168	if (LOG_PARSE) printf(" ");
168		break;
169	169	}
	170	break;
	171
	172	default:
	173	break;
	174	}
170	175
171		if (iscrlf(*cursrc) && outputs)
	176	if (iscrlf(**cursrc) && outputs)
	177	{
	178	outputs = false;
	179	if (LOG_PARSE) printf("\n");
	180
	181	if (curinput != pinfo->inputs \|\| curoutput != pinfo->outputs)
	182	return false;
	183
	184	curinput = 0;
	185	curoutput = 0;
	186	}
	187
	188	(*cursrc)++;
	189	}
	190
	191	return true;
	192	}
	193
	194
	195
	196	/*-------------------------------------------------
	197	process_field - process a single field
	198	-------------------------------------------------*/
	199
	200	static bool process_field(jed_data data, const UINT8 cursrc, const UINT8 srcend, parse_info *pinfo)
	201	{
	202	(*cursrc)++;
	203
	204	switch (**cursrc)
	205	{
	206	// number of inputs
	207	case 'i': case 'I':
	208	pinfo->inputs = suck_number(cursrc, srcend);
	209	if (pinfo->inputs == 0 \|\| pinfo->inputs >= (JED_MAX_FUSES/2))
	210	return false;
	211
	212	if (LOG_PARSE) printf("Inputs: %u\n", pinfo->inputs);
	213	break;
	214
	215	// number of outputs
	216	case 'o': case 'O':
	217	pinfo->outputs = suck_number(cursrc, srcend);
	218	if (pinfo->outputs == 0 \|\| pinfo->outputs >= (JED_MAX_FUSES/2))
	219	return false;
	220
	221	if (LOG_PARSE) printf("Outputs: %u\n", pinfo->outputs);
	222	break;
	223
	224	case 'p': case 'P':
	225	// output polarity (optional)
	226	if (tolower((cursrc)[1]) == 'h' && tolower((cursrc)[2]) == 'a' && tolower((cursrc)[3]) == 's' && tolower((cursrc)[4]) == 'e')
	227	{
	228	if (LOG_PARSE) printf("Phase...\n");
	229	while (cursrc < srcend && !iscrlf(*cursrc) && pinfo->xorptr < (JED_MAX_FUSES/2))
172	230	{
173		outputs = false;
174		if (LOG_PARSE) printf("\n");
	231	if (cursrc == '0' \|\| cursrc == '1')
	232	{
	233	// 0 is negative
	234	if (**cursrc == '0')
	235	pinfo->xorval[pinfo->xorptr/32] \|= 1 << (pinfo->xorptr & 31);
	236	pinfo->xorptr++;
	237	}
	238
	239	(*cursrc)++;
175	240	}
	241	}
	242
	243	// or number of product terms (optional)
	244	else
	245	{
	246	pinfo->terms = suck_number(cursrc, srcend);
	247	if (pinfo->terms == 0 \|\| pinfo->terms >= (JED_MAX_FUSES/2))
	248	return false;
176	249
177		cursr~~c++~~;
	250	if (LOG_PARSE) printf("Terms: %u\n", pinfo->terms);
178	251	}
179
180		data->numfuses = curfuse;
181	252	break;
182		}
183	253
184		// end of file
185		case 'e':
	254	// end of file (optional)
	255	case 'e': case 'E':
186	256	if (LOG_PARSE) printf("End of file\n");
187	257	break;
	258
	259	default:
	260	return false;
188	261	}
189
190		cursrc++;
	262
	263	return true;
191	264	}
192	265
193	266
r241920	r241921
201	274	{
202	275	const UINT8 cursrc = (const UINT8 )data;
203	276	const UINT8 *srcend = cursrc + length;
204		~~const UINT8 *scan;~~
	277
205	278	parse_info pinfo;
	279	memset(&pinfo, 0, sizeof(pinfo));
206	280
207	281	result->numfuses = 0;
208		memset(result->fusemap, 0~~x00~~, sizeof(result->fusemap));
	282	memset(result->fusemap, 0, sizeof(result->fusemap));
209	283
210	284	while (cursrc < srcend)
211	285	{
212		if (*cursrc ~~== '#'~~)
	286	switch (*cursrc)
213	287	{
214		cursrc++;
215		while (cursrc < srcend && !iscrlf(*cursrc))
	288	// comment line
	289	case '#':
	290	while (cursrc < srcend && !iscrlf(*cursrc))
	291	cursrc++;
	292	break;
	293
	294	// keyword
	295	case '.':
	296	if (!process_field(result, &cursrc, srcend, &pinfo))
	297	return JEDERR_INVALID_DATA;
	298	break;
	299
	300	// terms
	301	case '0': case '1': case '-': case '~':
	302	if (!process_terms(result, &cursrc, srcend, &pinfo))
	303	return JEDERR_INVALID_DATA;
	304	break;
	305
	306	default:
216	307	cursrc++;
	308	break;
217	309	}
218		else if (*cursrc == '.')
	310	}
	311
	312	// write output polarity
	313	if (pinfo.xorptr > 0)
	314	{
	315	if (LOG_PARSE) printf("Polarity: ");
	316
	317	for (int i = 0; i < pinfo.outputs; i++)
219	318	{
220		scan = cursrc;
221		while (scan < srcend && !iscrlf(*scan))
222		scan++;
223		if (scan >= srcend)
224		return JEDERR_INVALID_DATA;
225
226		process_field(result, cursrc, srcend, &pinfo);
227
228		cursrc = scan + 1;
	319	int bit = pinfo.xorval[i/32] >> (i & 31) & 1;
	320	jed_set_fuse(result, result->numfuses++, bit);
	321	if (LOG_PARSE) printf("%d", bit);
229	322	}
230
231		cursrc++;
	323	if (LOG_PARSE) printf("\n");
232	324	}
233	325
234	326	return JEDERR_NONE;

trunk/src/mame/drivers/alinvade.c
r241920	r241921
13	13
14	14	#include "emu.h"
15	15	#include "cpu/m6502/m6502.h"
	16	#include "alinvade.lh"
16	17
17	18	class alinvade_state : public driver_device
18	19	{
r241920	r241921
190	191	ROM_END
191	192
192	193
193		GAME( 198?, alinvade, 0, alinvade, alinvade, driver_device, 0, ROT90, "Forbes?", "Alien Invaders", GAME_UNEMULATED_PROTECTION \| GAME_NO_SOUND )
	194	GAMEL( 198?, alinvade, 0, alinvade, alinvade, driver_device, 0, ROT90, "Forbes?", "Alien Invaders", GAME_UNEMULATED_PROTECTION \| GAME_NO_SOUND, layout_alinvade )

trunk/src/mame/drivers/dooyong.c
r241920	r241921
84	84	#include "sound/okim6295.h"
85	85	#include "includes/dooyong.h"
86	86
87		WRITE8_MEMBER(dooyong_state::~~lastday_~~bankswitch_w)
	87	WRITE8_MEMBER(dooyong_z80_state::bankswitch_w)
88	88	{
89	89	membank("bank1")->set_entry(data & 0x07);
90	90
91	91	if (data & 0xf8) popmessage("bankswitch %02x",data);
92	92	}
93	93
94		MACHINE_START_MEMBER(dooyong_state,~~lastday~~)
	94	MACHINE_START_MEMBER(dooyong_z80_state, cpu_z80)
95	95	{
96	96	membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000);
97	97	}
98	98
99		WRITE8_MEMBER(dooyong_state::flip_screen_w)
	99	WRITE8_MEMBER(dooyong_z80_state::flip_screen_w)
100	100	{
101	101	flip_screen_set(data);
102	102	}
103	103
104		MACHINE_RESET_MEMBER(dooyong_state,sound_ym2203)
	104	MACHINE_RESET_MEMBER(dooyong_z80_ym2203_state, sound_ym2203)
105	105	{
106		m_interrupt_line_1=0;
107		m_interrupt_line_2=0;
	106	m_interrupt_line_1 = 0;
	107	m_interrupt_line_2 = 0;
108	108	}
109	109
110	110	/***************************************************************************
r241920	r241921
113	113
114	114	***************************************************************************/
115	115
116		static ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8, dooyong_state )
	116	static ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
117	117	AM_RANGE(0x0000, 0x7fff) AM_ROM
118	118	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
119		AM_RANGE(0xc000, 0xc007) AM_WRITE(dooyong_bgscroll8_w)
120		AM_RANGE(0xc008, 0xc00f) AM_WRITE(dooyong_fgscroll8_w)
	119	AM_RANGE(0xc000, 0xc007) AM_WRITE(bgscroll_w)
	120	AM_RANGE(0xc008, 0xc00f) AM_WRITE(fgscroll_w)
121	121	AM_RANGE(0xc010, 0xc010) AM_READ_PORT("SYSTEM")
122	122	AM_RANGE(0xc010, 0xc010) AM_WRITE(lastday_ctrl_w) /* coin counter, flip screen */
123	123	AM_RANGE(0xc011, 0xc011) AM_READ_PORT("P1")
124		AM_RANGE(0xc011, 0xc011) AM_WRITE(~~lastday_~~bankswitch_w)
	124	AM_RANGE(0xc011, 0xc011) AM_WRITE(bankswitch_w)
125	125	AM_RANGE(0xc012, 0xc012) AM_READ_PORT("P2")
126	126	AM_RANGE(0xc012, 0xc012) AM_WRITE(soundlatch_byte_w)
127	127	AM_RANGE(0xc013, 0xc013) AM_READ_PORT("DSWA")
128	128	AM_RANGE(0xc014, 0xc014) AM_READ_PORT("DSWB")
129	129	AM_RANGE(0xc800, 0xcfff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
130		AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(~~dooyong_~~txvideoram8_w) AM_SHARE("txvideoram")
	130	AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(txvideoram_w) AM_SHARE("txvideoram")
131	131	AM_RANGE(0xe000, 0xefff) AM_RAM
132	132	AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("spriteram")
133	133	ADDRESS_MAP_END
134	134
135		static ADDRESS_MAP_START( pollux_map, AS_PROGRAM, 8, dooyong_state )
	135	static ADDRESS_MAP_START( pollux_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
136	136	AM_RANGE(0x0000, 0x7fff) AM_ROM
137	137	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
138	138	AM_RANGE(0xc000, 0xcfff) AM_RAM
139	139	AM_RANGE(0xd000, 0xdfff) AM_RAM AM_SHARE("spriteram")
140		AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_SHARE("txvideoram")
141		AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSWA") AM_WRITE(lastday_bankswitch_w)
	140	AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(txvideoram_w) AM_SHARE("txvideoram")
	141	AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSWA") AM_WRITE(bankswitch_w)
142	142	AM_RANGE(0xf001, 0xf001) AM_READ_PORT("DSWB")
143	143	AM_RANGE(0xf002, 0xf002) AM_READ_PORT("P1")
144	144	AM_RANGE(0xf003, 0xf003) AM_READ_PORT("P2")
145	145	AM_RANGE(0xf004, 0xf004) AM_READ_PORT("SYSTEM")
146	146	AM_RANGE(0xf008, 0xf008) AM_WRITE(pollux_ctrl_w) /* coin counter, flip screen */
147	147	AM_RANGE(0xf010, 0xf010) AM_WRITE(soundlatch_byte_w)
148		AM_RANGE(0xf018, 0xf01f) AM_WRITE(dooyong_bgscroll8_w)
149		AM_RANGE(0xf020, 0xf027) AM_WRITE(dooyong_fgscroll8_w)
	148	AM_RANGE(0xf018, 0xf01f) AM_WRITE(bgscroll_w)
	149	AM_RANGE(0xf020, 0xf027) AM_WRITE(fgscroll_w)
150	150	AM_RANGE(0xf800, 0xffff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
151	151	ADDRESS_MAP_END
152	152
153		static ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8, dooyong_state )
	153	static ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
154	154	AM_RANGE(0x0000, 0x7fff) AM_ROM
155	155	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
156	156	AM_RANGE(0xc000, 0xcfff) AM_RAM
157	157	AM_RANGE(0xd000, 0xdfff) AM_RAM AM_SHARE("spriteram")
158		AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(~~dooyong_~~txvideoram8_w) AM_SHARE("txvideoram")
	158	AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(txvideoram_w) AM_SHARE("txvideoram")
159	159	AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSWA")
160		AM_RANGE(0xf000, 0xf000) AM_WRITE(~~lastday_~~bankswitch_w)
	160	AM_RANGE(0xf000, 0xf000) AM_WRITE(bankswitch_w)
161	161	AM_RANGE(0xf001, 0xf001) AM_READ_PORT("DSWB")
162	162	AM_RANGE(0xf002, 0xf002) AM_READ_PORT("P2")
163	163	AM_RANGE(0xf003, 0xf003) AM_READ_PORT("P1")
164	164	AM_RANGE(0xf004, 0xf004) AM_READ_PORT("SYSTEM")
165	165	AM_RANGE(0xf008, 0xf008) AM_WRITE(pollux_ctrl_w) /* coin counter, flip screen */
166	166	AM_RANGE(0xf010, 0xf010) AM_WRITE(soundlatch_byte_w)
167		AM_RANGE(0xf018, 0xf01f) AM_WRITE(dooyong_bgscroll8_w)
168		AM_RANGE(0xf020, 0xf027) AM_WRITE(dooyong_fgscroll8_w)
	167	AM_RANGE(0xf018, 0xf01f) AM_WRITE(bgscroll_w)
	168	AM_RANGE(0xf020, 0xf027) AM_WRITE(fgscroll_w)
169	169	AM_RANGE(0xf800, 0xffff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
170	170	ADDRESS_MAP_END
171	171
172		static ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8, dooyong_state )
	172	static ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8, dooyong_z80_state )
173	173	AM_RANGE(0x0000, 0x7fff) AM_ROM
174	174	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
175	175	AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSWA")
r241920	r241921
178	178	AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P1")
179	179	AM_RANGE(0xc003, 0xc003) AM_READ_PORT("P2")
180	180	AM_RANGE(0xc004, 0xc004) AM_READ_PORT("SYSTEM")
181		AM_RANGE(0xc008, 0xc008) AM_WRITE(~~lastday_~~bankswitch_w)
	181	AM_RANGE(0xc008, 0xc008) AM_WRITE(bankswitch_w)
182	182	AM_RANGE(0xc010, 0xc010) AM_WRITE(soundlatch_byte_w)
183		AM_RANGE(0xc018, 0xc01f) AM_WRITE(dooyong_fg2scroll8_w)
184		AM_RANGE(0xc040, 0xc047) AM_WRITE(dooyong_bgscroll8_w)
185		AM_RANGE(0xc048, 0xc04f) AM_WRITE(dooyong_fgscroll8_w)
	183	AM_RANGE(0xc018, 0xc01f) AM_WRITE(fg2scroll_w)
	184	AM_RANGE(0xc040, 0xc047) AM_WRITE(bgscroll_w)
	185	AM_RANGE(0xc048, 0xc04f) AM_WRITE(fgscroll_w)
186	186	AM_RANGE(0xc800, 0xcfff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
187		AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(~~dooyong_~~txvideoram8_w) AM_SHARE("txvideoram")
	187	AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(txvideoram_w) AM_SHARE("txvideoram")
188	188	AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("spriteram")
189	189	AM_RANGE(0xf000, 0xffff) AM_RAM
190	190	ADDRESS_MAP_END
191	191
192		static ADDRESS_MAP_START( flytiger_map, AS_PROGRAM, 8, dooyong_state )
	192	static ADDRESS_MAP_START( flytiger_map, AS_PROGRAM, 8, dooyong_z80_state )
193	193	AM_RANGE(0x0000, 0x7fff) AM_ROM
194	194	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
195	195	AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE("spriteram")
196	196	AM_RANGE(0xd000, 0xdfff) AM_RAM
197	197	AM_RANGE(0xe000, 0xe000) AM_READ_PORT("P1")
198		AM_RANGE(0xe000, 0xe000) AM_WRITE(~~lastday_~~bankswitch_w)
	198	AM_RANGE(0xe000, 0xe000) AM_WRITE(bankswitch_w)
199	199	AM_RANGE(0xe002, 0xe002) AM_READ_PORT("P2")
200	200	AM_RANGE(0xe004, 0xe004) AM_READ_PORT("SYSTEM")
201	201	AM_RANGE(0xe006, 0xe006) AM_READ_PORT("DSWA")
202	202	AM_RANGE(0xe008, 0xe008) AM_READ_PORT("DSWB")
203	203	AM_RANGE(0xe010, 0xe010) AM_WRITE(flytiger_ctrl_w) /* coin counter, flip screen */
204	204	AM_RANGE(0xe020, 0xe020) AM_WRITE(soundlatch_byte_w)
205		AM_RANGE(0xe030, 0xe037) AM_WRITE(dooyong_bgscroll8_w)
206		AM_RANGE(0xe040, 0xe047) AM_WRITE(dooyong_fgscroll8_w)
	205	AM_RANGE(0xe030, 0xe037) AM_WRITE(bgscroll_w)
	206	AM_RANGE(0xe040, 0xe047) AM_WRITE(fgscroll_w)
207	207	AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_flytiger_w) AM_SHARE("flytiger_palram")
208		AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(~~dooyong_~~txvideoram8_w) AM_SHARE("txvideoram")
	208	AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(txvideoram_w) AM_SHARE("txvideoram")
209	209	ADDRESS_MAP_END
210	210
211		static ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8, dooyong_state )
	211	static ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8, dooyong_z80_state )
212	212	AM_RANGE(0x0000, 0x7fff) AM_ROM
213	213	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
214	214	AM_RANGE(0xc000, 0xcfff) AM_RAM
215	215	AM_RANGE(0xd000, 0xd3ff) AM_RAM /* what is this? looks like a palette? scratchpad RAM maybe? */
216		AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(~~dooyong_~~txvideoram8_w) AM_SHARE("txvideoram")
	216	AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(txvideoram_w) AM_SHARE("txvideoram")
217	217	AM_RANGE(0xf000, 0xf7ff) AM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
218	218	AM_RANGE(0xf800, 0xf800) AM_READ_PORT("DSWA")
219	219	AM_RANGE(0xf800, 0xf800) AM_WRITE(primella_ctrl_w) /* bank switch, flip screen etc */
r241920	r241921
222	222	AM_RANGE(0xf820, 0xf820) AM_READ_PORT("P1")
223	223	AM_RANGE(0xf830, 0xf830) AM_READ_PORT("P2")
224	224	AM_RANGE(0xf840, 0xf840) AM_READ_PORT("SYSTEM")
225		AM_RANGE(0xfc00, 0xfc07) AM_WRITE(dooyong_bgscroll8_w)
226		AM_RANGE(0xfc08, 0xfc0f) AM_WRITE(dooyong_fgscroll8_w)
	225	AM_RANGE(0xfc00, 0xfc07) AM_WRITE(bgscroll_w)
	226	AM_RANGE(0xfc08, 0xfc0f) AM_WRITE(fgscroll_w)
227	227	ADDRESS_MAP_END
228	228
229		static ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16, dooyong_state )
	229	static ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16, dooyong_68k_state )
230	230	ADDRESS_MAP_GLOBAL_MASK(0xfffff) /* super-x needs this and is similar */
231	231	AM_RANGE(0x000000, 0x03ffff) AM_ROM
232	232	AM_RANGE(0x040000, 0x04cfff) AM_RAM
233		AM_RANGE(0x04d000, 0x04dfff) AM_RAM AM_SHARE("spriteram16")
	233	AM_RANGE(0x04d000, 0x04dfff) AM_RAM AM_SHARE("spriteram")
234	234	AM_RANGE(0x04e000, 0x04ffff) AM_RAM
235	235	AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW")
236	236	AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("P1_P2")
237	237	AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("SYSTEM")
238		AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE(dooyong_bgscroll16_w)
239		AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE(dooyong_bg2scroll16_w)
	238	AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE8(bgscroll_w, 0x00ff)
	239	AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE8(bg2scroll_w, 0x00ff)
240	240	AM_RANGE(0x0c8000, 0x0c8fff) AM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
241	241	AM_RANGE(0x0c0012, 0x0c0013) AM_WRITE(soundlatch_word_w)
242		AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(rshark_ctrl_w) /* flip screen + unknown stuff */
243		AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE(dooyong_fgscroll16_w)
244		AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE(dooyong_fg2scroll16_w)
	242	AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(ctrl_w) /* flip screen + unknown stuff */
	243	AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE8(fgscroll_w, 0x00ff)
	244	AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE8(fg2scroll_w, 0x00ff)
245	245	ADDRESS_MAP_END
246	246
247		static ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16, dooyong_state )
	247	static ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16, dooyong_68k_state )
248	248	ADDRESS_MAP_GLOBAL_MASK(0xfffff)
249	249	AM_RANGE(0x000000, 0x03ffff) AM_ROM
250	250	AM_RANGE(0x0d0000, 0x0dcfff) AM_RAM
251		AM_RANGE(0x0dd000, 0x0ddfff) AM_RAM AM_SHARE("spriteram16")
	251	AM_RANGE(0x0dd000, 0x0ddfff) AM_RAM AM_SHARE("spriteram")
252	252	AM_RANGE(0x0de000, 0x0dffff) AM_RAM
253	253	AM_RANGE(0x080002, 0x080003) AM_READ_PORT("DSW")
254	254	AM_RANGE(0x080004, 0x080005) AM_READ_PORT("P1_P2")
255	255	AM_RANGE(0x080006, 0x080007) AM_READ_PORT("SYSTEM")
256		AM_RANGE(0x084000, 0x08400f) AM_WRITE(dooyong_bgscroll16_w)
257		AM_RANGE(0x084010, 0x08401f) AM_WRITE(dooyong_bg2scroll16_w)
	256	AM_RANGE(0x084000, 0x08400f) AM_WRITE8(bgscroll_w, 0x00ff)
	257	AM_RANGE(0x084010, 0x08401f) AM_WRITE8(bg2scroll_w, 0x00ff)
258	258	AM_RANGE(0x088000, 0x088fff) AM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
259	259	AM_RANGE(0x080012, 0x080013) AM_WRITE(soundlatch_word_w)
260		AM_RANGE(0x080014, 0x080015) AM_WRITE(rshark_ctrl_w) /* flip screen + unknown stuff */
261		AM_RANGE(0x08c000, 0x08c00f) AM_WRITE(dooyong_fgscroll16_w)
262		AM_RANGE(0x08c010, 0x08c01f) AM_WRITE(dooyong_fg2scroll16_w)
	260	AM_RANGE(0x080014, 0x080015) AM_WRITE(ctrl_w) /* flip screen + unknown stuff */
	261	AM_RANGE(0x08c000, 0x08c00f) AM_WRITE8(fgscroll_w, 0x00ff)
	262	AM_RANGE(0x08c010, 0x08c01f) AM_WRITE8(fg2scroll_w, 0x00ff)
263	263	ADDRESS_MAP_END
264	264
265		static ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16, dooyong_state )
	265	static ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16, dooyong_68k_state )
266	266	ADDRESS_MAP_GLOBAL_MASK(0xfffff)
267	267	AM_RANGE(0x000000, 0x03ffff) AM_ROM
268	268	AM_RANGE(0x040000, 0x04cfff) AM_RAM
269		AM_RANGE(0x04d000, 0x04dfff) AM_RAM AM_SHARE("spriteram16")
	269	AM_RANGE(0x04d000, 0x04dfff) AM_RAM AM_SHARE("spriteram")
270	270	AM_RANGE(0x04e000, 0x04ffff) AM_RAM
271	271	AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW")
272	272	AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("P1_P2")
273	273	AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("SYSTEM")
274	274	AM_RANGE(0x0c0012, 0x0c0013) AM_WRITE(soundlatch_word_w)
275		AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(~~rshark_~~ctrl_w)
	275	AM_RANGE(0x0c0014, 0x0c0015) AM_WRITE(ctrl_w)
276	276	AM_RANGE(0x0c0018, 0x0c001b) AM_WRITENOP // ?
277		AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE(dooyong_bgscroll16_w)
278		AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE(dooyong_bg2scroll16_w) // not used atm
	277	AM_RANGE(0x0c4000, 0x0c400f) AM_WRITE8(bgscroll_w, 0x00ff)
	278	AM_RANGE(0x0c4010, 0x0c401f) AM_WRITE8(bg2scroll_w, 0x00ff) // not used atm
279	279	AM_RANGE(0x0c8000, 0x0c8fff) AM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
280		AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE(dooyong_fgscroll16_w) // not used atm
281		AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE(dooyong_fg2scroll16_w) // not used atm
	280	AM_RANGE(0x0cc000, 0x0cc00f) AM_WRITE8(fgscroll_w, 0x00ff) // not used atm
	281	AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE8(fg2scroll_w, 0x00ff) // not used atm
282	282	AM_RANGE(0x0dc000, 0x0dc01f) AM_RAM // registers of some kind?
283	283	ADDRESS_MAP_END
284	284
285		static ADDRESS_MAP_START( lastday_sound_map, AS_PROGRAM, 8, dooyong_state )
	285	static ADDRESS_MAP_START( lastday_sound_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
286	286	AM_RANGE(0x0000, 0x7fff) AM_ROM
287	287	AM_RANGE(0xc000, 0xc7ff) AM_RAM
288	288	AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_byte_r)
r241920	r241921
290	290	AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
291	291	ADDRESS_MAP_END
292	292
293		static ADDRESS_MAP_START( pollux_sound_map, AS_PROGRAM, 8, dooyong_state )
	293	static ADDRESS_MAP_START( pollux_sound_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
294	294	AM_RANGE(0x0000, 0xefff) AM_ROM
295	295	AM_RANGE(0xf000, 0xf7ff) AM_RAM
296	296	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_byte_r)
r241920	r241921
772	772	GFXDECODE_ENTRY( "gfx2", 0, popbingo_tilelayout, 256, 1 )
773	773	GFXDECODE_END
774	774
775		READ8_MEMBER(dooyong_state::unk_r)
	775	READ8_MEMBER(dooyong_z80_ym2203_state::unk_r)
776	776	{
777	777	return 0;
778	778	}
779	779
780		WRITE_LINE_MEMBER(dooyong_state::irqhandler_2203_1)
	780	WRITE_LINE_MEMBER(dooyong_z80_ym2203_state::irqhandler_2203_1)
781	781	{
782	782	m_interrupt_line_1=state;
783	783	m_audiocpu->set_input_line(0, (m_interrupt_line_1 \| m_interrupt_line_2) ? ASSERT_LINE : CLEAR_LINE);
784	784	}
785	785
786		WRITE_LINE_MEMBER(dooyong_state::irqhandler_2203_2)
	786	WRITE_LINE_MEMBER(dooyong_z80_ym2203_state::irqhandler_2203_2)
787	787	{
788	788	m_interrupt_line_2=state;
789	789	m_audiocpu->set_input_line(0, (m_interrupt_line_1 \| m_interrupt_line_2) ? ASSERT_LINE : CLEAR_LINE);
r241920	r241921
800	800	MCFG_SPEAKER_STANDARD_MONO("mono")
801	801
802	802	MCFG_SOUND_ADD("ym1", YM2203, 1500000)
803		MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_state,irqhandler_2203_1))
804		MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_state, unk_r))
	803	MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_1))
	804	MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
805	805	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
806	806
807	807	MCFG_SOUND_ADD("ym2", YM2203, 1500000)
808		MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_state, irqhandler_2203_2))
809		MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_state, unk_r))
	808	MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_2))
	809	MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
810	810	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
811	811	MACHINE_CONFIG_END
812	812
r241920	r241921
834	834	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
835	835	MACHINE_CONFIG_END
836	836
837		static MACHINE_CONFIG_START( lastday, dooyong_state )
	837	static MACHINE_CONFIG_START( lastday, dooyong_z80_ym2203_state )
838	838
839	839	/* basic machine hardware */
840	840	MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
r241920	r241921
844	844	MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* ??? */
845	845	MCFG_CPU_PROGRAM_MAP(lastday_sound_map)
846	846
847		MCFG_MACHINE_START_OVERRIDE(dooyong_state,lastday)
848		MCFG_MACHINE_RESET_OVERRIDE(dooyong_state,sound_ym2203)
	847	MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
	848	MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203)
849	849
850	850
851	851	/* video hardware */
r241920	r241921
856	856	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
857	857	MCFG_SCREEN_SIZE(648, 328)
858	858	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 18, 318-1 )
859		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_lastday)
	859	MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_lastday)
860	860	MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram8_device, vblank_copy_rising)
861	861	MCFG_SCREEN_PALETTE("palette")
862	862
r241920	r241921
864	864	MCFG_PALETTE_ADD("palette", 1024)
865	865	MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
866	866
867		MCFG_VIDEO_START_OVERRIDE(dooyong_state,lastday)
	867	MCFG_VIDEO_START_OVERRIDE(dooyong_z80_ym2203_state, lastday)
868	868
869	869	/* sound hardware */
870	870	MCFG_SPEAKER_STANDARD_MONO("mono")
871	871
872	872	MCFG_SOUND_ADD("ym1", YM2203, 4000000)
873		MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_state,irqhandler_2203_1))
874		MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_state, unk_r))
	873	MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_1))
	874	MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
875	875	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
876	876
877	877	MCFG_SOUND_ADD("ym2", YM2203, 4000000)
878		MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_state, irqhandler_2203_2))
879		MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_state, unk_r))
	878	MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_2))
	879	MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
880	880	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
881	881
882	882	MACHINE_CONFIG_END
883	883
884		static MACHINE_CONFIG_START( gulfstrm, dooyong_state )
	884	static MACHINE_CONFIG_START( gulfstrm, dooyong_z80_ym2203_state )
885	885
886	886	/* basic machine hardware */
887	887	MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
r241920	r241921
891	891	MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* ??? */
892	892	MCFG_CPU_PROGRAM_MAP(lastday_sound_map)
893	893
894		MCFG_MACHINE_START_OVERRIDE(dooyong_state,lastday)
895		MCFG_MACHINE_RESET_OVERRIDE(dooyong_state,sound_ym2203)
	894	MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
	895	MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203)
896	896
897	897	/* video hardware */
898	898	MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
r241920	r241921
902	902	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
903	903	MCFG_SCREEN_SIZE(648, 328)
904	904	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 18, 318-1 )
905		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_gulfstrm)
	905	MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_gulfstrm)
906	906	MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram8_device, vblank_copy_rising)
907	907	MCFG_SCREEN_PALETTE("palette")
908	908
r241920	r241921
910	910	MCFG_PALETTE_ADD("palette", 1024)
911	911	MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
912	912
913		MCFG_VIDEO_START_OVERRIDE(dooyong_state,gulfstrm)
	913	MCFG_VIDEO_START_OVERRIDE(dooyong_z80_ym2203_state, gulfstrm)
914	914
915	915	/* sound hardware */
916	916	MCFG_FRAGMENT_ADD( sound_2203 )
917	917	MACHINE_CONFIG_END
918	918
919		static MACHINE_CONFIG_START( pollux, dooyong_state )
	919	static MACHINE_CONFIG_START( pollux, dooyong_z80_ym2203_state )
920	920
921	921	/* basic machine hardware */
922	922	MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
r241920	r241921
926	926	MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* ??? */
927	927	MCFG_CPU_PROGRAM_MAP(pollux_sound_map)
928	928
929		MCFG_MACHINE_START_OVERRIDE(dooyong_state,lastday)
930		MCFG_MACHINE_RESET_OVERRIDE(dooyong_state,sound_ym2203)
	929	MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
	930	MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203)
931	931
932	932	/* video hardware */
933	933	MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
r241920	r241921
937	937	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
938	938	MCFG_SCREEN_SIZE(648, 328)
939	939	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 18, 318-1 )
940		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_pollux)
	940	MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_pollux)
941	941	MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram8_device, vblank_copy_rising)
942	942	MCFG_SCREEN_PALETTE("palette")
943	943
r241920	r241921
945	945	MCFG_PALETTE_ADD("palette", 1024)
946	946	MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
947	947
948		MCFG_VIDEO_START_OVERRIDE(dooyong_state,pollux)
	948	MCFG_VIDEO_START_OVERRIDE(dooyong_z80_ym2203_state, pollux)
949	949
950	950	/* sound hardware */
951	951	MCFG_FRAGMENT_ADD( sound_2203 )
952	952	MACHINE_CONFIG_END
953	953
954		static MACHINE_CONFIG_START( bluehawk, dooyong_state )
	954	static MACHINE_CONFIG_START( bluehawk, dooyong_z80_state )
955	955
956	956	/* basic machine hardware */
957	957	MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
r241920	r241921
961	961	MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
962	962	MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
963	963
964		MCFG_MACHINE_START_OVERRIDE(dooyong_state,~~lastday~~)
	964	MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
965	965
966	966	/* video hardware */
967	967	MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
r241920	r241921
971	971	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
972	972	MCFG_SCREEN_SIZE(648, 328)
973	973	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 18, 318-1 )
974		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_bluehawk)
	974	MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_bluehawk)
975	975	MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram8_device, vblank_copy_rising)
976	976	MCFG_SCREEN_PALETTE("palette")
977	977
r241920	r241921
979	979	MCFG_PALETTE_ADD("palette", 1024)
980	980	MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
981	981
982		MCFG_VIDEO_START_OVERRIDE(dooyong_state,bluehawk)
	982	MCFG_VIDEO_START_OVERRIDE(dooyong_z80_state, bluehawk)
983	983
984	984	/* sound hardware */
985	985	MCFG_FRAGMENT_ADD( sound_2151 )
986	986	MACHINE_CONFIG_END
987	987
988		static MACHINE_CONFIG_START( flytiger, dooyong_state )
	988	static MACHINE_CONFIG_START( flytiger, dooyong_z80_state )
989	989
990	990	/* basic machine hardware */
991	991	MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
r241920	r241921
995	995	MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
996	996	MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
997	997
998		MCFG_MACHINE_START_OVERRIDE(dooyong_state,~~lastday~~)
	998	MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
999	999
1000	1000	/* video hardware */
1001	1001	MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
r241920	r241921
1005	1005	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
1006	1006	MCFG_SCREEN_SIZE(648, 328)
1007	1007	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 18, 318-1 )
1008		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_flytiger)
	1008	MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_flytiger)
1009	1009	MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram8_device, vblank_copy_rising)
1010	1010	MCFG_SCREEN_PALETTE("palette")
1011	1011
r241920	r241921
1013	1013	MCFG_PALETTE_ADD("palette", 1024)
1014	1014	MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
1015	1015
1016		MCFG_VIDEO_START_OVERRIDE(dooyong_state,flytiger)
	1016	MCFG_VIDEO_START_OVERRIDE(dooyong_z80_state, flytiger)
1017	1017
1018	1018	/* sound hardware */
1019	1019	MCFG_FRAGMENT_ADD( sound_2151 )
1020	1020	MACHINE_CONFIG_END
1021	1021
1022		static MACHINE_CONFIG_START( primella, dooyong_state )
	1022	static MACHINE_CONFIG_START( primella, dooyong_z80_state )
1023	1023
1024	1024	/* basic machine hardware */
1025	1025	MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
r241920	r241921
1029	1029	MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
1030	1030	MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
1031	1031
1032		MCFG_MACHINE_START_OVERRIDE(dooyong_state,~~lastday~~)
	1032	MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
1033	1033
1034	1034	/* video hardware */
1035	1035	MCFG_SCREEN_ADD("screen", RASTER)
r241920	r241921
1037	1037	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
1038	1038	MCFG_SCREEN_SIZE(648, 328)
1039	1039	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 08, 328-1 )
1040		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_primella)
	1040	MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_primella)
1041	1041	MCFG_SCREEN_PALETTE("palette")
1042	1042
1043	1043	MCFG_GFXDECODE_ADD("gfxdecode", "palette", primella)
1044	1044	MCFG_PALETTE_ADD("palette", 1024)
1045	1045	MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
1046	1046
1047		MCFG_VIDEO_START_OVERRIDE(dooyong_state,primella)
	1047	MCFG_VIDEO_START_OVERRIDE(dooyong_z80_state, primella)
1048	1048
1049	1049	/* sound hardware */
1050	1050	MCFG_FRAGMENT_ADD( sound_2151 )
1051	1051	MACHINE_CONFIG_END
1052	1052
1053		TIMER_DEVICE_CALLBACK_MEMBER(dooyong_state::rshark_scanline)
	1053
	1054	TIMER_DEVICE_CALLBACK_MEMBER(dooyong_68k_state::scanline)
1054	1055	{
1055	1056	int scanline = param;
1056	1057
1057		if(scanline == 248) // vblank-out irq
	1058	if (scanline == 248) // vblank-out irq
1058	1059	m_maincpu->set_input_line(5, HOLD_LINE);
1059	1060
1060		if(scanline == 120) // timer irq?
	1061	if (scanline == 120) // timer irq?
1061	1062	m_maincpu->set_input_line(6, HOLD_LINE);
1062	1063	}
1063	1064
1064	1065
1065		static MACHINE_CONFIG_START( rshark, dooyong_state )
	1066	static MACHINE_CONFIG_START( rshark, dooyong_68k_state )
1066	1067
1067	1068	/* basic machine hardware */
1068	1069	MCFG_CPU_ADD("maincpu", M68000, 8000000) /* measured on super-x */
1069	1070	MCFG_CPU_PROGRAM_MAP(rshark_map)
1070		MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_state, ~~rshark_~~scanline, "screen", 0, 1)
	1071	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_68k_state, scanline, "screen", 0, 1)
1071	1072
1072	1073	MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
1073	1074	MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
1074	1075
1075	1076	/* video hardware */
1076		MCFG_BUFFERED_SPRITERAM16_ADD("spriteram16")
	1077	MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
1077	1078
1078	1079	MCFG_SCREEN_ADD("screen", RASTER)
1079	1080	MCFG_SCREEN_REFRESH_RATE(60)
1080	1081	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
1081	1082	MCFG_SCREEN_SIZE(648, 328)
1082	1083	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 18, 318-1 )
1083		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_rshark)
1084		MCFG_SCREEN_VBLANK_DEVICE("spriteram16", buffered_spriteram16_device, vblank_copy_rising)
	1084	MCFG_SCREEN_UPDATE_DRIVER(dooyong_68k_state, screen_update_rshark)
	1085	MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram16_device, vblank_copy_rising)
1085	1086	MCFG_SCREEN_PALETTE("palette")
1086	1087
1087	1088	MCFG_GFXDECODE_ADD("gfxdecode", "palette", rshark)
1088	1089	MCFG_PALETTE_ADD("palette", 2048)
1089	1090	MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
1090	1091
1091		MCFG_VIDEO_START_OVERRIDE(dooyong_state,rshark)
	1092	MCFG_VIDEO_START_OVERRIDE(dooyong_68k_state, rshark)
1092	1093
1093	1094	/* sound hardware */
1094	1095	MCFG_FRAGMENT_ADD( sound_2151_m68k )
1095	1096	MACHINE_CONFIG_END
1096	1097
1097		static MACHINE_CONFIG_START( superx, dooyong_state ) // dif mem map
	1098	static MACHINE_CONFIG_START( superx, dooyong_68k_state ) // dif mem map
1098	1099
1099	1100	/* basic machine hardware */
1100	1101	MCFG_CPU_ADD("maincpu", M68000, 8000000) /* measured on super-x */
1101	1102	MCFG_CPU_PROGRAM_MAP(superx_map)
1102		MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_state, ~~rshark_~~scanline, "screen", 0, 1)
	1103	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_68k_state, scanline, "screen", 0, 1)
1103	1104
1104	1105	MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
1105	1106	MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
1106	1107
1107	1108	/* video hardware */
1108		MCFG_BUFFERED_SPRITERAM16_ADD("spriteram16")
	1109	MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
1109	1110
1110	1111	MCFG_SCREEN_ADD("screen", RASTER)
1111	1112	MCFG_SCREEN_REFRESH_RATE(60)
1112	1113	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
1113	1114	MCFG_SCREEN_SIZE(648, 328)
1114	1115	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 18, 318-1 )
1115		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_rshark)
1116		MCFG_SCREEN_VBLANK_DEVICE("spriteram16", buffered_spriteram16_device, vblank_copy_rising)
	1116	MCFG_SCREEN_UPDATE_DRIVER(dooyong_68k_state, screen_update_rshark)
	1117	MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram16_device, vblank_copy_rising)
1117	1118	MCFG_SCREEN_PALETTE("palette")
1118	1119
1119	1120	MCFG_GFXDECODE_ADD("gfxdecode", "palette", rshark)
1120	1121	MCFG_PALETTE_ADD("palette", 2048)
1121	1122	MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
1122	1123
1123		MCFG_VIDEO_START_OVERRIDE(dooyong_state,rshark)
	1124	MCFG_VIDEO_START_OVERRIDE(dooyong_68k_state, rshark)
1124	1125
1125	1126	/* sound hardware */
1126	1127	MCFG_FRAGMENT_ADD( sound_2151_m68k )
1127	1128	MACHINE_CONFIG_END
1128	1129
1129		static MACHINE_CONFIG_START( popbingo, dooyong_state )
	1130	static MACHINE_CONFIG_START( popbingo, dooyong_68k_state )
1130	1131
1131	1132	/* basic machine hardware */
1132	1133	MCFG_CPU_ADD("maincpu", M68000, 10000000)
1133	1134	MCFG_CPU_PROGRAM_MAP(popbingo_map)
1134		MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_state, ~~rshark_~~scanline, "screen", 0, 1)
	1135	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_68k_state, scanline, "screen", 0, 1)
1135	1136
1136	1137	MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
1137	1138	MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
1138	1139
1139	1140	/* video hardware */
1140		MCFG_BUFFERED_SPRITERAM16_ADD("spriteram16")
	1141	MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
1141	1142
1142	1143	MCFG_SCREEN_ADD("screen", RASTER)
1143	1144	MCFG_SCREEN_REFRESH_RATE(60)
1144	1145	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
1145	1146	MCFG_SCREEN_SIZE(648, 328)
1146	1147	MCFG_SCREEN_VISIBLE_AREA(88, (64-8)8-1, 18, 318-1 )
1147		MCFG_SCREEN_UPDATE_DRIVER(dooyong_state, screen_update_popbingo)
1148		MCFG_SCREEN_VBLANK_DEVICE("spriteram16", buffered_spriteram16_device, vblank_copy_rising)
	1148	MCFG_SCREEN_UPDATE_DRIVER(dooyong_68k_state, screen_update_popbingo)
	1149	MCFG_SCREEN_VBLANK_DEVICE("spriteram", buffered_spriteram16_device, vblank_copy_rising)
1149	1150	MCFG_SCREEN_PALETTE("palette")
1150	1151
1151	1152	MCFG_GFXDECODE_ADD("gfxdecode", "palette", popbingo)
1152	1153	MCFG_PALETTE_ADD("palette", 2048)
1153	1154	MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
1154	1155
1155		MCFG_VIDEO_START_OVERRIDE(dooyong_state,popbingo)
	1156	MCFG_VIDEO_START_OVERRIDE(dooyong_68k_state, popbingo)
1156	1157
1157	1158	/* sound hardware */
1158	1159	MCFG_FRAGMENT_ADD( sound_2151_m68k )

trunk/src/mame/drivers/meritm.c
r241920	r241921
94	94	Pit Boss Superstar III 30 (c)1993
95	95	Pit Boss Megastar (c)1994
96	96	Pit Boss Supertouch 30 (c)1993/4
	97	Pit Boss Megatouch (c)1994
97	98
98	99	Custom Program Versions (Superstar 30 / Supertouch 30):
99	100
r241920	r241921
109	110
110	111
111	112	CRT-260:
112		*Megatouch Video (c)1994?
113	113	Megatouch II (c)1994
114	114	Megatouch III (c)1995
115	115	Megatouch III Tournament Edition (c)1996
r241920	r241921
1191	1191	The Touchscreen Calibration routine doesn't seem to work?
1192	1192
1193	1193	*/
1194
1195	1194	ROM_START( mtjpoker ) /* Uses the CRT-258 touch controller board & Dallas DS1225Y NV SRAM */
1196	1195	ROM_REGION( 0x80000, "maincpu", 0 )
1197	1196	ROM_LOAD( "9132-00-02_u9-r0.u9", 0x00000, 0x10000, CRC(4ec683b6) SHA1(7cff76ba1517deede3dfa2a419e11fd603dcf695) ) /* 9132-00-02 R0 46 940416 */
r241920	r241921
1213	1212	Hold5 advances through the list.
1214	1213	Hi-Score will clear the High Scores
1215	1214
1216		Is the "Stand" & "Hi-Score" keys the same? Without a sperate Stand key, you cannot set up the "TWIN" bonus feature
	1215	Is the "Stand" & "Hi-Score" keys the same? Without a separate Stand key, you cannot set up the "TWIN" bonus feature
1217	1216
1218	1217	*/
1219
1220	1218	ROM_START( americna ) /* Uses a small daughter card CRT-251 & Dallas DS1225Y NV SRAM */
1221	1219	ROM_REGION( 0x80000, "maincpu", 0 )
1222	1220	ROM_LOAD( "9131-00_u9-2.u9", 0x00000, 0x10000, CRC(8a741fb6) SHA1(2d77c67e5a0bdaf6199c31c4055df214672db3e1) ) /* 9131-00 U9-2 888020 */
r241920	r241921
1231	1229	ROM_LOAD( "9131-02_u11-0.u11", 0x20000, 0x10000, CRC(f137d70c) SHA1(8ec04ec17300aa3a6ef14bcca1ca1c2aec0eea18) )
1232	1230	ROM_END
1233	1231
1234		/*
1235		Pit Boss II - Merit Industries Inc. 1988
1236		----------------------------------------
1237
1238		All eproms are 27C512
1239
1240		One 8 bank dip switch.
1241
1242		Two YAMAHA V9938 Video Processors.
1243
1244		21.47727 MHz Crystal
1245
1246		CPU Z80
1247
1248		Audio AY8930
1249
1250		Two Z80A-PIO
1251
1252		One bq4010YMA-150 NVRAM
1253		Eight V53C464AP80 (41464) RAMS
1254
1255		One PAL16L8AN
1256		One PAL20L10NC
1257		*/
1258
1259	1232	ROM_START( pitboss2 )
1260	1233	ROM_REGION( 0x80000, "maincpu", 0 )
1261	1234	ROM_LOAD( "9221-01_u9-0c.u9", 0x00000, 0x10000, CRC(a1b6ac15) SHA1(b7b395f3e7e14dbb84003e03bf7d054e795a7211) ) /* 9221-01C 880221 */
r241920	r241921
1270	1243
1271	1244	ROM_START( spitboss )
1272	1245	ROM_REGION( 0x80000, "maincpu", 0 )
1273		ROM_LOAD( "9221-02_u9-0a.u9", 0x00000, 0x10000, CRC(e0c45c9c) SHA1(534bff67c8fee08f1c348275de8977659efa9f69) ) /* 9221-02A 886021 ~~(actual, but should be 880621)~~ */
	1246	ROM_LOAD( "9221-02_u9-0a.u9", 0x00000, 0x10000, CRC(e0c45c9c) SHA1(534bff67c8fee08f1c348275de8977659efa9f69) ) /* 9221-02A 886021 */
1274	1247	ROM_LOAD( "9221-02_u10-0.u10", 0x10000, 0x10000, CRC(ed010c58) SHA1(02750944a28c1c27ce2a9904d11b7e46272a940e) )
1275	1248	ROM_LOAD( "9221-02_u11-0a.u11", 0x20000, 0x10000, CRC(0c65fa86) SHA1(7906a8d615116ca67bf370dfb2da8cb2389a313d) )
1276	1249	ROM_LOAD( "9221-02_u12-0.u12", 0x30000, 0x10000, CRC(0cf95b0e) SHA1(c6ffc13703892b9ae0da39a02db37c4ec890f79e) )
r241920	r241921
1294	1267
1295	1268	ROM_START( pitbosssa )
1296	1269	ROM_REGION( 0x80000, "maincpu", 0 )
1297		ROM_LOAD( "9221-10_u9-0a.u9", 0x00000, 0x10000, CRC(41be6b30) SHA1(c4df87a599e310ce29ee9277e5adc916ff68f060) ) /* 9221-10-00A 090370 ~~(actual, but should be 090390)~~ */
	1270	ROM_LOAD( "9221-10_u9-0a.u9", 0x00000, 0x10000, CRC(41be6b30) SHA1(c4df87a599e310ce29ee9277e5adc916ff68f060) ) /* 9221-10-00A 090370 */
1298	1271	ROM_LOAD( "9221-10_u10-0.u10", 0x10000, 0x10000, CRC(853a1a99) SHA1(45e33442aa7e51c05c9ac8b8458937ee3ff4c21d) )
1299	1272	ROM_LOAD( "9221-10_u11-0a.u11", 0x20000, 0x10000, CRC(c9137469) SHA1(618680609bdffa92b919a2417bd3ec41a4c8bf2b) )
1300	1273	ROM_LOAD( "9221-10_u12-0.u12", 0x30000, 0x10000, CRC(3577a203) SHA1(80f9c827ad9dea2c6af788bd3b46ab65e8c594eb) )
r241920	r241921
1330	1303	ROM_LOAD( "9233-00-01_u15-r0", 0x60000, 0x10000, CRC(5810840e) SHA1(bad6457752ac212c3c11360a13a8d3473662a287) )
1331	1304
1332	1305	ROM_REGION( 0x000022, "ds1204", 0 )
1333		ROM_LOAD( "9233-01_u1-ro1_c1993_mii", 0x000000, 0x000022, BAD_DUMP CRC(93459659) SHA1(73ad4c3a7c52d3db3acb43662c535f8c2ed2376a) )
	1306	ROM_LOAD( "9233-01_u1-r01_c1993_mii", 0x000000, 0x000022, BAD_DUMP CRC(93459659) SHA1(73ad4c3a7c52d3db3acb43662c535f8c2ed2376a) )
1334	1307
1335	1308	ROM_REGION( 0xc0000, "extra", 0 ) // question roms
1336	1309	ROM_LOAD( "qs9233-01_u7-r0", 0x00000, 0x40000, CRC(176dd688) SHA1(306cf78101219ef1122023a01d16dff5e9f2aecf) ) /* These 3 roms are on CRT-256 sattalite PCB */
r241920	r241921
1338	1311	ROM_LOAD( "qs9233-01_u5-r0", 0x80000, 0x40000, CRC(740b1274) SHA1(14eab68fc137b905a5a2739c7081900a48cba562) )
1339	1312	ROM_END
1340	1313
	1314	/*
	1315	Basically this Pit Boss Megatouch set is Pit Boss Supertouch 30 v2.0 but marks the first time Merit
	1316	started using the Megatouch name.
	1317
	1318	NOTE: Once again U10, U12 & U13 doesn't change between this set and the Pit Boss Supertouch 30 sets
	1319	and the question roms are the same data with a new label and game number ID
	1320	*/
	1321	ROM_START( megat ) /* Dallas DS1204V security key attached to CRT-254 connected to J2 connector labeled 9234-20 U1-RO C1994 MII */
	1322	ROM_REGION( 0x80000, "maincpu", 0 )
	1323	ROM_LOAD( "9234-20-01_u9-r0a", 0x00000, 0x10000, CRC(5a9fd092) SHA1(756b6a925dafb17451e7dc37c95a26d09ecfe2d7) ) /* 9234-20-01 R0A 940519 */
	1324	ROM_LOAD( "9234-20-01_u10-r0a", 0x10000, 0x10000, CRC(853a1a99) SHA1(45e33442aa7e51c05c9ac8b8458937ee3ff4c21d) ) /* Also found as PBC U10 */
	1325	ROM_LOAD( "9234-20-01_u11-r0a", 0x20000, 0x10000, CRC(8bd5f6bb) SHA1(95b23d7d14207fcafc01ee975400ebdd1e7b5ad5) )
	1326	ROM_LOAD( "9234-20-01_u12-r0a", 0x30000, 0x10000, CRC(b9fb4203) SHA1(84b514d9739d9c2ab1081cfc7cdedb41155ee038) ) /* Also found as PBC U12 */
	1327	ROM_LOAD( "9234-20-01_u13-r0a", 0x40000, 0x10000, CRC(574fb3c7) SHA1(213741df3055b97ddd9889c2aa3d3e863e2c86d3) ) /* Also found as PBC U13 */
	1328	ROM_LOAD( "9234-20-01_u14-r0a", 0x50000, 0x10000, CRC(40d78506) SHA1(5e1d8e4ef8aa02faa2a323f5e988bf56d4747b60) )
	1329	ROM_LOAD( "9234-20-01_u15-r0a", 0x60000, 0x10000, CRC(9adc67b8) SHA1(271e6b6473eeea01f2923ef82c192a583bb5e338) )
	1330
	1331	ROM_REGION( 0x000022, "ds1204", 0 )
	1332	ROM_LOAD( "9234-20_u1-r0_c1994_mii", 0x000000, 0x000022, BAD_DUMP CRC(6cbdbde1) SHA1(b076ee21fc792a5e85cdaed427bc41554568811e) )
	1333
	1334	ROM_REGION( 0xc0000, "extra", 0 ) // question roms
	1335	ROM_LOAD( "qs9234-20_u7-r0", 0x00000, 0x40000, CRC(c0534aaa) SHA1(4b3cbf03f29fd5b4b8fd423e73c0c8147692fa75) ) /* These 3 roms are on CRT-256 sattalite PCB */
	1336	ROM_LOAD( "qs9234-20_u6-r0", 0x40000, 0x40000, CRC(fe2cd934) SHA1(623011dc53ed6eefefa0725dba6fd1efee2077c1) ) /* Same data as Pit Boss Supertouch 30 sets, different label - verified */
	1337	ROM_LOAD( "qs9234-20_u5-r0", 0x80000, 0x40000, CRC(293fe305) SHA1(8a551ae8fb4fa4bf329128be1bfd6f1c3ff5a366) )
	1338	ROM_END
	1339
1341	1340	ROM_START( pbst30 ) /* Dallas DS1204V security key attached to CRT-254 connected to J2 connector labeled 9234-10 U1-RO1 C1994 MII */
1342	1341	ROM_REGION( 0x80000, "maincpu", 0 )
1343	1342	ROM_LOAD( "9234-10-01_u9-r0", 0x00000, 0x10000, CRC(96f39c9a) SHA1(df698e94a5204cf050ceadc5c257ca5f68171114) ) /* 9234-10-01 032294 */
r241920	r241921
1349	1348	ROM_LOAD( "9234-10-01_u15-r0", 0x60000, 0x10000, CRC(9fbd8582) SHA1(c0f68c8a7cdca34c8736cefc71767c421bcaba8a) )
1350	1349
1351	1350	ROM_REGION( 0x000022, "ds1204", 0 )
1352		ROM_LOAD( "9234-10_u1-ro1_c1994_mii", 0x000000, 0x000022, BAD_DUMP CRC(1c782f78) SHA1(8255afcffbe21a43f53cfb41867552681403ea47) )
	1351	ROM_LOAD( "9234-10_u1-r01_c1994_mii", 0x000000, 0x000022, BAD_DUMP CRC(1c782f78) SHA1(8255afcffbe21a43f53cfb41867552681403ea47) )
1353	1352
1354	1353	ROM_REGION( 0xc0000, "extra", 0 ) // question roms
1355	1354	ROM_LOAD( "qs9234-01_u7-r0", 0x00000, 0x40000, CRC(c0534aaa) SHA1(4b3cbf03f29fd5b4b8fd423e73c0c8147692fa75) ) /* These 3 roms are on CRT-256 sattalite PCB */
r241920	r241921
1357	1356	ROM_LOAD( "qs9234-01_u5-r0", 0x80000, 0x40000, CRC(293fe305) SHA1(8a551ae8fb4fa4bf329128be1bfd6f1c3ff5a366) )
1358	1357	ROM_END
1359	1358
1360		ROM_START( pbst30b ) /* Dallas DS1204V security key attached to CRT-254 connected to J2 connector labeled 9234-01 U1-RO1 C1993 MII */
	1359	ROM_START( pbst30a ) /* Dallas DS1204V security key attached to CRT-254 connected to J2 connector labeled 9234-01 U1-RO1 C1993 MII */
1361	1360	ROM_REGION( 0x80000, "maincpu", 0 )
1362	1361	ROM_LOAD( "9234-00-01_u9-r0a", 0x00000, 0x10000, CRC(5f058f95) SHA1(98382935340a076bdb1b20c7f16c25b6084599fe) ) /* 9234-00-01 122293 */
1363	1362	ROM_LOAD( "9234-00-01_u10-r0", 0x10000, 0x10000, CRC(853a1a99) SHA1(45e33442aa7e51c05c9ac8b8458937ee3ff4c21d) )
r241920	r241921
1368	1367	ROM_LOAD( "9234-00-01_u15-r0a", 0x60000, 0x10000, CRC(f10f0d39) SHA1(2b5d5a93adb5251e09160b10c067b6e70289f608) )
1369	1368
1370	1369	ROM_REGION( 0x000022, "ds1204", 0 )
1371		ROM_LOAD( "9234-01_u1-ro1_c1993_mii", 0x000000, 0x000022, BAD_DUMP CRC(74bf0546) SHA1(eb44a057cf797279ee3456a74e166fa711547ea4) )
	1370	ROM_LOAD( "9234-01_u1-r01_c1993_mii", 0x000000, 0x000022, BAD_DUMP CRC(74bf0546) SHA1(eb44a057cf797279ee3456a74e166fa711547ea4) )
1372	1371
1373	1372	ROM_REGION( 0xc0000, "extra", 0 ) // question roms
1374	1373	ROM_LOAD( "qs9234-01_u7-r0", 0x00000, 0x40000, CRC(c0534aaa) SHA1(4b3cbf03f29fd5b4b8fd423e73c0c8147692fa75) ) /* These 3 roms are on CRT-256 sattalite PCB */
r241920	r241921
1387	1386	ROM_LOAD( "9243-00-01_u15-r0", 0x60000, 0x10000, CRC(27034061) SHA1(cff6be592a4a3ab01c204b081470f224e6186c4d) )
1388	1387	ROM_RELOAD( 0x70000, 0x10000)
1389	1388
1390
1391	1389	ROM_REGION( 0xc0000, "extra", 0 ) // question roms
1392	1390	ROM_LOAD( "qs9243-00-01_u7-r0", 0x00000, 0x40000, CRC(35f4ca46) SHA1(87917b3017f505fae65d6bfa2c7d6fb503c2da6a) ) /* These 3 roms are on CRT-256 sattalite PCB */
1393	1391	ROM_LOAD( "qs9243-00-01_u6-r0", 0x40000, 0x40000, CRC(606f1656) SHA1(7f1e3a698a34d3c3b8f9f2cd8d5224b6c096e941) )
r241920	r241921
1426	1424	1- Great Draw Poker and 7 Stud Poker have been added to the program set
1427	1425	2- On page 3-1 legend artwork has changed. PASS has been replaced with
1428	1426	PASS/PLAY and COLLECT/QUIT has been replaced with COLLECT/QUIT/RAISE
1429		3- An additional Solitaire Instruction decal has beed added to the kit.
1430		This new Instruction decal is to be mounted in a visivle loction for
	1427	3- An additional Solitaire Instruction decal has been added to the kit.
	1428	This new Instruction decal is to be mounted in a visible location for
1431	1429	players use.
1432	1430
1433	1431	*/
1434
1435	1432	ROM_START( pitbossm ) /* Dallas DS1204V security key attached to CRT-254 connected to J2 connector labeled 9244-00 U1-RO1 C1994 MII */
1436	1433	ROM_REGION( 0x80000, "maincpu", 0 )
1437	1434	ROM_LOAD( "9244-00-01_u9-r0", 0x00000, 0x10000, CRC(8317fea1) SHA1(eb84fdca7cd51883153561785571790d12d0d612) ) /* 9244-00-01 R0 940822 */
r241920	r241921
1491	1488	It's currently unknown how to access / enable those features or if it's possible to do so.
1492	1489
1493	1490	*/
1494
1495	1491	ROM_START( realbrod ) /* Dallas DS1204U-3 security key labeled 9131-20-00-U5-R0A */
1496	1492	ROM_REGION( 0x400000, "maincpu", 0 )
1497	1493	/* U32 Empty */
r241920	r241921
1522	1518	one PC16550DN
1523	1519	one PB255a or L5220574
1524	1520	One Dallas DS1204 Data Key
1525		One Dallas DS1225Y 64k Non-volitile SRAM (Mega Touch 4)
1526		or Dallas DS1230Y 256K Non-volitile SRAM (Mega Touch 6)
	1521	One Dallas DS1225Y 64k Non-volatile SRAM (Mega Touch 4)
	1522	or Dallas DS1230Y 256K Non-volatile SRAM (Mega Touch 6)
1527	1523	or Dallas DS1644 32K NVRAM + RTC (Tournament sets)
1528	1524	Two Z80APIO (Z0842004PSC)
1529	1525
r241920	r241921
2292	2288
2293	2289	/* CRT-250 + CRT-252 + CRT-256 + CRT-258 */
2294	2290	GAME( 1994, mtjpoker, 0, meritm_crt250_crt252_crt258, mtjpoker, driver_device, 0, ROT0, "Merit", "Merit Touch Joker Poker (9132-00)", GAME_IMPERFECT_GRAPHICS )
	2291	GAME( 1994, megat, 0, meritm_crt250_crt252_crt258, pbst30, driver_device, 0, ROT0, "Merit", "Pit Boss Megatouch (9234-20-01)", GAME_IMPERFECT_GRAPHICS )
2295	2292	GAME( 1994, pbst30, 0, meritm_crt250_crt252_crt258, pbst30, driver_device, 0, ROT0, "Merit", "Pit Boss Supertouch 30 (9234-10-01)", GAME_IMPERFECT_GRAPHICS )
2296		GAME( 1993, pbst30b, pbst30, meritm_crt250_crt252_crt258, pbst30, driver_device, 0, ROT0, "Merit", "Pit Boss Supertouch 30 (9234-00-01)", GAME_IMPERFECT_GRAPHICS )
	2293	GAME( 1993, pbst30a, pbst30, meritm_crt250_crt252_crt258, pbst30, driver_device, 0, ROT0, "Merit", "Pit Boss Supertouch 30 (9234-00-01)", GAME_IMPERFECT_GRAPHICS )
2297	2294
2298	2295	/* CRT-250 + CRT-254 + CRT-256 */
2299	2296	GAME( 1993, pbss330, 0, meritm_crt250_questions, pbss330, driver_device, 0, ROT0, "Merit", "Pit Boss Superstar III 30 (9233-00-01)", GAME_IMPERFECT_GRAPHICS )

trunk/src/mame/drivers/naomi.c
r241920	r241921
2661	2661	*/
2662	2662
2663	2663	static MACHINE_CONFIG_DERIVED( naomim4, naomi_base )
2664		MCFG_NAOMI_M4_BOARD_ADD("rom_board", ":~~rom~~_key", "naomibd_eeprom", ":boardid", WRITE8(dc_state, g1_irq))
	2664	MCFG_NAOMI_M4_BOARD_ADD("rom_board", ":pic_readout", "naomibd_eeprom", ":boardid", WRITE8(dc_state, g1_irq))
2665	2665	MACHINE_CONFIG_END
2666	2666
2667	2667	/*
r241920	r241921
5597	5597	ROM_LOAD( "fpr-24333.ic8", 0x0000000, 0x4000000, CRC(a467b69c) SHA1(66a841b72ef1bb8cbabbfb1d14081b4dff14b1d3) )
5598	5598	ROM_LOAD( "fpr-24334.ic9", 0x4000000, 0x4000000, CRC(13d2d1dc) SHA1(6a47cfaddf006e6ff46837fac956fbcc20619d79) )
5599	5599
5600		ROM_REGION( 4, "rom_key", 0 )
5601		ROM_LOAD( "mushik2e-key.bin", 0, 4, CRC(b32a0633) SHA1(984c01e43cf359d8e8a0c6cb1a04c5dc3da47d39) )
	5600	// ROM_REGION( 4, "rom_key", 0 )
	5601	// ROM_LOAD( "mushik2e-key.bin", 0, 4, CRC(b32a0633) SHA1(984c01e43cf359d8e8a0c6cb1a04c5dc3da47d39) )
	5602	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5603	ROM_LOAD( "317-0437-com.ic3", 0, 20, NO_DUMP )
5602	5604
5603	5605	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x02))
5604	5606	ROM_END
r241920	r241921
5612	5614	ROM_LOAD( "epr-24357.ic7", 0x0000000, 0x0400000, CRC(a2236d58) SHA1(3746b9d3c0f7ecf6340619bb8bf01f170ac4efb7) ) // EPR mode, overwrite FPR data
5613	5615	ROM_LOAD( "fpr-24334.ic9", 0x4000000, 0x4000000, CRC(13d2d1dc) SHA1(6a47cfaddf006e6ff46837fac956fbcc20619d79) )
5614	5616
5615		ROM_REGION( 4, "rom_key", 0 )
5616		ROM_LOAD( "mushik2e-key.bin", 0, 4, CRC(b32a0633) SHA1(984c01e43cf359d8e8a0c6cb1a04c5dc3da47d39) )
	5617	// ROM_REGION( 4, "rom_key", 0 )
	5618	// ROM_LOAD( "mushik2e-key.bin", 0, 4, CRC(b32a0633) SHA1(984c01e43cf359d8e8a0c6cb1a04c5dc3da47d39) )
	5619	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5620	ROM_LOAD( "317-0437-com.ic3", 0, 20, NO_DUMP )
5617	5621
5618	5622	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x82))
5619	5623	ROM_END
r241920	r241921
5626	5630	ROM_LOAD( "fpr-24338.ic8", 0x0000000, 0x4000000, CRC(1423c374) SHA1(e6a3f0eaccd13c161d07705bcd00f447f08fc186) )
5627	5631	ROM_LOAD( "fpr-24339.ic9", 0x4000000, 0x4000000, CRC(11883792) SHA1(1782db04f74394f981f887ab1a95d687eb2c0b35) )
5628	5632
5629		ROM_REGION( 4, "rom_key", 0 )
5630		ROM_LOAD( "zunou-key.bin", 0, 4, CRC(cbe35afb) SHA1(78877655800aae27661bf720e1c37d6c6f2e3d1c) )
	5633	// ROM_REGION( 4, "rom_key", 0 )
	5634	// ROM_LOAD( "zunou-key.bin", 0, 4, CRC(cbe35afb) SHA1(78877655800aae27661bf720e1c37d6c6f2e3d1c) )
	5635	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5636	ROM_LOAD( "317-0435-jpn.ic3", 0, 20, NO_DUMP )
5631	5637
5632	5638	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x02))
5633	5639	ROM_END
r241920	r241921
5642	5648	ROM_LOAD( "fpr-24415.ic10", 0x8000000, 0x4000000, CRC(133c742c) SHA1(89f857a31731dc918afc72b6cb716f5c77cb9d6e) )
5643	5649	ROM_LOAD( "fpr-24416.ic11", 0xc000000, 0x4000000, CRC(562fb88e) SHA1(172678e3e27cfad7f7e6217c4653a4ba119bfbdf) )
5644	5650
5645		ROM_REGION( 4, "rom_key", 0 )
5646		ROM_LOAD( "sl2007-key.bin", 0, 4, CRC(d5d1e807) SHA1(8a0cc371729c622bb05c5d26b3e39ec31d29ace1) )
	5651	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5652	ROM_LOAD( "317-5129-jpn.ic3", 0, 20, CRC(b6191cea) SHA1(13e14ff013bf2728203641303141c016e82b10a3) )
5647	5653
5648	5654	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04))
5649	5655	ROM_END
r241920	r241921
5658	5664	ROM_LOAD( "fpr-24384.ic10", 0x8000000, 0x4000000, CRC(2e9116c4) SHA1(58903a33c4ce72a1f75aefcab94393fc2e8bd2d9) )
5659	5665	ROM_LOAD( "fpr-24385.ic11", 0xc000000, 0x4000000, CRC(2b79f45d) SHA1(db97d980bf1590df4b983a4b7786977687238ef5) )
5660	5666
5661		ROM_REGION( 4, "rom_key", 0 )
5662		ROM_LOAD( "asndynmt-key.bin", 0, 4, CRC(bf5396a9) SHA1(0b27fdc800143fb977cb2f1e937078d7a7006939) )
	5667	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5668	ROM_LOAD( "317-0495-com.ic3", 0, 20, CRC(675aca7b) SHA1(5127189e1f960abf9ed3f643158747d9abcaee1c) )
5663	5669
5664	5670	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04))
5665	5671	ROM_END
r241920	r241921
5674	5680	ROM_LOAD( "fpr-24439.ic10", 0x8000000, 0x4000000, CRC(c02040f9) SHA1(27ad2cb45e8a516433917f060ca9798412bb95f7) )
5675	5681	// IC11 Populated, Empty
5676	5682
5677		ROM_REGION( 4, "rom_key", 0 )
5678		ROM_LOAD( "illvelo-key.bin", 0, 4, CRC(e164952f) SHA1(6c0dfe567640e1e843a5d7bf858a24c101dfcf95) )
	5683	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5684	ROM_LOAD( "317-5131-jpn.ic3", 0, 20, CRC(44ab8ca9) SHA1(c17b10041e70590547ed010dc16a4dd2510fcc80) )
5679	5685
5680	5686	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04))
5681	5687	ROM_END
r241920	r241921
5690	5696	ROM_LOAD( "ic10.bin", 0x8000000, 0x4000000, CRC(76fb945f) SHA1(448be0c3d9a7c3956dd51aca3c4d8d28f8cec227) )
5691	5697	// IC11 Populated, Empty
5692	5698
5693		ROM_REGION( 4, "rom_key", 0 )
5694		ROM_LOAD( "mamonoro-key.bin", 0x000000, 0x000004, CRC(264ca27a) SHA1(3b81b9794d86697f8eac7ea6945d992564ad6199) )
	5699	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5700	ROM_LOAD( "317-5132-jpn.ic3", 0, 20, CRC(f2089de5) SHA1(12af0681decb22bbfa4b3e01037c3503846f265a) )
5695	5701
5696	5702	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04))
5697	5703	ROM_END
r241920	r241921
5708	5714	ROM_LOAD( "ic12.bin", 0x10000000, 0x4000000, CRC(b8a6bff2) SHA1(befbc2e917b3107f1c4bfb9169623282ff97bfb2) )
5709	5715	ROM_LOAD( "ic13.bin", 0x14000000, 0x4000000, CRC(4886329f) SHA1(6ccf6fb83cfdbef3f85f6c06e641c38ff434d605) )
5710	5716
5711		ROM_REGION( 4, "rom_key", 0 )
5712		ROM_LOAD( "mbaa-key.bin", 0x000000, 0x000004, CRC(f4ad909f) SHA1(27ba44592c2642b5862a24f68c755ad4115e6047) )
	5717	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5718	ROM_LOAD( "317-5133-jpn.ic3", 0, 20, CRC(3dc7d902) SHA1(bb70e80dff878bca3652088f3333079e0781f482) )
5713	5719
5714	5720	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x06))
5715	5721	ROM_END
r241920	r241921
5727	5733	ROM_LOAD( "ic12.bin", 0x10000000, 0x4000000, CRC(b8a6bff2) SHA1(befbc2e917b3107f1c4bfb9169623282ff97bfb2) )
5728	5734	ROM_LOAD( "ic13.bin", 0x14000000, 0x4000000, CRC(4886329f) SHA1(6ccf6fb83cfdbef3f85f6c06e641c38ff434d605) )
5729	5735
5730		ROM_REGION( 4, "rom_key", 0 )
5731		ROM_LOAD( "mbaa-key.bin", 0x000000, 0x000004, CRC(f4ad909f) SHA1(27ba44592c2642b5862a24f68c755ad4115e6047) )
	5736	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5737	ROM_LOAD( "317-5133-jpn.ic3", 0, 20, CRC(3dc7d902) SHA1(bb70e80dff878bca3652088f3333079e0781f482) )
5732	5738
5733	5739	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x86))
5734	5740	ROM_END
r241920	r241921
5742	5748	ROM_LOAD( "ic9.bin", 0x4000000, 0x4000000, CRC(16cf2e7a) SHA1(ff7c6540e4507f84e3128ba03be4826ba504678c) )
5743	5749	// IC10 and IC11 Populated, Empty
5744	5750
5745		ROM_REGION( 4, "rom_key", 0 )
5746		ROM_LOAD( "radirgyn-key.bin", 0x000000, 0x000004, CRC(c158cf3b) SHA1(c128646d7fee79fc10bf7bbaa23121f347df77f4) )
	5751	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5752	ROM_LOAD( "317-5138-jpn.ic3", 0, 20, CRC(babcc420) SHA1(653cdcfa388426f4ce03c76506046ec6fd070562) )
5747	5753
5748	5754	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04))
5749	5755	ROM_END
r241920	r241921
5757	5763	ROM_LOAD( "ic9.bin", 0x4000000, 0x4000000, CRC(18c994d7) SHA1(159e1425b2fc645133814b0d26d93a90e9849b1a) )
5758	5764	// IC10 and IC11 Populated, Empty
5759	5765
5760		ROM_REGION( 4, "rom_key", 0 )
5761		ROM_LOAD( "ausfache-key.bin", 0, 4, CRC(93cdc793) SHA1(f0a0c321a3bdf8ca87cbd840a168a9057c08f16a) )
	5766	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5767	ROM_LOAD( "317-5130-jpn.ic3", 0, 20, CRC(3e0c010b) SHA1(b6da97d4ecb228e73fb9a5ada837d0d6699ab0f1) )
5762	5768
5763	5769	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04))
5764	5770	ROM_END
r241920	r241921
5777	5783	ROM_REGION( 0x200000, "ioboard", 0) // touch screen I/O board, program disassembles as little-endian SH-4
5778	5784	ROM_LOAD( "fpr24351.ic14", 0x000000, 0x200000, CRC(4d1b7b89) SHA1(965b8c6b5a2e7b3f1b1e2eac19c86000c3b66754) )
5779	5785
5780		ROM_REGION( 4, "rom_key", 0 )
5781		ROM_LOAD( "pokasuka-key.bin", 0, 4, CRC(f00bcd61) SHA1(b8315b851656c2e0b7853979988d1c44eab0886b) )
	5786	// ROM_REGION( 4, "rom_key", 0 )
	5787	// ROM_LOAD( "pokasuka-key.bin", 0, 4, CRC(f00bcd61) SHA1(b8315b851656c2e0b7853979988d1c44eab0886b) )
	5788	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5789	ROM_LOAD( "317-0461-com.ic3", 0, 20, NO_DUMP )
5782	5790
5783	5791	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x05))
5784	5792	ROM_END
r241920	r241921
5797	5805	ROM_REGION( 0x200000, "ioboard", 0) // touch screen I/O board, program disassembles as little-endian SH-4
5798	5806	ROM_LOAD( "fpr24351.ic14", 0x000000, 0x200000, CRC(4d1b7b89) SHA1(965b8c6b5a2e7b3f1b1e2eac19c86000c3b66754) )
5799	5807
5800		ROM_REGION( 4, "rom_key", 0 )
5801		ROM_LOAD( "pokasuka-key.bin", 0, 4, CRC(f00bcd61) SHA1(b8315b851656c2e0b7853979988d1c44eab0886b) )
	5808	// ROM_REGION( 4, "rom_key", 0 )
	5809	// ROM_LOAD( "pokasuka-key.bin", 0, 4, CRC(f00bcd61) SHA1(b8315b851656c2e0b7853979988d1c44eab0886b) )
	5810	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5811	ROM_LOAD( "317-0461-com.ic3", 0, 20, NO_DUMP )
5802	5812
5803	5813	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x05))
5804	5814	ROM_END
r241920	r241921
5816	5826	ROM_LOAD( "fpr-24425.ic10", 0x08000000, 0x4000000, CRC(6223ebac) SHA1(64c0ec61c108acbb557e7d3837f578deba832cb6) )
5817	5827	ROM_LOAD( "fpr-24426.ic11", 0x0c000000, 0x4000000, CRC(c78b0981) SHA1(f889acf9065566e11ff985a3b6c4824e364d57ae) )
5818	5828
5819		ROM_REGION( 4, "rom_key", 0 )
5820		ROM_LOAD( "rhytngk-key.bin", 0x000000, 0x000004, CRC(e2560d28) SHA1(46fb9b47a0df3035f92db2b0c63a6e4e0745ad29) )
	5829	ROM_REGION( 20, "pic_readout", 0 ) // data obtained using a custom PIC reader
	5830	ROM_LOAD( "317-0503-jpn.ic3", 0, 20, CRC(69fc3f47) SHA1(3a887c62e93fa264b307c954eb39a4fca1bdfad6) )
5821	5831
5822	5832	ROM_REGION(0x4, "boardid", ROMREGION_ERASEVAL(0x04))
5823	5833	ROM_END

trunk/src/mame/drivers/prehisle.c
r241920	r241921
100	100	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
101	101	PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
102	102	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
103		PORT_DIPNAME( 0x02, 0x02, DEF_STR( Level_Select ) ) PORT_DIPLOCATION("SW1:2")
	103	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Level_Select ) ) PORT_DIPLOCATION("SW1:2")
104	104	PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
105	105	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
106	106	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:3")
r241920	r241921
126	126	PORT_DIPSETTING( 0x03, DEF_STR( Standard ) )
127	127	PORT_DIPSETTING( 0x01, "Middle" )
128	128	PORT_DIPSETTING( 0x00, DEF_STR( Difficult ) )
129		PORT_DIPNAME( 0x0c, 0x0c, "Game Mode" ) PORT_DIPLOCATION("SW2:3,4")
	129	PORT_DIPNAME( 0x0c, 0x0c, "Game Mode" ) PORT_DIPLOCATION("SW2:3,4")
130	130	PORT_DIPSETTING( 0x08, "Demo Sounds Off" )
131	131	PORT_DIPSETTING( 0x0c, "Demo Sounds On" )
132	132	PORT_DIPSETTING( 0x00, "Freeze" )
r241920	r241921
136	136	PORT_DIPSETTING( 0x20, "150K 300K" )
137	137	PORT_DIPSETTING( 0x10, "300K 500K" )
138	138	PORT_DIPSETTING( 0x00, DEF_STR( None ) )
139		PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:7")
	139	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:7")
140	140	PORT_DIPSETTING( 0x00, DEF_STR( No ) )
141	141	PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
142	142	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen")

trunk/src/mame/includes/dooyong.h
r241920	r241921
5	5	public:
6	6	dooyong_state(const machine_config &mconfig, device_type type, const char *tag)
7	7	: driver_device(mconfig, type, tag),
8		m_spriteram(*this, "spriteram"),
9		m_spriteram16(*this, "spriteram16") ,
10		m_txvideoram(*this, "txvideoram"),
11		m_paletteram_flytiger(*this, "flytiger_palram"),
12	8	m_maincpu(*this, "maincpu"),
13	9	m_audiocpu(*this, "audiocpu"),
14	10	m_gfxdecode(*this, "gfxdecode"),
15		m_palette(*this, "palette") { }
	11	m_palette(*this, "palette")
	12	{ }
16	13
17		optional_device<buffered_spriteram8_device> m_spriteram;
18		optional_device<buffered_spriteram16_device> m_spriteram16;
19		optional_shared_ptr<UINT8> m_txvideoram;
20		optional_shared_ptr<UINT8> m_paletteram_flytiger;
21		UINT8 m_sprites_disabled;
22		UINT8 m_flytiger_palette_bank;
23		UINT8 m_flytiger_pri;
24		UINT8 m_tx_pri;
25		UINT16 m_rshark_pri;
	14	DECLARE_WRITE8_MEMBER(bgscroll_w);
	15	DECLARE_WRITE8_MEMBER(bg2scroll_w);
	16	DECLARE_WRITE8_MEMBER(fgscroll_w);
	17	DECLARE_WRITE8_MEMBER(fg2scroll_w);
	18	TILE_GET_INFO_MEMBER(get_bg_tile_info);
	19	TILE_GET_INFO_MEMBER(get_bg2_tile_info);
	20	TILE_GET_INFO_MEMBER(get_fg_tile_info);
	21	TILE_GET_INFO_MEMBER(get_fg2_tile_info);
	22	inline void get_tile_info(tile_data &tileinfo, int tile_index, UINT8 const tilerom, UINT8 const scroll, int graphics);
	23	inline void scroll8_w(offs_t offset, UINT8 data, UINT8 scroll, tilemap_t map);
	24
26	25	tilemap_t *m_bg_tilemap;
27	26	tilemap_t *m_bg2_tilemap;
28	27	tilemap_t *m_fg_tilemap;
r241920	r241921
36	35	UINT8 *m_bg2_tilerom;
37	36	UINT8 *m_fg_tilerom;
38	37	UINT8 *m_fg2_tilerom;
39		UINT8 *m_bg_tilerom2;
40		UINT8 *m_bg2_tilerom2;
41		UINT8 *m_fg_tilerom2;
42		UINT8 *m_fg2_tilerom2;
43	38	int m_bg_gfx;
44	39	int m_bg2_gfx;
45	40	int m_fg_gfx;
46	41	int m_fg2_gfx;
47		int m_tx_tilemap_mode;
48	42
49		int m_interrupt_line_1;
50		int m_interrupt_line_2;
	43	required_device<cpu_device> m_maincpu;
	44	required_device<cpu_device> m_audiocpu;
	45	required_device<gfxdecode_device> m_gfxdecode;
	46	required_device<palette_device> m_palette;
	47	};
51	48
52		DECLARE_WRITE8_MEMBER(lastday_bankswitch_w);
	49	class dooyong_z80_state : public dooyong_state
	50	{
	51	public:
	52	dooyong_z80_state(const machine_config &mconfig, device_type type, const char *tag)
	53	: dooyong_state(mconfig, type, tag),
	54	m_txvideoram(*this, "txvideoram"),
	55	m_paletteram_flytiger(*this, "flytiger_palram"),
	56	m_spriteram(*this, "spriteram")
	57	{ }
	58
	59	enum
	60	{
	61	SPRITE_12BIT = 0x01,
	62	SPRITE_HEIGHT = 0x02,
	63	SPRITE_YSHIFT_BLUEHAWK = 0x04,
	64	SPRITE_YSHIFT_FLYTIGER = 0x08
	65	};
	66
53	67	DECLARE_WRITE8_MEMBER(flip_screen_w);
54		DECLARE_WRITE8_MEMBER(dooyong_bgscroll8_w);
55		DECLARE_WRITE8_MEMBER(dooyong_bg2scroll8_w);
56		DECLARE_WRITE8_MEMBER(dooyong_fgscroll8_w);
57		DECLARE_WRITE8_MEMBER(dooyong_fg2scroll8_w);
58		DECLARE_WRITE16_MEMBER(dooyong_bgscroll16_w);
59		DECLARE_WRITE16_MEMBER(dooyong_bg2scroll16_w);
60		DECLARE_WRITE16_MEMBER(dooyong_fgscroll16_w);
61		DECLARE_WRITE16_MEMBER(dooyong_fg2scroll16_w);
62		DECLARE_WRITE8_MEMBER(dooyong_txvideoram8_w);
63		DECLARE_WRITE8_MEMBER(lastday_ctrl_w);
64		DECLARE_WRITE8_MEMBER(pollux_ctrl_w);
	68	DECLARE_WRITE8_MEMBER(bankswitch_w);
	69	DECLARE_WRITE8_MEMBER(txvideoram_w);
65	70	DECLARE_WRITE8_MEMBER(primella_ctrl_w);
66	71	DECLARE_WRITE8_MEMBER(paletteram_flytiger_w);
67	72	DECLARE_WRITE8_MEMBER(flytiger_ctrl_w);
68		DECLARE_WRITE16_MEMBER(rshark_ctrl_w);
69		DECLARE_READ8_MEMBER(unk_r);
70		TILE_GET_INFO_MEMBER(get_bg_tile_info);
71		TILE_GET_INFO_MEMBER(get_bg2_tile_info);
72		TILE_GET_INFO_MEMBER(get_fg_tile_info);
73		TILE_GET_INFO_MEMBER(get_fg2_tile_info);
74		TILE_GET_INFO_MEMBER(flytiger_get_fg_tile_info);
75	73	TILE_GET_INFO_MEMBER(get_tx_tile_info);
76		inline void lastday_get_tile_info(tile_data &tileinfo, int tile_index, const UINT8 tilerom, UINT8 scroll, int graphics);
77		inline void rshark_get_tile_info(tile_data &tileinfo, int tile_index, const UINT8 tilerom1, const UINT8 tilerom2, UINT8 *scroll, int graphics);
78		DECLARE_MACHINE_START(lastday);
79		DECLARE_MACHINE_RESET(sound_ym2203);
80		DECLARE_VIDEO_START(lastday);
81		DECLARE_VIDEO_START(gulfstrm);
82		DECLARE_VIDEO_START(pollux);
	74	void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, unsigned extensions = 0);
	75	UINT32 screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
	76	UINT32 screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
	77	UINT32 screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
	78	DECLARE_MACHINE_START(cpu_z80);
83	79	DECLARE_VIDEO_START(bluehawk);
84	80	DECLARE_VIDEO_START(flytiger);
85	81	DECLARE_VIDEO_START(primella);
86		DECLARE_VIDEO_START(rshark);
87		DECLARE_VIDEO_START(popbingo);
	82
	83	required_shared_ptr<UINT8> m_txvideoram;
	84	optional_shared_ptr<UINT8> m_paletteram_flytiger;
	85	UINT8 m_sprites_disabled;
	86	UINT8 m_flytiger_palette_bank;
	87	UINT8 m_flytiger_pri;
	88	UINT8 m_tx_pri;
	89	int m_tx_tilemap_mode;
	90
	91	optional_device<buffered_spriteram8_device> m_spriteram;
	92	};
	93
	94	class dooyong_z80_ym2203_state : public dooyong_z80_state
	95	{
	96	public:
	97	dooyong_z80_ym2203_state(const machine_config &mconfig, device_type type, const char *tag)
	98	: dooyong_z80_state(mconfig, type, tag)
	99	{ }
	100
	101	DECLARE_WRITE8_MEMBER(lastday_ctrl_w);
	102	DECLARE_WRITE8_MEMBER(pollux_ctrl_w);
	103	DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_1);
	104	DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_2);
	105	DECLARE_READ8_MEMBER(unk_r);
	106	DECLARE_MACHINE_RESET(sound_ym2203);
88	107	UINT32 screen_update_lastday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
89	108	UINT32 screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
90	109	UINT32 screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
91		UINT32 screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
92		UINT32 screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
93		UINT32 screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
	110	DECLARE_VIDEO_START(lastday);
	111	DECLARE_VIDEO_START(gulfstrm);
	112	DECLARE_VIDEO_START(pollux);
	113
	114	int m_interrupt_line_1;
	115	int m_interrupt_line_2;
	116	};
	117
	118	class dooyong_68k_state : public dooyong_state
	119	{
	120	public:
	121	dooyong_68k_state(const machine_config &mconfig, device_type type, const char *tag)
	122	: dooyong_state(mconfig, type, tag),
	123	m_spriteram(*this, "spriteram")
	124	{ }
	125
	126	DECLARE_WRITE16_MEMBER(ctrl_w);
	127	TIMER_DEVICE_CALLBACK_MEMBER(scanline);
	128	TILE_GET_INFO_MEMBER(rshark_get_bg_tile_info);
	129	TILE_GET_INFO_MEMBER(rshark_get_bg2_tile_info);
	130	TILE_GET_INFO_MEMBER(rshark_get_fg_tile_info);
	131	TILE_GET_INFO_MEMBER(rshark_get_fg2_tile_info);
	132	inline void rshark_get_tile_info(tile_data &tileinfo, int tile_index, UINT8 const tilerom1, UINT8 const tilerom2, UINT8 const *scroll, int graphics);
	133	void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
94	134	UINT32 screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
95	135	UINT32 screen_update_popbingo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
96		TIMER_DEVICE_CALLBACK_MEMBER(rshark_scanline);
97		inline void dooyong_scroll8_w(offs_t offset, UINT8 data, UINT8 scroll, tilemap_t map);
98		void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pollux_extensions);
99		void rshark_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
100		DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_1);
101		DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_2);
102		required_device<cpu_device> m_maincpu;
103		required_device<cpu_device> m_audiocpu;
104		required_device<gfxdecode_device> m_gfxdecode;
105		required_device<palette_device> m_palette;
	136	DECLARE_VIDEO_START(rshark);
	137	DECLARE_VIDEO_START(popbingo);
	138
	139	UINT8 *m_bg_tilerom2;
	140	UINT8 *m_bg2_tilerom2;
	141	UINT8 *m_fg_tilerom2;
	142	UINT8 *m_fg2_tilerom2;
	143	UINT16 m_bg2_priority;
	144
	145	required_device<buffered_spriteram16_device> m_spriteram;
106	146	};

trunk/src/mame/includes/prehisle.h
r241920	r241921
23	23	tilemap_t *m_bg2_tilemap;
24	24	tilemap_t *m_bg_tilemap;
25	25	tilemap_t *m_fg_tilemap;
	26
26	27	DECLARE_WRITE16_MEMBER(prehisle_sound16_w);
27	28	DECLARE_WRITE16_MEMBER(prehisle_bg_videoram16_w);
28	29	DECLARE_WRITE16_MEMBER(prehisle_fg_videoram16_w);
r241920	r241921
35	36	TILE_GET_INFO_MEMBER(get_fg_tile_info);
36	37	virtual void video_start();
37	38	UINT32 screen_update_prehisle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
38		void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect~~, int foreground~~ );
	39	void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
39	40	DECLARE_WRITE_LINE_MEMBER(irqhandler);
	41
40	42	required_device<cpu_device> m_maincpu;
41	43	required_device<cpu_device> m_audiocpu;
42	44	required_device<upd7759_device> m_upd7759;

trunk/src/mame/layout/alinvade.lay
r0	r241921
	1	<?xml version="1.0"?>
	2	<mamelayout version="2">
	3	<element name="overlay">
	4	<rect>
	5	<bounds left="0" top="0" right="127" bottom="23" />
	6	<color red="1" green="1" blue="0.60" />
	7	</rect>
	8	<rect>
	9	<bounds left="0" top="24" right="127" bottom="82" />
	10	<color red="0.25" green="1" blue="0.65" />
	11	</rect>
	12	<rect>
	13	<bounds left="0" top="83" right="127" bottom="127" />
	14	<color red="1" green="0.125" blue="0.125" />
	15	</rect>
	16	</element>
	17
	18	<view name="Color Overlay">
	19	<screen index="0">
	20	<bounds left="0" top="0" right="3" bottom="4" />
	21	</screen>
	22	<overlay name="overlay" element="overlay">
	23	<bounds left="0" top="0" right="3" bottom="4" />
	24	</overlay>
	25	</view>
	26	</mamelayout>

trunk/src/mame/machine/naomim4.c
r241920	r241921
16	16	// phase is indeed a nibble-based linear combination.
17	17	// With that block cipher, a stream cipher is constructed by feeding the output result of the 1st round
18	18	// of a certain 16-bits block as a whitening value for the next block. The cart dependent data used by
19		// the algorithm is comprised by a 16-bits "key" and a 16-bits IV (initialization vector) --though they
20		// will be merged in a only 32-bits number in the code--. The hardware auto-reset the feed value
	19	// the algorithm is a 32-bits key stored in the PIC16C621A. The hardware auto-reset the feed value
21	20	// to the cart-based IV every 16 blocks (32 bytes); that reset is not address-based, but index-based.
22	21
23	22	const device_type NAOMI_M4_BOARD = &device_creator<naomi_m4_board>;
24	23
25	24	const UINT8 naomi_m4_board::k_sboxes[4][16] = {
26		{13,14,1,11,7,9,10,0,15,6,4,5,8,2,12,3},
27		{12,3,14,6,7,15,2,13,1,4,11,0,9,10,8,5},
28		{6,12,0,10,1,5,14,9,7,2,15,13,4,11,3,8},
29		{9,12,8,7,10,4,0,15,1,11,14,2,13,5,6,3}
	25	{9,8,2,11,1,14,5,15,12,6,0,3,7,13,10,4},
	26	{2,10,0,15,14,1,11,3,7,12,13,8,4,9,5,6},
	27	{4,11,3,8,7,2,15,13,1,5,14,9,6,12,0,10},
	28	{1,13,8,2,0,5,6,14,4,11,15,10,12,3,7,9}
30	29	};
31	30
32	31	// from S29GL512N datasheet
r241920	r241921
67	66	key = tempkey & 0xffff;
68	67	#else
69	68	const UINT8 *key_data = memregion(key_tag)->base();
70		key = (key_data[2] << 8) \| key_data[3];
71		iv = (key_data[0] << 8) \| key_data[1];
	69	subkey1 = (key_data[17] << 8) \| key_data[16];
	70	subkey2 = (key_data[19] << 8) \| key_data[18];
72	71	#endif
73	72	buffer = auto_alloc_array(machine(), UINT8, BUFFER_SIZE);
74	73	enc_init();
r241920	r241921
117	116	encryption = false;
118	117	cfi_mode = false;
119	118	counter = 0;
120		~~cur_~~iv = 0;
	119	iv = 0;
121	120	}
122	121
123	122	void naomi_m4_board::board_setup_address(UINT32 address, bool is_dma)
r241920	r241921
176	175	void naomi_m4_board::enc_reset()
177	176	{
178	177	buffer_actual_size = 0;
179		~~cur_~~iv = iv;
	178	iv = 0;
180	179	counter = 0;
181	180	}
182	181
	182	UINT16 naomi_m4_board::decrypt_one_round(UINT16 word, UINT16 subkey)
	183	{
	184	return one_round[word ^ subkey] ^ subkey ;
	185	}
	186
183	187	void naomi_m4_board::enc_fill()
184	188	{
185	189	const UINT8 *base = m_region->base() + rom_cur_address;
186	190	while(buffer_actual_size < BUFFER_SIZE) {
187	191	UINT16 enc = base[0] \| (base[1] << 8);
188		UINT16 output_whitening = key ^ cur_iv;
189		cur_iv = one_round[enc ^ cur_iv];
190		UINT16 dec = one_round[key ^ cur_iv] ^ output_whitening;
191
	192	UINT16 dec = iv;
	193	iv = decrypt_one_round(enc ^ iv, subkey1);
	194	dec ^= decrypt_one_round(iv, subkey2);
	195
192	196	buffer[buffer_actual_size++] = dec;
193	197	buffer[buffer_actual_size++] = dec >> 8;
194	198
r241920	r241921
198	202	counter++;
199	203	if(counter == 16) {
200	204	counter = 0;
201		~~cur_~~iv = iv;
	205	iv = 0;
202	206	}
203	207	}
204	208	}

trunk/src/mame/machine/naomim4.h
r241920	r241921
32	32	static const UINT8 k_sboxes[4][16];
33	33
34	34	const char *key_tag;
35		UINT16 key, iv;
	35	UINT16 subkey1, subkey2;
36	36	UINT16 *one_round;
37	37
38	38	UINT8 *buffer;
39	39	UINT32 rom_cur_address, buffer_actual_size;
40		UINT16 ~~cur_~~iv;
	40	UINT16 iv;
41	41	UINT8 counter;
42	42	bool encryption;
43	43	bool cfi_mode;
r241920	r241921
45	45	void enc_init();
46	46	void enc_reset();
47	47	void enc_fill();
	48	UINT16 decrypt_one_round(UINT16 word, UINT16 subkey);
48	49	};
49	50
50	51	extern const device_type NAOMI_M4_BOARD;

trunk/src/mame/mame.lst
r241920	r241921
10531	10531	pitbossma // (c) 1994 Merit
10532	10532	pbss330 // (c) 1994 Merit
10533	10533	pbst30 // (c) 1994 Merit
10534		pbst30b // (c) 1993 Merit
	10534	pbst30a // (c) 1993 Merit
10535	10535	realbrod // (c) 1995 Merit
10536	10536	mtjpoker // (c) 1994 Merit
	10537	megat // (c) 1994 Merit
10537	10538	megat2 // (c) 1994 Merit
10538	10539	megat2a // (c) 1994 Merit
10539	10540	megat2b // (c) 1994 Merit

trunk/src/mame/mame.mak
r241920	r241921
2480	2480
2481	2481	$(DRIVERS)/acefruit.o: $(LAYOUT)/sidewndr.lh
2482	2482
	2483	$(DRIVERS)/alinvade.o: $(LAYOUT)/alinvade.lh
	2484
2483	2485	$(DRIVERS)/allied.o: $(LAYOUT)/allied.lh
2484	2486
2485	2487	$(DRIVERS)/amaticmg.o: $(LAYOUT)/suprstar.lh

trunk/src/mame/video/dooyong.c
r241920	r241921
2	2	#include "includes/dooyong.h"
3	3
4	4
5		inline void dooyong_state::~~dooyong_~~scroll8_w(offs_t offset, UINT8 data, UINT8 scroll, tilemap_t map)
	5	inline void dooyong_state::scroll8_w(offs_t offset, UINT8 data, UINT8 scroll, tilemap_t map)
6	6	{
7	7	UINT8 old = scroll[offset];
8	8	if (old != data)
r241920	r241921
18	18	break;
19	19	case 3: /* Low byte of y scroll */
20	20	case 4: /* High byte of y scroll */
21		map->set_scrolly(0, (int)scroll[3] \| ((int)scroll[4] << 8));
	21	map->set_scrolly(0, (unsigned)scroll[3] \| ((unsigned)scroll[4] << 8));
22	22	break;
23	23	case 6: /* Tilemap enable and mode control */
24	24	map->enable(!(data & 0x10));
r241920	r241921
43	43	}
44	44
45	45
46		/* These handle writes to the tilemap scroll registers ~~in 8-bit machines~~.
	46	/* These handle writes to the tilemap scroll registers.
47	47	There is one per tilemap, wrapping the above function that does the work. */
48	48
49		WRITE8_MEMBER(dooyong_state::~~dooyong_~~bgscroll8_w)
	49	WRITE8_MEMBER(dooyong_state::bgscroll_w)
50	50	{
51		~~dooyong_~~scroll8_w(offset, data, m_bgscroll8, m_bg_tilemap);
	51	scroll8_w(offset, data, m_bgscroll8, m_bg_tilemap);
52	52	}
53	53
54		WRITE8_MEMBER(dooyong_state::~~dooyong_~~bg2scroll8_w)
	54	WRITE8_MEMBER(dooyong_state::bg2scroll_w)
55	55	{
56		~~dooyong_~~scroll8_w(offset, data, m_bg2scroll8, m_bg2_tilemap);
	56	scroll8_w(offset, data, m_bg2scroll8, m_bg2_tilemap);
57	57	}
58	58
59		WRITE8_MEMBER(dooyong_state::~~dooyong_~~fgscroll8_w)
	59	WRITE8_MEMBER(dooyong_state::fgscroll_w)
60	60	{
61		~~dooyong_~~scroll8_w(offset, data, m_fgscroll8, m_fg_tilemap);
	61	scroll8_w(offset, data, m_fgscroll8, m_fg_tilemap);
62	62	}
63	63
64		WRITE8_MEMBER(dooyong_state::~~dooyong_~~fg2scroll8_w)
	64	WRITE8_MEMBER(dooyong_state::fg2scroll_w)
65	65	{
66		~~dooyong_~~scroll8_w(offset, data, m_fg2scroll8, m_fg2_tilemap);
	66	scroll8_w(offset, data, m_fg2scroll8, m_fg2_tilemap);
67	67	}
68	68
69	69
70		/* These handle writes to the tilemap scroll registers in 16-bit machines.
71		This is just an 8-bit peripheral in a 16-bit machine. */
72
73		WRITE16_MEMBER(dooyong_state::dooyong_bgscroll16_w)
	70	WRITE8_MEMBER(dooyong_z80_state::txvideoram_w)
74	71	{
75		if (ACCESSING_BITS_0_7) dooyong_bgscroll8_w(space, offset, data & 0x00ff);
76		}
77
78		WRITE16_MEMBER(dooyong_state::dooyong_bg2scroll16_w)
79		{
80		if (ACCESSING_BITS_0_7) dooyong_bg2scroll8_w(space, offset, data & 0x00ff);
81		}
82
83		WRITE16_MEMBER(dooyong_state::dooyong_fgscroll16_w)
84		{
85		if (ACCESSING_BITS_0_7) dooyong_fgscroll8_w(space, offset, data & 0x00ff);
86		}
87
88		WRITE16_MEMBER(dooyong_state::dooyong_fg2scroll16_w)
89		{
90		if (ACCESSING_BITS_0_7) dooyong_fg2scroll8_w(space, offset, data & 0x00ff);
91		}
92
93
94		WRITE8_MEMBER(dooyong_state::dooyong_txvideoram8_w)
95		{
96	72	if (m_txvideoram[offset] != data)
97	73	{
98	74	m_txvideoram[offset] = data;
r241920	r241921
106	82
107	83	/* Control registers seem to be different on every game */
108	84
109		WRITE8_MEMBER(dooyong_state::lastday_ctrl_w)
	85	WRITE8_MEMBER(dooyong_z80_ym2203_state::lastday_ctrl_w)
110	86	{
111	87	/* bits 0 and 1 are coin counters */
112	88	coin_counter_w(machine(), 0, data & 0x01);
r241920	r241921
121	97	flip_screen_set(data & 0x40);
122	98	}
123	99
124		WRITE8_MEMBER(dooyong_state::pollux_ctrl_w)
	100	WRITE8_MEMBER(dooyong_z80_ym2203_state::pollux_ctrl_w)
125	101	{
126	102	/* bit 0 is flip screen */
127	103	flip_screen_set(data & 0x01);
r241920	r241921
136	112	/* bit 4 is used but unknown */
137	113	}
138	114
139		WRITE8_MEMBER(dooyong_state::primella_ctrl_w)
	115	WRITE8_MEMBER(dooyong_z80_state::primella_ctrl_w)
140	116	{
141	117	/* bits 0-2 select ROM bank */
142	118	membank("bank1")->set_entry(data & 0x07);
r241920	r241921
152	128	// logerror("%04x: bankswitch = %02x\n",space.device().safe_pc(),data&0xe0);
153	129	}
154	130
155		WRITE8_MEMBER(dooyong_state::paletteram_flytiger_w)
	131	WRITE8_MEMBER(dooyong_z80_state::paletteram_flytiger_w)
156	132	{
157	133	if (m_flytiger_palette_bank)
158	134	{
r241920	r241921
163	139	}
164	140	}
165	141
166		WRITE8_MEMBER(dooyong_state::flytiger_ctrl_w)
	142	WRITE8_MEMBER(dooyong_z80_state::flytiger_ctrl_w)
167	143	{
168	144	/* bit 0 is flip screen */
169	145	flip_screen_set(data & 0x01);
r241920	r241921
177	153	m_flytiger_pri = data & 0x10;
178	154	}
179	155
180		WRITE16_MEMBER(dooyong_state::rshark_ctrl_w)
181	156
182		{
183		if (ACCESSING_BITS_0_7)
184		{
185		/* bit 0 flips screen */
186		flip_screen_set(data & 0x0001);
187
188		/* bit 4 changes tilemaps priority */
189		m_rshark_pri = data & 0x0010;
190
191		/* bit 5 used but unknown */
192		}
193		}
194
195
196	157	/* These games all have ROM-based tilemaps for the backgrounds, title
197	158	screens and sometimes "bosses" and special attacks. There are three
198	159	schemes for tilemap encoding. The scheme is chosen based on the
r241920	r241921
203	164	when the x scroll moves out of range (trying to decode the whole lot
204	165	at once uses hundreds of megabytes of RAM). */
205	166
206		inline void dooyong_state::lastday_get_tile_info(tile_data &tileinfo, int tile_index,
207		const UINT8 tilerom, UINT8 scroll, int graphics)
	167	inline void dooyong_state::get_tile_info(tile_data &tileinfo, int tile_index,
	168	UINT8 const tilerom, UINT8 const scroll, int graphics)
208	169	{
209		int offs = (tile_index + ((int)scroll[1] << 6)) * 2;
210		int attr = tilerom[offs];
	170	int const offs = (tile_index + ((int)scroll[1] << 6)) * 2;
	171	int const attr = tilerom[offs];
211	172	int code, color, flags;
212	173	if (scroll[6] & 0x20)
213	174	{ /* lastday/gulfstrm/pollux/flytiger */
r241920	r241921
221	182	Y = y flip */
222	183	code = tilerom[offs + 1] \| ((attr & 0x01) << 8) \| ((attr & 0x80) << 2);
223	184	color = (attr & 0x78) >> 3;
224		flags = ~~((attr & 0x02) ?~~ TILE_FLIPX ~~: 0) \|~~ ((attr & 0x04) ? ~~TILE_FLIPY : 0~~);
	185	flags = TILE_FLIPYX((attr & 0x06) >> 1);
225	186	}
226	187	else
227		{
228		/* primella */
	188	{ /* primella/popbingo */
229	189	/* Tiles take two bytes in ROM:
230	190	MSB LSB
231	191	[offs + 0x00] YXCC CCcc (Y flip, X flip, bits 3-0 of color code, bits 9-8 of gfx code)
r241920	r241921
245	205
246	206	code = tilerom[offs + 1] \| ((attr & codemask) << 8);
247	207	color = (attr & palmask) >> 2;
248		flags = ~~((attr & 0x40) ?~~ TILE_FLIPX ~~: 0) \|~~ ((attr & 0x80) ? ~~TILE_FLIPY : 0~~);
	208	flags = TILE_FLIPYX((attr & 0xC0) >> 6);
249	209	}
250	210
251		~~SET_TILE_INFO_MEMBER~~(graphics, code, color, flags);
	211	tileinfo.set(graphics, code, color, flags);
252	212	}
253	213
254		inline void dooyong_state::rshark_get_tile_info(tile_data &tileinfo, int tile_index,
255		const UINT8 tilerom1, const UINT8 tilerom2, UINT8 *scroll, int graphics)
256		{
257		/* Tiles take two bytes in tile ROM 1:
258		MSB LSB
259		[offs + 0x00] YX?c cccc (Y flip, X flip, bits 12-8 of gfx code)
260		[offs + 0x01] cccc cccc (bits 7-0 of gfx code)
261		? = unused/unknown
262		c = gfx code
263		X = x flip
264		Y = y flip */
265		int offs = tile_index + ((int)scroll[1] << 9);
266		int attr = tilerom1[offs * 2];
267		int code = tilerom1[(offs * 2) + 1] \| ((attr & 0x1f) << 8);
268		int color = tilerom2[offs] & 0x0f;
269		int flags = ((attr & 0x40) ? TILE_FLIPX : 0) \| ((attr & 0x80) ? TILE_FLIPY : 0);
270
271		SET_TILE_INFO_MEMBER(graphics, code, color, flags);
272		}
273
274	214	TILE_GET_INFO_MEMBER(dooyong_state::get_bg_tile_info)
275	215	{
276		if (m_bg_tilerom2 != NULL)
277		rshark_get_tile_info(tileinfo, tile_index, m_bg_tilerom, m_bg_tilerom2, m_bgscroll8, m_bg_gfx);
278		else
279		lastday_get_tile_info(tileinfo, tile_index, m_bg_tilerom, m_bgscroll8, m_bg_gfx);
	216	get_tile_info(tileinfo, tile_index, m_bg_tilerom, m_bgscroll8, m_bg_gfx);
280	217	}
281	218
282	219	TILE_GET_INFO_MEMBER(dooyong_state::get_bg2_tile_info)
283	220	{
284		if (m_bg2_tilerom2 != NULL)
285		rshark_get_tile_info(tileinfo, tile_index, m_bg2_tilerom, m_bg2_tilerom2, m_bg2scroll8, m_bg2_gfx);
286		else
287		lastday_get_tile_info(tileinfo, tile_index, m_bg2_tilerom, m_bg2scroll8, m_bg2_gfx);
	221	get_tile_info(tileinfo, tile_index, m_bg2_tilerom, m_bg2scroll8, m_bg2_gfx);
288	222	}
289	223
290	224	TILE_GET_INFO_MEMBER(dooyong_state::get_fg_tile_info)
291	225	{
292		if (m_fg_tilerom2 != NULL)
293		rshark_get_tile_info(tileinfo, tile_index, m_fg_tilerom, m_fg_tilerom2, m_fgscroll8, m_fg_gfx);
294		else
295		lastday_get_tile_info(tileinfo, tile_index, m_fg_tilerom, m_fgscroll8, m_fg_gfx);
	226	get_tile_info(tileinfo, tile_index, m_fg_tilerom, m_fgscroll8, m_fg_gfx);
296	227	}
297	228
298	229	TILE_GET_INFO_MEMBER(dooyong_state::get_fg2_tile_info)
299	230	{
300		if (m_fg2_tilerom2 != NULL)
301		rshark_get_tile_info(tileinfo, tile_index, m_fg2_tilerom, m_fg2_tilerom2, m_fg2scroll8, m_fg2_gfx);
302		else
303		lastday_get_tile_info(tileinfo, tile_index, m_fg2_tilerom, m_fg2scroll8, m_fg2_gfx);
	231	get_tile_info(tileinfo, tile_index, m_fg2_tilerom, m_fg2scroll8, m_fg2_gfx);
304	232	}
305	233
306		/* flytiger uses some palette banking technique or something maybe a trash protection */
307
308		TILE_GET_INFO_MEMBER(dooyong_state::flytiger_get_fg_tile_info)
	234	TILE_GET_INFO_MEMBER(dooyong_z80_state::get_tx_tile_info)
309	235	{
310		const UINT8 *tilerom = m_fg_tilerom;
311
312		int offs = (tile_index + (m_fgscroll8[1] << 6)) * 2;
313		int attr = tilerom[offs];
314		int code = tilerom[offs + 1] \| ((attr & 0x01) << 8) \| ((attr & 0x80) << 2);
315		int color = (attr & 0x78) >> 3;
316		int flags = ((attr & 0x02) ? TILE_FLIPX : 0) \| ((attr & 0x04) ? TILE_FLIPY : 0);
317
318		SET_TILE_INFO_MEMBER(m_fg_gfx, code, color, flags);
319		}
320
321		TILE_GET_INFO_MEMBER(dooyong_state::get_tx_tile_info)
322		{
323	236	/* Each tile takes two bytes of memory:
324	237	MSB LSB
325	238	[offs + 0x00] cccc cccc (bits 7-0 of gfx code)
326	239	[offs + 0x01] CCCC cccc (bits 3-0 of color code, bits 11-8 of gfx code)
327	240	c = gfx code
328	241	C = color code */
329		int offs, att~~r, code, colo~~r;
	242	unsigned offs, attr;
330	243	if (m_tx_tilemap_mode == 0)
331	244	{ /* lastday/gulfstrm/pollux/flytiger */
332	245	offs = tile_index;
r241920	r241921
337	250	offs = tile_index * 2;
338	251	attr = m_txvideoram[offs + 1];
339	252	}
340		code = m_txvideoram[offs] \| ((attr & 0x0f) << 8);
341		color = (attr & 0xf0) >> 4;
	253	int const code = m_txvideoram[offs] \| ((attr & 0x0f) << 8);
	254	int const color = (attr & 0xf0) >> 4;
342	255
343		~~SET_TILE_INFO_MEMBER~~(0, code, color, 0);
	256	tileinfo.set(0, code, color, 0);
344	257	}
345	258
346	259
347		void dooyong_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int ~~pollux_~~extensions)
	260	void dooyong_z80_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, unsigned extensions)
348	261	{
349	262	/* Sprites take 32 bytes each in memory:
350	263	MSB LSB
r241920	r241921
364	277	w = width
365	278	X = x flip
366	279	Y = y flip
367		* = alters y position in pollux and flytiger - see code below
	280	* = alters y position in bluehawk and flytiger - see code below
368	281	bit 11 of gfx code only used by gulfstrm, pollux, bluehawk and flytiger
369	282	height only used by pollux, bluehawk and flytiger
370	283	x flip and y flip only used by pollux and flytiger */
371	284
372		UINT8 *buffered_spriteram = m_spriteram->buffer();
373		int offs;
374
375		for (offs = 0; offs < m_spriteram->bytes(); offs += 32)
	285	UINT8 const *const buffered_spriteram = m_spriteram->buffer();
	286	for (int offs = 0; offs < m_spriteram->bytes(); offs += 32)
376	287	{
377		int sx, sy, code, color, pri;
378		int flipx = 0, flipy = 0, height = 0, y;
379
380		sx = buffered_spriteram[offs+3] \| ((buffered_spriteram[offs+1] & 0x10) << 4);
381		sy = buffered_spriteram[offs+2];
382		code = buffered_spriteram[offs] \| ((buffered_spriteram[offs+1] & 0xe0) << 3);
383		color = buffered_spriteram[offs+1] & 0x0f;
	288	int sx = buffered_spriteram[offs+3] \| ((buffered_spriteram[offs+1] & 0x10) << 4);
	289	int sy = buffered_spriteram[offs+2];
	290	int code = buffered_spriteram[offs] \| ((buffered_spriteram[offs+1] & 0xe0) << 3);
	291	int const color = buffered_spriteram[offs+1] & 0x0f;
384	292	//TODO: This priority mechanism works for known games, but seems a bit strange.
385	293	//Are we missing something? (The obvious spare palette bit isn't it.)
386		pri = (((color == 0x00) \|\| (color == 0x0f)) ? 0xfc : 0xf0);
	294	int const pri = (((color == 0x00) \|\| (color == 0x0f)) ? 0xfc : 0xf0);
387	295
388		if (pollux_extensions)
	296	bool flipx = false, flipy = false;
	297	int height = 0;
	298	if (extensions)
389	299	{
390		/* gulfstrm, pollux, bluehawk, flytiger */
391		code \|= ((buffered_spriteram[offs+0x1c] & 0x01) << 11);
	300	UINT8 const ext = buffered_spriteram[offs+0x1c];
392	301
393		if (pollux_extensions >= 2)
	302	if (extensions & SPRITE_12BIT)
	303	code \|= ((ext & 0x01) << 11);
	304
	305	if (extensions & SPRITE_HEIGHT)
394	306	{
395		/* pollux, bluehawk, flytiger */
396		height = (buffered_spriteram[offs+0x1c] & 0x70) >> 4;
	307	height = (ext & 0x70) >> 4;
397	308	code &= ~height;
398	309
399		flipx = buffered_spriteram[offs+0x1c] & 0x08;
400		flipy = buffered_spriteram[offs+0x1c] & 0x04;
	310	flipx = ext & 0x08;
	311	flipy = ext & 0x04;
	312	}
401	313
402		if (pollux_extensions == 3)
403		{
404		/* bluehawk */
405		sy += 6 - ((~buffered_spriteram[offs+0x1c] & 0x02) << 7);
406		}
	314	if (extensions & SPRITE_YSHIFT_BLUEHAWK)
	315	sy += 6 - ((~ext & 0x02) << 7);
407	316
408		if (pollux_extensions == 4)
409		{
410		/* flytiger */
411		sy -=(buffered_spriteram[offs+0x1c] & 0x02) << 7;
412		}
413		}
	317	if (extensions & SPRITE_YSHIFT_FLYTIGER)
	318	sy -=(ext & 0x02) << 7;
414	319	}
415	320
416	321	if (flip_screen())
r241920	r241921
421	326	flipy = !flipy;
422	327	}
423	328
424		for (y = 0; y <= height; y++)
	329	for (int y = 0; y <= height; y++)
425	330	{
426	331	m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect,
427	332	code + y,
r241920	r241921
434	339	}
435	340	}
436	341
437		void dooyong_state::rshark_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
438		{
439		UINT16 *buffered_spriteram16 = m_spriteram16->buffer();
440	342
441		/* Sprites take 8 16-bit words each in memory:
442		MSB LSB
443		[offs + 0] ???? ???? ???? ???E
444		[offs + 1] ???? ???? hhhh wwww
445		[offs + 2] ???? ???? ???? ????
446		[offs + 3] cccc cccc cccc cccc
447		[offs + 4] ???? ???x xxxx xxxx
448		[offs + 5] ???? ???? ???? ????
449		[offs + 6] ???? ???y yyyy yyyy
450		[offs + 7] ???? ???? ???? CCCC
451		? = unused/unknown
452		E = enable
453		c = gfx code
454		x = x offset
455		y = y offset (signed)
456		C = color code
457		w = width
458		h = height */
459
460		int offs;
461
462		for (offs = (m_spriteram16->bytes() / 2) - 8; offs >= 0; offs -= 8)
463		{
464		if (buffered_spriteram16[offs] & 0x0001) /* enable */
465		{
466		int sx, sy, code, color, pri;
467		int flipx = 0, flipy = 0, width, height, x, y;
468
469		sx = buffered_spriteram16[offs+4] & 0x01ff;
470		sy = (INT16)buffered_spriteram16[offs+6] & 0x01ff;
471		if (sy & 0x0100) sy \|= ~(int)0x01ff; // Correctly sign-extend 9-bit number
472		code = buffered_spriteram16[offs+3];
473		color = buffered_spriteram16[offs+7] & 0x000f;
474		//TODO: This priority mechanism works for known games, but seems a bit strange.
475		//Are we missing something? (The obvious spare palette bit isn't it.)
476		pri = (((color == 0x00) \|\| (color == 0x0f)) ? 0xfc : 0xf0);
477		width = buffered_spriteram16[offs+1] & 0x000f;
478		height = (buffered_spriteram16[offs+1] & 0x00f0) >> 4;
479
480		if (flip_screen())
481		{
482		sx = 498 - (16 * width) - sx;
483		sy = 240 - (16 * height) - sy;
484		flipx = !flipx;
485		flipy = !flipy;
486		}
487
488		for (y = 0; y <= height; y++)
489		{
490		int _y = sy + (16 * (flipy ? (height - y) : y));
491		for (x = 0; x <= width; x++)
492		{
493		int _x = sx + (16 * (flipx ? (width - x) : x));
494		m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect,
495		code,
496		color,
497		flipx, flipy,
498		_x, _y,
499		screen.priority(),
500		pri, 15);
501		code++;
502		}
503		}
504		}
505		}
506		}
507
508
509		UINT32 dooyong_state::screen_update_lastday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	343	UINT32 dooyong_z80_ym2203_state::screen_update_lastday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
510	344	{
511	345	bitmap.fill(m_palette->black_pen(), cliprect);
512	346	screen.priority().fill(0, cliprect);
r241920	r241921
516	350	m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 4);
517	351
518	352	if (!m_sprites_disabled)
519		draw_sprites(screen, bitmap, cliprect, 0);
	353	draw_sprites(screen, bitmap, cliprect);
	354
520	355	return 0;
521	356	}
522	357
523		UINT32 dooyong_state::screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	358	UINT32 dooyong_z80_ym2203_state::screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
524	359	{
525	360	bitmap.fill(m_palette->black_pen(), cliprect);
526	361	screen.priority().fill(0, cliprect);
r241920	r241921
529	364	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 2);
530	365	m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 4);
531	366
532		draw_sprites(screen, bitmap, cliprect, 1);
	367	draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT);
	368
533	369	return 0;
534	370	}
535	371
536		UINT32 dooyong_state::screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	372	UINT32 dooyong_z80_ym2203_state::screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
537	373	{
538	374	bitmap.fill(m_palette->black_pen(), cliprect);
539	375	screen.priority().fill(0, cliprect);
r241920	r241921
542	378	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 2);
543	379	m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 4);
544	380
545		draw_sprites(screen, bitmap, cliprect, 2);
	381	draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT \| SPRITE_HEIGHT);
	382
546	383	return 0;
547	384	}
548	385
549		UINT32 dooyong_state::screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	386	UINT32 dooyong_z80_state::screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
550	387	{
551	388	bitmap.fill(m_palette->black_pen(), cliprect);
552	389	screen.priority().fill(0, cliprect);
r241920	r241921
563	400	}
564	401	m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 4);
565	402
566		draw_sprites(screen, bitmap, cliprect, 4);
	403	draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT \| SPRITE_HEIGHT \| SPRITE_YSHIFT_FLYTIGER);
	404
567	405	return 0;
568	406	}
569	407
570	408
571		UINT32 dooyong_state::screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	409	UINT32 dooyong_z80_state::screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
572	410	{
573	411	bitmap.fill(m_palette->black_pen(), cliprect);
574	412	screen.priority().fill(0, cliprect);
r241920	r241921
578	416	m_fg2_tilemap->draw(screen, bitmap, cliprect, 0, 4);
579	417	m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 4);
580	418
581		draw_sprites(screen, bitmap, cliprect, 3);
	419	draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT \| SPRITE_HEIGHT \| SPRITE_YSHIFT_BLUEHAWK);
	420
582	421	return 0;
583	422	}
584	423
585		UINT32 dooyong_state::screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	424	UINT32 dooyong_z80_state::screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
586	425	{
587	426	bitmap.fill(m_palette->black_pen(), cliprect);
588	427
r241920	r241921
590	429	if (m_tx_pri) m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 0);
591	430	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
592	431	if (!m_tx_pri) m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 0);
593		return 0;
594		}
595	432
596		UINT32 dooyong_state::screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
597		{
598		bitmap.fill(m_palette->black_pen(), cliprect);
599		screen.priority().fill(0, cliprect);
600
601		m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 1);
602		m_bg2_tilemap->draw(screen, bitmap, cliprect, 0, (m_rshark_pri ? 2 : 1));
603		m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 2);
604		m_fg2_tilemap->draw(screen, bitmap, cliprect, 0, 2);
605
606		rshark_draw_sprites(screen, bitmap, cliprect);
607	433	return 0;
608	434	}
609	435
610		UINT32 dooyong_~~state::screen~~_~~update~~_~~popbingo(~~s~~creen_device &screen, bi~~tma~~p_ind16 &bi~~t~~map~~, ~~con~~st ~~rect~~a~~ngle &cliprect~~)
	436	VIDEO_START_MEMBER(dooyong_z80_ym2203_state, lastday)
611	437	{
612		bitmap.fill(m_palette->black_pen(), cliprect);
613		screen.priority().fill(0, cliprect);
614
615		m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 1);
616
617		rshark_draw_sprites(screen, bitmap, cliprect);
618		return 0;
619		}
620
621
622		VIDEO_START_MEMBER(dooyong_state,lastday)
623		{
624	438	/* Configure tilemap callbacks */
625	439	m_bg_tilerom = memregion("gfx5")->base();
626	440	m_fg_tilerom = memregion("gfx6")->base();
627		m_bg_tilerom2 = NULL;
628		m_fg_tilerom2 = NULL;
629	441	m_bg_gfx = 2;
630	442	m_fg_gfx = 3;
631	443	m_tx_tilemap_mode = 0;
r241920	r241921
635	447	32, 32, 32, 8);
636	448	m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS,
637	449	32, 32, 32, 8);
638		m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
	450	m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_z80_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
639	451	8, 8, 64, 32);
640	452
641	453	/* Configure tilemap transparency */
r241920	r241921
658	470	save_item(NAME(m_interrupt_line_2));
659	471	}
660	472
661		VIDEO_START_MEMBER(dooyong_state,gulfstrm)
	473	VIDEO_START_MEMBER(dooyong_z80_ym2203_state, gulfstrm)
662	474	{
663	475	/* Configure tilemap callbacks */
664	476	m_bg_tilerom = memregion("gfx5")->base();
665	477	m_fg_tilerom = memregion("gfx6")->base();
666		m_bg_tilerom2 = NULL;
667		m_fg_tilerom2 = NULL;
668	478	m_bg_gfx = 2;
669	479	m_fg_gfx = 3;
670	480	m_tx_tilemap_mode = 0;
r241920	r241921
674	484	32, 32, 32, 8);
675	485	m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS,
676	486	32, 32, 32, 8);
677		m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
	487	m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_z80_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
678	488	8, 8, 64, 32);
679	489
680	490	/* Configure tilemap transparency */
r241920	r241921
696	506	save_item(NAME(m_interrupt_line_2));
697	507	}
698	508
699		VIDEO_START_MEMBER(dooyong_state,pollux)
	509	VIDEO_START_MEMBER(dooyong_z80_ym2203_state, pollux)
700	510	{
701	511	/* Configure tilemap callbacks */
702	512	m_bg_tilerom = memregion("gfx5")->base();
703	513	m_fg_tilerom = memregion("gfx6")->base();
704		m_bg_tilerom2 = NULL;
705		m_fg_tilerom2 = NULL;
706	514	m_bg_gfx = 2;
707	515	m_fg_gfx = 3;
708	516	m_tx_tilemap_mode = 0;
r241920	r241921
712	520	32, 32, 32, 8);
713	521	m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS,
714	522	32, 32, 32, 8);
715		m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
	523	m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_z80_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
716	524	8, 8, 64, 32);
717	525
718	526	/* Configure tilemap transparency */
r241920	r241921
731	539	save_item(NAME(m_interrupt_line_2));
732	540	}
733	541
734		VIDEO_START_MEMBER(dooyong_state,bluehawk)
	542	VIDEO_START_MEMBER(dooyong_z80_state, bluehawk)
735	543	{
736	544	/* Configure tilemap callbacks */
737	545	m_bg_tilerom = memregion("gfx3")->base() + 0x78000;
738	546	m_fg_tilerom = memregion("gfx4")->base() + 0x78000;
739	547	m_fg2_tilerom = memregion("gfx5")->base() + 0x38000;
740		m_bg_tilerom2 = NULL;
741		m_fg_tilerom2 = NULL;
742		m_fg2_tilerom2 = NULL;
743	548	m_bg_gfx = 2;
744	549	m_fg_gfx = 3;
745	550	m_fg2_gfx = 4;
r241920	r241921
752	557	32, 32, 32, 8);
753	558	m_fg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),this), TILEMAP_SCAN_COLS,
754	559	32, 32, 32, 8);
755		m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
	560	m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_z80_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
756	561	8, 8, 64, 32);
757	562
758	563	/* Configure tilemap transparency */
r241920	r241921
771	576	save_item(NAME(m_fg2scroll8));
772	577	}
773	578
774		VIDEO_START_MEMBER(dooyong_state,flytiger)
	579	VIDEO_START_MEMBER(dooyong_z80_state, flytiger)
775	580	{
776	581	/* Configure tilemap callbacks */
777	582	m_bg_tilerom = memregion("gfx3")->base() + 0x78000;
778	583	m_fg_tilerom = memregion("gfx4")->base() + 0x78000;
779		m_bg_tilerom2 = NULL;
780		m_fg_tilerom2 = NULL;
781	584	m_bg_gfx = 2;
782	585	m_fg_gfx = 3;
783	586	m_tx_tilemap_mode = 0;
r241920	r241921
785	588	/* Create tilemaps */
786	589	m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS,
787	590	32, 32, 32, 8);
788		m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::~~flytiger_~~get_fg_tile_info),this), TILEMAP_SCAN_COLS,
	591	m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS,
789	592	32, 32, 32, 8);
790		m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
	593	m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_z80_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
791	594	8, 8, 64, 32);
792	595
793	596	/* Configure tilemap transparency */
r241920	r241921
806	609	save_item(NAME(m_flytiger_pri));
807	610	}
808	611
809		VIDEO_START_MEMBER(dooyong_state,primella)
	612	VIDEO_START_MEMBER(dooyong_z80_state, primella)
810	613	{
811	614	/* Configure tilemap callbacks */
812	615	m_bg_tilerom = memregion("gfx2")->base() + memregion("gfx2")->bytes() - 0x8000;
813	616	m_fg_tilerom = memregion("gfx3")->base() + memregion("gfx3")->bytes() - 0x8000;
814		m_bg_tilerom2 = NULL;
815		m_fg_tilerom2 = NULL;
816	617	m_bg_gfx = 1;
817	618	m_fg_gfx = 2;
818	619	m_tx_tilemap_mode = 1;
r241920	r241921
822	623	32, 32, 32, 8);
823	624	m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS,
824	625	32, 32, 32, 8);
825		m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
	626	m_tx_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_z80_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS,
826	627	8, 8, 64, 32);
827	628
828	629	/* Configure tilemap transparency */
r241920	r241921
840	641	save_item(NAME(m_tx_pri));
841	642	}
842	643
843		VIDEO_START_MEMBER(dooyong_state,rshark)
	644
	645	WRITE16_MEMBER(dooyong_68k_state::ctrl_w)
844	646	{
	647	if (ACCESSING_BITS_0_7)
	648	{
	649	/* bit 0 flips screen */
	650	flip_screen_set(data & 0x0001);
	651
	652	/* bit 4 changes tilemaps priority */
	653	m_bg2_priority = data & 0x0010;
	654
	655	/* bit 5 used but unknown */
	656	}
	657	}
	658
	659
	660	inline void dooyong_68k_state::rshark_get_tile_info(tile_data &tileinfo, int tile_index,
	661	UINT8 const tilerom1, UINT8 const tilerom2, UINT8 const *scroll, int graphics)
	662	{
	663	/* Tiles take two bytes in tile ROM 1:
	664	MSB LSB
	665	[offs + 0x00] YX?c cccc (Y flip, X flip, bits 12-8 of gfx code)
	666	[offs + 0x01] cccc cccc (bits 7-0 of gfx code)
	667	? = unused/unknown
	668	c = gfx code
	669	X = x flip
	670	Y = y flip */
	671	int const offs = tile_index + ((int)scroll[1] << 9);
	672	int const attr = tilerom1[offs * 2];
	673	int const code = tilerom1[(offs * 2) + 1] \| ((attr & 0x1f) << 8);
	674	int const color = tilerom2[offs] & 0x0f;
	675	int const flags = TILE_FLIPYX((attr & 0xC0) >> 6);
	676
	677	tileinfo.set(graphics, code, color, flags);
	678	}
	679
	680	TILE_GET_INFO_MEMBER(dooyong_68k_state::rshark_get_bg_tile_info)
	681	{
	682	rshark_get_tile_info(tileinfo, tile_index, m_bg_tilerom, m_bg_tilerom2, m_bgscroll8, m_bg_gfx);
	683	}
	684
	685	TILE_GET_INFO_MEMBER(dooyong_68k_state::rshark_get_bg2_tile_info)
	686	{
	687	rshark_get_tile_info(tileinfo, tile_index, m_bg2_tilerom, m_bg2_tilerom2, m_bg2scroll8, m_bg2_gfx);
	688	}
	689
	690	TILE_GET_INFO_MEMBER(dooyong_68k_state::rshark_get_fg_tile_info)
	691	{
	692	rshark_get_tile_info(tileinfo, tile_index, m_fg_tilerom, m_fg_tilerom2, m_fgscroll8, m_fg_gfx);
	693	}
	694
	695	TILE_GET_INFO_MEMBER(dooyong_68k_state::rshark_get_fg2_tile_info)
	696	{
	697	rshark_get_tile_info(tileinfo, tile_index, m_fg2_tilerom, m_fg2_tilerom2, m_fg2scroll8, m_fg2_gfx);
	698	}
	699
	700
	701	void dooyong_68k_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	702	{
	703	/* Sprites take 8 16-bit words each in memory:
	704	MSB LSB
	705	[offs + 0] ???? ???? ???? ???E
	706	[offs + 1] ???? ???? hhhh wwww
	707	[offs + 2] ???? ???? ???? ????
	708	[offs + 3] cccc cccc cccc cccc
	709	[offs + 4] ???? ???x xxxx xxxx
	710	[offs + 5] ???? ???? ???? ????
	711	[offs + 6] ???? ???y yyyy yyyy
	712	[offs + 7] ???? ???? ???? CCCC
	713	? = unused/unknown
	714	E = enable
	715	c = gfx code
	716	x = x offset
	717	y = y offset (signed)
	718	C = color code
	719	w = width
	720	h = height */
	721
	722	UINT16 const *const buffered_spriteram = m_spriteram->buffer();
	723	for (int offs = (m_spriteram->bytes() / 2) - 8; offs >= 0; offs -= 8)
	724	{
	725	if (buffered_spriteram[offs] & 0x0001) /* enable */
	726	{
	727	int code = buffered_spriteram[offs+3];
	728	int const color = buffered_spriteram[offs+7] & 0x000f;
	729	//TODO: This priority mechanism works for known games, but seems a bit strange.
	730	//Are we missing something? (The obvious spare palette bit isn't it.)
	731	int const pri = (((color == 0x00) \|\| (color == 0x0f)) ? 0xfc : 0xf0);
	732	int const width = buffered_spriteram[offs+1] & 0x000f;
	733	int const height = (buffered_spriteram[offs+1] & 0x00f0) >> 4;
	734
	735	bool const flip = flip_screen();
	736	int sx = buffered_spriteram[offs+4] & 0x01ff;
	737	int sy = (INT16)buffered_spriteram[offs+6] & 0x01ff;
	738	if (sy & 0x0100) sy \|= ~(int)0x01ff; // Correctly sign-extend 9-bit number
	739	if (flip)
	740	{
	741	sx = 498 - (16 * width) - sx;
	742	sy = 240 - (16 * height) - sy;
	743	}
	744
	745	for (int y = 0; y <= height; y++)
	746	{
	747	int const _y = sy + (16 * (flip ? (height - y) : y));
	748	for (int x = 0; x <= width; x++)
	749	{
	750	int const _x = sx + (16 * (flip ? (width - x) : x));
	751	m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect,
	752	code,
	753	color,
	754	flip, flip,
	755	_x, _y,
	756	screen.priority(),
	757	pri, 15);
	758	code++;
	759	}
	760	}
	761	}
	762	}
	763	}
	764
	765	UINT32 dooyong_68k_state::screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	766	{
	767	bitmap.fill(m_palette->black_pen(), cliprect);
	768	screen.priority().fill(0, cliprect);
	769
	770	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 1);
	771	m_bg2_tilemap->draw(screen, bitmap, cliprect, 0, (m_bg2_priority ? 2 : 1));
	772	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 2);
	773	m_fg2_tilemap->draw(screen, bitmap, cliprect, 0, 2);
	774
	775	draw_sprites(screen, bitmap, cliprect);
	776
	777	return 0;
	778	}
	779
	780	UINT32 dooyong_68k_state::screen_update_popbingo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
	781	{
	782	bitmap.fill(m_palette->black_pen(), cliprect);
	783	screen.priority().fill(0, cliprect);
	784
	785	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 1);
	786
	787	draw_sprites(screen, bitmap, cliprect);
	788
	789	return 0;
	790	}
	791
	792
	793	VIDEO_START_MEMBER(dooyong_68k_state, rshark)
	794	{
845	795	/* Configure tilemap callbacks */
846	796	m_bg_tilerom = memregion("gfx5")->base();
847	797	m_bg2_tilerom = memregion("gfx4")->base();
r241920	r241921
857	807	m_fg2_gfx = 1;
858	808
859	809	/* Create tilemaps */
860		m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS,
	810	m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_68k_state::rshark_get_bg_tile_info),this), TILEMAP_SCAN_COLS,
861	811	16, 16, 64, 32);
862		m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS,
	812	m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_68k_state::rshark_get_bg2_tile_info),this), TILEMAP_SCAN_COLS,
863	813	16, 16, 64, 32);
864		m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS,
	814	m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_68k_state::rshark_get_fg_tile_info),this), TILEMAP_SCAN_COLS,
865	815	16, 16, 64, 32);
866		m_fg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_state::get_fg2_tile_info),this), TILEMAP_SCAN_COLS,
	816	m_fg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(dooyong_68k_state::rshark_get_fg2_tile_info),this), TILEMAP_SCAN_COLS,
867	817	16, 16, 64, 32);
868	818
869	819	/* Configure tilemap transparency */
r241920	r241921
881	831	save_item(NAME(m_bg2scroll8));
882	832	save_item(NAME(m_fgscroll8));
883	833	save_item(NAME(m_fg2scroll8));
884		save_item(NAME(m_~~rshark~~_pri));
	834	save_item(NAME(m_bg2_priority));
885	835	}
886	836
887		VIDEO_START_MEMBER(dooyong_state,popbingo)
	837	VIDEO_START_MEMBER(dooyong_68k_state, popbingo)
888	838	{
889	839	/* Configure tilemap callbacks */
890	840	m_bg_tilerom = memregion("gfx2")->base();
r241920	r241921
905	855	save_item(NAME(m_bg2scroll8)); // Not used atm
906	856	save_item(NAME(m_fgscroll8)); // Not used atm
907	857	save_item(NAME(m_fg2scroll8)); // Not used atm
908		save_item(NAME(m_~~rshark~~_pri));
	858	save_item(NAME(m_bg2_priority));
909	859	}

trunk/src/mame/video/prehisle.c
r241920	r241921
27	27	switch (offset)
28	28	{
29	29	case 0x08: return ioport("P2")->read(); // Player 2
30		case 0x10: return ioport("COIN")->read(); // Coins, Tilt, Service
31		case 0x20: return ioport("P1")->read() ^ m_invert_controls; // Player 1
32		case 0x21: return ioport("DSW0")->read(); // DIPs
33		case 0x22: return ioport("DSW1")->read(); // DIPs + VBLANK
	30	case 0x10: return ioport("COIN")->read(); // Coins, Tilt, Service
	31	case 0x20: return ioport("P1")->read() ^ m_invert_controls; // Player 1
	32	case 0x21: return ioport("DSW0")->read(); // DIPs
	33	case 0x22: return ioport("DSW1")->read(); // DIPs + VBLANK
34	34	default: return 0;
35	35	}
36	36	}
r241920	r241921
54	54	}
55	55	}
56	56
	57	/* tile layout
	58	0 xxxx.... color
	59	0 ....x... flip x
	60	0 .....xxx gfx code high bits
	61	1 xxxxxxxx gfx code low bits
	62	*/
57	63	TILE_GET_INFO_MEMBER(prehisle_state::get_bg2_tile_info)
58	64	{
59		UINT8 *tilerom = memregion("gfx5")->base();
	65	UINT8 const *const tilerom = memregion("gfx5")->base();
60	66
61		int offs = tile_index * 2;
62		int attr = tilerom[offs + 1] + (tilerom[offs] << 8);
63		int code = (attr & 0x7ff) \| 0x800;
64		int color = attr >> 12;
65		int flags = (attr & 0x800) ? TILE_FLIPX : 0;
	67	int const offs = tile_index * 2;
	68	int const attr = tilerom[offs + 1] + (tilerom[offs] << 8);
	69	int const code = (attr & 0x7ff) \| 0x800;
	70	int const color = attr >> 12;
	71	int const flags = (attr & 0x800) ? TILE_FLIPX : 0;
66	72
67	73	SET_TILE_INFO_MEMBER(1, code, color, flags);
68	74	}
69	75
	76	/* tile layout
	77	0 xxxx.... ........ color
	78	0 ....x... ........ flip y
	79	0 .....xxx xxxxxxxx gfx code
	80	*/
70	81	TILE_GET_INFO_MEMBER(prehisle_state::get_bg_tile_info)
71	82	{
72		int attr = m_bg_videoram16[tile_index];
73		int code = attr & 0x7ff;
74		int color = attr >> 12;
75		int flags = (attr & 0x800) ? TILE_FLIPY : 0;
	83	int const attr = m_bg_videoram16[tile_index];
	84	int const code = attr & 0x7ff;
	85	int const color = attr >> 12;
	86	int const flags = (attr & 0x800) ? TILE_FLIPY : 0;
76	87
77	88	SET_TILE_INFO_MEMBER(2, code, color, flags);
78	89	}
79	90
	91	/* tile layout
	92	0 xxxx.... ........ color
	93	0 ....xxxx xxxxxxxx gfx code
	94	*/
80	95	TILE_GET_INFO_MEMBER(prehisle_state::get_fg_tile_info)
81	96	{
82		int attr = m_videoram[tile_index];
83		int code = attr & 0xfff;
84		int color = attr >> 12;
	97	int const attr = m_videoram[tile_index];
	98	int const code = attr & 0xfff;
	99	int const color = attr >> 12;
85	100
86	101	SET_TILE_INFO_MEMBER(0, code, color, 0);
87	102	}
88	103
89	104	void prehisle_state::video_start()
90	105	{
91		m_bg2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(prehisle_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS,
92		16, 16, 1024, 32);
	106	// ROM-based background layer
	107	m_bg2_tilemap = &machine().tilemap().create(
	108	m_gfxdecode,
	109	tilemap_get_info_delegate(FUNC(prehisle_state::get_bg2_tile_info), this),
	110	TILEMAP_SCAN_COLS, // scan order
	111	16, 16, // tile size
	112	1024, 32); // tilemap size
93	113
94		m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(prehisle_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS,
95		16, 16, 256, 32);
	114	// RAM-based background layer (overlays most sprites)
	115	m_bg_tilemap = &machine().tilemap().create(
	116	m_gfxdecode,
	117	tilemap_get_info_delegate(FUNC(prehisle_state::get_bg_tile_info), this),
	118	TILEMAP_SCAN_COLS, // scan order
	119	16, 16, // tile size
	120	256, 32); // tilemap size
	121	m_bg_tilemap->set_transparent_pen(15);
96	122
97		m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(prehisle_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS,
98		8, 8, 32, 32);
99
100		m_bg_tilemap->set_transparent_pen(15);
	123	// text layer
	124	m_fg_tilemap = &machine().tilemap().create(
	125	m_gfxdecode,
	126	tilemap_get_info_delegate(FUNC(prehisle_state::get_fg_tile_info), this),
	127	TILEMAP_SCAN_ROWS, // scan order
	128	8, 8, // tile size
	129	32, 32); // tilemap size
101	130	m_fg_tilemap->set_transparent_pen(15);
102	131
103	132	/* register for saving */
r241920	r241921
105	134	}
106	135
107	136	/* sprite layout
108		o fedcba9876543210
109	137
110		0 .......xxxxxxxxx y, other bits unused?
111		1 .......xxxxxxxxx x, other bits unused?
112
113		2 ...xxxxxxxxxxxxx code
114		2 ..x............. ?
115		2 .x.............. flipx
116		2 x............... flipy
117
118		3 xxxx............ color+priority, other bits unknown
	138	0 .......x xxxxxxxx y, other bits unused?
	139	1 .......x xxxxxxxx x, other bits unused?
	140	2 x....... ........ flip y
	141	2 .x...... ........ flip x
	142	2 ..x..... ........ ?
	143	2 ...xxxxx xxxxxxxx gfx code
	144	3 xxxx.... ........ color+priority, other bits unknown
119	145	*/
120		void prehisle_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect~~, int foreground~~ )
	146	void prehisle_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
121	147	{
122		UINT16 *spriteram16 = m_spriteram;
123		int offs;
	148	UINT16 const *const spriteram16 = m_spriteram;
124	149
125		for (offs = 0; offs < 1024; offs += 4)
	150	for (int offs = 0; offs < 1024; offs += 4)
126	151	{
127		int attr = spriteram16[offs + 2];
128		int code = attr & 0x1fff;
129		int color = spriteram16[offs + 3] >> 12;
130		int priority = (color < 0x4); // correct?
131		int flipx = attr & 0x4000;
132		int flipy = attr & 0x8000;
133		int sx = spriteram16[offs + 1]&0x1ff;
134		int sy = spriteram16[offs]&0x1ff;
	152	int const attr = spriteram16[offs + 2];
	153	int const code = attr & 0x1fff;
	154	int const color = spriteram16[offs + 3] >> 12;
	155	int const priority = (color < 0x4) ? 0x04 : 0x06;
	156	bool flipx = attr & 0x4000;
	157	bool flipy = attr & 0x8000;
	158	int sx = spriteram16[offs + 1] & 0x1ff;
	159	int sy = spriteram16[offs] & 0x1ff;
135	160
136	161	// coordinates are 9-bit signed
137		if (sx&0x100) sx=-0x100+(sx&0xff);
138		if (sy&0x100) sy=-0x100+(sy&0xff);
	162	if (sx & 0x100) sx = -0x100 + (sx & 0xff);
	163	if (sy & 0x100) sy = -0x100 + (sy & 0xff);
139	164
140	165	if (flip_screen())
141	166	{
r241920	r241921
145	170	flipy = !flipy;
146	171	}
147	172
148		if ((foreground && priority) \|\| (!foreground && !priority))
149		{
150		m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, code, color, flipx, flipy, sx, sy, 15);
151		}
	173	m_gfxdecode->gfx(3)->prio_transpen(
	174	bitmap, cliprect,
	175	code, color,
	176	flipx, flipy,
	177	sx, sy,
	178	screen.priority(), priority,
	179	15); // transparent pen
152	180	}
153	181	}
154	182
155	183	UINT32 prehisle_state::screen_update_prehisle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
156	184	{
	185	screen.priority().fill(0, cliprect);
	186
157	187	m_bg2_tilemap->draw(screen, bitmap, cliprect, 0, 0);
158		draw_sprites(bitmap, cliprect, 0);
159		m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
160		draw_sprites(bitmap, cliprect, 1);
161		m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
	188	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 1);
	189	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 2);
	190	draw_sprites(screen, bitmap, cliprect);
	191
162	192	return 0;
163	193	}

trunk/src/mess/drivers/mc1502.c
r241920	r241921
254	254	MCFG_MACHINE_RESET_OVERRIDE( mc1502_state, mc1502 )
255	255
256	256	MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
257		MCFG_PIT8253_CLK0(XTAL_15MHz/12) /* heartbeat IRQ */
	257	MCFG_PIT8253_CLK0(XTAL_16MHz/12) /* heartbeat IRQ */
258	258	MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
259	259	MCFG_PIT8253_CLK1(XTAL_16MHz/12) /* serial port */
260	260	MCFG_PIT8253_OUT1_HANDLER(WRITELINE(mc1502_state, mc1502_pit8253_out1_changed))
r241920	r241921
296	296	MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
297	297	MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259", pic8259_device, ir6_w))
298	298	MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259", pic8259_device, ir7_w))
	299
	300	MCFG_ISA8_SLOT_ADD("isa", "board0", mc1502_isa8_cards, "cga_mc1502", true)
299	301	MCFG_ISA8_SLOT_ADD("isa", "isa1", mc1502_isa8_cards, "fdc", false)
300	302	MCFG_ISA8_SLOT_ADD("isa", "isa2", mc1502_isa8_cards, "rom", false)
301		/* video hardware (only 1 chargen in ROM; CGA_FONT dip always 1 */
302		MCFG_ISA8_SLOT_ADD("isa", "isa3", mc1502_isa8_cards, "cga_mc1502", false)
303	303
304		/* sound hardware */
305	304	MCFG_SPEAKER_STANDARD_MONO("mono")
306	305	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
307	306	MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
r241920	r241921
323	322	MCFG_SOFTWARE_LIST_ADD("flop_list","mc1502_flop")
324	323	// MCFG_SOFTWARE_LIST_ADD("cass_list","mc1502_cass")
325	324
326		/* internal ram */
327	325	MCFG_RAM_ADD(RAM_TAG)
328	326	MCFG_RAM_DEFAULT_SIZE("608K") /* 96 base + 512 on expansion card */
329	327	MCFG_RAM_EXTRA_OPTIONS("96K")

https://github.com/mamedev/mame/commit/03e9f7234e6fe91c6402d6354b173c506c7213e7

199869 Revisions