Emulation/ProjectPSX
1
0
Fork 0
mirror of https://github.com/BluestormDNA/ProjectPSX.git synced 2025-04-02 10:52:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Removed unused Device interface

Browse source
This commit is contained in:
Blue 2019-06-19 18:16:20 +02:00
parent 56c8c5db1d
commit 87d7ec9556
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ProjectPSX/Devices/InterruptController.cs
View file

@ -1,7 +1,7 @@
using System;
namespace ProjectPSX.Devices {
public class InterruptController : Device {
public class InterruptController {
private uint ISTAT; //IF Trigger that needs to be ack
private uint IMASK; //IE Global Interrupt enable

6
ProjectPSX/Devices/JOYPAD.cs
View file

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Windows.Forms;
namespace ProjectPSX {
internal class JOYPAD : Device {
internal class JOYPAD {
private Queue<byte> JOY_TX_DATA = new Queue<byte>(8); //1F801040h JOY_TX_DATA(W)
private Queue<byte> JOY_RX_DATA = new Queue<byte>(8); //1F801040h JOY_RX_DATA(R) FIFO
@ -76,7 +76,7 @@ namespace ProjectPSX {
baudrateTimer = (int)(JOY_BAUD * baudrateReloadFactor) & ~0x1;
}
public new void write(Width w, uint addr, uint value) {
public void write(Width w, uint addr, uint value) {
switch (addr & 0xFF) {
case 0x40:
//Console.WriteLine("[JOYPAD] TX DATA ENQUEUE " + value.ToString("x2"));
@ -139,7 +139,7 @@ namespace ProjectPSX {
clkOutputPolarity = ((value >> 8) & 0x1) != 0;
}
public new uint load(Width w, uint addr) {
public uint load(Width w, uint addr) {
switch (addr & 0xFF) {
case 0x40:
if (JOY_RX_DATA.Count == 0) {

10
ProjectPSX/Devices/TIMERS.cs
View file

@ -1,7 +1,7 @@
using System;
namespace ProjectPSX.Devices {
public class TIMERS : Device {
public class TIMERS {
TIMER[] timer = new TIMER[3];
@ -11,13 +11,13 @@ namespace ProjectPSX.Devices {
timer[2] = new TIMER();
}
public new void write(Width w, uint addr, uint value) {
public void write(Width w, uint addr, uint value) {
int timerNumber = (int)(addr & 0xF0) >> 4;
timer[timerNumber].write(w, addr, value);
//Console.WriteLine("[TIMER] Write on" + ((addr & 0xF0) >> 4).ToString("x8") + " Value " + value.ToString("x8"));
}
public new uint load(Width w, uint addr) {
public uint load(Width w, uint addr) {
int timerNumber = (int)(addr & 0xF0) >> 4;
//Console.WriteLine("[TIMER] load on" + ((addr & 0xF0) >> 4).ToString("x8") + " Value " + timer[timerNumber].load(w, addr).ToString("x4"));
return timer[timerNumber].load(w, addr);
@ -34,8 +34,6 @@ namespace ProjectPSX.Devices {
private ushort counterValue;
private uint counterTargetValue;
int counter2div8;
private byte syncEnable;
private byte syncMode;
private byte resetCounterOnTarget;
@ -162,8 +160,6 @@ namespace ProjectPSX.Devices {
return false;
}
/*
*/
}
private void setCounterMode(uint value) {