O2: Make G7400 part of the O2 core instead, not worth a serperatecore
This commit is contained in:
alyosha-tas
parent
39bbe30b8e
commit
1e90dbc978
|
|
@ -62,6 +62,11 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
|
|||
|
||||
public class O2SyncSettings
|
||||
{
|
||||
[DisplayName("Use G7400 Enhanemants")]
|
||||
[Description("When true, boots using G7400 BIOS and features")]
|
||||
[DefaultValue(true)]
|
||||
public bool G7400_Enable { get; set; }
|
||||
|
||||
[DisplayName("Use Existing SaveRAM")]
|
||||
[Description("When true, existing SaveRAM will be loaded at boot up")]
|
||||
[DefaultValue(true)]
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
|
|||
public PPU ppu;
|
||||
|
||||
public bool is_pal;
|
||||
public bool is_G7400;
|
||||
|
||||
[CoreConstructor("O2")]
|
||||
public O2Hawk(CoreComm comm, GameInfo game, byte[] rom, /*string gameDbFn,*/ object settings, object syncSettings)
|
||||
|
|
@ -60,11 +61,22 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
|
|||
|
||||
_settings = (O2Settings)settings ?? new O2Settings();
|
||||
_syncSettings = (O2SyncSettings)syncSettings ?? new O2SyncSettings();
|
||||
_controllerDeck = new O2HawkControllerDeck("O2 Controller", "O2 Controller");
|
||||
|
||||
_bios = comm.CoreFileProvider.GetFirmware("O2", "BIOS", true, "BIOS Not Found, Cannot Load")
|
||||
is_G7400 = _syncSettings.G7400_Enable;
|
||||
|
||||
_controllerDeck = new O2HawkControllerDeck("O2 Controller", "O2 Controller", is_G7400);
|
||||
|
||||
if (is_G7400)
|
||||
{
|
||||
_bios = comm.CoreFileProvider.GetFirmware("G7400", "BIOS", true, "BIOS Not Found, Cannot Load")
|
||||
?? throw new MissingFirmwareException("Missing G7400 Bios");
|
||||
}
|
||||
else
|
||||
{
|
||||
_bios = comm.CoreFileProvider.GetFirmware("O2", "BIOS", true, "BIOS Not Found, Cannot Load")
|
||||
?? throw new MissingFirmwareException("Missing Odyssey2 Bios");
|
||||
|
||||
}
|
||||
|
||||
Buffer.BlockCopy(rom, 0x100, header, 0, 0x50);
|
||||
|
||||
Console.WriteLine("MD5: " + rom.HashMD5(0, rom.Length));
|
||||
|
|
@ -87,7 +99,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
|
|||
cpu.SetCallbacks(ReadMemory, PeekMemory, PeekMemory, WriteMemory);
|
||||
|
||||
// set up differences between PAL and NTSC systems
|
||||
if (game.Region == "US" || game.Region == "EU-US" || game.Region == null)
|
||||
if ((game.Region == "US" || game.Region == "EU-US" || game.Region == null) && !is_G7400)
|
||||
{
|
||||
is_pal = false;
|
||||
pic_height = 240;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
|
|||
{
|
||||
public class O2HawkControllerDeck
|
||||
{
|
||||
public O2HawkControllerDeck(string controller1Name, string controller2Name)
|
||||
public O2HawkControllerDeck(string controller1Name, string controller2Name, bool is_G7400)
|
||||
{
|
||||
if (!ValidControllerTypes.ContainsKey(controller1Name))
|
||||
{
|
||||
|
|
@ -25,14 +25,37 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
|
|||
Port1 = (IPort)Activator.CreateInstance(ValidControllerTypes[controller1Name], 1);
|
||||
Port2 = (IPort)Activator.CreateInstance(ValidControllerTypes[controller2Name], 2);
|
||||
|
||||
Definition = new ControllerDefinition
|
||||
if (is_G7400)
|
||||
{
|
||||
Name = Port1.Definition.Name,
|
||||
BoolButtons = Port1.Definition.BoolButtons
|
||||
Definition = new ControllerDefinition
|
||||
{
|
||||
Name = Port1.Definition.Name,
|
||||
BoolButtons = Port1.Definition.BoolButtons
|
||||
.Concat(Port2.Definition.BoolButtons)
|
||||
.Concat(new[]
|
||||
{
|
||||
"0", "1", "2", "3", "4", "5", "6", "7",
|
||||
"0", "1", "2", "3", "4", "5", "6", "7",
|
||||
"8", "9", "SPC", "?", "L", "P",
|
||||
"+", "W", "E", "R", "T", "U", "I", "O",
|
||||
"Q", "S", "D", "F", "G", "H", "J", "K",
|
||||
"A", "Z", "X", "C", "V", "B", "M", "PERIOD",
|
||||
"-", "*", "/", "=", "YES", "NO", "CLR", "ENT",
|
||||
"Reset","Power",
|
||||
"SHIFT", "LOCK", "CTNL", ":", "|", "]", "..", ",", "<", "ESC", "BREAK", "RET"
|
||||
})
|
||||
.ToList()
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
Definition = new ControllerDefinition
|
||||
{
|
||||
Name = Port1.Definition.Name,
|
||||
BoolButtons = Port1.Definition.BoolButtons
|
||||
.Concat(Port2.Definition.BoolButtons)
|
||||
.Concat(new[]
|
||||
{
|
||||
"0", "1", "2", "3", "4", "5", "6", "7",
|
||||
"8", "9", "SPC", "?", "L", "P",
|
||||
"+", "W", "E", "R", "T", "U", "I", "O",
|
||||
"Q", "S", "D", "F", "G", "H", "J", "K",
|
||||
|
|
@ -41,7 +64,8 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
|
|||
"Reset","Power"
|
||||
})
|
||||
.ToList()
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
foreach (var kvp in Port1.Definition.Axes) Definition.Axes.Add(kvp);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1006,6 +1006,281 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
|
|||
0xFFFFFFFF, // white
|
||||
};
|
||||
|
||||
// G7400 specific
|
||||
public static readonly byte[] VPP_Alpha_Numeric = { 0x00, 0x38, 0x44, 0x40, 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, // (reverse ?) 0x00
|
||||
0x00, 0x10, 0x28, 0x00, 0x38, 0x44, 0x7C, 0x44, 0x00, 0x00, // (A hat) 0x01
|
||||
0x00, 0x08, 0x10, 0x3C, 0x20, 0x30, 0x20, 0x3C, 0x00, 0x00, // (E accent /) 0x02
|
||||
0x00, 0x08, 0x14, 0x10, 0x38, 0x10, 0x24, 0x3C, 0x00, 0x00, // (pound) 0x03
|
||||
0x00, 0x10, 0x38, 0x50, 0x38, 0x14, 0x54, 0x38, 0x10, 0x00, // $ 0x04
|
||||
0x00, 0x38, 0x44, 0x40, 0x40, 0x40, 0x44, 0x38, 0x10, 0x20, // (C accent) 0x05
|
||||
0x00, 0x28, 0x28, 0x7C, 0x28, 0x7C, 0x28, 0x28, 0x00, 0x00, // # 0x06
|
||||
0x00, 0x20, 0x18, 0x00, 0x38, 0x44, 0x7C, 0x44, 0x00, 0x00, // (A accent) 0x07
|
||||
0x00, 0x20, 0x18, 0x00, 0x44, 0x44, 0x44, 0x38, 0x00, 0x00, // (U accent) 0x08
|
||||
0x00, 0x10, 0x08, 0x3C, 0x20, 0x30, 0x20, 0x3C, 0x00, 0x00, // (E accent \) 0x09
|
||||
0x00, 0x3C, 0x50, 0x50, 0x58, 0x50, 0x50, 0x3C, 0x00, 0x00, // (E bold) 0x0A
|
||||
0x00, 0x08, 0x14, 0x3C, 0x20, 0x30, 0x20, 0x3C, 0x00, 0x00, // (E hat) 0x0B
|
||||
0x00, 0x00, 0x10, 0x20, 0x7F, 0x20, 0x10, 0x00, 0x00, 0x00, // (Left Arrow) 0x0C
|
||||
0x00, 0x10, 0x38, 0x54, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, // (Up Arrow) 0x0D
|
||||
0x00, 0x00, 0x80, 0x40, 0xFE, 0x40, 0x80, 0x00, 0x00, 0x00, // (Right Arrow) 0x0E
|
||||
0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x54, 0x38, 0x10, 0x00, // (Down Arrow) 0x0F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (degree) 0x10
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (+/-) 0x11
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (e accent /) 0x12
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (e accent ..) 0x13
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (i accent ..) 0x14
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (c accent) 0x15
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (u hat) 0x16
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (a accent) 0x17
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (divide) 0x18
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (e accent \) 0x19
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (e bold) 0x1A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (e hat) 0x1B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (1/4) 0x1C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (1/2) 0x1D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (3/4) 0x1E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (o hat) 0x1F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (space) 0x20
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ! 0x21
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // " 0x22
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (E accent ..) 0x23
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (a hat) 0x24
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // % 0x25
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // & 0x26
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ' 0x27
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ( 0x28
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ) 0x29
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // * 0x2A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x2B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // , 0x2C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // - 0x2D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // . 0x2E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // / 0x2F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0 0x30
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1 0x31
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2 0x32
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 3 0x33
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 4 0x34
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 5 0x35
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 6 0x36
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 7 0x37
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 8 0x38
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 9 0x39
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // : 0x3A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ; 0x3B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // < 0x3C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // = 0x3D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // > 0x3E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ? 0x3F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // @ 0x40
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // A 0x41
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // B 0x42
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // C 0x43
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // D 0x44
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // E 0x45
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // F 0x46
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // G 0x47
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // H 0x48
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // I 0x49
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // J 0x4A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // K 0x4B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // L 0x4C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // M 0x4D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // N 0x4E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // O 0x4F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // P 0x50
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Q 0x51
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // R 0x52
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // S 0x53
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // T 0x54
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // U 0x55
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // V 0x56
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // W 0x57
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // X 0x58
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Y 0x59
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Z 0x5A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [ 0x5B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // \ 0x5C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ] 0x5D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (i hat) 0x5E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // _ 0x5F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (long dash) 0x60
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // a 0x61
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // b 0x62
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // c 0x63
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // d 0x64
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // e 0x65
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // f 0x66
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // g 0x67
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // h 0x68
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // i 0x69
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // j 0x6A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // k 0x6B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // l 0x6C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // m 0x6D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // n 0x6E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // o 0x6F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // p 0x70
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // q 0x71
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // r 0x72
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // s 0x73
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // t 0x74
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // u 0x75
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // v 0x76
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // w 0x77
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // x 0x78
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // y 0x79
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // z 0x7A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (left line) 0x7B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // | 0x7C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (right line) 0x7D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // (top dash) 0x7E
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF // (full box) 0x7F
|
||||
};
|
||||
|
||||
public static readonly byte[] VPP_Mosaic = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x01
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x02
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x03
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x04
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x05
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x06
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x07
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x08
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x09
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x0A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x0B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x0C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x0D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x0E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x0F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x10
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x11
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x12
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x13
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x14
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x15
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x16
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x17
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x18
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x19
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x1A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x1B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x1C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x1D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x1E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x1F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x21
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x22
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x23
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x24
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x25
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x26
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x27
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x28
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x29
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x2A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x2B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x2C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x2D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x2E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x2F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x30
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x31
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x32
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x33
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x34
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x35
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x36
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x37
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x38
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x39
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x3A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x3B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x3C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x3D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x3E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x3F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x40
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x41
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x42
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x43
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x44
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x45
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x46
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x47
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x48
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x49
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x4A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x4B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x4C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x4D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x4E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x4F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x50
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x51
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x52
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x53
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x54
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x55
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x56
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x57
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x58
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x59
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x5A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x5B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x5C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x5D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x5E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x5F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x60
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x61
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x62
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x63
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x64
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x65
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x66
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x67
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x68
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x69
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x6A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x6B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x6C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x6D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x6E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x6F
|
||||
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x70
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x71
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x72
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x73
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x74
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x75
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x76
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x77
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x78
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x79
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x7A
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x7B
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x7C
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x7D
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x7E
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x7F
|
||||
};
|
||||
|
||||
|
||||
public void SyncState(Serializer ser)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
using System.IO;
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Emulation.Cores.Components.I8048;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk : ICodeDataLogger
|
||||
{
|
||||
private ICodeDataLog _cdl;
|
||||
|
||||
public void SetCDL(ICodeDataLog cdl)
|
||||
{
|
||||
_cdl = cdl;
|
||||
if (cdl == null)
|
||||
this.cpu.CDLCallback = null;
|
||||
else this.cpu.CDLCallback = CDLCpuCallback;
|
||||
}
|
||||
|
||||
public void NewCDL(ICodeDataLog cdl)
|
||||
{
|
||||
cdl["ROM"] = new byte[MemoryDomains["ROM"].Size];
|
||||
cdl["HRAM"] = new byte[MemoryDomains["Zero Page RAM"].Size];
|
||||
|
||||
cdl["WRAM"] = new byte[MemoryDomains["Main RAM"].Size];
|
||||
|
||||
if (MemoryDomains.Has("Cart RAM"))
|
||||
{
|
||||
cdl["CartRAM"] = new byte[MemoryDomains["Cart RAM"].Size];
|
||||
}
|
||||
|
||||
cdl.SubType = "O2";
|
||||
cdl.SubVer = 0;
|
||||
}
|
||||
|
||||
[FeatureNotImplemented]
|
||||
void ICodeDataLogger.DisassembleCDL(Stream s, ICodeDataLog cdl)
|
||||
{
|
||||
}
|
||||
|
||||
public void SetCDL(I8048.eCDLogMemFlags flags, string type, int cdladdr)
|
||||
{
|
||||
if (type == null) return;
|
||||
byte val = (byte)flags;
|
||||
_cdl[type][cdladdr] |= (byte)flags;
|
||||
}
|
||||
|
||||
void CDLCpuCallback(ushort addr, I8048.eCDLogMemFlags flags)
|
||||
{
|
||||
|
||||
if (addr < 0x400)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
mapper.MapCDL(addr, flags);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk : IDebuggable
|
||||
{
|
||||
public IDictionary<string, RegisterValue> GetCpuFlagsAndRegisters()
|
||||
=> cpu.GetCpuFlagsAndRegisters();
|
||||
|
||||
public void SetCpuRegister(string register, int value)
|
||||
=> cpu.SetCpuRegister(register, value);
|
||||
|
||||
public IMemoryCallbackSystem MemoryCallbacks { get; } = new MemoryCallbackSystem(new[] { "System Bus" });
|
||||
|
||||
public bool CanStep(StepType type) => false;
|
||||
|
||||
[FeatureNotImplemented]
|
||||
public void Step(StepType type) => throw new NotImplementedException();
|
||||
|
||||
public long TotalExecutedCycles => (long)cpu.TotalExecutedCycles;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,254 +0,0 @@
|
|||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk : IEmulator, IVideoProvider
|
||||
{
|
||||
public IEmulatorServiceProvider ServiceProvider { get; }
|
||||
|
||||
public ControllerDefinition ControllerDefinition => _controllerDeck.Definition;
|
||||
|
||||
public byte controller_state_1, controller_state_2, kb_state_row, kb_state_col;
|
||||
public bool in_vblank_old;
|
||||
public bool in_vblank;
|
||||
public bool vblank_rise;
|
||||
public uint ticker;
|
||||
|
||||
public bool FrameAdvance(IController controller, bool render, bool rendersound)
|
||||
{
|
||||
//Console.WriteLine("-----------------------FRAME-----------------------");
|
||||
|
||||
if (_tracer.Enabled)
|
||||
{
|
||||
cpu.TraceCallback = s => _tracer.Put(s);
|
||||
}
|
||||
else
|
||||
{
|
||||
cpu.TraceCallback = null;
|
||||
}
|
||||
|
||||
_frame++;
|
||||
|
||||
if (controller.IsPressed("Power"))
|
||||
{
|
||||
HardReset();
|
||||
}
|
||||
|
||||
if (controller.IsPressed("Reset"))
|
||||
{
|
||||
SoftReset();
|
||||
}
|
||||
|
||||
_islag = true;
|
||||
|
||||
do_frame(controller);
|
||||
|
||||
if (_islag)
|
||||
{
|
||||
_lagcount++;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void do_frame(IController controller)
|
||||
{
|
||||
// update the controller state on VBlank
|
||||
GetControllerState(controller);
|
||||
|
||||
bool frame_chk = true;
|
||||
//Console.WriteLine("----------FRAME----------");
|
||||
|
||||
if (is_pal)
|
||||
{
|
||||
// PAL timing is: 17.7 / 5 ppu
|
||||
// and 17.7 / 9 for cpu (divide by 3 externally then by 3 again internally)
|
||||
while (frame_chk)
|
||||
{
|
||||
ticker++;
|
||||
|
||||
if (ticker % 5 == 0)
|
||||
{
|
||||
ppu.tick();
|
||||
if (ticker % 10 == 0)
|
||||
{
|
||||
ppu.Audio_tick();
|
||||
}
|
||||
}
|
||||
|
||||
if ((ticker % 9) == 0)
|
||||
{
|
||||
cpu.ExecuteOne();
|
||||
}
|
||||
|
||||
if (!in_vblank && in_vblank_old)
|
||||
{
|
||||
frame_chk = false;
|
||||
}
|
||||
|
||||
in_vblank_old = in_vblank;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// NTSC is 2 to 1 ppu to cpu ticks
|
||||
while (frame_chk)
|
||||
{
|
||||
ppu.tick();
|
||||
ppu.tick();
|
||||
ppu.Audio_tick();
|
||||
cpu.ExecuteOne();
|
||||
|
||||
if (!in_vblank && in_vblank_old)
|
||||
{
|
||||
frame_chk = false;
|
||||
}
|
||||
|
||||
in_vblank_old = in_vblank;
|
||||
}
|
||||
}
|
||||
|
||||
// send the image on VBlank
|
||||
SendVideoBuffer();
|
||||
}
|
||||
|
||||
public void do_single_step()
|
||||
{
|
||||
ppu.tick();
|
||||
ppu.tick();
|
||||
ppu.Audio_tick();
|
||||
cpu.ExecuteOne();
|
||||
|
||||
}
|
||||
|
||||
public void GetControllerState(IController controller)
|
||||
{
|
||||
InputCallbacks.Call();
|
||||
controller_state_1 = _controllerDeck.ReadPort1(controller);
|
||||
controller_state_2 = _controllerDeck.ReadPort2(controller);
|
||||
|
||||
kb_state_row = 8; // nothing pressed
|
||||
if (controller.IsPressed("0")) { kb_state_row = 0; kb_state_col = 7; }
|
||||
if (controller.IsPressed("1")) { kb_state_row = 0; kb_state_col = 6; }
|
||||
if (controller.IsPressed("2")) { kb_state_row = 0; kb_state_col = 5; }
|
||||
if (controller.IsPressed("3")) { kb_state_row = 0; kb_state_col = 4; }
|
||||
if (controller.IsPressed("4")) { kb_state_row = 0; kb_state_col = 3; }
|
||||
if (controller.IsPressed("5")) { kb_state_row = 0; kb_state_col = 2; }
|
||||
if (controller.IsPressed("6")) { kb_state_row = 0; kb_state_col = 1; }
|
||||
if (controller.IsPressed("7")) { kb_state_row = 0; kb_state_col = 0; }
|
||||
if (controller.IsPressed("8")) { kb_state_row = 1; kb_state_col = 7; }
|
||||
if (controller.IsPressed("9")) { kb_state_row = 1; kb_state_col = 6; }
|
||||
if (controller.IsPressed("SPC")) { kb_state_row = 1; kb_state_col = 3; }
|
||||
if (controller.IsPressed("?")) { kb_state_row = 1; kb_state_col = 2; }
|
||||
if (controller.IsPressed("L")) { kb_state_row = 1; kb_state_col = 1; }
|
||||
if (controller.IsPressed("P")) { kb_state_row = 1; kb_state_col = 0; }
|
||||
if (controller.IsPressed("+")) { kb_state_row = 2; kb_state_col = 7; }
|
||||
if (controller.IsPressed("W")) { kb_state_row = 2; kb_state_col = 6; }
|
||||
if (controller.IsPressed("E")) { kb_state_row = 2; kb_state_col = 5; }
|
||||
if (controller.IsPressed("R")) { kb_state_row = 2; kb_state_col = 4; }
|
||||
if (controller.IsPressed("T")) { kb_state_row = 2; kb_state_col = 3; }
|
||||
if (controller.IsPressed("U")) { kb_state_row = 2; kb_state_col = 2; }
|
||||
if (controller.IsPressed("I")) { kb_state_row = 2; kb_state_col = 1; }
|
||||
if (controller.IsPressed("O")) { kb_state_row = 2; kb_state_col = 0; }
|
||||
if (controller.IsPressed("Q")) { kb_state_row = 3; kb_state_col = 7; }
|
||||
if (controller.IsPressed("S")) { kb_state_row = 3; kb_state_col = 6; }
|
||||
if (controller.IsPressed("D")) { kb_state_row = 3; kb_state_col = 5; }
|
||||
if (controller.IsPressed("F")) { kb_state_row = 3; kb_state_col = 4; }
|
||||
if (controller.IsPressed("G")) { kb_state_row = 3; kb_state_col = 3; }
|
||||
if (controller.IsPressed("H")) { kb_state_row = 3; kb_state_col = 2; }
|
||||
if (controller.IsPressed("J")) { kb_state_row = 3; kb_state_col = 1; }
|
||||
if (controller.IsPressed("K")) { kb_state_row = 3; kb_state_col = 0; }
|
||||
if (controller.IsPressed("A")) { kb_state_row = 4; kb_state_col = 7; }
|
||||
if (controller.IsPressed("Z")) { kb_state_row = 4; kb_state_col = 6; }
|
||||
if (controller.IsPressed("X")) { kb_state_row = 4; kb_state_col = 5; }
|
||||
if (controller.IsPressed("C")) { kb_state_row = 4; kb_state_col = 4; }
|
||||
if (controller.IsPressed("V")) { kb_state_row = 4; kb_state_col = 3; }
|
||||
if (controller.IsPressed("B")) { kb_state_row = 4; kb_state_col = 2; }
|
||||
if (controller.IsPressed("M")) { kb_state_row = 4; kb_state_col = 1; }
|
||||
if (controller.IsPressed(".")) { kb_state_row = 4; kb_state_col = 0; }
|
||||
if (controller.IsPressed("-")) { kb_state_row = 5; kb_state_col = 7; }
|
||||
if (controller.IsPressed("*")) { kb_state_row = 5; kb_state_col = 6; }
|
||||
if (controller.IsPressed("/")) { kb_state_row = 5; kb_state_col = 5; }
|
||||
if (controller.IsPressed("=")) { kb_state_row = 5; kb_state_col = 4; }
|
||||
if (controller.IsPressed("YES")) { kb_state_row = 5; kb_state_col = 3; }
|
||||
if (controller.IsPressed("NO")) { kb_state_row = 5; kb_state_col = 2; }
|
||||
if (controller.IsPressed("CLR")) { kb_state_row = 5; kb_state_col = 1; }
|
||||
if (controller.IsPressed("ENT")) { kb_state_row = 5; kb_state_col = 0; }
|
||||
|
||||
}
|
||||
|
||||
public void KB_Scan()
|
||||
{
|
||||
if (kb_byte == kb_state_row)
|
||||
{
|
||||
kb_byte &= 0xEF;
|
||||
kb_byte |= (byte)(kb_state_col << 5);
|
||||
}
|
||||
else
|
||||
{
|
||||
kb_byte |= 0x10;
|
||||
}
|
||||
}
|
||||
|
||||
public int Frame => _frame;
|
||||
|
||||
public string SystemId => "O2";
|
||||
|
||||
public bool DeterministicEmulation { get; set; }
|
||||
|
||||
public void ResetCounters()
|
||||
{
|
||||
_frame = 0;
|
||||
_lagcount = 0;
|
||||
_islag = false;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
ppu.DisposeSound();
|
||||
}
|
||||
|
||||
public int _frameHz = 60;
|
||||
|
||||
public int[] _vidbuffer;
|
||||
|
||||
public int[] frame_buffer;
|
||||
|
||||
public int[] GetVideoBuffer()
|
||||
{
|
||||
return frame_buffer;
|
||||
}
|
||||
|
||||
public void SendVideoBuffer()
|
||||
{
|
||||
for (int j = 0; j < pic_height; j++)
|
||||
{
|
||||
for (int i = 0; i < 320; i++)
|
||||
{
|
||||
frame_buffer[j * 320 + i] = _vidbuffer[j * 372 + i];
|
||||
_vidbuffer[j * 372 + i] = 0;
|
||||
}
|
||||
|
||||
for (int k = 320; k < 372; k++)
|
||||
{
|
||||
_vidbuffer[j * 372 + k] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public int pic_height;
|
||||
|
||||
public int VirtualWidth => 320;
|
||||
public int VirtualHeight => pic_height;
|
||||
public int BufferWidth => 320;
|
||||
public int BufferHeight => pic_height;
|
||||
public int BackgroundColor => unchecked((int)0xFF000000);
|
||||
public int VsyncNumerator => _frameHz;
|
||||
public int VsyncDenominator => 1;
|
||||
|
||||
public static readonly uint[] color_palette_BW = { 0xFFFFFFFF , 0xFFAAAAAA, 0xFF555555, 0xFF000000 };
|
||||
public static readonly uint[] color_palette_Gr = { 0xFFA4C505, 0xFF88A905, 0xFF1D551D, 0xFF052505 };
|
||||
|
||||
public uint[] color_palette = new uint[4];
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk : IInputPollable
|
||||
{
|
||||
public int LagCount
|
||||
{
|
||||
get => _lagcount;
|
||||
set => _lagcount = value;
|
||||
}
|
||||
|
||||
public bool IsLagFrame
|
||||
{
|
||||
get => _islag;
|
||||
set => _islag = value;
|
||||
}
|
||||
|
||||
public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem();
|
||||
|
||||
public bool _islag = true;
|
||||
private int _lagcount;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
using System.Collections.Generic;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk
|
||||
{
|
||||
private IMemoryDomains MemoryDomains;
|
||||
|
||||
public void SetupMemoryDomains()
|
||||
{
|
||||
var domains = new List<MemoryDomain>
|
||||
{
|
||||
new MemoryDomainDelegate(
|
||||
"Main RAM",
|
||||
RAM.Length,
|
||||
MemoryDomain.Endian.Little,
|
||||
addr => RAM[addr],
|
||||
(addr, value) => RAM[addr] = value,
|
||||
1),
|
||||
new MemoryDomainDelegate(
|
||||
"CPU RAM",
|
||||
64,
|
||||
MemoryDomain.Endian.Little,
|
||||
addr => (byte)cpu.Regs[addr],
|
||||
(addr, value) => cpu.Regs[addr] = value,
|
||||
1),
|
||||
new MemoryDomainDelegate(
|
||||
"System Bus",
|
||||
0X1000,
|
||||
MemoryDomain.Endian.Little,
|
||||
addr => PeekSystemBus(addr),
|
||||
(addr, value) => PokeSystemBus(addr, value),
|
||||
1),
|
||||
new MemoryDomainDelegate(
|
||||
"ROM",
|
||||
_rom.Length,
|
||||
MemoryDomain.Endian.Little,
|
||||
addr => _rom[addr],
|
||||
(addr, value) => _rom[addr] = value,
|
||||
1),
|
||||
new MemoryDomainDelegate(
|
||||
"PPU",
|
||||
256,
|
||||
MemoryDomain.Endian.Little,
|
||||
addr => ppu.PeekReg((int)addr),
|
||||
(addr, value) => ppu.WriteReg((int)addr, value),
|
||||
1)
|
||||
};
|
||||
|
||||
if (cart_RAM != null)
|
||||
{
|
||||
var CartRam = new MemoryDomainByteArray("Cart RAM", MemoryDomain.Endian.Little, cart_RAM, true, 1);
|
||||
domains.Add(CartRam);
|
||||
}
|
||||
|
||||
MemoryDomains = new MemoryDomainList(domains);
|
||||
(ServiceProvider as BasicServiceProvider).Register<IMemoryDomains>(MemoryDomains);
|
||||
}
|
||||
|
||||
private byte PeekSystemBus(long addr)
|
||||
{
|
||||
ushort addr2 = (ushort)(addr & 0xFFF);
|
||||
return PeekMemory(addr2);
|
||||
}
|
||||
|
||||
private void PokeSystemBus(long addr, byte value)
|
||||
{
|
||||
ushort addr2 = (ushort)(addr & 0xFFF);
|
||||
WriteMemory(addr2, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
using System;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk : ISaveRam
|
||||
{
|
||||
public byte[] CloneSaveRam()
|
||||
{
|
||||
return (byte[])cart_RAM?.Clone();
|
||||
}
|
||||
|
||||
public void StoreSaveRam(byte[] data)
|
||||
{
|
||||
if (_syncSettings.Use_SRAM)
|
||||
{
|
||||
Buffer.BlockCopy(data, 0, cart_RAM, 0, data.Length);
|
||||
Console.WriteLine("loading SRAM here");
|
||||
}
|
||||
}
|
||||
|
||||
public bool SaveRamModified => has_bat & _syncSettings.Use_SRAM;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
using System.ComponentModel;
|
||||
using BizHawk.Common;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk : IEmulator, ISettable<G7400Hawk.G7400Settings, G7400Hawk.G7400SyncSettings>
|
||||
{
|
||||
public G7400Settings GetSettings()
|
||||
{
|
||||
return _settings.Clone();
|
||||
}
|
||||
|
||||
public G7400SyncSettings GetSyncSettings()
|
||||
{
|
||||
return _syncSettings.Clone();
|
||||
}
|
||||
|
||||
public PutSettingsDirtyBits PutSettings(G7400Settings o)
|
||||
{
|
||||
_settings = o;
|
||||
return PutSettingsDirtyBits.None;
|
||||
}
|
||||
|
||||
public PutSettingsDirtyBits PutSyncSettings(G7400SyncSettings o)
|
||||
{
|
||||
bool ret = G7400SyncSettings.NeedsReboot(_syncSettings, o);
|
||||
_syncSettings = o;
|
||||
return ret ? PutSettingsDirtyBits.RebootCore : PutSettingsDirtyBits.None;
|
||||
}
|
||||
|
||||
public G7400Settings _settings = new G7400Settings();
|
||||
public G7400SyncSettings _syncSettings = new G7400SyncSettings();
|
||||
|
||||
public class G7400Settings
|
||||
{
|
||||
[DisplayName("Display Characters")]
|
||||
[Description("When true, displays character.")]
|
||||
[DefaultValue(true)]
|
||||
public bool Show_Chars { get; set; }
|
||||
|
||||
[DisplayName("Display Quad Characters")]
|
||||
[Description("When true, displays quad character.")]
|
||||
[DefaultValue(true)]
|
||||
public bool Show_Quads { get; set; }
|
||||
|
||||
[DisplayName("Display Sprites")]
|
||||
[Description("When true, displays sprites.")]
|
||||
[DefaultValue(true)]
|
||||
public bool Show_Sprites { get; set; }
|
||||
|
||||
public G7400Settings Clone()
|
||||
{
|
||||
return (G7400Settings)MemberwiseClone();
|
||||
}
|
||||
|
||||
public G7400Settings()
|
||||
{
|
||||
SettingsUtil.SetDefaultValues(this);
|
||||
}
|
||||
}
|
||||
|
||||
public class G7400SyncSettings
|
||||
{
|
||||
[DisplayName("Use Existing SaveRAM")]
|
||||
[Description("When true, existing SaveRAM will be loaded at boot up")]
|
||||
[DefaultValue(true)]
|
||||
public bool Use_SRAM { get; set; }
|
||||
|
||||
public G7400SyncSettings Clone()
|
||||
{
|
||||
return (G7400SyncSettings)MemberwiseClone();
|
||||
}
|
||||
|
||||
public G7400SyncSettings()
|
||||
{
|
||||
SettingsUtil.SetDefaultValues(this);
|
||||
}
|
||||
|
||||
public static bool NeedsReboot(G7400SyncSettings x, G7400SyncSettings y)
|
||||
{
|
||||
return !DeepEquality.DeepEquals(x, y);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
using BizHawk.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk
|
||||
{
|
||||
private void SyncState(Serializer ser)
|
||||
{
|
||||
ser.BeginSection("Videopac G7400");
|
||||
cpu.SyncState(ser);
|
||||
mapper.SyncState(ser);
|
||||
ppu.SyncState(ser);
|
||||
|
||||
ser.Sync("Lag", ref _lagcount);
|
||||
ser.Sync("Frame", ref _frame);
|
||||
ser.Sync("IsLag", ref _islag);
|
||||
_controllerDeck.SyncState(ser);
|
||||
|
||||
ser.Sync(nameof(controller_state_1), ref controller_state_1);
|
||||
ser.Sync(nameof(controller_state_2), ref controller_state_2);
|
||||
ser.Sync(nameof(in_vblank), ref in_vblank);
|
||||
ser.Sync(nameof(in_vblank_old), ref in_vblank_old);
|
||||
ser.Sync(nameof(vblank_rise), ref vblank_rise);
|
||||
ser.Sync(nameof(ticker), ref ticker);
|
||||
|
||||
ser.Sync(nameof(RAM_en), ref RAM_en);
|
||||
ser.Sync(nameof(ppu_en), ref ppu_en);
|
||||
ser.Sync(nameof(cart_b0), ref cart_b0);
|
||||
ser.Sync(nameof(cart_b1), ref cart_b1);
|
||||
ser.Sync(nameof(copy_en), ref copy_en);
|
||||
ser.Sync(nameof(kybrd_en), ref kybrd_en);
|
||||
ser.Sync(nameof(rom_bank), ref rom_bank);
|
||||
ser.Sync(nameof(bank_size), ref bank_size);
|
||||
|
||||
// memory domains
|
||||
ser.Sync(nameof(RAM), ref RAM, false);
|
||||
ser.Sync(nameof(_bios), ref _bios, false);
|
||||
ser.Sync(nameof(addr_latch), ref addr_latch);
|
||||
ser.Sync(nameof(kb_byte), ref kb_byte);
|
||||
ser.Sync(nameof(kb_state_row), ref kb_state_row);
|
||||
ser.Sync(nameof(kb_state_col), ref kb_state_col);
|
||||
|
||||
// probably a better way to do this
|
||||
if (cart_RAM != null)
|
||||
{
|
||||
ser.Sync(nameof(cart_RAM), ref cart_RAM, false);
|
||||
}
|
||||
|
||||
ser.EndSection();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,171 +0,0 @@
|
|||
using System;
|
||||
|
||||
using BizHawk.Common.BufferExtensions;
|
||||
using BizHawk.Emulation.Common;
|
||||
using BizHawk.Emulation.Cores.Components.I8048;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
[Core(
|
||||
"G7400Hawk",
|
||||
"",
|
||||
isPorted: false,
|
||||
isReleased: false,
|
||||
displayName: "Videopac G7400")]
|
||||
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
|
||||
public partial class G7400Hawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable, ISettable<G7400Hawk.G7400Settings, G7400Hawk.G7400SyncSettings>, IBoardInfo
|
||||
{
|
||||
// memory domains
|
||||
public byte[] RAM = new byte[0x80];
|
||||
|
||||
public byte addr_latch;
|
||||
public byte kb_byte;
|
||||
public bool ppu_en, RAM_en, kybrd_en, copy_en, cart_b0, cart_b1;
|
||||
public ushort rom_bank;
|
||||
public ushort bank_size;
|
||||
|
||||
public byte[] _bios;
|
||||
public readonly byte[] _rom;
|
||||
public readonly byte[] header = new byte[0x50];
|
||||
|
||||
public byte[] cart_RAM;
|
||||
public bool has_bat;
|
||||
|
||||
public int _frame = 0;
|
||||
|
||||
public MapperBase mapper;
|
||||
|
||||
private readonly ITraceable _tracer;
|
||||
|
||||
public I8048 cpu;
|
||||
public PPU ppu;
|
||||
|
||||
public bool is_pal;
|
||||
|
||||
[CoreConstructor("G7400")]
|
||||
public G7400Hawk(CoreComm comm, GameInfo game, byte[] rom, /*string gameDbFn,*/ object settings, object syncSettings)
|
||||
{
|
||||
var ser = new BasicServiceProvider(this);
|
||||
|
||||
cpu = new I8048
|
||||
{
|
||||
ReadMemory = ReadMemory,
|
||||
WriteMemory = WriteMemory,
|
||||
PeekMemory = PeekMemory,
|
||||
DummyReadMemory = ReadMemory,
|
||||
ReadPort = ReadPort,
|
||||
WritePort = WritePort,
|
||||
OnExecFetch = ExecFetch,
|
||||
};
|
||||
|
||||
_settings = (G7400Settings)settings ?? new G7400Settings();
|
||||
_syncSettings = (G7400SyncSettings)syncSettings ?? new G7400SyncSettings();
|
||||
_controllerDeck = new G7400HawkControllerDeck("G7400 Controller", "G7400 Controller");
|
||||
|
||||
_bios = comm.CoreFileProvider.GetFirmware("G7400", "BIOS", true, "BIOS Not Found, Cannot Load")
|
||||
?? throw new MissingFirmwareException("Missing Odyssey2 Bios");
|
||||
|
||||
Buffer.BlockCopy(rom, 0x100, header, 0, 0x50);
|
||||
|
||||
Console.WriteLine("MD5: " + rom.HashMD5(0, rom.Length));
|
||||
Console.WriteLine("SHA1: " + rom.HashSHA1(0, rom.Length));
|
||||
_rom = rom;
|
||||
Setup_Mapper();
|
||||
|
||||
_frameHz = 60;
|
||||
|
||||
ser.Register<IVideoProvider>(this);
|
||||
ServiceProvider = ser;
|
||||
|
||||
_settings = (G7400Settings)settings ?? new G7400Settings();
|
||||
_syncSettings = (G7400SyncSettings)syncSettings ?? new G7400SyncSettings();
|
||||
|
||||
_tracer = new TraceBuffer { Header = cpu.TraceHeader };
|
||||
ser.Register(_tracer);
|
||||
ser.Register<IStatable>(new StateSerializer(SyncState));
|
||||
SetupMemoryDomains();
|
||||
cpu.SetCallbacks(ReadMemory, PeekMemory, PeekMemory, WriteMemory);
|
||||
|
||||
// G7400 is PAL only
|
||||
is_pal = true;
|
||||
pic_height = 240;
|
||||
_frameHz = 50;
|
||||
ppu = new PAL_PPU();
|
||||
|
||||
ppu.Core = this;
|
||||
|
||||
ppu.set_region(is_pal);
|
||||
|
||||
ser.Register<ISoundProvider>(ppu);
|
||||
|
||||
_vidbuffer = new int[372 * pic_height];
|
||||
frame_buffer = new int[320 * pic_height];
|
||||
|
||||
HardReset();
|
||||
}
|
||||
|
||||
public DisplayType Region => DisplayType.PAL;
|
||||
|
||||
private readonly G7400HawkControllerDeck _controllerDeck;
|
||||
|
||||
public void HardReset()
|
||||
{
|
||||
in_vblank = true; // we start off in vblank since the LCD is off
|
||||
in_vblank_old = true;
|
||||
|
||||
ppu.Reset();
|
||||
|
||||
cpu.Reset();
|
||||
|
||||
RAM = new byte[0x80];
|
||||
|
||||
ticker = 0;
|
||||
|
||||
// some of these get overwritten, but
|
||||
addr_latch = 0;
|
||||
kb_state_row = kb_state_col = 0;
|
||||
|
||||
// bank switching carts expect to be in upper bank on boot up, so can't have 0 at ports
|
||||
WritePort(1, 0xFF);
|
||||
WritePort(2, 0xFF);
|
||||
}
|
||||
|
||||
public void SoftReset()
|
||||
{
|
||||
cpu.Reset();
|
||||
}
|
||||
|
||||
public string BoardName => mapper.GetType().Name;
|
||||
|
||||
// TODO: move callbacks to cpu to avoid non-inlinable function call
|
||||
private void ExecFetch(ushort addr)
|
||||
{
|
||||
if (MemoryCallbacks.HasExecutes)
|
||||
{
|
||||
uint flags = (uint)MemoryCallbackFlags.AccessExecute;
|
||||
MemoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus");
|
||||
}
|
||||
}
|
||||
|
||||
private void Setup_Mapper()
|
||||
{
|
||||
mapper = new MapperDefault
|
||||
{
|
||||
Core = this
|
||||
};
|
||||
|
||||
mapper.Initialize();
|
||||
|
||||
// bank size is different for 12 k carts, it uses all 3k per bank. Note that A11 is held low by the CPU during interrupts
|
||||
// so this means 12k games use the upper 1k outside of vbl
|
||||
if (_rom.Length == 0x3000)
|
||||
{
|
||||
bank_size = 0xC00;
|
||||
}
|
||||
else
|
||||
{
|
||||
bank_size = 0x800;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
using BizHawk.Common;
|
||||
using BizHawk.Common.ReflectionExtensions;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public class G7400HawkControllerDeck
|
||||
{
|
||||
public G7400HawkControllerDeck(string controller1Name, string controller2Name)
|
||||
{
|
||||
if (!ValidControllerTypes.ContainsKey(controller1Name))
|
||||
{
|
||||
throw new InvalidOperationException("Invalid controller type: " + controller1Name);
|
||||
}
|
||||
|
||||
if (!ValidControllerTypes.ContainsKey(controller2Name))
|
||||
{
|
||||
throw new InvalidOperationException("Invalid controller type: " + controller2Name);
|
||||
}
|
||||
|
||||
Port1 = (IPort)Activator.CreateInstance(ValidControllerTypes[controller1Name], 1);
|
||||
Port2 = (IPort)Activator.CreateInstance(ValidControllerTypes[controller2Name], 2);
|
||||
|
||||
Definition = new ControllerDefinition
|
||||
{
|
||||
Name = Port1.Definition.Name,
|
||||
BoolButtons = Port1.Definition.BoolButtons
|
||||
.Concat(Port2.Definition.BoolButtons)
|
||||
.Concat(new[]
|
||||
{
|
||||
"0", "1", "2", "3", "4", "5", "6", "7",
|
||||
"8", "9", "SPC", "?", "L", "P",
|
||||
"+", "W", "E", "R", "T", "U", "I", "O",
|
||||
"Q", "S", "D", "F", "G", "H", "J", "K",
|
||||
"A", "Z", "X", "C", "V", "B", "M", "PERIOD",
|
||||
"-", "*", "/", "=", "YES", "NO", "CLR", "ENT",
|
||||
"Reset","Power"
|
||||
})
|
||||
.ToList()
|
||||
};
|
||||
|
||||
foreach (var kvp in Port1.Definition.Axes) Definition.Axes.Add(kvp);
|
||||
}
|
||||
|
||||
public byte ReadPort1(IController c)
|
||||
{
|
||||
return Port1.Read(c);
|
||||
}
|
||||
|
||||
public byte ReadPort2(IController c)
|
||||
{
|
||||
return Port2.Read(c);
|
||||
}
|
||||
|
||||
public ControllerDefinition Definition { get; }
|
||||
|
||||
public void SyncState(Serializer ser)
|
||||
{
|
||||
ser.BeginSection(nameof(Port1));
|
||||
Port1.SyncState(ser);
|
||||
ser.EndSection();
|
||||
ser.BeginSection(nameof(Port2));
|
||||
Port2.SyncState(ser);
|
||||
ser.EndSection();
|
||||
}
|
||||
|
||||
private readonly IPort Port1, Port2;
|
||||
|
||||
private static Dictionary<string, Type> _controllerTypes;
|
||||
|
||||
public static Dictionary<string, Type> ValidControllerTypes
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_controllerTypes == null)
|
||||
{
|
||||
_controllerTypes = typeof(G7400HawkControllerDeck).Assembly
|
||||
.GetTypes()
|
||||
.Where(t => typeof(IPort).IsAssignableFrom(t))
|
||||
.Where(t => !t.IsAbstract && !t.IsInterface)
|
||||
.ToDictionary(tkey => tkey.DisplayName());
|
||||
}
|
||||
|
||||
return _controllerTypes;
|
||||
}
|
||||
}
|
||||
|
||||
public static string DefaultControllerName => typeof(StandardControls).DisplayName();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
|
||||
using BizHawk.Common;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents a G7400 add on
|
||||
/// </summary>
|
||||
public interface IPort
|
||||
{
|
||||
byte Read(IController c);
|
||||
|
||||
ControllerDefinition Definition { get; }
|
||||
|
||||
void SyncState(Serializer ser);
|
||||
|
||||
int PortNum { get; }
|
||||
}
|
||||
|
||||
[DisplayName("G7400 Controller")]
|
||||
public class StandardControls : IPort
|
||||
{
|
||||
public StandardControls(int portNum)
|
||||
{
|
||||
PortNum = portNum;
|
||||
Definition = new ControllerDefinition
|
||||
{
|
||||
Name = "O2 Joystick",
|
||||
BoolButtons = BaseDefinition
|
||||
.Select(b => "P" + PortNum + " " + b)
|
||||
.ToList()
|
||||
};
|
||||
}
|
||||
|
||||
public int PortNum { get; }
|
||||
|
||||
public ControllerDefinition Definition { get; }
|
||||
|
||||
public byte Read(IController c)
|
||||
{
|
||||
byte result = 0xFF;
|
||||
|
||||
if (c.IsPressed(Definition.BoolButtons[0]))
|
||||
{
|
||||
result -= 1;
|
||||
}
|
||||
if (c.IsPressed(Definition.BoolButtons[1]))
|
||||
{
|
||||
result -= 4;
|
||||
}
|
||||
if (c.IsPressed(Definition.BoolButtons[2]))
|
||||
{
|
||||
result -= 8;
|
||||
}
|
||||
if (c.IsPressed(Definition.BoolButtons[3]))
|
||||
{
|
||||
result -= 2;
|
||||
}
|
||||
if (c.IsPressed(Definition.BoolButtons[4]))
|
||||
{
|
||||
result -= 16;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static readonly string[] BaseDefinition =
|
||||
{
|
||||
"Up", "Down", "Left", "Right", "F"
|
||||
};
|
||||
|
||||
public void SyncState(Serializer ser)
|
||||
{
|
||||
//nothing
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
using BizHawk.Common;
|
||||
using BizHawk.Emulation.Cores.Components.I8048;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public class MapperBase
|
||||
{
|
||||
public G7400Hawk Core { get; set; }
|
||||
|
||||
public virtual byte ReadMemory(ushort addr) => 0;
|
||||
|
||||
public virtual byte PeekMemory(ushort addr) => ReadMemory(addr);
|
||||
|
||||
public virtual void WriteMemory(ushort addr, byte value)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void SyncState(Serializer ser)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Initialize()
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Mapper_Tick()
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void RTC_Get(int value, int index)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void MapCDL(ushort addr, I8048.eCDLogMemFlags flags)
|
||||
{
|
||||
}
|
||||
|
||||
protected void SetCDLROM(I8048.eCDLogMemFlags flags, int cdladdr)
|
||||
{
|
||||
Core.SetCDL(flags, "ROM", cdladdr);
|
||||
}
|
||||
|
||||
protected void SetCDLRAM(I8048.eCDLogMemFlags flags, int cdladdr)
|
||||
{
|
||||
Core.SetCDL(flags, "CartRAM", cdladdr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
using BizHawk.Common;
|
||||
using BizHawk.Emulation.Cores.Components.I8048;
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
// Default mapper with no bank switching
|
||||
public class MapperDefault : MapperBase
|
||||
{
|
||||
public int ROM_mask;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
// roms come in 3 sizes, but the last size is a degenerate case
|
||||
if (Core._rom.Length == 0x3000)
|
||||
{
|
||||
ROM_mask = 0x3FFF;
|
||||
}
|
||||
else
|
||||
{
|
||||
ROM_mask = Core._rom.Length - 1;
|
||||
}
|
||||
}
|
||||
|
||||
public override byte ReadMemory(ushort addr)
|
||||
{
|
||||
return Core._rom[addr & ROM_mask];
|
||||
}
|
||||
|
||||
public override void MapCDL(ushort addr, I8048.eCDLogMemFlags flags)
|
||||
{
|
||||
SetCDLROM(flags, addr);
|
||||
}
|
||||
|
||||
public override void WriteMemory(ushort addr, byte value)
|
||||
{
|
||||
// no mapping hardware available
|
||||
}
|
||||
|
||||
public override void SyncState(Serializer ser)
|
||||
{
|
||||
ser.Sync(nameof(ROM_mask), ref ROM_mask);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
TODO:
|
||||
Official Mappers
|
||||
Unofficial Mappers
|
||||
|
|
@ -1,179 +0,0 @@
|
|||
using System;
|
||||
using BizHawk.Common.NumberExtensions;
|
||||
using BizHawk.Emulation.Common;
|
||||
|
||||
/*
|
||||
$0400-$0FFF Cartridge (Only 2K accessible, bit 10 not mapped to cart)
|
||||
$0000-$03FF BIOS
|
||||
*/
|
||||
|
||||
namespace BizHawk.Emulation.Cores.Consoles.G7400Hawk
|
||||
{
|
||||
public partial class G7400Hawk
|
||||
{
|
||||
public byte ReadMemory(ushort addr)
|
||||
{
|
||||
if (MemoryCallbacks.HasReads)
|
||||
{
|
||||
uint flags = (uint)MemoryCallbackFlags.AccessRead;
|
||||
MemoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus");
|
||||
}
|
||||
|
||||
if (addr < 0x400)
|
||||
{
|
||||
return _bios[addr];
|
||||
}
|
||||
|
||||
return mapper.ReadMemory((ushort)((addr - 0x400) + bank_size * rom_bank));
|
||||
}
|
||||
|
||||
public void WriteMemory(ushort addr, byte value)
|
||||
{
|
||||
if (MemoryCallbacks.HasWrites)
|
||||
{
|
||||
uint flags = (uint)MemoryCallbackFlags.AccessWrite;
|
||||
MemoryCallbacks.CallMemoryCallbacks(addr, value, flags, "System Bus");
|
||||
}
|
||||
|
||||
if (addr < 0x400)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
mapper.WriteMemory(addr, value);
|
||||
}
|
||||
}
|
||||
|
||||
public byte PeekMemory(ushort addr)
|
||||
{
|
||||
if (addr < 0x400)
|
||||
{
|
||||
return _bios[addr];
|
||||
}
|
||||
|
||||
return mapper.PeekMemory((ushort)((addr - 0x400) + bank_size * rom_bank));
|
||||
}
|
||||
|
||||
public byte ReadPort(ushort port)
|
||||
{
|
||||
if (port == 0)
|
||||
{
|
||||
// BUS, used with external memory and ppu
|
||||
if (cpu.EA)
|
||||
{
|
||||
return addr_latch;
|
||||
}
|
||||
|
||||
if (RAM_en)
|
||||
{
|
||||
if (addr_latch < 0x80)
|
||||
{
|
||||
return RAM[addr_latch & 0x7F];
|
||||
}
|
||||
|
||||
// voice module would return here
|
||||
return 0;
|
||||
}
|
||||
if (ppu_en)
|
||||
{
|
||||
return ppu.ReadReg(addr_latch);
|
||||
}
|
||||
|
||||
// if neither RAM or PPU is enabled, then a RD pulse from instruction IN A,BUS will latch controller
|
||||
// onto the bus, but only if they are enabled correctly using port 2
|
||||
if (kybrd_en)
|
||||
{
|
||||
_islag = false;
|
||||
if ((kb_byte & 7) == 1)
|
||||
{
|
||||
return controller_state_1;
|
||||
}
|
||||
if ((kb_byte & 7) == 0)
|
||||
{
|
||||
return controller_state_2;
|
||||
}
|
||||
}
|
||||
|
||||
Console.WriteLine(cpu.TotalExecutedCycles);
|
||||
// not sure what happens if this case is reached, probably whatever the last value on the bus is
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (port == 1)
|
||||
{
|
||||
// various control pins
|
||||
return (byte)((ppu.lum_en ? 0x80 : 0) |
|
||||
(copy_en ? 0x40 : 0) |
|
||||
(0x20) |
|
||||
(!RAM_en ? 0x10 : 0) |
|
||||
(!ppu_en ? 0x08 : 0) |
|
||||
(!kybrd_en ? 0x04 : 0) |
|
||||
(cart_b1 ? 0x02 : 0) |
|
||||
(cart_b0 ? 0x01 : 0));
|
||||
}
|
||||
|
||||
// keyboard
|
||||
_islag = false;
|
||||
return kb_byte;
|
||||
}
|
||||
|
||||
public void WritePort(ushort port, byte value)
|
||||
{
|
||||
if (port == 0)
|
||||
{
|
||||
// BUS, used with external memory and ppu
|
||||
if (cpu.EA)
|
||||
{
|
||||
addr_latch = value;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (RAM_en && !copy_en)
|
||||
{
|
||||
if (addr_latch < 0x80)
|
||||
{
|
||||
RAM[addr_latch] = value;
|
||||
}
|
||||
else
|
||||
{
|
||||
// voice module goes here
|
||||
}
|
||||
}
|
||||
|
||||
if (ppu_en)
|
||||
{
|
||||
ppu.WriteReg(addr_latch, value);
|
||||
//Console.WriteLine((addr_latch) + " " + value);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (port == 1)
|
||||
{
|
||||
// various control pins
|
||||
ppu.lum_en = value.Bit(7);
|
||||
copy_en = value.Bit(6);
|
||||
RAM_en = !value.Bit(4);
|
||||
ppu_en = !value.Bit(3);
|
||||
kybrd_en = !value.Bit(2);
|
||||
cart_b1 = value.Bit(1);
|
||||
cart_b0 = value.Bit(0);
|
||||
|
||||
rom_bank = (ushort)(cart_b0 ? 1 : 0);
|
||||
rom_bank |= (ushort)(cart_b1 ? 2 : 0);
|
||||
//rom_bank = (ushort)(rom_bank << 12);
|
||||
|
||||
ppu.bg_brightness = !ppu.lum_en ? 8 : 0;
|
||||
ppu.grid_brightness = (!ppu.lum_en | ppu.VDC_color.Bit(6)) ? 8 : 0;
|
||||
|
||||
//Console.WriteLine("main ctrl: " + value + " " + ppu.lum_en + " " + ppu_en + " " + RAM_en + " " + cpu.TotalExecutedCycles + " " + ppu.LY + " " + rom_bank);
|
||||
}
|
||||
else
|
||||
{
|
||||
// keyboard
|
||||
kb_byte = (byte)(value & 7);
|
||||
KB_Scan();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue