Previous

199869 Revisions

Next

r36852 Tuesday 31st March, 2015 at 22:12:08 UTC by Angelo Salese
irq 2 is certainly used somehow, I don't know yet where tho ... (it apparently fixes sound not triggered at some point)

[/trunk]	makefile
[scripts]	genie.lua
[scripts/src/osd]	modules.lua sdl.lua sdl_cfg.lua windows.lua windows_cfg.lua
[src/mame/audio]	hng64.c
[src/mess]	mess.lst
[src/mess/drivers]	hh_tms1k.c ticalc1x.c
[src/mess/includes]	hh_tms1k.h
[src/mess/layout]	astro.lay
[src/osd/sdl]	osdsdl.h sdlmain.c

trunk/makefile

r245363	r245364
293	293	PARAMS += --targetos=$(TARGETOS)
294	294	endif
295	295
	296	ifndef USE_QT
	297	ifneq ($(TARGETOS),macosx)
	298	USE_QT := 1
	299	else
	300	USE_QT := 0
	301	endif
	302	endif
	303	PARAMS += --USE_QT=$(USE_QT)
	304
296	305	ifdef DONT_USE_NETWORK
297	306	PARAMS += --DONT_USE_NETWORK='$(DONT_USE_NETWORK)'
298	307	endif
r245363	r245364
305	314	PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)'
306	315	endif
307	316
308		ifdef NO_USE_MIDI
309		PARAMS += --NO_USE_MIDI='$(NO_USE_MIDI)'
310		endif
311
312		ifdef USE_QTDEBUG
313		PARAMS += --USE_QTDEBUG='$(USE_QTDEBUG)'
314		endif
315
316	317	ifdef MESA_INSTALL_ROOT
317	318	PARAMS += --MESA_INSTALL_ROOT='$(MESA_INSTALL_ROOT)'
318	319	endif
r245363	r245364
325	326	PARAMS += --NO_USE_XINPUT='$(NO_USE_XINPUT)'
326	327	endif
327	328
	329	ifdef NO_USE_MIDI
	330	PARAMS += --NO_USE_MIDI='$(NO_USE_MIDI)'
	331	endif
	332
328	333	ifdef SDL_LIBVER
329	334	PARAMS += --SDL_LIBVER='$(SDL_LIBVER)'
330	335	endif
r245363	r245364
705	710
706	711	LAYOUTS=$(wildcard $(SRC)/emu/layout/*.lay) $(wildcard $(SRC)/$(TARGET)/layout/*.lay)
707	712
708		MOC_FILES=$(wildcard $(SRC)/osd/modules/debugger/qt/*.h)
709		ifneq ($(USE_QTDEBUG),1)
710		ifeq ($(TARGETOS),macosx)
	713	ifeq ($(USE_QT),0)
711	714	MOC_FILES=
712		endif
713		ifeq ($(TARGETOS),solaris)
714		MOC_FILES=
715		endif
716		ifeq ($(TARGETOS),haiku)
717		MOC_FILES=
718		endif
719		ifeq ($(TARGETOS),emscripten)
720		MOC_FILES=
721		endif
722		ifeq ($(TARGETOS),os2)
723		MOC_FILES=
724		endif
725		endif
	715	else
	716	MOC_FILES=$(wildcard $(SRC)/osd/modules/debugger/qt/*.h)
726	717
727	718	ifeq ($(OS),windows)
728	719	MOC = moc
	720	ifneq ($(OSD),sdl)
	721	MOC_FILES=
	722	endif
729	723	else
730	724	MOCTST = $(shell which moc-qt4 2>/dev/null)
731	725	ifeq '$(MOCTST)' ''
r245363	r245364
740	734	endif
741	735	endif
742	736
	737	endif
743	738
744	739	ifneq (,$(wildcard src/osd/$(OSD)/$(OSD).mak))
745	740	include src/osd/$(OSD)/$(OSD).mak

trunk/scripts/genie.lua

r245363	r245364
182	182	}
183	183	}
184	184
	185	newoption {
	186	trigger = "USE_QT",
	187	description = "Use of QT.",
	188	allowed = {
	189	{ "0",   "Disabled"    },
	190	{ "1",   "Enabled"      },
	191	}
	192	}
	193
	194	newoption {
	195	trigger = "DONT_USE_NETWORK",
	196	description = "Disable network access",
	197	}
	198
185	199	local os_version = str_to_version(_OPTIONS["os_version"])
186	200
187	201	USE_BGFX = 1
r245363	r245364
192	206	USE_BGFX = tonumber(_OPTIONS["USE_BGFX"])
193	207	end
194	208
	209	USE_QT = 1
	210	if(_OPTIONS["USE_QT"]~=nil) then
	211	USE_QT = tonumber(_OPTIONS["USE_QT"])
	212	end
	213
195	214	GEN_DIR = MAME_BUILD_DIR .. "generated/"
196	215
197	216	if (_OPTIONS["target"] == nil) then return false end

trunk/scripts/src/osd/modules.lua

r245363	r245364
1		function osdmodulesbuild()
2
3		removeflags {
4		"SingleOutputDir",
5		}
6
7		options {
8		"ForceCPP",
9		}
10
11		files {
12		MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
13		MAME_DIR .. "src/osd/modules/debugger/none.c",
14		MAME_DIR .. "src/osd/modules/debugger/debugint.c",
15		MAME_DIR .. "src/osd/modules/debugger/debugwin.c",
16		MAME_DIR .. "src/osd/modules/debugger/debugqt.c",
17		MAME_DIR .. "src/osd/modules/font/font_sdl.c",
18		MAME_DIR .. "src/osd/modules/font/font_windows.c",
19		MAME_DIR .. "src/osd/modules/font/font_osx.c",
20		MAME_DIR .. "src/osd/modules/font/font_none.c",
21		MAME_DIR .. "src/osd/modules/netdev/taptun.c",
22		MAME_DIR .. "src/osd/modules/netdev/pcap.c",
23		MAME_DIR .. "src/osd/modules/netdev/none.c",
24		MAME_DIR .. "src/osd/modules/midi/portmidi.c",
25		MAME_DIR .. "src/osd/modules/midi/none.c",
26		MAME_DIR .. "src/osd/modules/sound/js_sound.c",
27		MAME_DIR .. "src/osd/modules/sound/direct_sound.c",
28		MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
29		MAME_DIR .. "src/osd/modules/sound/none.c",
30		}
31
32		if _OPTIONS["targetos"]=="windows" then
33		includedirs {
34		MAME_DIR .. "3rdparty/winpcap/Include",
35		}
36		end
37
38		if _OPTIONS["NO_OPENGL"]=="1" then
39		defines {
40		"USE_OPENGL=0",
41		}
42		else
43		files {
44		MAME_DIR .. "src/osd/modules/render/drawogl.c",
45		MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
46		MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
47		}
48		defines {
49		"USE_OPENGL=1",
50		}
51		if _OPTIONS["USE_DISPATCH_GL"]=="1" then
52		defines {
53		"USE_DISPATCH_GL=1",
54		}
55		end
56		end
57
58		if USE_BGFX == 1 then
59		files {
60		MAME_DIR .. "src/osd/modules/render/drawbgfx.c",
61		}
62		defines {
63		"USE_BGFX"
64		}
65		includedirs {
66		MAME_DIR .. "3rdparty/bgfx/include",
67		MAME_DIR .. "3rdparty/bx/include",
68		}
69		end
70
71		if _OPTIONS["NO_USE_MIDI"]=="1" then
72		defines {
73		"NO_USE_MIDI",
74		}
75		end
76
77		if _OPTIONS["USE_QTDEBUG"]=="1" then
78		files {
79		MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.c",
80		MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.c",
81		MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.c",
82		MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.c",
83		MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.c",
84		MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.c",
85		MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.c",
86		MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.c",
87		MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.c",
88		GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.c",
89		GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.c",
90		GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.c",
91		GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.c",
92		GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.c",
93		GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.c",
94		GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.c",
95		GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.c",
96		GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.c",
97		}
98		defines {
99		"USE_QTDEBUG=1",
100		}
101		if _OPTIONS["targetos"]=="windows" then
102		configuration { "mingw*" }
103		buildoptions {
104		"-I$(shell qmake -query QT_INSTALL_HEADERS)/QtCore",
105		"-I$(shell qmake -query QT_INSTALL_HEADERS)/QtGui",
106		"-I$(shell qmake -query QT_INSTALL_HEADERS)",
107		}
108		configuration { }
109		elseif _OPTIONS["targetos"]=="macosx" then
110		-- TODO: search path for Qt on OSX platform
111		else
112		buildoptions {
113		string.gsub(os.outputof("pkg-config --cflags QtGui"), '[\r\n]+', ' '),
114		}
115		end
116		else
117		defines {
118		"USE_QTDEBUG=0",
119		}
120		end
121
122		end
123
124
125		function osdmodulestargetconf()
126
127		if _OPTIONS["NO_OPENGL"]~="1" then
128		if _OPTIONS["targetos"]=="macosx" then
129		links {
130		"OpenGL.framework",
131		}
132		elseif _OPTIONS["USE_DISPATCH_GL"]~="1" then
133		if _OPTIONS["targetos"]=="windows" then
134		links {
135		"opengl32",
136		}
137		else
138		links {
139		"GL",
140		}
141		end
142		end
143		end
144
145		if _OPTIONS["NO_USE_MIDI"]~="1" then
146		if _OPTIONS["targetos"]=="linux" then
147		linkoptions {
148		string.gsub(os.outputof("pkg-config --libs alsa"), '[\r\n]+', ' '),
149		}
150		elseif _OPTIONS["targetos"]=="macosx" then
151		links {
152		"CoreAudio.framework",
153		"CoreMIDI.framework",
154		}
155		end
156		end
157
158		if _OPTIONS["USE_QTDEBUG"]=="1" then
159		if _OPTIONS["targetos"]=="windows" then
160		linkoptions {
161		"-L$(shell qmake -query QT_INSTALL_LIBS)",
162		}
163		links {
164		"qtmain",
165		"QtGui4",
166		"QtCore4",
167		}
168		elseif _OPTIONS["targetos"]=="macosx" then
169		-- TODO: Qt libs for OSX platform
170		else
171		linkoptions {
172		string.gsub(os.outputof("pkg-config --libs QtGui"), '[\r\n]+', ' '),
173		}
174		end
175		end
176
177		end
178
179
180		newoption {
181		trigger = "DONT_USE_NETWORK",
182		description = "Disable network access",
183		}
184
185		newoption {
186		trigger = "NO_OPENGL",
187		description = "Disable use of OpenGL",
188		allowed = {
189		{ "0",  "Enable OpenGL"  },
190		{ "1",  "Disable OpenGL" },
191		},
192		}
193
194		if not _OPTIONS["NO_OPENGL"] then
195		if _OPTIONS["targetos"]=="os2" then
196		_OPTIONS["NO_OPENGL"] = "1"
197		else
198		_OPTIONS["NO_OPENGL"] = "0"
199		end
200		end
201
202		newoption {
203		trigger = "USE_DISPATCH_GL",
204		description = "Use GL-dispatching",
205		allowed = {
206		{ "0",  "Link to OpenGL library"  },
207		{ "1",  "Use GL-dispatching"      },
208		},
209		}
210
211		if not _OPTIONS["USE_DISPATCH_GL"] then
212		if USE_BGFX == 1 then
213		_OPTIONS["USE_DISPATCH_GL"] = "0"
214		else
215		_OPTIONS["USE_DISPATCH_GL"] = "1"
216		end
217		end
218
219		newoption {
220		trigger = "NO_USE_MIDI",
221		description = "Disable MIDI I/O",
222		allowed = {
223		{ "0",  "Enable MIDI"  },
224		{ "1",  "Disable MIDI" },
225		},
226		}
227
228		if not _OPTIONS["NO_USE_MIDI"] then
229		if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
230		_OPTIONS["NO_USE_MIDI"] = "1"
231		else
232		_OPTIONS["NO_USE_MIDI"] = "0"
233		end
234		end
235
236		newoption {
237		trigger = "USE_QTDEBUG",
238		description = "Use QT debugger",
239		allowed = {
240		{ "0",  "Don't use Qt debugger"  },
241		{ "1",  "Use Qt debugger" },
242		},
243		}
244
245		if not _OPTIONS["USE_QTDEBUG"] then
246		if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
247		_OPTIONS["USE_QTDEBUG"] = "0"
248		else
249		_OPTIONS["USE_QTDEBUG"] = "1"
250		end
251		end

trunk/scripts/src/osd/sdl.lua

r245363	r245364
1		dofile("modules.lua")
2
3
4	1	function maintargetosdoptions(_target)
5		osdmodulestargetconf()
6
7	2	if _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
8	3	libdirs {
9	4	path.join(_OPTIONS["MESA_INSTALL_ROOT"],"lib"),
r245363	r245364
37	32	"SDL_ttf",
38	33	}
39	34	end
	35	if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" then
	36	links {
	37	"GL"
	38	}
	39	end
40	40	linkoptions {
41	41	string.gsub(os.outputof("pkg-config --libs fontconfig"), '[\r\n]+', ' '),
42	42	}
43	43	end
44	44
45	45	if _OPTIONS["targetos"]=="windows" then
	46	if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" then
	47	links {
	48	"opengl32"
	49	}
	50	end
46	51	configuration { "mingw*" }
47	52	linkoptions{
48	53	"-municode",
r245363	r245364
60	65	"SDL2",
61	66	}
62	67	configuration {}
	68
	69	if (USE_QT == 1) then
	70	linkoptions{
	71	"-L$(shell qmake -query QT_INSTALL_LIBS)",
	72	}
	73	links {
	74	"qtmain",
	75	"QtGui4",
	76	"QtCore4",
	77	}
	78	end
	79	elseif _OPTIONS["targetos"]=="linux" then
	80	if USE_QT == 1 then
	81	linkoptions {
	82	"$(shell pkg-config --libs QtGui)",
	83	}
	84	links {
	85	"QtGui",
	86	"QtCore",
	87	}
	88	end
	89	if _OPTIONS["NO_USE_MIDI"]~="1" then
	90	linkoptions {
	91	string.gsub(os.outputof("pkg-config --libs alsa"), '[\r\n]+', ' '),
	92	}
	93	end
	94	elseif _OPTIONS["targetos"]=="macosx" then
	95	if _OPTIONS["NO_USE_MIDI"]~="1" then
	96	links {
	97	"CoreAudio.framework",
	98	"CoreMIDI.framework",
	99	}
	100	end
63	101	elseif _OPTIONS["targetos"]=="haiku" then
64	102	links {
65	103	"network",
r245363	r245364
84	122
85	123
86	124	newoption {
	125	trigger = "NO_OPENGL",
	126	description = "Disable use of OpenGL",
	127	allowed = {
	128	{ "0",  "Enable OpenGL"  },
	129	{ "1",  "Disable OpenGL" },
	130	},
	131	}
	132
	133	if not _OPTIONS["NO_OPENGL"] then
	134	if _OPTIONS["targetos"]=="os2" then
	135	_OPTIONS["NO_OPENGL"] = "1"
	136	else
	137	_OPTIONS["NO_OPENGL"] = "0"
	138	end
	139	end
	140
	141	newoption {
	142	trigger = "USE_DISPATCH_GL",
	143	description = "Use GL-dispatching (takes precedence over MESA_INSTALL_ROOT)",
	144	allowed = {
	145	{ "0",  "Link to OpenGL library"  },
	146	{ "1",  "Use GL-dispatching"      },
	147	},
	148	}
	149
	150	if not _OPTIONS["USE_DISPATCH_GL"] then
	151	if USE_BGFX == 1 then
	152	_OPTIONS["USE_DISPATCH_GL"] = "0"
	153	else
	154	_OPTIONS["USE_DISPATCH_GL"] = "1"
	155	end
	156	end
	157
	158	newoption {
87	159	trigger = "MESA_INSTALL_ROOT",
88		description = "link against specific GL-Library - also adds rpath to executable (overridden by USE_DISPATCH_GL)",
	160	description = "link against specific GL-Library - also adds rpath to executable",
89	161	}
90	162
91	163	newoption {
r245363	r245364
119	191	end
120	192
121	193	newoption {
	194	trigger = "NO_USE_MIDI",
	195	description = "Disable MIDI I/O",
	196	allowed = {
	197	{ "0",  "Enable MIDI"  },
	198	{ "1",  "Disable MIDI" },
	199	},
	200	}
	201
	202	if not _OPTIONS["NO_USE_MIDI"] then
	203	if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
	204	_OPTIONS["NO_USE_MIDI"] = "1"
	205	else
	206	_OPTIONS["NO_USE_MIDI"] = "0"
	207	end
	208	end
	209
	210	newoption {
122	211	trigger = "SDL_LIBVER",
123	212	description = "Choose SDL version",
124	213	allowed = {
r245363	r245364
206	295	SYNC_IMPLEMENTATION = "os2"
207	296	end
208	297
	298	if _OPTIONS["NO_X11"]~="1" then
	299	libdirs {
	300	"/usr/X11/lib",
	301	"/usr/X11R6/lib",
	302	"/usr/openwin/lib",
	303	}
	304	if _OPTIONS["SDL_LIBVER"]=="sdl" then
	305	links {
	306	"X11",
	307	}
	308	end
	309	end
	310
209	311	if BASE_TARGETOS=="unix" then
210	312	if _OPTIONS["targetos"]=="macosx" then
211	313	links {
212	314	"Cocoa.framework",
	315	"OpenGL.framework",
213	316	}
214	317	if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then
215	318	linkoptions {
r245363	r245364
230	333	}
231	334	end
232	335	else
233		if _OPTIONS["NO_X11"]=="1" then
234		_OPTIONS["USE_QTDEBUG"] = "0"
235		USE_BGFX = 0
236		else
237		libdirs {
238		"/usr/X11/lib",
239		"/usr/X11R6/lib",
240		"/usr/openwin/lib",
241		}
242		if _OPTIONS["SDL_LIBVER"]=="sdl" then
243		links {
244		"X11",
245		}
246		end
247		end
248	336	linkoptions {
249	337	string.gsub(os.outputof(sdlconfigcmd() .. " --libs"), '[\r\n]+', ' '),
250	338	}
r245363	r245364
286	374	uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
287	375	kind "StaticLib"
288	376
	377	removeflags {
	378	"SingleOutputDir",
	379	}
	380
	381	options {
	382	"ForceCPP",
	383	}
	384
289	385	dofile("sdl_cfg.lua")
290		osdmodulesbuild()
291
	386
292	387	includedirs {
293	388	MAME_DIR .. "src/emu",
294	389	MAME_DIR .. "src/osd",
r245363	r245364
296	391	MAME_DIR .. "src/lib/util",
297	392	MAME_DIR .. "src/osd/modules/render",
298	393	MAME_DIR .. "3rdparty",
	394	MAME_DIR .. "3rdparty/winpcap/Include",
	395	MAME_DIR .. "3rdparty/bgfx/include",
	396	MAME_DIR .. "3rdparty/bx/include",
299	397	MAME_DIR .. "src/osd/sdl",
300	398	}
301	399
r245363	r245364
341	439	MAME_DIR .. "src/osd/sdl/window.c",
342	440	MAME_DIR .. "src/osd/sdl/output.c",
343	441	MAME_DIR .. "src/osd/sdl/watchdog.c",
	442	MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
344	443	MAME_DIR .. "src/osd/modules/render/drawsdl.c",
	444	MAME_DIR .. "src/osd/modules/debugger/none.c",
	445	MAME_DIR .. "src/osd/modules/debugger/debugint.c",
	446	MAME_DIR .. "src/osd/modules/debugger/debugwin.c",
	447	MAME_DIR .. "src/osd/modules/debugger/debugqt.c",
	448	MAME_DIR .. "src/osd/modules/font/font_sdl.c",
	449	MAME_DIR .. "src/osd/modules/font/font_windows.c",
	450	MAME_DIR .. "src/osd/modules/font/font_osx.c",
	451	MAME_DIR .. "src/osd/modules/font/font_none.c",
	452	MAME_DIR .. "src/osd/modules/netdev/taptun.c",
	453	MAME_DIR .. "src/osd/modules/netdev/pcap.c",
	454	MAME_DIR .. "src/osd/modules/netdev/none.c",
	455	MAME_DIR .. "src/osd/modules/midi/portmidi.c",
	456	MAME_DIR .. "src/osd/modules/midi/none.c",
	457	MAME_DIR .. "src/osd/modules/sound/js_sound.c",
	458	MAME_DIR .. "src/osd/modules/sound/direct_sound.c",
	459	MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
	460	MAME_DIR .. "src/osd/modules/sound/none.c",
345	461	}
	462	if _OPTIONS["NO_OPENGL"]~="1" then
	463	files {
	464	MAME_DIR .. "src/osd/modules/render/drawogl.c",
	465	MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
	466	MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
	467	}
	468	end
346	469	if _OPTIONS["SDL_LIBVER"]=="sdl2" then
347	470	files {
348	471	MAME_DIR .. "src/osd/modules/render/draw13.c",
349	472	}
350	473	end
351	474
	475	if USE_QT == 1 then
	476	files {
	477	MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.c",
	478	MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.c",
	479	MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.c",
	480	MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.c",
	481	MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.c",
	482	MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.c",
	483	MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.c",
	484	MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.c",
	485	MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.c",
352	486
	487	GEN_DIR  .. "osd/modules/debugger/qt/debuggerview.moc.c",
	488	GEN_DIR  .. "osd/modules/debugger/qt/windowqt.moc.c",
	489	GEN_DIR  .. "osd/modules/debugger/qt/logwindow.moc.c",
	490	GEN_DIR  .. "osd/modules/debugger/qt/dasmwindow.moc.c",
	491	GEN_DIR  .. "osd/modules/debugger/qt/mainwindow.moc.c",
	492	GEN_DIR  .. "osd/modules/debugger/qt/memorywindow.moc.c",
	493	GEN_DIR  .. "osd/modules/debugger/qt/breakpointswindow.moc.c",
	494	GEN_DIR  .. "osd/modules/debugger/qt/deviceswindow.moc.c",
	495	GEN_DIR  .. "osd/modules/debugger/qt/deviceinformationwindow.moc.c",
	496	}
	497	end
	498
	499	if USE_BGFX == 1 then
	500	files {
	501	MAME_DIR .. "src/osd/modules/render/drawbgfx.c",
	502	}
	503	end
	504
	505
353	506	project ("ocore_" .. _OPTIONS["osd"])
354	507	uuid (os.uuid("ocore_" .. _OPTIONS["osd"]))
355	508	kind "StaticLib"

trunk/scripts/src/osd/sdl_cfg.lua

r245363	r245364
8	8	}
9	9	end
10	10
11		if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
12		includedirs {
13		path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"),
	11	if _OPTIONS["NO_OPENGL"]=="1" then
	12	defines {
	13	"USE_OPENGL=0",
14	14	}
	15	else
	16	defines {
	17	"USE_OPENGL=1",
	18	}
	19	if _OPTIONS["USE_DISPATCH_GL"]=="1" then
	20	defines {
	21	"USE_DISPATCH_GL=1",
	22	}
	23	elseif _OPTIONS["MESA_INSTALL_ROOT"] then
	24	includedirs {
	25	path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"),
	26	}
	27	end
15	28	end
16	29
17	30
r245363	r245364
41	54	}
42	55	end
43	56
44		if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then
	57	if _OPTIONS["NO_USE_MIDI"]=="1" then
	58	defines {
	59	"NO_USE_MIDI",
	60	}
	61	elseif _OPTIONS["targetos"]=="linux" then
45	62	buildoptions {
46	63	string.gsub(os.outputof("pkg-config --cflags alsa"), '[\r\n]+', ' '),
47	64	}
r245363	r245364
62	79	}
63	80	end
64	81
	82	if USE_BGFX == 1 then
	83	defines {
	84	"USE_BGFX"
	85	}
	86	end
	87
65	88	defines {
66	89	"OSD_SDL",
67	90	"SYNC_IMPLEMENTATION=" .. SYNC_IMPLEMENTATION,
r245363	r245364
101	124	defines {
102	125	"UNICODE",
103	126	"_UNICODE",
	127	"USE_QTDEBUG=" .. USE_QT,
104	128	"main=utf8_main",
105	129	}
106
	130	configuration { "mingw*" }
	131	buildoptions {
	132	"-I$(shell qmake -query QT_INSTALL_HEADERS)/QtCore",
	133	"-I$(shell qmake -query QT_INSTALL_HEADERS)/QtGui",
	134	"-I$(shell qmake -query QT_INSTALL_HEADERS)",
	135	}
	136
107	137	configuration { "vs*" }
108	138	includedirs {
109	139	path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include")
r245363	r245364
111	141	configuration { }
112	142
113	143	elseif _OPTIONS["targetos"]=="linux" then
	144	defines {
	145	"USE_QTDEBUG=" .. USE_QT,
	146	}
114	147	buildoptions {
115	148	'$(shell pkg-config --cflags QtGui)',
116	149	}
r245363	r245364
118	151	defines {
119	152	"SDLMAME_MACOSX",
120	153	"SDLMAME_DARWIN",
	154	"USE_QTDEBUG=0",
121	155	}
122	156	elseif _OPTIONS["targetos"]=="freebsd" then
123	157	buildoptions {

trunk/scripts/src/osd/windows.lua

r245363	r245364
1		dofile("modules.lua")
2
3
4	1	function maintargetosdoptions(_target)
5		osdmodulestargetconf()
6
7	2	linkoptions {
8	3	"-municode",
9	4	}
r245363	r245364
26	21	uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
27	22	kind "StaticLib"
28	23
	24	removeflags {
	25	"SingleOutputDir",
	26	}
	27
	28	options {
	29	"ForceCPP",
	30	}
	31
29	32	dofile("windows_cfg.lua")
30		osdmodulesbuild()
31	33
32	34	defines {
33	35	"DIRECTINPUT_VERSION=0x0800",
r245363	r245364
41	43	MAME_DIR .. "src/lib/util",
42	44	MAME_DIR .. "src/osd/modules/render",
43	45	MAME_DIR .. "3rdparty",
	46	MAME_DIR .. "3rdparty/winpcap/Include",
	47	MAME_DIR .. "3rdparty/bgfx/include",
	48	MAME_DIR .. "3rdparty/bx/include",
44	49	}
45	50
46	51	includedirs {
r245363	r245364
60	65	MAME_DIR .. "src/osd/windows/window.c",
61	66	MAME_DIR .. "src/osd/windows/winmenu.c",
62	67	MAME_DIR .. "src/osd/windows/winmain.c",
	68	MAME_DIR .. "src/osd/modules/debugger/none.c",
	69	MAME_DIR .. "src/osd/modules/debugger/debugint.c",
	70	MAME_DIR .. "src/osd/modules/debugger/debugwin.c",
	71	MAME_DIR .. "src/osd/modules/debugger/debugqt.c",
63	72	MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.c",
64	73	MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.c",
65	74	MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.c",
r245363	r245364
73	82	MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.c",
74	83	MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.c",
75	84	MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.c",
	85	MAME_DIR .. "src/osd/modules/render/drawogl.c",
	86	MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
	87	MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
	88	MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
	89	MAME_DIR .. "src/osd/modules/font/font_sdl.c",
	90	MAME_DIR .. "src/osd/modules/font/font_windows.c",
	91	MAME_DIR .. "src/osd/modules/font/font_osx.c",
	92	MAME_DIR .. "src/osd/modules/font/font_none.c",
	93	MAME_DIR .. "src/osd/modules/netdev/taptun.c",
	94	MAME_DIR .. "src/osd/modules/netdev/pcap.c",
	95	MAME_DIR .. "src/osd/modules/netdev/none.c",
	96	MAME_DIR .. "src/osd/modules/midi/portmidi.c",
	97	MAME_DIR .. "src/osd/modules/midi/none.c",
	98	MAME_DIR .. "src/osd/modules/sound/js_sound.c",
	99	MAME_DIR .. "src/osd/modules/sound/direct_sound.c",
	100	MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
	101	MAME_DIR .. "src/osd/modules/sound/none.c",
76	102	}
77	103
	104	if USE_BGFX == 1 then
	105	files {
	106	MAME_DIR .. "src/osd/modules/render/drawbgfx.c",
	107	}
	108	end
78	109
	110
79	111	project ("ocore_" .. _OPTIONS["osd"])
80	112	uuid (os.uuid("ocore_" .. _OPTIONS["osd"]))
81	113	kind "StaticLib"

trunk/scripts/src/osd/windows_cfg.lua

r245363	r245364
3	3	"_UNICODE",
4	4	"OSD_WINDOWS",
5	5	"USE_SDL=0",
	6	"USE_QTDEBUG=0",
	7	"USE_OPENGL=1",
	8	"USE_DISPATCH_GL=1",
	9	"DIRECTINPUT_VERSION=0x0800",
6	10	"main=utf8_main",
7	11	"_WIN32_WINNT=0x0501",
8	12	}

trunk/src/mame/audio/hng64.c

r245363	r245364
194	194	//  logerror("hng64_sound_port_0008_w %04x %04x\n", data, mem_mask);
195	195	// seems to one or more of the DMARQ on the V53, writes here when it expects DMA channel 3 to transfer ~0x20 bytes just after startup
196	196
197
	197	printf("transfer\n");
198	198	m_audiocpu->dreq3_w(data&1);
199	199	//  m_audiocpu->hack_w(1);
200	200
r245363	r245364
339	339	// these are very active, maybe they feed back into the v53 via one of the IRQ pins?  TM2 toggles more rapidly than TM1
340	340	//  logerror("tcu_tm1_cb %02x\n", state);
341	341	//m_audiocpu->set_input_line(5, state? ASSERT_LINE:CLEAR_LINE); // not accurate, just so we have a trigger
	342	/* Almost likely wrong */
	343	m_audiocpu->set_input_line(2, state? ASSERT_LINE :CLEAR_LINE);
	344
342	345	}
343	346
344	347	WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb)
r245363	r245364
347	350	//  logerror("tcu_tm2_cb %02x\n", state);
348	351
349	352	// NOT ACCURATE, just so that all the interrupts get triggered for now.
350		//static int i = 0;
351		//m_audiocpu->set_input_line(i, state? ASSERT_LINE:CLEAR_LINE);
	353	#if 0
	354	static int i;
	355	if(machine().input().code_pressed_once(KEYCODE_Z))
	356	i++;
	357
	358	if(machine().input().code_pressed_once(KEYCODE_X))
	359	i--;
	360
	361	if(i < 0)
	362	i = 0;
	363	if(i > 7)
	364	i = 7;
	365
	366	printf("trigger %02x %d\n",i,state);
	367
	368	//if(machine().input().code_pressed_once(KEYCODE_C))
	369	{
	370	m_audiocpu->set_input_line(i, state? ASSERT_LINE :CLEAR_LINE);
	371	}
352	372	//i++;
353	373	//if (i == 3) i = 0;
	374	#endif
354	375	}
355	376
356	377

trunk/src/mess/drivers/hh_tms1k.c

r245363	r245364
1344	1344	* TMS1470NLHL MP1133 (die labeled TMS1400 MP1133)
1345	1345	* 9digit 7seg VFD display + 8 LEDs(4 green, 4 yellow), no sound
1346	1346
1347		This is an astrological calculator, and also supports 4-function
1348		calculations. Refer to the official manual on how to use this device.
	1347	x
1349	1348
1350	1349	***************************************************************************/
1351	1350
1352		void hh_tms1k_state::astro_display()
1353		{
1354		// declare 7segs
1355		for (int y = 0; y < 9; y++)
1356		m_display_segmask[y] = 0xff;
1357
1358		display_matrix(8, 10, m_o, m_r);
1359		}
1360
1361	1351	WRITE16_MEMBER(hh_tms1k_state::astro_write_r)
1362	1352	{
1363		// R0-R7: input mux
1364		m_inp_mux = data & 0xff;
1365
1366		// R0-R9: select digit/leds
1367		m_r = data;
1368		astro_display();
1369	1353	}
1370	1354
1371	1355	WRITE16_MEMBER(hh_tms1k_state::astro_write_o)
1372	1356	{
1373		// O0-O7: digit segments/leds
1374		m_o = data;
1375		astro_display();
1376	1357	}
1377	1358
1378	1359	READ8_MEMBER(hh_tms1k_state::astro_read_k)
1379	1360	{
1380		return read_inputs(8);
	1361	return 0;
1381	1362	}
1382	1363
1383	1364
1384	1365	static INPUT_PORTS_START( astro )
1385		PORT_START("IN.0") // R0
1386		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("0")
1387		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("5")
1388		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE"/Sun")
1389		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
1390
1391		PORT_START("IN.1") // R1
1392		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("1")
1393		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("6")
1394		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME(UTF8_MULTIPLY"/Mercury")
1395		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
1396
1397		PORT_START("IN.2") // R2
1398		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("2")
1399		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD) PORT_NAME("7")
1400		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("-/Venus")
1401		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
1402
1403		PORT_START("IN.3") // R3
1404		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD) PORT_NAME("3")
1405		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_NAME("8")
1406		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("+/Mars")
1407		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
1408
1409		PORT_START("IN.4") // R4
1410		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("4")
1411		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9")
1412		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("=/Astro")
1413		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
1414
1415		PORT_START("IN.5") // R5
1416		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_NAME("B1")
1417		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_NAME("B2")
1418		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CODE(KEYCODE_DEL_PAD) PORT_NAME(".")
1419		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
1420
1421		PORT_START("IN.6") // R6
1422		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL) PORT_NAME("C")
1423		PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED )
1424
1425		PORT_START("IN.7") // R7
1426		PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNUSED )
1427		PORT_CONFNAME( 0x08, 0x08, "Mode" )
1428		PORT_CONFSETTING(    0x00, "Calculator" )
1429		PORT_CONFSETTING(    0x08, "Astro" )
1430	1366	INPUT_PORTS_END
1431	1367
1432	1368
1433	1369	static MACHINE_CONFIG_START( astro, hh_tms1k_state )
1434	1370
1435	1371	/* basic machine hardware */
1436		MCFG_CPU_ADD("maincpu", TMS1470, 450000) // approximation - RC osc. R=4.7K, C=33pf, but unknown RC curve
	1372	MCFG_CPU_ADD("maincpu", TMS1470, 400000) // approximation - RC osc. R=4.7K, C=33pf, but unknown RC curve
1437	1373	MCFG_TMS1XXX_READ_K_CB(READ8(hh_tms1k_state, astro_read_k))
1438	1374	MCFG_TMS1XXX_WRITE_R_CB(WRITE16(hh_tms1k_state, astro_write_r))
1439	1375	MCFG_TMS1XXX_WRITE_O_CB(WRITE16(hh_tms1k_state, astro_write_o))
r245363	r245364
1463	1399	Press the R key to start, followed by a set of unique numbers and E.
1464	1400	Refer to the official manual for more information.
1465	1401
	1402
1466	1403	***************************************************************************/
1467	1404
1468	1405	WRITE16_MEMBER(hh_tms1k_state::comp4_write_r)
r245363	r245364
2656	2593	CONS( 1979, starwbc,   0,        0, starwbc,   starwbc,   driver_device, 0, "Kenner", "Star Wars - Electronic Battle Command", GAME_SUPPORTS_SAVE )
2657	2594	CONS( 1979, starwbcp,  starwbc,  0, starwbc,   starwbc,   driver_device, 0, "Kenner", "Star Wars - Electronic Battle Command (prototype)", GAME_SUPPORTS_SAVE )
2658	2595
2659		COMP( 1979, astro,     0,        0, astro,     astro,     driver_device, 0, "Kosmos", "Astro", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )
	2596	COMP( 1979, astro,     0,        0, astro,     astro,     driver_device, 0, "Kosmos", "Astro", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW | GAME_NOT_WORKING )
2660	2597
2661	2598	CONS( 1977, comp4,     0,        0, comp4,     comp4,     driver_device, 0, "Milton Bradley", "Comp IV", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )
2662	2599	CONS( 1978, simon,     0,        0, simon,     simon,     driver_device, 0, "Milton Bradley", "Simon (Rev. A)", GAME_SUPPORTS_SAVE )

trunk/src/mess/drivers/ticalc1x.c

r245363	r245364
43	43	DECLARE_WRITE16_MEMBER(ti1270_write_r);
44	44	DECLARE_READ8_MEMBER(ti1270_read_k);
45	45
46		DECLARE_WRITE16_MEMBER(ti1000_write_o);
47		DECLARE_WRITE16_MEMBER(ti1000_write_r);
48		DECLARE_READ8_MEMBER(ti1000_read_k);
49
50	46	DECLARE_WRITE16_MEMBER(wizatron_write_o);
51	47	DECLARE_WRITE16_MEMBER(wizatron_write_r);
52	48	DECLARE_READ8_MEMBER(wizatron_read_k);
r245363	r245364
401	397
402	398	/***************************************************************************
403	399
404		TI-1000
405		* TMS1990 MCU labeled TMC1991NL, die labeled 1991-91A
406		* 8-digit 7seg LED display
407
408		***************************************************************************/
409
410		WRITE16_MEMBER(ticalc1x_state::ti1000_write_r)
411		{
412		// R0-R7: select digit (right-to-left)
413		UINT8 o = BITSWAP8(m_o,7,4,3,2,1,0,6,5);
414		display_matrix_seg(8, 8, o, data, 0xff);
415		}
416
417		WRITE16_MEMBER(ticalc1x_state::ti1000_write_o)
418		{
419		// O0-O3,O5(?): input mux
420		// O0-O7: digit segments
421		m_inp_mux = (data & 0xf) | (data >> 1 & 0x10);
422		m_o = data;
423		}
424
425		READ8_MEMBER(ticalc1x_state::ti1000_read_k)
426		{
427		return read_inputs(5);
428		}
429
430
431		static INPUT_PORTS_START( ti1000 )
432		PORT_START("IN.0") // O0
433		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("1")
434		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("2")
435		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD) PORT_NAME("3")
436		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("+")
437
438		PORT_START("IN.1") // O1
439		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("4")
440		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("5")
441		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("6")
442		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("-")
443
444		PORT_START("IN.2") // O2
445		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD) PORT_NAME("7")
446		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_NAME("8")
447		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9")
448		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME(UTF8_MULTIPLY)
449
450		// note: even though power buttons are on the matrix, they are not CPU-controlled
451		PORT_START("IN.3") // O3 or O4?
452		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Off") PORT_CHANGED_MEMBER(DEVICE_SELF, ticalc1x_state, power_button, (void *)false)
453		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_NAME("+/-")
454		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_NAME("%")
455		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE)
456
457		PORT_START("IN.4") // O5
458		PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGUP) PORT_CODE(KEYCODE_DEL) PORT_NAME("On/C") PORT_CHANGED_MEMBER(DEVICE_SELF, ticalc1x_state, power_button, (void *)true)
459		PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("0")
460		PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CODE(KEYCODE_DEL_PAD) PORT_NAME(".")
461		PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("=")
462		INPUT_PORTS_END
463
464
465		static MACHINE_CONFIG_START( ti1000, ticalc1x_state )
466
467		/* basic machine hardware */
468		MCFG_CPU_ADD("maincpu", TMS1990, 250000) // guessed
469		MCFG_TMS1XXX_READ_K_CB(READ8(ticalc1x_state, ti1000_read_k))
470		MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ticalc1x_state, ti1000_write_o))
471		MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ticalc1x_state, ti1000_write_r))
472
473		MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
474		MCFG_DEFAULT_LAYOUT(layout_ti1270)
475
476		/* no video! */
477
478		/* no sound! */
479		MACHINE_CONFIG_END
480
481
482
483
484
485		/***************************************************************************
486
487	400	TI WIZ-A-TRON
488	401	* TMS0970 MCU labeled TMC0907NL ZA0379, DP0907BS. die labeled 0970F-07B
489	402	* 9-digit 7seg LED display(one custom digit)
r245363	r245364
660	573
661	574	WRITE16_MEMBER(ticalc1x_state::lilprof78_write_o)
662	575	{
663		// O0-O3,O5(?): input mux
	576	// O0-O3,O5: input mux
664	577	// O0-O6: digit segments A-G
665	578	// O7: 6th digit
666	579	m_inp_mux = (data & 0xf) | (data >> 1 & 0x10);
r245363	r245364
743	656	m_display_segmask[0] = 0xe2;
744	657
745	658	// R0-R8: select digit
746		UINT8 o = BITSWAP8(m_o,7,5,2,1,4,0,6,3);
747		display_matrix_seg(8, 9, o, data, 0xff);
	659	display_matrix_seg(8, 9, BITSWAP8(m_o,7,5,2,1,4,0,6,3), data, 0xff);
748	660	}
749	661
750	662	WRITE16_MEMBER(ticalc1x_state::ti30_write_o)
r245363	r245364
1007	919	ROM_END
1008	920
1009	921
1010		ROM_START( ti1000 )
1011		ROM_REGION( 0x0400, "maincpu", 0 )
1012		ROM_LOAD( "tmc1991nl", 0x0000, 0x0400, CRC(2da5381d) SHA1(b5dc14553db2068ed48e130e5ec9109930d8cda9) )
1013
1014		ROM_REGION( 782, "maincpu:ipla", 0 )
1015		ROM_LOAD( "tms0970_ti1000_ipla.pla", 0, 782, CRC(05306ef8) SHA1(60a0a3c49ce330bce0c27f15f81d61461d0432ce) )
1016		ROM_REGION( 860, "maincpu:mpla", 0 )
1017		ROM_LOAD( "tms0970_ti1000_mpla.pla", 0, 860, CRC(7f50ab2e) SHA1(bff3be9af0e322986f6e545b567c97d70e135c93) )
1018		ROM_REGION( 352, "maincpu:opla", 0 )
1019		ROM_LOAD( "tms0970_ti1000_opla.pla", 0, 352, CRC(1d82061a) SHA1(90e4a4b0fb3b4ae5965da90479b7fed737ad8831) )
1020		ROM_REGION( 157, "maincpu:spla", 0 )
1021		ROM_LOAD( "tms0970_ti1000_spla.pla", 0, 157, CRC(234ca3a8) SHA1(76844dd87cb380a07c8fcbef143038087e98f138) )
1022		ROM_END
1023
1024
1025	922	ROM_START( wizatron )
1026	923	ROM_REGION( 0x0400, "maincpu", 0 )
1027	924	ROM_LOAD( "za0379", 0x0000, 0x0400, CRC(5a6af094) SHA1(b1f27e1f13f4db3b052dd50fb08dbf9c4d8db26e) )
r245363	r245364
1117	1014	COMP( 1975, tisr16ii,  0,        0, tisr16ii,  tisr16ii,  driver_device, 0, "Texas Instruments", "SR-16 II", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )
1118	1015
1119	1016	COMP( 1976, ti1270,    0,        0, ti1270,    ti1270,    driver_device, 0, "Texas Instruments", "TI-1270", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )
1120		COMP( 1977, ti1000,    0,        0, ti1000,    ti1000,    driver_device, 0, "Texas Instruments", "TI-1000", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )
1121	1017	COMP( 1977, wizatron,  0,        0, wizatron,  wizatron,  driver_device, 0, "Texas Instruments", "Wiz-A-Tron", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )
1122	1018	COMP( 1976, lilprof,   0,        0, lilprof,   lilprof,   driver_device, 0, "Texas Instruments", "Little Professor (1976 version)", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )
1123	1019	COMP( 1978, lilprof78, lilprof,  0, lilprof78, lilprof78, driver_device, 0, "Texas Instruments", "Little Professor (1978 version)", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )

trunk/src/mess/includes/hh_tms1k.h

r245363	r245364
101	101	DECLARE_WRITE16_MEMBER(starwbc_write_o);
102	102	DECLARE_READ8_MEMBER(starwbc_read_k);
103	103
104		void astro_display();
105	104	DECLARE_WRITE16_MEMBER(astro_write_r);
106	105	DECLARE_WRITE16_MEMBER(astro_write_o);
107	106	DECLARE_READ8_MEMBER(astro_read_k);

trunk/src/mess/layout/astro.lay

r245363	r245364
5	5
6	6	<element name="static_black"><rect><color red="0.0" green="0.0" blue="0.0" /></rect></element>
7	7
8		<element name="text_sun"><text string="SUN"><color red="0.66" green="0.66" blue="0.7" /></text></element>
9		<element name="text_mercury"><text string="MERCURY"><color red="0.66" green="0.66" blue="0.7" /></text></element>
10		<element name="text_venus"><text string="VENUS"><color red="0.66" green="0.66" blue="0.7" /></text></element>
11		<element name="text_mars"><text string="MARS"><color red="0.66" green="0.66" blue="0.7" /></text></element>
12	8
13		<element name="led_g" defstate="0">
14		<disk state="1"><color red="0.25" green="1.0" blue="0.25" /></disk>
15		<disk state="0"><color red="0.05" green="0.2" blue="0.05" /></disk>
16		</element>
17		<element name="led_y" defstate="0">
18		<disk state="1"><color red="1.0" green="1.0" blue="0.25" /></disk>
19		<disk state="0"><color red="0.2" green="0.2" blue="0.05" /></disk>
20		</element>
21
22		<element name="digit" defstate="0">
23		<led7seg><color red="0.2" green="1.0" blue="0.85" /></led7seg>
24		</element>
25
26
27	9	<!-- build screen -->
28	10
29	11	<view name="Internal Layout">
30		<bounds left="0" right="90" top="0" bottom="32" />
	12	<bounds left="0" right="47" top="0" bottom="53" />
31	13	<bezel element="static_black">
32		<bounds left="0" right="90" top="0" bottom="32" />
	14	<bounds left="0" right="47" top="0" bottom="53" />
33	15	</bezel>
34	16
35		<bezel name="digit0" element="digit"><bounds x="0" y="0" width="10" height="15" /></bezel>
36		<bezel name="digit1" element="digit"><bounds x="10" y="0" width="10" height="15" /></bezel>
37		<bezel name="digit2" element="digit"><bounds x="20" y="0" width="10" height="15" /></bezel>
38		<bezel name="digit3" element="digit"><bounds x="30" y="0" width="10" height="15" /></bezel>
39		<bezel name="digit4" element="digit"><bounds x="40" y="0" width="10" height="15" /></bezel>
40		<bezel name="digit5" element="digit"><bounds x="50" y="0" width="10" height="15" /></bezel>
41		<bezel name="digit6" element="digit"><bounds x="60" y="0" width="10" height="15" /></bezel>
42		<bezel name="digit7" element="digit"><bounds x="70" y="0" width="10" height="15" /></bezel>
43		<bezel name="digit8" element="digit"><bounds x="80" y="0" width="10" height="15" /></bezel>
44	17
45		<bezel element="text_sun"><bounds x="10" y="22" width="10" height="3" /></bezel>
46		<bezel element="text_mercury"><bounds x="30" y="22" width="10" height="3" /></bezel>
47		<bezel element="text_venus"><bounds x="50" y="22" width="10" height="3" /></bezel>
48		<bezel element="text_mars"><bounds x="70" y="22" width="10" height="3" /></bezel>
49
50		<bezel name="lamp90" element="led_g"><bounds x="10" y="27" width="4" height="4" /></bezel>
51		<bezel name="lamp91" element="led_y"><bounds x="15" y="27" width="4" height="4" /></bezel>
52
53		<bezel name="lamp92" element="led_g"><bounds x="30" y="27" width="4" height="4" /></bezel>
54		<bezel name="lamp93" element="led_y"><bounds x="35" y="27" width="4" height="4" /></bezel>
55
56		<bezel name="lamp94" element="led_g"><bounds x="50" y="27" width="4" height="4" /></bezel>
57		<bezel name="lamp95" element="led_y"><bounds x="55" y="27" width="4" height="4" /></bezel>
58
59		<bezel name="lamp96" element="led_g"><bounds x="70" y="27" width="4" height="4" /></bezel>
60		<bezel name="lamp97" element="led_y"><bounds x="75" y="27" width="4" height="4" /></bezel>
61
62
63	18	</view>
64	19	</mamelayout>

trunk/src/mess/mess.lst

r245363	r245364
1084	1084	tisr16    // 1974 SR-16
1085	1085	tisr16ii
1086	1086	ti1270
1087		ti1000
1088	1087	ti30      // 1976 TI-30
1089	1088	tiprog
1090	1089	tibusan1

trunk/src/osd/sdl/osdsdl.h

r245363	r245364
30	30	#define SDL13_COMBINE_RESIZE (0)
31	31	#endif
32	32
	33	#if defined(NO_DEBUGGER)
	34	#define SDLMAME_HAS_DEBUGGER            (0)
	35	#else
	36	#define SDLMAME_HAS_DEBUGGER            (1)
	37	#endif
	38
33	39	//============================================================
34	40	//  Defines
35	41	//============================================================

trunk/src/osd/sdl/sdlmain.c

r245363	r245364
397	397	MACRO_VERBOSE(LSB_FIRST);
398	398	MACRO_VERBOSE(PTR64);
399	399	MACRO_VERBOSE(MAME_DEBUG);
	400	MACRO_VERBOSE(NO_DEBUGBER);
400	401	MACRO_VERBOSE(BIGENDIAN);
401	402	MACRO_VERBOSE(CPP_COMPILE);
402	403	MACRO_VERBOSE(SYNC_IMPLEMENTATION);
r245363	r245364
598	599
599	600	defines_verbose();
600	601
	602	if (!SDLMAME_HAS_DEBUGGER)
	603	if (machine.debug_flags & DEBUG_FLAG_OSD_ENABLED)
	604	{
	605	osd_printf_error("sdlmame: -debug not supported on X11-less builds\n\n");
	606	osd_exit();
	607	exit(-1);
	608	}
	609
601	610	osd_common_t::init_subsystems();
602	611
603	612	if (options().oslog())

https://github.com/mamedev/mame/commit/782c39227f5271b4c599251f0c71c0ef024ac8b4

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team