ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaning up some Bizhawk.Emulation namespaces

This commit is contained in:
adelikat 2013-11-13 03:32:25 +00:00
parent e6f4213564
commit dd3df013fb
60 changed files with 114 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Client.Common/config/Config.cs
View File

@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Collections; using System.Collections;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
{ {
@ -618,7 +619,7 @@ namespace BizHawk.Client.Common
public bool GB_MulticartCompat = false; public bool GB_MulticartCompat = false;
public string GB_PaletteFile = ""; public string GB_PaletteFile = "";
public bool GB_AsSGB = false; public bool GB_AsSGB = false;
public Emulation.Consoles.GB.GBColors.ColorType CGBColors = Emulation.Consoles.GB.GBColors.ColorType.gambatte; public GBColors.ColorType CGBColors = GBColors.ColorType.gambatte;
//Dual Gb //Dual Gb

5
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -6,8 +6,9 @@ using System.Windows.Forms;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Calculator; using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Emulation.Consoles.GB; using BizHawk.Emulation.Cores.Atari.Atari2600;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Consoles.Nintendo.SNES; using BizHawk.Emulation.Consoles.Nintendo.SNES;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk

12
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -3,6 +3,10 @@ using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.GBA;
using BizHawk.Emulation.Consoles.Sega;
using BizHawk.Emulation.Consoles.Sega.Saturn;
using BizHawk.Emulation.Consoles.Sony.PSP;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -89,10 +93,10 @@ namespace BizHawk.Client.EmuHawk
public void LoadRecordMovieDialog() public void LoadRecordMovieDialog()
{ {
// put any BEETA quality cores here // put any BEETA quality cores here
if (Global.Emulator is Emulation.Consoles.Nintendo.GBA.GBA || if (Global.Emulator is GBA ||
Global.Emulator is Emulation.Consoles.Sega.Genesis || Global.Emulator is Genesis ||
Global.Emulator is Emulation.Consoles.Sega.Saturn.Yabause || Global.Emulator is Yabause ||
Global.Emulator is Emulation.Consoles.Sony.PSP.PSP) Global.Emulator is PSP)
{ {
var result = MessageBox.Show var result = MessageBox.Show
(this, "Thanks for using Bizhawk! The emulation core you have selected " + (this, "Thanks for using Bizhawk! The emulation core you have selected " +

14
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -13,13 +13,15 @@ using BizHawk.Client.Common;
using BizHawk.Emulation; using BizHawk.Emulation;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Computers.Commodore64; using BizHawk.Emulation.Cores.Computers.Commodore64;
using BizHawk.Emulation.Cores.Calculator; using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Emulation.Consoles.Coleco; using BizHawk.Emulation.Cores.Atari.Atari2600;
using BizHawk.Emulation.Consoles.GB; using BizHawk.Emulation.Cores.Atari.Atari7800;
using BizHawk.Emulation.Consoles.Intellivision; using BizHawk.Emulation.Cores.ColecoVision;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Intellivision;
using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Emulation.Consoles.Nintendo;
using BizHawk.Emulation.Consoles.Nintendo.GBA; using BizHawk.Emulation.Cores.Nintendo.GBA;
using BizHawk.Emulation.Consoles.Nintendo.N64; using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Emulation.Consoles.Nintendo.SNES; using BizHawk.Emulation.Consoles.Nintendo.SNES;
using BizHawk.Emulation.Consoles.Sega; using BizHawk.Emulation.Consoles.Sega;
using BizHawk.Emulation.Consoles.TurboGrafx; using BizHawk.Emulation.Consoles.TurboGrafx;

2
BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
View File

@ -1,9 +1,9 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Emulation.Consoles.GB;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {

6
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -3,12 +3,12 @@ using System.Windows.Forms;
using System.IO; using System.IO;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Consoles.GB; using BizHawk.Emulation.Cores.ColecoVision;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Consoles.Nintendo.SNES; using BizHawk.Emulation.Consoles.Nintendo.SNES;
using BizHawk.Emulation.Consoles.Sega; using BizHawk.Emulation.Consoles.Sega;
using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Emulation.Consoles.Nintendo;
using BizHawk.Emulation.Consoles.Coleco; using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Emulation.Consoles.Nintendo.N64;
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk

7
BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
View File

@ -5,6 +5,7 @@ using System.Windows.Forms;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -25,7 +26,7 @@ namespace BizHawk.Client.EmuHawk
// g' = 8.25g // g' = 8.25g
// b' = 8.25b // b' = 8.25b
Emulation.Consoles.GB.Gameboy gb; Gameboy gb;
// gambatte doesn't modify these memory locations unless you reconstruct, so we can store // gambatte doesn't modify these memory locations unless you reconstruct, so we can store
IntPtr vram; IntPtr vram;
@ -84,9 +85,9 @@ namespace BizHawk.Client.EmuHawk
public void Restart() public void Restart()
{ {
if (Global.Emulator is Emulation.Consoles.GB.Gameboy) if (Global.Emulator is Gameboy)
{ {
gb = Global.Emulator as Emulation.Consoles.GB.Gameboy; gb = Global.Emulator as Gameboy;
cgb = gb.IsCGBMode(); cgb = gb.IsCGBMode();
_lcdc = 0; _lcdc = 0;
if (!gb.GetGPUMemoryAreas(out vram, out bgpal, out sppal, out oam)) if (!gb.GetGPUMemoryAreas(out vram, out bgpal, out sppal, out oam))

8
BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
View File

@ -4,12 +4,14 @@ using System.Windows.Forms;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.GBA;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
public partial class GBAGPUView : Form, IToolForm public partial class GBAGPUView : Form, IToolForm
{ {
Emulation.Consoles.Nintendo.GBA.GBA gba; GBA gba;
// emulator memory areas // emulator memory areas
private IntPtr vram; private IntPtr vram;
@ -31,7 +33,7 @@ namespace BizHawk.Client.EmuHawk
InitializeComponent(); InitializeComponent();
// TODO: hook up something // TODO: hook up something
// we do this twice to avoid having to & 0x7fff with every color // we do this twice to avoid having to & 0x7fff with every color
int[] tmp = Emulation.Consoles.GB.GBColors.GetLut(Emulation.Consoles.GB.GBColors.ColorType.vivid); int[] tmp = GBColors.GetLut(GBColors.ColorType.vivid);
ColorConversion = new int[65536]; ColorConversion = new int[65536];
Buffer.BlockCopy(tmp, 0, ColorConversion, 0, sizeof(int) * tmp.Length); Buffer.BlockCopy(tmp, 0, ColorConversion, 0, sizeof(int) * tmp.Length);
Buffer.BlockCopy(tmp, 0, ColorConversion, sizeof(int) * tmp.Length, sizeof(int) * tmp.Length); Buffer.BlockCopy(tmp, 0, ColorConversion, sizeof(int) * tmp.Length, sizeof(int) * tmp.Length);
@ -678,7 +680,7 @@ namespace BizHawk.Client.EmuHawk
public void Restart() public void Restart()
{ {
gba = Global.Emulator as Emulation.Consoles.Nintendo.GBA.GBA; gba = Global.Emulator as GBA;
if (gba != null) if (gba != null)
{ {
gba.GetGPUMemoryAreas(out vram, out palram, out oam, out mmio); gba.GetGPUMemoryAreas(out vram, out palram, out oam, out mmio);

2
BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
View File

@ -2,7 +2,7 @@
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Emulation.Cores.Calculator; using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Client.Common; using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk

2
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -4,7 +4,7 @@ using System.Windows.Forms;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Consoles.Nintendo; using BizHawk.Emulation.Consoles.Nintendo;
using BizHawk.Emulation.Cores.Calculator; using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Emulation.Consoles.Nintendo.SNES; using BizHawk.Emulation.Consoles.Nintendo.SNES;
using BizHawk.Emulation.Consoles.Sega; using BizHawk.Emulation.Consoles.Sega;

3
BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
View File

@ -3,8 +3,9 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Emulation.Consoles.Nintendo.N64;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.N64;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {

2
BizHawk.Emulation/Calculator/TI83.cs
View File

@ -9,7 +9,7 @@ using BizHawk.Emulation.CPUs.Z80;
//http://www.ticalc.org/pub/text/calcinfo/ //http://www.ticalc.org/pub/text/calcinfo/
namespace BizHawk.Emulation.Cores.Calculator namespace BizHawk.Emulation.Cores.Calculators
{ {
public class TI83 : IEmulator public class TI83 : IEmulator
{ {

7
BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
View File

@ -1,11 +1,10 @@
using System; using System;
using BizHawk.Emulation.CPUs.M6502;
using BizHawk.Emulation.Consoles.Atari;
using BizHawk.Emulation.Consoles.Atari._2600;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.CPUs.M6502;
namespace BizHawk
namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
partial class Atari2600 partial class Atari2600
{ {

2
BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
View File

@ -5,7 +5,7 @@ using System.IO;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
public partial class Atari2600 : IEmulator public partial class Atari2600 : IEmulator
{ {

2
BizHawk.Emulation/Consoles/Atari/2600/M6532.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
// Emulates the M6532 RIOT Chip // Emulates the M6532 RIOT Chip
public class M6532 public class M6532

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
This is another 8K bankswitching method with two 4K banks. The rationale is that it's This is another 8K bankswitching method with two 4K banks. The rationale is that it's

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m2K.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
partial class Atari2600 partial class Atari2600
{ {

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
3E (Boulderdash 3E (Boulderdash

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
3F (Tigervision) 3F (Tigervision)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
class m3Fe : MapperBase class m3Fe : MapperBase
{ {

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
4A50 (no name) 4A50 (no name)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4K.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
partial class Atari2600 partial class Atari2600
{ {

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mCV.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
This was used by Commavid. It allowed for both ROM and RAM on the cartridge, This was used by Commavid. It allowed for both ROM and RAM on the cartridge,

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mDPC.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
partial class Atari2600 partial class Atari2600
{ {

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
E0 (Parker Bros) E0 (Parker Bros)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
E7 (M-Network) E7 (M-Network)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
EF (no name?) EF (no name?)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
F0 (Megaboy) F0 (Megaboy)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
F4 (Atari style 32K) F4 (Atari style 32K)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF6.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
F6 (Atari style 16K) F6 (Atari style 16K)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF8.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
partial class Atari2600 partial class Atari2600
{ {

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
FA (RAM Plus) FA (RAM Plus)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
FE (Activision special) FE (Activision special)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
MC (Megacart) MC (Megacart)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
UA (UA Ltd) UA (UA Ltd)

2
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Common; using BizHawk.Common;
namespace BizHawk.Emulation.Consoles.Atari._2600 namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
/* /*
X07 (Atariage) X07 (Atariage)

2
BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
View File

@ -4,7 +4,7 @@ using System.Collections.Generic;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Consoles.Atari namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
// Emulates the TIA // Emulates the TIA
public class TIA : IVideoProvider, ISoundProvider public class TIA : IVideoProvider, ISoundProvider

2
BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace BizHawk.Emulation.Consoles.Atari namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
// Emulates the TIA // Emulates the TIA
public class oldTIA public class oldTIA

2
BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using EMU7800.Core; using EMU7800.Core;
namespace BizHawk.Emulation namespace BizHawk.Emulation.Cores.Atari.Atari7800
{ {
partial class Atari7800 partial class Atari7800
{ {

2
BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
View File

@ -6,7 +6,7 @@ using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using EMU7800.Core; using EMU7800.Core;
namespace BizHawk.Emulation namespace BizHawk.Emulation.Cores.Atari.Atari7800
{ {
public partial class Atari7800 : IEmulator public partial class Atari7800 : IEmulator
{ {

2
BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
View File

@ -3,7 +3,7 @@
using EMU7800.Core; using EMU7800.Core;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation namespace BizHawk.Emulation.Cores.Atari.Atari7800
{ {
public class Atari7800Control public class Atari7800Control
{ {

2
BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
View File

@ -7,7 +7,7 @@ using BizHawk.Emulation.Common;
using BizHawk.Emulation.CPUs.Z80; using BizHawk.Emulation.CPUs.Z80;
using BizHawk.Emulation.Sound; using BizHawk.Emulation.Sound;
namespace BizHawk.Emulation.Consoles.Coleco namespace BizHawk.Emulation.Cores.ColecoVision
{ {
public sealed partial class ColecoVision : IEmulator public sealed partial class ColecoVision : IEmulator
{ {

2
BizHawk.Emulation/Consoles/Coleco/Input.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Consoles.Coleco namespace BizHawk.Emulation.Cores.ColecoVision
{ {
public partial class ColecoVision public partial class ColecoVision
{ {

48
BizHawk.Emulation/Consoles/Coleco/MemoryMap.cs
View File

@ -1,29 +1,29 @@
namespace BizHawk.Emulation.Consoles.Coleco namespace BizHawk.Emulation.Cores.ColecoVision
{ {
public partial class ColecoVision public partial class ColecoVision
{ {
public byte ReadMemory(ushort addr) public byte ReadMemory(ushort addr)
{ {
if (addr >= 0x8000) if (addr >= 0x8000)
return RomData[addr & 0x7FFF]; return RomData[addr & 0x7FFF];
if (addr >= 0x6000) if (addr >= 0x6000)
return Ram[addr & 1023]; return Ram[addr & 1023];
if (addr < 0x2000) if (addr < 0x2000)
return BiosRom[addr]; return BiosRom[addr];
//Console.WriteLine("Unhandled read at {0:X4}", addr); //Console.WriteLine("Unhandled read at {0:X4}", addr);
return 0xFF; return 0xFF;
} }
public void WriteMemory(ushort addr, byte value) public void WriteMemory(ushort addr, byte value)
{ {
if (addr >= 0x6000 && addr < 0x8000) if (addr >= 0x6000 && addr < 0x8000)
{ {
Ram[addr & 1023] = value; Ram[addr & 1023] = value;
return; return;
} }
//Console.WriteLine("Unhandled write at {0:X4}:{1:X2}", addr, value); //Console.WriteLine("Unhandled write at {0:X4}:{1:X2}", addr, value);
} }
} }
} }

2
BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
View File

@ -6,7 +6,7 @@ using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.CPUs.Z80; using BizHawk.Emulation.CPUs.Z80;
namespace BizHawk.Emulation.Consoles.Coleco namespace BizHawk.Emulation.Cores.ColecoVision
{ {
public sealed class TMS9918A : IVideoProvider public sealed class TMS9918A : IVideoProvider
{ {

2
BizHawk.Emulation/Consoles/Intellivision/Cartridge.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Emulation.Consoles.Intellivision namespace BizHawk.Emulation.Cores.Intellivision
{ {
public sealed class Cartridge : ICart public sealed class Cartridge : ICart
{ {

2
BizHawk.Emulation/Consoles/Intellivision/ICart.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Emulation.Consoles.Intellivision namespace BizHawk.Emulation.Cores.Intellivision
{ {
public interface ICart public interface ICart
{ {

2
BizHawk.Emulation/Consoles/Intellivision/Intellicart.cs
View File

@ -1,6 +1,6 @@
using System; using System;
namespace BizHawk.Emulation.Consoles.Intellivision namespace BizHawk.Emulation.Cores.Intellivision
{ {
public sealed class Intellicart : ICart public sealed class Intellicart : ICart
{ {

2
BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.CPUs.CP1610; using BizHawk.Emulation.CPUs.CP1610;
namespace BizHawk.Emulation.Consoles.Intellivision namespace BizHawk.Emulation.Cores.Intellivision
{ {
public sealed partial class Intellivision : IEmulator public sealed partial class Intellivision : IEmulator
{ {

2
BizHawk.Emulation/Consoles/Intellivision/MemoryMap.cs
View File

@ -1,4 +1,4 @@
namespace BizHawk.Emulation.Consoles.Intellivision namespace BizHawk.Emulation.Cores.Intellivision
{ {
public sealed partial class Intellivision public sealed partial class Intellivision
{ {

2
BizHawk.Emulation/Consoles/Intellivision/PSG.cs
View File

@ -1,6 +1,6 @@
using System; using System;
namespace BizHawk.Emulation.Consoles.Intellivision namespace BizHawk.Emulation.Cores.Intellivision
{ {
public sealed class PSG public sealed class PSG
{ {

2
BizHawk.Emulation/Consoles/Intellivision/STIC.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Consoles.Intellivision namespace BizHawk.Emulation.Cores.Intellivision
{ {
public sealed class STIC : IVideoProvider public sealed class STIC : IVideoProvider
{ {

2
BizHawk.Emulation/Consoles/Nintendo/GBA/LibMeteor.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace BizHawk.Emulation.Consoles.Nintendo.GBA namespace BizHawk.Emulation.Cores.Nintendo.GBA
{ {
/// <summary> /// <summary>
/// bindings into libmeteor.dll /// bindings into libmeteor.dll

2
BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
View File

@ -6,7 +6,7 @@ using System.IO;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Consoles.Nintendo.GBA namespace BizHawk.Emulation.Cores.Nintendo.GBA
{ {
public class GBA : IEmulator, IVideoProvider, ISyncSoundProvider public class GBA : IEmulator, IVideoProvider, ISyncSoundProvider
{ {

2
BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs
View File

@ -1,6 +1,6 @@
using System; using System;
namespace BizHawk.Emulation.Consoles.GB namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
public class GBColors public class GBColors
{ {

2
BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
View File

@ -5,7 +5,7 @@ using System.IO;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Consoles.GB namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
/// <summary> /// <summary>
/// a gameboy/gameboy color emulator wrapped around native C++ libgambatte /// a gameboy/gameboy color emulator wrapped around native C++ libgambatte

6
BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
View File

@ -6,7 +6,7 @@ using System.Linq;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Consoles.GB namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
public class GambatteLink : IEmulator, IVideoProvider, ISyncSoundProvider public class GambatteLink : IEmulator, IVideoProvider, ISyncSoundProvider
{ {
@ -31,8 +31,8 @@ namespace BizHawk.Emulation.Consoles.GB
const int SampPerFrame = 35112; const int SampPerFrame = 35112;
Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController LCont = new Nintendo.SNES.LibsnesCore.SnesSaveController(Gameboy.GbController); Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController LCont = new BizHawk.Emulation.Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController(Gameboy.GbController);
Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController RCont = new Nintendo.SNES.LibsnesCore.SnesSaveController(Gameboy.GbController); Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController RCont = new BizHawk.Emulation.Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController(Gameboy.GbController);
public GambatteLink(CoreComm comm, GameInfo leftinfo, byte[] leftrom, GameInfo rightinfo, byte[] rightrom) public GambatteLink(CoreComm comm, GameInfo leftinfo, byte[] leftrom, GameInfo rightinfo, byte[] rightrom)
{ {

2
BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace BizHawk.Emulation.Consoles.GB namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
/// <summary> /// <summary>
/// static bindings into libgambatte.dll /// static bindings into libgambatte.dll

2
BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
View File

@ -7,7 +7,7 @@ using System.Threading;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Consoles.Nintendo.N64 namespace BizHawk.Emulation.Cores.Nintendo.N64
{ {
public class N64 : IEmulator, IVideoProvider public class N64 : IEmulator, IVideoProvider
{ {

2
BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
View File

@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
namespace BizHawk.Emulation.Consoles.Nintendo.N64 namespace BizHawk.Emulation.Cores.Nintendo.N64
{ {
public class mupen64plusApi : IDisposable public class mupen64plusApi : IDisposable
{ {