Previous 199869 Revisions Next

r36071 Monday 23rd February, 2015 at 08:00:57 UTC by Guru
Merge pull request #142 from mzdmommy/patch-1

updated opwolf dipswitches
[/branches/kale/hash]microvision.xml
[/branches/kale/src/mess/drivers]tispeak.c
[/branches/kale/src/mess/layout]lantutor.lay snspell.lay
[/branches/kale/src/osd/sdl]input.c osdsdl.h sdlmain.c window.c
[/branches/kale/src/osd/windows]drawbgfx.c

branches/kale/hash/microvision.xml
r244582r244583
179179         <feature name="paddle" value="no" />
180180         <feature name="rc" value="100pf/39.4K" />
181181         <dataarea name="rom" size="2048">
182            <rom name="mp3496-n1_4064" size="2048" crc="83093475" sha1="1882330dc2215b6a658a5f251e037897a1b8a8d6" offset="0" />
182            <rom name="mp3496-n1_4064" size="2048" crc="77a8f71b" sha1="1f95ecf3b1ec6a17db92e1ae903be269aa0b47d8" offset="0" />
183183         </dataarea>
184184      </part>
185185   </software>
branches/kale/src/mess/drivers/tispeak.c
r244582r244583
162162      {
163163         output_set_digit_value(i, active_state[i] & 0x3fff);
164164
165         // lampxyy where x=digit, y=segment
165166         for (int j = 0; j < 0x10; j++)
166            output_set_lamp_value(i*0x10 + j, active_state[i] >> j & 1);
167            output_set_lamp_value(i*100 + j, active_state[i] >> j & 1);
167168      }
168169
169170   memcpy(m_display_cache, active_state, sizeof(m_display_cache));
r244582r244583
654655
655656ROM_START( snmatha )
656657   ROM_REGION( 0x1000, "maincpu", 0 )
657   ROM_LOAD( "us4946391_t2074", 0x0000, 0x1000, BAD_DUMP CRC(011f0c2d) SHA1(d2e14d72e03ca864abd51da78ffb71a9da82f624) ) // placeholder, use the one we have
658   ROM_LOAD( "cd2708n2l", 0x0000, 0x1000, CRC(35937360) SHA1(69c362c75bb459056c09c7fab37c91040485474b) )
658659
659660   ROM_REGION( 1246, "maincpu:ipla", 0 )
660661   ROM_LOAD( "tms0980_default_ipla.pla", 0, 1246, CRC(42db9a38) SHA1(2d127d98028ec8ec6ea10c179c25e447b14ba4d0) )
661662   ROM_REGION( 2127, "maincpu:mpla", 0 )
662   ROM_LOAD( "tms0270_cd2708_mpla.pla", 0, 2127, BAD_DUMP CRC(504b96bb) SHA1(67b691e7c0b97239410587e50e5182bf46475b43) ) // placeholder, use the one we have
663   ROM_LOAD( "tms0270_cd2708_mpla.pla", 0, 2127, CRC(504b96bb) SHA1(67b691e7c0b97239410587e50e5182bf46475b43) )
663664   ROM_REGION( 1246, "maincpu:opla", 0 )
664   ROM_LOAD( "tms0270_cd2708_opla.pla", 0, 1246, BAD_DUMP CRC(1abad753) SHA1(53d20b519ed73ce248368047a056836afbe3cd46) ) // placeholder, use the one we have
665   ROM_LOAD( "tms0270_cd2708_opla.pla", 0, 1246, CRC(1abad753) SHA1(53d20b519ed73ce248368047a056836afbe3cd46) )
665666
666667   ROM_REGION( 0x8000, "tms6100", 0 )
667668   ROM_LOAD( "cd2381.vsm", 0x0000, 0x4000, CRC(f048dc81) SHA1(e97667d1002de40ab3d702c63b82311480032e0f) )
r244582r244583
692693COMP( 1980, snspella,   snspell, 0, snspell,  snspell,  tispeak_state, snspell,  "Texas Instruments", "Speak & Spell (US set 2)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND )
693694COMP( 1978, snspelluk,  snspell, 0, snspell,  snspell,  tispeak_state, snspell,  "Texas Instruments", "Speak & Spell (UK set 1)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND )
694695COMP( 1981, snspelluka, snspell, 0, snspell,  snspell,  tispeak_state, snspell,  "Texas Instruments", "Speak & Spell (UK set 2)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) // different voice actor
695COMP( 1979, snspelljp,  snspell, 0, snspell,  snspell,  tispeak_state, snspell,  "Texas Instruments", "Speak & Spell (Japan)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND )
696COMP( 1979, snspelljp,  snspell, 0, snspell,  snspell,  tispeak_state, snspell,  "Texas Instruments", "Speak & Spell (Japan)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) // English words, but very low difficulty
696697COMP( 1980, ladictee,   snspell, 0, snspell,  snspell,  tispeak_state, snspell,  "Texas Instruments", "La Dictee Magique (France)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) // doesn't work due to missing CD2702 MCU dump, German version has CD2702 too
697698
698699COMP( 1980, snmath,     0,       0, snmath,   snmath,   driver_device, 0,        "Texas Instruments", "Speak & Math (US prototype)", GAME_IMPERFECT_SOUND ) // also US set 1
699COMP( 1986, snmatha,    snmath,  0, snmath,   snmath,   driver_device, 0,        "Texas Instruments", "Speak & Math (US set 2)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND )
700COMP( 1986, snmatha,    snmath,  0, snmath,   snmath,   driver_device, 0,        "Texas Instruments", "Speak & Math (US set 2)", GAME_IMPERFECT_SOUND )
700701
701702COMP( 1979, lantutor,   0,       0, lantutor, lantutor, tispeak_state, lantutor, "Texas Instruments", "Language Tutor (prototype)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND )
branches/kale/src/mess/layout/lantutor.lay
r244582r244583
3232      <bezel name="digit13" element="digit"><bounds x="99" y="4" width="10" height="15" /></bezel>
3333
3434      <bezel name="lamp14" element="triangle_mark"><bounds x="4" y="0" width="4" height="3" /></bezel>
35      <bezel name="lamp30" element="triangle_mark"><bounds x="15" y="0" width="4" height="3" /></bezel>
36      <bezel name="lamp46" element="triangle_mark"><bounds x="26" y="0" width="4" height="3" /></bezel>
37      <bezel name="lamp62" element="triangle_mark"><bounds x="37" y="0" width="4" height="3" /></bezel>
38      <bezel name="lamp78" element="triangle_mark"><bounds x="48" y="0" width="4" height="3" /></bezel>
39      <bezel name="lamp94" element="triangle_mark"><bounds x="59" y="0" width="4" height="3" /></bezel>
40      <bezel name="lamp110" element="triangle_mark"><bounds x="70" y="0" width="4" height="3" /></bezel>
41      <bezel name="lamp126" element="triangle_mark"><bounds x="81" y="0" width="4" height="3" /></bezel>
42      <bezel name="lamp142" element="triangle_mark"><bounds x="92" y="0" width="4" height="3" /></bezel>
43      <bezel name="lamp222" element="triangle_mark"><bounds x="103" y="0" width="4" height="3" /></bezel>
35      <bezel name="lamp114" element="triangle_mark"><bounds x="15" y="0" width="4" height="3" /></bezel>
36      <bezel name="lamp214" element="triangle_mark"><bounds x="26" y="0" width="4" height="3" /></bezel>
37      <bezel name="lamp314" element="triangle_mark"><bounds x="37" y="0" width="4" height="3" /></bezel>
38      <bezel name="lamp414" element="triangle_mark"><bounds x="48" y="0" width="4" height="3" /></bezel>
39      <bezel name="lamp514" element="triangle_mark"><bounds x="59" y="0" width="4" height="3" /></bezel>
40      <bezel name="lamp614" element="triangle_mark"><bounds x="70" y="0" width="4" height="3" /></bezel>
41      <bezel name="lamp714" element="triangle_mark"><bounds x="81" y="0" width="4" height="3" /></bezel>
42      <bezel name="lamp814" element="triangle_mark"><bounds x="92" y="0" width="4" height="3" /></bezel>
43      <bezel name="lamp1314" element="triangle_mark"><bounds x="103" y="0" width="4" height="3" /></bezel>
4444
4545   </view>
4646</mamelayout>
branches/kale/src/mess/layout/snspell.lay
r244582r244583
3434      <bezel name="lamp15" element="lamp_ap"><bounds x="10.5" y="0" width="0.5" height="3.5" /></bezel>
3535
3636      <bezel name="digit1" element="digit"><bounds x="11" y="0" width="10" height="15" /></bezel>
37      <bezel name="lamp30" element="lamp_dp"><bounds x="20" y="13.5" width="1.5" height="1.5" /></bezel>
38      <bezel name="lamp31" element="lamp_ap"><bounds x="21.5" y="0" width="0.5" height="3.5" /></bezel>
37      <bezel name="lamp114" element="lamp_dp"><bounds x="20" y="13.5" width="1.5" height="1.5" /></bezel>
38      <bezel name="lamp115" element="lamp_ap"><bounds x="21.5" y="0" width="0.5" height="3.5" /></bezel>
3939
4040      <bezel name="digit2" element="digit"><bounds x="22" y="0" width="10" height="15" /></bezel>
41      <bezel name="lamp46" element="lamp_dp"><bounds x="31" y="13.5" width="1.5" height="1.5" /></bezel>
42      <bezel name="lamp47" element="lamp_ap"><bounds x="32.5" y="0" width="0.5" height="3.5" /></bezel>
41      <bezel name="lamp214" element="lamp_dp"><bounds x="31" y="13.5" width="1.5" height="1.5" /></bezel>
42      <bezel name="lamp215" element="lamp_ap"><bounds x="32.5" y="0" width="0.5" height="3.5" /></bezel>
4343
4444      <bezel name="digit3" element="digit"><bounds x="33" y="0" width="10" height="15" /></bezel>
45      <bezel name="lamp62" element="lamp_dp"><bounds x="42" y="13.5" width="1.5" height="1.5" /></bezel>
46      <bezel name="lamp63" element="lamp_ap"><bounds x="43.5" y="0" width="0.5" height="3.5" /></bezel>
45      <bezel name="lamp314" element="lamp_dp"><bounds x="42" y="13.5" width="1.5" height="1.5" /></bezel>
46      <bezel name="lamp315" element="lamp_ap"><bounds x="43.5" y="0" width="0.5" height="3.5" /></bezel>
4747
4848      <bezel name="digit4" element="digit"><bounds x="44" y="0" width="10" height="15" /></bezel>
49      <bezel name="lamp78" element="lamp_dp"><bounds x="53" y="13.5" width="1.5" height="1.5" /></bezel>
50      <bezel name="lamp79" element="lamp_ap"><bounds x="54.5" y="0" width="0.5" height="3.5" /></bezel>
49      <bezel name="lamp414" element="lamp_dp"><bounds x="53" y="13.5" width="1.5" height="1.5" /></bezel>
50      <bezel name="lamp415" element="lamp_ap"><bounds x="54.5" y="0" width="0.5" height="3.5" /></bezel>
5151
5252      <bezel name="digit5" element="digit"><bounds x="55" y="0" width="10" height="15" /></bezel>
53      <bezel name="lamp94" element="lamp_dp"><bounds x="64" y="13.5" width="1.5" height="1.5" /></bezel>
54      <bezel name="lamp95" element="lamp_ap"><bounds x="65.5" y="0" width="0.5" height="3.5" /></bezel>
53      <bezel name="lamp514" element="lamp_dp"><bounds x="64" y="13.5" width="1.5" height="1.5" /></bezel>
54      <bezel name="lamp515" element="lamp_ap"><bounds x="65.5" y="0" width="0.5" height="3.5" /></bezel>
5555
5656      <bezel name="digit6" element="digit"><bounds x="66" y="0" width="10" height="15" /></bezel>
57      <bezel name="lamp110" element="lamp_dp"><bounds x="75" y="13.5" width="1.5" height="1.5" /></bezel>
58      <bezel name="lamp111" element="lamp_ap"><bounds x="76.5" y="0" width="0.5" height="3.5" /></bezel>
57      <bezel name="lamp614" element="lamp_dp"><bounds x="75" y="13.5" width="1.5" height="1.5" /></bezel>
58      <bezel name="lamp615" element="lamp_ap"><bounds x="76.5" y="0" width="0.5" height="3.5" /></bezel>
5959
6060      <bezel name="digit7" element="digit"><bounds x="77" y="0" width="10" height="15" /></bezel>
61      <bezel name="lamp126" element="lamp_dp"><bounds x="86" y="13.5" width="1.5" height="1.5" /></bezel>
62      <bezel name="lamp127" element="lamp_ap"><bounds x="87.5" y="0" width="0.5" height="3.5" /></bezel>
61      <bezel name="lamp714" element="lamp_dp"><bounds x="86" y="13.5" width="1.5" height="1.5" /></bezel>
62      <bezel name="lamp715" element="lamp_ap"><bounds x="87.5" y="0" width="0.5" height="3.5" /></bezel>
6363
6464      <bezel name="digit8" element="digit"><bounds x="88" y="0" width="10" height="15" /></bezel>
65      <bezel name="lamp142" element="lamp_dp"><bounds x="97" y="13.5" width="1.5" height="1.5" /></bezel>
66      <bezel name="lamp143" element="lamp_ap"><bounds x="98.5" y="0" width="0.5" height="3.5" /></bezel>
65      <bezel name="lamp814" element="lamp_dp"><bounds x="97" y="13.5" width="1.5" height="1.5" /></bezel>
66      <bezel name="lamp815" element="lamp_ap"><bounds x="98.5" y="0" width="0.5" height="3.5" /></bezel>
6767
6868   </view>
6969</mamelayout>
branches/kale/src/osd/sdl/input.c
r244582r244583
15831583      }
15841584      osd_lock_release(input_lock);
15851585   }
1586   else
1587      SDL_PumpEvents();
15861588}
15871589
15881590
branches/kale/src/osd/sdl/osdsdl.h
r244582r244583
1313//  System dependent defines
1414//============================================================
1515
16// Process events in worker thread
17#if defined(SDLMAME_WIN32) || ((SDLMAME_SDL2) && (!defined(SDLMAME_EMSCRIPTEN)) && (!defined(SDLMAME_MACOSX)))
18#define SDLMAME_EVENTS_IN_WORKER_THREAD (1)
19#else
20#define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
21#endif
2216
2317#if defined(SDLMAME_WIN32)
2418   #if (SDLMAME_SDL2)
25      #define SDLMAME_INIT_IN_WORKER_THREAD   (0) //FIXME: breaks mt
26      #define SDL13_COMBINE_RESIZE (1)
19      #define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
20      #define SDLMAME_INIT_IN_WORKER_THREAD   (0)
21      #define SDL13_COMBINE_RESIZE (0) //(1) no longer needed
2722   #else
23      #define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
2824      #define SDLMAME_INIT_IN_WORKER_THREAD   (1)
2925      #define SDL13_COMBINE_RESIZE (0)
3026   #endif
3127#else
28   #define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
3229   #define SDLMAME_INIT_IN_WORKER_THREAD   (0)
3330   #define SDL13_COMBINE_RESIZE (0)
3431#endif
branches/kale/src/osd/sdl/sdlmain.c
r244582r244583
263263{
264264   int res = 0;
265265
266#if defined(SDLMAME_X11) && !(SDLMAME_SDL2)
267   XInitThreads();
268#endif
269
266270#if defined(SDLMAME_WIN32)
267271#if !(SDLMAME_SDL2)
268272   /* Load SDL dynamic link library */
branches/kale/src/osd/sdl/window.c
r244582r244583
561561   window->renderer().destroy();
562562
563563#if (SDLMAME_SDL2)
564   if (window->fullscreen() && video_config.switchres)
564   bool is_osx = false;
565#ifdef SDLMAME_MACOSX
566   // FIXME: This is weird behaviour and certainly a bug in SDL
567   is_osx = true;
568#endif
569   if (window->fullscreen() && (video_config.switchres || is_osx))
565570   {
566571      SDL_SetWindowFullscreen(window->sdl_window(), 0);    // Try to set mode
567572      SDL_SetWindowDisplayMode(window->sdl_window(), &window->m_original_mode);    // Try to set mode
r244582r244583
12241229      window->m_extra_flags |= SDL_ASYNCBLIT;
12251230
12261231   if (window->renderer().has_flags(osd_renderer::FLAG_NEEDS_OPENGL))
1227 {
1232   {
12281233      window->m_extra_flags |= SDL_DOUBLEBUF | SDL_OPENGL;
12291234      SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
12301235      #if (SDL_VERSION_ATLEAST(1,2,10)) && (!defined(SDLMAME_EMSCRIPTEN))
12311236      SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, video_config.waitvsync ? 1 : 0);
12321237      #endif
1233         //load_gl_lib(window->machine());
1234 }
1238      //   load_gl_lib(window->machine());
1239   }
12351240
12361241   // create the SDL surface (which creates the window in windowed mode)
1242#if 0
12371243   window->m_sdlsurf = SDL_SetVideoMode(tempwidth, tempheight,
1244                     0, SDL_OPENGL | SDL_FULLSCREEN);// | window->m_extra_flags);
1245   if (!window->m_sdlsurf)
1246      printf("completely failed\n");
1247#endif
1248   window->m_sdlsurf = SDL_SetVideoMode(tempwidth, tempheight,
12381249                     0, SDL_SWSURFACE  | SDL_ANYFORMAT | window->m_extra_flags);
12391250
12401251   if (!window->m_sdlsurf)
1252   {
1253      osd_printf_error("SDL Error: %s\n", SDL_GetError());
12411254      return (void *) &result[1];
1255   }
12421256   if ( (video_config.mode  == VIDEO_MODE_OPENGL) && !(window->m_sdlsurf->flags & SDL_OPENGL) )
12431257   {
12441258      osd_printf_error("OpenGL not supported on this driver!\n");
12451259      return (void *) &result[1];
12461260   }
1247
12481261   // set the window title
12491262   SDL_WM_SetCaption(window->m_title, "SDLMAME");
12501263#endif
branches/kale/src/osd/windows/drawbgfx.c
r244582r244583
3232
3333   virtual int create();
3434   virtual render_primitive_list *get_primitives();
35   virtual int draw(int update);
35   virtual int draw(const int update);
3636   virtual void save() {};
3737   virtual void record() {};
3838   virtual void toggle_fsfx() {};

https://github.com/mamedev/mame/commit/1b1513df66fd1b05d9ac02b37b6f3f938b47f728

Previous 199869 Revisions Next

© 1997-2024 The MAME Team