MAME SVN History

199869 Revisions

r34348 Sunday 11th January, 2015 at 16:07:19 UTC by Miodrag Milanović
Move expat.h include to c file (nw)

[src/emu]	softlist.c softlist.h
[src/emu/bus/nes]	aladdin.c datach.c karastudio.c sunsoft_dcs.c
[src/emu/ui]	miscmenu.c

trunk/src/emu/bus/nes/aladdin.c
r242859	r242860
325	325	//-------------------------------------------------
326	326
327	327	static SLOT_INTERFACE_START(ade_cart)
328		SLOT_INTERFACE_INTERNAL("algn", NES_ALGN_ROM)
329		SLOT_INTERFACE_INTERNAL("algq", NES_ALGQ_ROM)
	328	SLOT_INTERFACE("algn", NES_ALGN_ROM)
	329	SLOT_INTERFACE("algq", NES_ALGQ_ROM)
330	330	SLOT_INTERFACE_END
331	331
332	332

trunk/src/emu/bus/nes/datach.c
r242859	r242860
372	372	//-------------------------------------------------
373	373
374	374	static SLOT_INTERFACE_START(datach_cart)
375		SLOT_INTERFACE_INTERNAL("datach_rom", NES_DATACH_ROM)
376		SLOT_INTERFACE_INTERNAL("datach_ep1", NES_DATACH_24C01)
	375	SLOT_INTERFACE("datach_rom", NES_DATACH_ROM)
	376	SLOT_INTERFACE("datach_ep1", NES_DATACH_24C01)
377	377	SLOT_INTERFACE_END
378	378
379	379

trunk/src/emu/bus/nes/karastudio.c
r242859	r242860
296	296	//-------------------------------------------------
297	297
298	298	static SLOT_INTERFACE_START(karaoke_studio_cart)
299		SLOT_INTERFACE~~_INTERNAL~~("ks_exp", NES_KSEXPANSION_ROM)
	299	SLOT_INTERFACE("ks_exp", NES_KSEXPANSION_ROM)
300	300	SLOT_INTERFACE_END
301	301
302	302

trunk/src/emu/bus/nes/sunsoft_dcs.c
r242859	r242860
283	283	//-------------------------------------------------
284	284
285	285	static SLOT_INTERFACE_START(ntb_cart)
286		SLOT_INTERFACE~~_INTERNAL~~("ntbrom", NES_NTB_ROM)
	286	SLOT_INTERFACE("ntbrom", NES_NTB_ROM)
287	287	SLOT_INTERFACE_END
288	288
289	289	static MACHINE_CONFIG_FRAGMENT( sub_slot )

trunk/src/emu/softlist.c
r242859	r242860
12	12	#include "softlist.h"
13	13	#include "clifront.h"
14	14	#include "validity.h"
	15	#include "expat.h"
15	16
16	17	#include <ctype.h>
17	18

trunk/src/emu/softlist.h
r242859	r242860
10	10	#define __SOFTLIST_H_
11	11
12	12	#include "ui/menu.h"
13		#include "expat.h"
14	13	#include "cstrpool.h"
15	14
16	15

trunk/src/emu/ui/miscmenu.c
r242859	r242860
120	120	else
121	121	{
122	122	astring temp;
123		current = machine().options().main_value(temp, slot->device().tag() + 1);
	123	current = machine().options().main_value(temp,slot->device().tag()+1);
124	124	}
125	125
126	126	return slot->option(current);
r242859	r242860
154	154	-------------------------------------------------*/
155	155	int ui_menu_slot_devices::slot_get_length(device_slot_interface *slot)
156	156	{
	157	const device_slot_option *current = slot_get_current_option(slot);
	158
157	159	int val = 0;
158	160	for (const device_slot_option *option = slot->first_option(); option != NULL; option = option->next())
159		if (option->selectable())
	161	if (option == current \|\| option->selectable())
160	162	val++;
161	163
162	164	return val;
r242859	r242860
201	203	-------------------------------------------------*/
202	204	const char ui_menu_slot_devices::slot_get_option(device_slot_interface slot, int index)
203	205	{
204		if (index >= 0)
	206	const device_slot_option *current = slot_get_current_option(slot);
	207
	208	if (index >= 0 )
205	209	{
206	210	int val = 0;
207	211	for (const device_slot_option *option = slot->first_option(); option != NULL; option = option->next())
r242859	r242860
209	213	if (val == index)
210	214	return option->name();
211	215
212		if (option->selectable())
	216	if (option == current \|\| option->selectable())
213	217	val++;
214	218	}
215	219	}
r242859	r242860
247	251	{
248	252	/* record the menu item */
249	253	const device_slot_option *option = slot_get_current_option(slot);
250		astring opt_name;
251		if (option == NULL)
252		opt_name.cpy("------");
253		else
254		{
255		opt_name.cpy(option->name());
256		if (slot->fixed() \|\| slot_get_length(slot) == 0)
257		opt_name.cat(" [internal]");
258		}
259	254
260		item_append(slot->device().tag() + 1, opt_name, (slot->fixed() \|\| slot_get_length(slot) == 0) ? 0 : (MENU_FLAG_LEFT_ARROW \| MENU_FLAG_RIGHT_ARROW), (void *)slot);
	255	item_append(slot->device().tag()+1, option == NULL ? "------" : option->name(), (slot->fixed() \|\| slot_get_length(slot) == 0) ? 0 : (MENU_FLAG_LEFT_ARROW \| MENU_FLAG_RIGHT_ARROW), (void *)slot);
261	256	}
262	257	item_append(MENU_SEPARATOR_ITEM, NULL, 0, NULL);
263	258	item_append("Reset", NULL, 0, (void *)1);

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

199869 Revisions