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

View File

@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Collections;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.Common
{
@ -618,7 +619,7 @@ namespace BizHawk.Client.Common
public bool GB_MulticartCompat = false;
public string GB_PaletteFile = "";
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

View File

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

View File

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

View File

@ -13,13 +13,15 @@ using BizHawk.Client.Common;
using BizHawk.Emulation;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Computers.Commodore64;
using BizHawk.Emulation.Cores.Calculator;
using BizHawk.Emulation.Consoles.Coleco;
using BizHawk.Emulation.Consoles.GB;
using BizHawk.Emulation.Consoles.Intellivision;
using BizHawk.Emulation.Cores.Calculators;
using BizHawk.Emulation.Cores.Atari.Atari2600;
using BizHawk.Emulation.Cores.Atari.Atari7800;
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.GBA;
using BizHawk.Emulation.Consoles.Nintendo.N64;
using BizHawk.Emulation.Cores.Nintendo.GBA;
using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Emulation.Consoles.Nintendo.SNES;
using BizHawk.Emulation.Consoles.Sega;
using BizHawk.Emulation.Consoles.TurboGrafx;

View File

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

View File

@ -3,12 +3,12 @@ using System.Windows.Forms;
using System.IO;
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.Sega;
using BizHawk.Emulation.Consoles.Nintendo;
using BizHawk.Emulation.Consoles.Coleco;
using BizHawk.Emulation.Consoles.Nintendo.N64;
using BizHawk.Emulation.Cores.Nintendo.N64;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk

View File

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

View File

@ -4,12 +4,14 @@ using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.GBA;
namespace BizHawk.Client.EmuHawk
{
public partial class GBAGPUView : Form, IToolForm
{
Emulation.Consoles.Nintendo.GBA.GBA gba;
GBA gba;
// emulator memory areas
private IntPtr vram;
@ -31,7 +33,7 @@ namespace BizHawk.Client.EmuHawk
InitializeComponent();
// TODO: hook up something
// 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];
Buffer.BlockCopy(tmp, 0, ColorConversion, 0, 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()
{
gba = Global.Emulator as Emulation.Consoles.Nintendo.GBA.GBA;
gba = Global.Emulator as GBA;
if (gba != null)
{
gba.GetGPUMemoryAreas(out vram, out palram, out oam, out mmio);

View File

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

View File

@ -4,7 +4,7 @@ using System.Windows.Forms;
using BizHawk.Client.Common;
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.Sega;

View File

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

View File

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

View File

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

View File

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

View File

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
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,

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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