OSDN Git Service

[VM][General] Merge upstream 2016-02-13. Still don't implement OSD/Gui part of joysti...
authorK.Ohta <whatisthis.sowhat@gmail.com>
Mon, 15 Feb 2016 17:38:38 +0000 (02:38 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Mon, 15 Feb 2016 17:38:38 +0000 (02:38 +0900)
commit2fc3688fce9d88e48aebd26b694fd2bb143a2574
tree80a3766cb6e36697be51a426630fb654864f9072
parent7193d07172d95e957c3e4c3e58f793931ad57e5b
[VM][General] Merge upstream 2016-02-13. Still don't implement OSD/Gui part of joystick(s).
327 files changed:
history.txt
source/multi8.vcproj
source/src/common.cpp
source/src/common.h
source/src/config.cpp
source/src/config.h
source/src/debugger.cpp
source/src/emu.cpp
source/src/emu.h
source/src/qt/common/emu_thread.cpp
source/src/qt/common/emu_thread.h
source/src/qt/common/qt_main.cpp
source/src/qt/gui/mainwidget.h
source/src/qt/gui/sound_dialog.cpp
source/src/qt/gui/sound_dialog.h
source/src/qt/machines/fm7/MainWindow.cpp
source/src/qt/osd.h
source/src/qt/osd_input.cpp
source/src/res/bmjr.rc
source/src/res/ex80.rc
source/src/res/familybasic.rc
source/src/res/fm16pi.rc
source/src/res/fm7.rc
source/src/res/fm77.rc
source/src/res/fm77av.rc
source/src/res/fm77av40.rc
source/src/res/fm77av40ex.rc
source/src/res/fmr30.rc
source/src/res/fmr50_i286.rc
source/src/res/fmr50_i386.rc
source/src/res/fmr50_i486.rc
source/src/res/fmr60.rc
source/src/res/fmr70.rc
source/src/res/fmr80.rc
source/src/res/fp1100.rc
source/src/res/fp200.rc
source/src/res/gamegear.rc
source/src/res/hc20.rc
source/src/res/hc40.rc
source/src/res/hc80.rc
source/src/res/j3100.rc
source/src/res/jr100.rc
source/src/res/jx.rc
source/src/res/m5.rc
source/src/res/map1010.rc
source/src/res/mastersystem.rc
source/src/res/msx1.rc
source/src/res/msx2.rc
source/src/res/multi8.rc
source/src/res/mycomz80a.rc
source/src/res/mz1200.rc
source/src/res/mz1500.rc
source/src/res/mz2200.rc
source/src/res/mz2500.rc
source/src/res/mz2800.rc
source/src/res/mz3500.rc
source/src/res/mz5500.rc
source/src/res/mz6500.rc
source/src/res/mz6550.rc
source/src/res/mz700.rc
source/src/res/mz800.rc
source/src/res/mz80a.rc
source/src/res/mz80b.rc
source/src/res/mz80k.rc
source/src/res/n5200.rc
source/src/res/pasopia.rc
source/src/res/pasopia7.rc
source/src/res/pc100.rc
source/src/res/pc6001.rc
source/src/res/pc6001mk2.rc
source/src/res/pc6001mk2sr.rc
source/src/res/pc6601.rc
source/src/res/pc6601sr.rc
source/src/res/pc8001mk2sr.rc
source/src/res/pc8201.rc
source/src/res/pc8801ma.rc
source/src/res/pc9801.rc
source/src/res/pc9801e.rc
source/src/res/pc9801u.rc
source/src/res/pc9801vf.rc
source/src/res/pc9801vm.rc
source/src/res/pc98do.rc
source/src/res/pc98ha.rc
source/src/res/pc98lt.rc
source/src/res/pcengine.rc
source/src/res/phc20.rc
source/src/res/phc25.rc
source/src/res/pv1000.rc
source/src/res/pv2000.rc
source/src/res/px7.rc
source/src/res/pyuta.rc
source/src/res/qc10.rc
source/src/res/qc10cms.rc
source/src/res/resource.h
source/src/res/rx78.rc
source/src/res/sc3000.rc
source/src/res/scv.rc
source/src/res/smc777.rc
source/src/res/tk80bs.rc
source/src/res/x07.rc
source/src/res/x1.rc
source/src/res/x1turbo.rc
source/src/res/x1turboz.rc
source/src/res/x1twin.rc
source/src/res/z80tvgame.rc
source/src/vm/beep.cpp
source/src/vm/beep.h
source/src/vm/bmjr/bmjr.cpp
source/src/vm/bmjr/bmjr.h
source/src/vm/bmjr/memory.cpp
source/src/vm/bmjr/memory.h
source/src/vm/datarec.cpp
source/src/vm/datarec.h
source/src/vm/device.h
source/src/vm/disk.cpp
source/src/vm/disk.h
source/src/vm/ex80/ex80.cpp
source/src/vm/ex80/ex80.h
source/src/vm/ex80/keyboard.cpp
source/src/vm/familybasic/apu.cpp
source/src/vm/familybasic/apu.h
source/src/vm/familybasic/familybasic.cpp
source/src/vm/familybasic/familybasic.h
source/src/vm/familybasic/memory.h
source/src/vm/fm16pi/fm16pi.cpp
source/src/vm/fm16pi/fm16pi.h
source/src/vm/fm7/fm7.cpp
source/src/vm/fm7/fm7.h
source/src/vm/fm7/joystick.h
source/src/vm/fmr30/fmr30.cpp
source/src/vm/fmr30/fmr30.h
source/src/vm/fmr50/fmr50.cpp
source/src/vm/fmr50/fmr50.h
source/src/vm/fp1100/fp1100.cpp
source/src/vm/fp1100/fp1100.h
source/src/vm/fp1100/sub.h
source/src/vm/fp200/fp200.cpp
source/src/vm/fp200/fp200.h
source/src/vm/fp200/io.h
source/src/vm/gamegear/gamegear.cpp
source/src/vm/gamegear/gamegear.h
source/src/vm/gamegear/keyboard.h
source/src/vm/gamegear/mastersystem.cpp
source/src/vm/gamegear/mastersystem.h
source/src/vm/gamegear/system.cpp
source/src/vm/hc20/hc20.cpp
source/src/vm/hc20/hc20.h
source/src/vm/hc40/hc40.cpp
source/src/vm/hc40/hc40.h
source/src/vm/hc80/hc80.cpp
source/src/vm/hc80/hc80.h
source/src/vm/j3100/j3100.cpp
source/src/vm/j3100/j3100.h
source/src/vm/jr100/jr100.cpp
source/src/vm/jr100/jr100.h
source/src/vm/jr100/memory.h
source/src/vm/jx/jx.cpp
source/src/vm/jx/jx.h
source/src/vm/ld700.cpp
source/src/vm/ld700.h
source/src/vm/m5/cmt.h
source/src/vm/m5/keyboard.h
source/src/vm/m5/m5.cpp
source/src/vm/m5/m5.h
source/src/vm/mame/emu/cpu/tms9900/9900dasm.c [new file with mode: 0644]
source/src/vm/mame/emu/cpu/tms9900/readme_takeda.txt [new file with mode: 0644]
source/src/vm/mb8877.cpp
source/src/vm/msx/joystick.h
source/src/vm/msx/keyboard.h
source/src/vm/msx/msx.cpp
source/src/vm/msx/msx.h
source/src/vm/multi8/keyboard.h
source/src/vm/multi8/multi8.cpp
source/src/vm/multi8/multi8.h
source/src/vm/mycomz80a/keyboard.h
source/src/vm/mycomz80a/mycomz80a.cpp
source/src/vm/mycomz80a/mycomz80a.h
source/src/vm/mz1p17.cpp
source/src/vm/mz2500/joystick.cpp
source/src/vm/mz2500/joystick.h
source/src/vm/mz2500/keyboard.cpp
source/src/vm/mz2500/keyboard.h
source/src/vm/mz2500/memory80b.cpp
source/src/vm/mz2500/memory80b.h
source/src/vm/mz2500/mouse.h
source/src/vm/mz2500/mz2500.cpp
source/src/vm/mz2500/mz2500.h
source/src/vm/mz2500/mz80b.cpp
source/src/vm/mz2500/mz80b.h
source/src/vm/mz2800/joystick.cpp
source/src/vm/mz2800/joystick.h
source/src/vm/mz2800/keyboard.h
source/src/vm/mz2800/mouse.h
source/src/vm/mz2800/mz2800.cpp
source/src/vm/mz2800/mz2800.h
source/src/vm/mz3500/keyboard.h
source/src/vm/mz3500/mz3500.cpp
source/src/vm/mz3500/mz3500.h
source/src/vm/mz5500/keyboard.h
source/src/vm/mz5500/mz5500.cpp
source/src/vm/mz5500/mz5500.h
source/src/vm/mz700/keyboard.h
source/src/vm/mz700/mz700.cpp
source/src/vm/mz700/mz700.h
source/src/vm/mz80k/keyboard.cpp
source/src/vm/mz80k/keyboard.h
source/src/vm/mz80k/mz80k.cpp
source/src/vm/mz80k/mz80k.h
source/src/vm/n5200/n5200.cpp
source/src/vm/n5200/n5200.h
source/src/vm/pasopia/joypac2.h
source/src/vm/pasopia/keyboard.h
source/src/vm/pasopia/pasopia.cpp
source/src/vm/pasopia/pasopia.h
source/src/vm/pasopia7/joypac2.h
source/src/vm/pasopia7/keyboard.h
source/src/vm/pasopia7/pasopia7.cpp
source/src/vm/pasopia7/pasopia7.h
source/src/vm/pc100/ioctrl.h
source/src/vm/pc100/pc100.cpp
source/src/vm/pc100/pc100.h
source/src/vm/pc6001/joystick.h
source/src/vm/pc6001/pc6001.cpp
source/src/vm/pc6001/pc6001.h
source/src/vm/pc6001/psub.cpp
source/src/vm/pc6001/psub.h
source/src/vm/pc6001/sub.h
source/src/vm/pc8201/keyboard.h
source/src/vm/pc8201/pc8201.cpp
source/src/vm/pc8201/pc8201.h
source/src/vm/pc8801/pc88.h
source/src/vm/pc8801/pc8801.cpp
source/src/vm/pc8801/pc8801.h
source/src/vm/pc9801/fmsound.cpp
source/src/vm/pc9801/fmsound.h
source/src/vm/pc9801/joystick.h
source/src/vm/pc9801/mouse.h
source/src/vm/pc9801/pc9801.cpp
source/src/vm/pc9801/pc9801.h
source/src/vm/pc98ha/pc98ha.cpp
source/src/vm/pc98ha/pc98ha.h
source/src/vm/pcengine/pce.cpp
source/src/vm/pcengine/pce.h
source/src/vm/pcengine/pcengine.cpp
source/src/vm/pcengine/pcengine.h
source/src/vm/pcm1bit.cpp
source/src/vm/pcm1bit.h
source/src/vm/phc20/memory.h
source/src/vm/phc20/phc20.cpp
source/src/vm/phc20/phc20.h
source/src/vm/phc25/joystick.h
source/src/vm/phc25/keyboard.h
source/src/vm/phc25/phc25.cpp
source/src/vm/phc25/phc25.h
source/src/vm/prnfile.cpp
source/src/vm/pv1000/joystick.h
source/src/vm/pv1000/psg.cpp
source/src/vm/pv1000/psg.h
source/src/vm/pv1000/pv1000.cpp
source/src/vm/pv1000/pv1000.h
source/src/vm/pv2000/keyboard.h
source/src/vm/pv2000/pv2000.cpp
source/src/vm/pv2000/pv2000.h
source/src/vm/pyuta/memory.h
source/src/vm/pyuta/pyuta.cpp
source/src/vm/pyuta/pyuta.h
source/src/vm/qc10/keyboard.h
source/src/vm/qc10/qc10.cpp
source/src/vm/qc10/qc10.h
source/src/vm/rx78/keyboard.h
source/src/vm/rx78/rx78.cpp
source/src/vm/rx78/rx78.h
source/src/vm/sc3000/keyboard.h
source/src/vm/sc3000/sc3000.cpp
source/src/vm/sc3000/sc3000.h
source/src/vm/scv/io.h
source/src/vm/scv/scv.cpp
source/src/vm/scv/scv.h
source/src/vm/scv/sound.cpp
source/src/vm/scv/sound.h
source/src/vm/smc777/io.cpp
source/src/vm/smc777/io.h
source/src/vm/smc777/smc777.cpp
source/src/vm/smc777/smc777.h
source/src/vm/sn76489an.cpp
source/src/vm/sn76489an.h
source/src/vm/t3444a.cpp
source/src/vm/tk80bs/keyboard.h
source/src/vm/tk80bs/tk80bs.cpp
source/src/vm/tk80bs/tk80bs.h
source/src/vm/tms3631.cpp
source/src/vm/tms3631.h
source/src/vm/upd7752.cpp
source/src/vm/upd7752.h
source/src/vm/x07/x07.cpp
source/src/vm/x07/x07.h
source/src/vm/x1/joystick.h
source/src/vm/x1/keyboard.cpp
source/src/vm/x1/keyboard.h
source/src/vm/x1/mouse.h
source/src/vm/x1/psub.h
source/src/vm/x1/x1.cpp
source/src/vm/x1/x1.h
source/src/vm/ym2151.cpp
source/src/vm/ym2151.h
source/src/vm/ym2203.cpp
source/src/vm/ym2203.h
source/src/vm/ym2413.cpp
source/src/vm/ym2413.h
source/src/vm/ys6464a/keyboard.h
source/src/vm/z80tvgame/joystick.h
source/src/vm/z80tvgame/z80tvgame.cpp
source/src/vm/z80tvgame/z80tvgame.h
source/src/win32/osd.h
source/src/win32/osd_input.cpp
source/src/winmain.cpp
source/tool/mz80k/Form1.Designer.vb [new file with mode: 0644]
source/tool/mz80k/Form1.resx [new file with mode: 0644]
source/tool/mz80k/Form1.vb [new file with mode: 0644]
source/tool/mz80k/My Project/Application.Designer.vb [new file with mode: 0644]
source/tool/mz80k/My Project/Application.myapp [new file with mode: 0644]
source/tool/mz80k/My Project/AssemblyInfo.vb [new file with mode: 0644]
source/tool/mz80k/My Project/Resources.Designer.vb [new file with mode: 0644]
source/tool/mz80k/My Project/Resources.resx [new file with mode: 0644]
source/tool/mz80k/My Project/Settings.Designer.vb [new file with mode: 0644]
source/tool/mz80k/My Project/Settings.settings [new file with mode: 0644]
source/tool/mz80k/mz80k_kbd.vbproj [new file with mode: 0644]