diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2021-05-29 20:30:48 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2021-05-29 20:30:48 +0300 |
| commit | 0ebacc40cc426500282116725159a3fa2e08a65f (patch) | |
| tree | 0a0fcd2dac5b4d4a1c982427fa08b267e9cde9df /FamicomDumperConnection | |
| parent | 34e31673e49b44c139e1beed9fdbcd12a872c95c (diff) | |
FDS fixes and refactoring
Diffstat (limited to 'FamicomDumperConnection')
| -rw-r--r-- | FamicomDumperConnection/Dumper.proto | 11 | ||||
| -rw-r--r-- | FamicomDumperConnection/FamicomDumperClient.cs | 39 | ||||
| -rw-r--r-- | FamicomDumperConnection/FamicomDumperConnection.cs | 1058 | ||||
| -rw-r--r-- | FamicomDumperConnection/FamicomDumperConnection.csproj | 4 | ||||
| -rw-r--r-- | FamicomDumperConnection/FamicomDumperService.cs | 11 |
5 files changed, 54 insertions, 1069 deletions
diff --git a/FamicomDumperConnection/Dumper.proto b/FamicomDumperConnection/Dumper.proto index 76f17ac..18d8204 100644 --- a/FamicomDumperConnection/Dumper.proto +++ b/FamicomDumperConnection/Dumper.proto @@ -132,14 +132,21 @@ message ReadFdsRequest { message ReadFdsResponse {
optional ErrorInfo error_info = 1;
// Array of Famicom Disk System blocks data
- repeated bytes fds_blocks = 2;
+ repeated FdsBlock fds_blocks = 2;
}
message WriteFdsRequest {
// Block numbers to write (zero-based)
repeated uint32 block_numbers = 1;
// Array of Famicom Disk System blocks data
- repeated bytes fds_blocks = 2;
+ repeated FdsBlock fds_blocks = 2;
+}
+
+message FdsBlock {
+ int32 block_type = 1;
+ bytes block_data = 2;
+ bool crc_ok = 3;
+ bool end_of_head_meet = 4;
}
message MirroringRawResponse {
diff --git a/FamicomDumperConnection/FamicomDumperClient.cs b/FamicomDumperConnection/FamicomDumperClient.cs index 1982413..29fd79d 100644 --- a/FamicomDumperConnection/FamicomDumperClient.cs +++ b/FamicomDumperConnection/FamicomDumperClient.cs @@ -282,10 +282,21 @@ namespace com.clusterrr.Famicom.DumperConnection {
StartBlock = startBlock,
MaxBlockCount = maxBlockCount
-
});
ThrowIfNotSuccess(r.ErrorInfo);
- return r.FdsBlocks.Select(block => FdsBlockParser.FromBytes(block.ToByteArray())).ToArray();
+ return r.FdsBlocks.Select(block => {
+ IFdsBlock parsedBlock = block.BlockType switch
+ {
+ 1 => FdsBlockDiskInfo.FromBytes(block.BlockData.ToByteArray()),
+ 2 => FdsBlockFileAmount.FromBytes(block.BlockData.ToByteArray()),
+ 3 => FdsBlockFileHeader.FromBytes(block.BlockData.ToByteArray()),
+ 4 => FdsBlockFileData.FromBytes(block.BlockData.ToByteArray()),
+ _ => throw new InvalidDataException("Invalid FDS block type"),
+ };
+ parsedBlock.CrcOk = block.CrcOk;
+ parsedBlock.EndOfHeadMeet = block.EndOfHeadMeet;
+ return parsedBlock;
+ }).ToArray();
}
/// <summary>
@@ -297,7 +308,11 @@ namespace com.clusterrr.Famicom.DumperConnection {
var request = new WriteFdsRequest();
request.BlockNumbers.AddRange(blockNumbers.Select(b => (uint)b));
- request.FdsBlocks.AddRange(blocks.Select(block => ByteString.CopyFrom(block)));
+ request.FdsBlocks.AddRange(blocks.Select(block => new FdsBlock()
+ {
+ BlockType = block[0],
+ BlockData = ByteString.CopyFrom(block[0])
+ }));
var r = client.WriteFdsBlocks(request);
ThrowIfNotSuccess(r.ErrorInfo);
}
@@ -311,7 +326,11 @@ namespace com.clusterrr.Famicom.DumperConnection {
var request = new WriteFdsRequest();
request.BlockNumbers.AddRange(blockNumbers.Select(b => (uint)b));
- request.FdsBlocks.AddRange(blocks.Select(block => ByteString.CopyFrom(block.ToBytes())));
+ request.FdsBlocks.AddRange(blocks.Select(block => new FdsBlock()
+ {
+ BlockType = block.ValidTypeID,
+ BlockData = ByteString.CopyFrom(block.ToBytes())
+ }));
var r = client.WriteFdsBlocks(request);
ThrowIfNotSuccess(r.ErrorInfo);
}
@@ -325,7 +344,11 @@ namespace com.clusterrr.Famicom.DumperConnection {
var request = new WriteFdsRequest();
request.BlockNumbers.Add(blockNumber);
- request.FdsBlocks.Add(ByteString.CopyFrom(block));
+ request.FdsBlocks.Add(new FdsBlock()
+ {
+ BlockType = block[0],
+ BlockData = ByteString.CopyFrom(block)
+ });
var r = client.WriteFdsBlocks(request);
ThrowIfNotSuccess(r.ErrorInfo);
}
@@ -339,7 +362,11 @@ namespace com.clusterrr.Famicom.DumperConnection {
var request = new WriteFdsRequest();
request.BlockNumbers.Add(blockNumber);
- request.FdsBlocks.Add(ByteString.CopyFrom(block.ToBytes()));
+ request.FdsBlocks.Add(new FdsBlock()
+ {
+ BlockType = block.ValidTypeID,
+ BlockData = ByteString.CopyFrom(block.ToBytes())
+ });
var r = client.WriteFdsBlocks(request);
ThrowIfNotSuccess(r.ErrorInfo);
}
diff --git a/FamicomDumperConnection/FamicomDumperConnection.cs b/FamicomDumperConnection/FamicomDumperConnection.cs deleted file mode 100644 index ab5cfd7..0000000 --- a/FamicomDumperConnection/FamicomDumperConnection.cs +++ /dev/null @@ -1,1058 +0,0 @@ -using com.clusterrr.Famicom.Containers;
-using FTD2XX_NET;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.IO.Ports;
-using System.Linq;
-using System.Threading;
-
-namespace com.clusterrr.Famicom.DumperConnection
-{
- public class FamicomDumperConnection : IDisposable, IFamicomDumperConnection
- {
- const int PortBaudRate = 250000;
- const ushort DefaultMaxReadPacketSize = 1024;
- const ushort DefaultMaxWritePacketSize = 1024;
- const byte Magic = 0x46;
- readonly string[] DeviceNames = new string[] { "Famicom Dumper/Programmer", "Famicom Dumper/Writer" };
-
- public string PortName { get; set; }
- public byte ProtocolVersion { get; private set; } = 0;
- public uint Timeout
- {
- get
- {
- return timeout;
- }
- set
- {
- timeout = value;
- if (serialPort != null)
- {
- serialPort.ReadTimeout = (int)timeout;
- serialPort.WriteTimeout = (int)timeout;
- }
- }
- }
-
- private SerialPort serialPort = null;
- private FTDI d2xxPort = null;
- public ushort MaxReadPacketSize { get; private set; }
- public ushort MaxWritePacketSize { get; private set; }
-
- private uint timeout = 10000;
-
- enum DumperCommand
- {
- STARTED = 0,
- CHR_STARTED = 1, // deprecated
- ERROR_INVALID = 2,
- ERROR_CRC = 3,
- ERROR_OVERFLOW = 4,
- PRG_INIT = 5,
- CHR_INIT = 6,
- PRG_READ_REQUEST = 7,
- PRG_READ_RESULT = 8,
- PRG_WRITE_REQUEST = 9,
- PRG_WRITE_DONE = 10,
- CHR_READ_REQUEST = 11,
- CHR_READ_RESULT = 12,
- CHR_WRITE_REQUEST = 13,
- CHR_WRITE_DONE = 14,
- //PHI2_INIT = 15,
- //PHI2_INIT_DONE = 16,
- MIRRORING_REQUEST = 17,
- MIRRORING_RESULT = 18,
- RESET = 19,
- RESET_ACK = 20,
- //PRG_EPROM_WRITE_REQUEST = 21,
- //CHR_EPROM_WRITE_REQUEST = 22,
- //EPROM_PREPARE = 23,
- //PRG_FLASH_ERASE_REQUEST = 24,
- //PRG_FLASH_WRITE_REQUEST = 25,
- //CHR_FLASH_ERASE_REQUEST = 26,
- //CHR_FLASH_WRITE_REQUEST = 27,
- //TEST_SET = 32,
- //TEST_RESULT = 33,
- COOLBOY_READ_REQUEST = 34,
- COOLBOY_ERASE_SECTOR_REQUEST = 35,
- COOLBOY_WRITE_REQUEST = 36,
- FLASH_ERASE_SECTOR_REQUEST = 37,
- FLASH_WRITE_REQUEST = 38,
- PRG_CRC_READ_REQUEST = 39,
- CHR_CRC_READ_REQUEST = 40,
- FLASH_WRITE_ERROR = 41,
- FLASH_WRITE_TIMEOUT = 42,
- FLASH_ERASE_ERROR = 43,
- FLASH_ERASE_TIMEOUT = 44,
- FDS_READ_REQUEST = 45,
- FDS_READ_RESULT_BLOCK = 46,
- FDS_READ_RESULT_END = 47,
- FDS_TIMEOUT = 48,
- FDS_NOT_CONNECTED = 49,
- FDS_BATTERY_LOW = 50,
- FDS_DISK_NOT_INSERTED = 51,
- FDS_END_OF_HEAD = 52,
- FDS_WRITE_REQUEST = 53,
- FDS_WRITE_DONE = 54,
- SET_FLASH_BUFFER_SIZE = 55,
- SET_VALUE_DONE = 56,
- FDS_DISK_WRITE_PROTECTED = 57,
- FDS_BLOCK_CRC_ERROR = 58,
-
- BOOTLOADER = 0xFE,
- DEBUG = 0xFF
- }
-
- public FamicomDumperConnection(string portName = null)
- {
- this.PortName = portName;
- }
-
- /// <summary>
- /// Method to obtain list of Linux USB devices
- /// </summary>
- /// <returns>Array of usb devices </returns>
- private static string[] GetLinuxUsbDevices()
- {
- return Directory.GetDirectories("/sys/bus/usb/devices").Where(d => File.Exists(Path.Combine(d, "dev"))).ToArray();
- }
-
- /// <summary>
- /// Method to get serial port path for specified USB converter
- /// </summary>
- /// <param name="deviceSerial">Serial number of USB to serial converter</param>
- /// <returns>Path of serial port</returns>
- private static string LinuxDeviceToPort(string device)
- {
- var subdirectories = Directory.GetDirectories(device);
- foreach (var subdir in subdirectories)
- {
- // Searching for /sys/bus/usb/devices/{device}/xxx/ttyZZZ/
- var subsubdirectories = Directory.GetDirectories(subdir);
- var ports = subsubdirectories.Where(d =>
- {
- var directory = Path.GetFileName(d);
- return directory.Length > 3 && directory.StartsWith("tty");
- });
- if (ports.Any())
- return $"/dev/{Path.GetFileName(ports.First())}";
-
- // Searching for /sys/bus/usb/devices/{device}/xxx/tty/ttyZZZ/
- var ttyDirectory = Path.Combine(subdir, "tty");
- if (Directory.Exists(ttyDirectory))
- {
- ports = Directory.GetDirectories(ttyDirectory).Where(d =>
- {
- var directory = Path.GetFileName(d);
- return directory.Length > 3 && directory.StartsWith("tty");
- });
- if (ports.Any())
- return $"/dev/{Path.GetFileName(ports.First())}";
- }
- }
- return null;
- }
-
- /// <summary>
- /// Method to get serial port path for specified USB converter
- /// </summary>
- /// <param name="deviceSerial">Serial number of USB to serial converter</param>
- /// <returns>Path of serial port</returns>
- private static string LinuxDeviceSerialToPort(string deviceSerial)
- {
- var devices = GetLinuxUsbDevices().Where(d =>
- {
- var serialFile = Path.Combine(d, "serial");
- return File.Exists(serialFile) && File.ReadAllText(serialFile).Trim() == deviceSerial;
- });
- if (!devices.Any()) return null;
- var device = devices.First();
- return LinuxDeviceToPort(device);
- }
-
- private static SerialPort OpenPort(string name, int timeout)
- {
- var sPort = new SerialPort
- {
- PortName = name,
- WriteTimeout = timeout,
- ReadTimeout = timeout
- };
- if (!name.Contains("ttyACM"))
- {
- // Not supported by ACM devices
- sPort.BaudRate = PortBaudRate;
- sPort.Parity = Parity.None;
- sPort.DataBits = 8;
- sPort.StopBits = StopBits.One;
- sPort.Handshake = Handshake.None;
- sPort.DtrEnable = false;
- sPort.RtsEnable = false;
- }
- sPort.NewLine = Environment.NewLine;
- sPort.Open();
- return sPort;
- }
-
- public void Open()
- {
- ProtocolVersion = 0;
- MaxReadPacketSize = DefaultMaxReadPacketSize;
- MaxWritePacketSize = DefaultMaxWritePacketSize;
-
- SerialPort sPort = null;
- string portName = PortName;
- // Is port specified?
- if (string.IsNullOrEmpty(portName) || portName.ToLower() == "auto")
- {
- portName = null;
- // Need to autodetect port
-
- // Is it running on Windows?
- try
- {
- // First of all lets check bus reported device descriptions
- var allComPorts = Win32DeviceMgmt.GetAllCOMPorts();
- foreach (var port in allComPorts)
- {
- if (!DeviceNames.Contains(port.bus_description))
- continue;
- // Seems like it's dumper port but it can be already busy
- try
- {
- sPort = OpenPort(port.name, (int)Timeout);
- // It's not busy
- portName = port.name;
- Console.WriteLine($"Autodetected virtual serial port: {portName}");
- break;
- }
- catch
- {
- continue;
- }
- }
- }
- catch { }
-
- if (portName == null)
- {
- // Port still not detected, using Windows FTDI driver to determine serial number
- try
- {
- FTDI myFtdiDevice = new();
- uint ftdiDeviceCount = 0;
- FTDI.FT_STATUS ftStatus = FTDI.FT_STATUS.FT_OK;
- // FTDI serial number autodetect
- ftStatus = myFtdiDevice.GetNumberOfDevices(ref ftdiDeviceCount);
- // Check status
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException("Failed to get number of devices (error " + ftStatus.ToString() + ")");
-
- // If no devices available, return
- if (ftdiDeviceCount == 0)
- throw new IOException("Failed to get number of devices (error " + ftStatus.ToString() + ")");
-
- // Allocate storage for device info list
- FTDI.FT_DEVICE_INFO_NODE[] ftdiDeviceList = new FTDI.FT_DEVICE_INFO_NODE[ftdiDeviceCount];
-
- // Populate our device list
- ftStatus = myFtdiDevice.GetDeviceList(ftdiDeviceList);
-
- portName = null;
- if (ftStatus == FTDI.FT_STATUS.FT_OK)
- {
- var dumpers = ftdiDeviceList.Where(d => DeviceNames.Contains(d.Description));
- portName = dumpers.First().SerialNumber;
- Console.WriteLine($"Autodetected USB device serial number: {portName}");
- }
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException("Failed to get FTDI devices (error " + ftStatus.ToString() + ")");
- }
- catch
- {
- }
- }
-
- if (portName == null)
- {
- // Port still not detected, let's try Linux methods
- var devices = GetLinuxUsbDevices();
- var dumpers = devices.Where(d =>
- {
- var productFile = Path.Combine(d, "product");
- return File.Exists(productFile) && DeviceNames.Contains(File.ReadAllText(productFile).Trim());
- });
- if (dumpers.Any())
- {
- portName = LinuxDeviceToPort(dumpers.First());
- if (string.IsNullOrEmpty(portName))
- throw new IOException($"Can't detect device path");
- Console.WriteLine($"Autodetected USB device path: {portName}");
- }
- }
-
- if (portName == null)
- throw new IOException($"{DeviceNames.First()} not found, try to specify port name manually");
- }
-
- if (sPort != null)
- {
- // success, already opened
- serialPort = sPort;
- return;
- }
-
- if (portName.ToUpper().StartsWith("COM") || File.Exists(portName))
- {
- // Serial port name/path to open
- serialPort = OpenPort(portName, (int)Timeout);
- return;
- }
-
- try
- {
- // Is it VCP serial number?
- var ttyPath = LinuxDeviceSerialToPort(portName);
- if (!string.IsNullOrEmpty(ttyPath))
- {
- serialPort = OpenPort(ttyPath, (int)Timeout);
- return;
- }
- }
- catch { }
-
- try
- {
- // Is is FTDI serial number?
- // Using Windows FTDI driver
- FTDI.FT_STATUS ftStatus = FTDI.FT_STATUS.FT_OK;
- // Create new instance of the FTDI device class
- FTDI myFtdiDevice = new();
- // Open first device in our list by serial number
- ftStatus = myFtdiDevice.OpenBySerialNumber(portName);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException($"Failed to open device (error {ftStatus})");
- // Set data characteristics - Data bits, Stop bits, Parity
- ftStatus = myFtdiDevice.SetTimeouts(Timeout, Timeout);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException($"Failed to set timeouts (error {ftStatus})");
- ftStatus = myFtdiDevice.SetDataCharacteristics(FTDI.FT_DATA_BITS.FT_BITS_8, FTDI.FT_STOP_BITS.FT_STOP_BITS_1, FTDI.FT_PARITY.FT_PARITY_NONE);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException($"Failed to set data characteristics (error {ftStatus})");
- // Set flow control
- ftStatus = myFtdiDevice.SetFlowControl(FTDI.FT_FLOW_CONTROL.FT_FLOW_NONE, 0x11, 0x13);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException($"Failed to set flow control (error {ftStatus})");
- // Set up device data parameters
- ftStatus = myFtdiDevice.SetBaudRate(PortBaudRate);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException($"Failed to set Baud rate (error {ftStatus})");
- // Set latency
- ftStatus = myFtdiDevice.SetLatency(0);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException($"Failed to set latency (error {ftStatus})");
- d2xxPort = myFtdiDevice;
- return;
- }
- catch { }
-
- throw new IOException($"Can't open {serialPort}");
- }
- public void Close()
- {
- if (serialPort != null)
- {
- if (serialPort.IsOpen)
- serialPort.Close();
- serialPort = null;
- }
- if (d2xxPort != null)
- {
- if (d2xxPort.IsOpen)
- d2xxPort.Close();
- d2xxPort = null;
- }
- }
-
- private byte[] ReadPort()
- {
- var buffer = new byte[MaxReadPacketSize + 8];
- if (serialPort != null)
- {
- var l = serialPort.Read(buffer, 0, buffer.Length);
- var result = new byte[l];
- Array.Copy(buffer, result, l);
- return result;
- }
- else if (d2xxPort != null)
- {
- uint numBytesAvailable = 0;
- FTDI.FT_STATUS ftStatus;
- int t = 0;
- do
- {
- ftStatus = d2xxPort.GetRxBytesAvailable(ref numBytesAvailable);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException("Failed to get number of bytes available to read (error " + ftStatus.ToString() + ")");
- if (numBytesAvailable > 0)
- break;
- Thread.Sleep(10);
- t += 10;
- if (t >= Timeout)
- throw new TimeoutException("Read timeout");
- } while (numBytesAvailable == 0);
- uint numBytesRead = 0;
- ftStatus = d2xxPort.Read(buffer, Math.Min(numBytesAvailable, (uint)MaxReadPacketSize + 8), ref numBytesRead);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException("Failed to read data (error " + ftStatus.ToString() + ")");
- var result = new byte[numBytesRead];
- Array.Copy(buffer, result, numBytesRead);
- return result;
- }
- return null;
- }
-
- void SendCommand(DumperCommand command, byte[] data)
- {
- byte[] buffer = new byte[data.Length + 5];
- buffer[0] = Magic;
- buffer[1] = (byte)command;
- buffer[2] = (byte)(data.Length & 0xFF);
- buffer[3] = (byte)((data.Length >> 8) & 0xFF);
- Array.Copy(data, 0, buffer, 4, data.Length);
-
- byte crc = 0;
- for (var i = 0; i < buffer.Length - 1; i++)
- {
- byte inbyte = buffer[i];
- for (int j = 0; j < 8; j++)
- {
- byte mix = (byte)((crc ^ inbyte) & 0x01);
- crc >>= 1;
- if (mix != 0)
- crc ^= 0x8C;
- inbyte >>= 1;
- }
- }
- buffer[^1] = crc;
- if (serialPort != null)
- serialPort.Write(buffer, 0, buffer.Length);
- if (d2xxPort != null)
- {
- uint numBytesWritten = 0;
- var ftStatus = d2xxPort.Write(buffer, buffer.Length, ref numBytesWritten);
- if (ftStatus != FTDI.FT_STATUS.FT_OK)
- throw new IOException("Failed to write to device (error " + ftStatus.ToString() + ")");
- }
- }
-
- (DumperCommand Command, byte[] Data) RecvCommand()
- {
- int commRecvPos = 0;
- DumperCommand commRecvCommand = 0;
- int commRecvLength = 0;
- List<byte> recvBuffer = new();
- while (true)
- {
- var data = ReadPort();
- foreach (var b in data)
- {
- recvBuffer.Add(b);
- switch (commRecvPos)
- {
- case 0:
- if (b == Magic)
- commRecvPos++;
- else
- {
- recvBuffer.Clear();
- continue;
- //throw new InvalidDataException("Received invalid magic");
- }
- break;
- case 1:
- commRecvCommand = (DumperCommand)b;
- commRecvPos++;
- break;
- case 2:
- commRecvLength = b;
- commRecvPos++;
- break;
- case 3:
- commRecvLength |= b << 8;
- commRecvPos++;
- break;
- default:
- if (recvBuffer.Count == commRecvLength + 5)
- {
- // CRC
- var calculatecCRC = CRC(recvBuffer);
- if (calculatecCRC == 0)
- {
- // CRC OK
- if (commRecvCommand == DumperCommand.ERROR_CRC)
- throw new InvalidDataException("Dumper reported CRC error");
- else if (commRecvCommand == DumperCommand.ERROR_INVALID)
- throw new InvalidDataException("Dumper reported invalid magic");
- else if (commRecvCommand == DumperCommand.ERROR_OVERFLOW)
- throw new InvalidDataException("Dumper reported overflow error");
- else
- return (commRecvCommand, recvBuffer.Skip(4).Take(commRecvLength).ToArray());
- }
- else
- {
- // CRC NOT OK
- throw new InvalidDataException("Received data CRC error");
- }
- }
- break;
- }
- }
- }
- }
-
- static byte CRC(IEnumerable<byte> data)
- {
- byte commRecvCrc = 0;
- foreach (var b in data)
- {
- var inbyte = b;
- int j;
- for (j = 0; j < 8; j++)
- {
- byte mix = (byte)((commRecvCrc ^ inbyte) & 0x01);
- commRecvCrc >>= 1;
- if (mix != 0)
- commRecvCrc ^= 0x8C;
- inbyte >>= 1;
- }
- }
- return commRecvCrc;
- }
-
- /// <summary>
- /// Init dumper (flush queud data, check connection, read version)
- /// </summary>
- /// <returns></returns>
- public bool DumperInit()
- {
- bool result = false;
- var oldTimeout = Timeout;
- try
- {
- Timeout = 250;
- // Flush all queud data
- while (true)
- {
- try
- {
- RecvCommand();
- }
- catch
- {
- break;
- }
- }
- for (int i = 0; i < 300 && !result; i++)
- {
- try
- {
- SendCommand(DumperCommand.PRG_INIT, Array.Empty<byte>());
- var (Command, Data) = RecvCommand();
- if (Command == DumperCommand.STARTED)
- {
- if (Data.Length >= 1)
- ProtocolVersion = Data[0];
- if (Data.Length >= 3)
- MaxReadPacketSize = (ushort)(Data[1] | (Data[2] << 8));
- if (Data.Length >= 5)
- MaxWritePacketSize = (ushort)(Data[3] | (Data[4] << 8));
- result = true;
- }
- }
- catch { }
- }
- }
- finally
- {
- Timeout = oldTimeout;
- }
- return result;
- }
-
-
- /// <summary>
- /// Simulate reset (M2 goes to Z-state for a second)
- /// </summary>
- public void Reset()
- {
- SendCommand(DumperCommand.RESET, Array.Empty<byte>());
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.RESET_ACK)
- throw new IOException($"Invalid data received: {Command}");
- }
-
- /// <summary>
- /// Read single byte from CPU (PRG) bus
- /// </summary>
- /// <param name="address">Address to read from</param>
- /// <returns>Data from CPU (PRG) bus</returns>
- public byte ReadCpu(ushort address) => ReadCpu(address, 1)[0];
-
- /// <summary>
- /// Read data from CPU (PRG) bus
- /// </summary>
- /// <param name="address">Address to read from</param>
- /// <param name="length">Number of bytes to read</param>
- /// <returns>Data from CPU (PRG) bus</returns>
- public byte[] ReadCpu(ushort address, int length)
- {
- var result = new List<byte>();
- while (length > 0)
- {
- result.AddRange(ReadCpuBlock(address, Math.Min(MaxReadPacketSize, length)));
- address += MaxReadPacketSize;
- length -= MaxReadPacketSize;
- }
- return result.ToArray();
- }
-
- private byte[] ReadCpuBlock(ushort address, int length)
- {
- var buffer = new byte[4];
- buffer[0] = (byte)(address & 0xFF);
- buffer[1] = (byte)((address >> 8) & 0xFF);
- buffer[2] = (byte)(length & 0xFF);
- buffer[3] = (byte)((length >> 8) & 0xFF);
- SendCommand(DumperCommand.PRG_READ_REQUEST, buffer);
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.PRG_READ_RESULT)
- throw new IOException($"Invalid data received: {Command}");
- return Data;
- }
-
- /// <summary>
- /// Read CRC16 checksum of data at CPU (PRG) bus
- /// </summary>
- /// <param name="address">Address to read from</param>
- /// <param name="length">Number of bytes to read</param>
- /// <returns>Checksum</returns>
- public ushort ReadCpuCrc(ushort address, int length)
- {
- var buffer = new byte[4];
- buffer[0] = (byte)(address & 0xFF);
- buffer[1] = (byte)((address >> 8) & 0xFF);
- buffer[2] = (byte)(length & 0xFF);
- buffer[3] = (byte)((length >> 8) & 0xFF);
- SendCommand(DumperCommand.PRG_CRC_READ_REQUEST, buffer);
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.PRG_READ_RESULT)
- throw new IOException($"Invalid data received: {Command}");
- var crc = (ushort)(Data[0] | (Data[1] << 8));
- return crc;
- }
-
- /// <summary>
- /// Write data to CPU (PRG) bus
- /// </summary>
- /// <param name="address">Address to write to</param>
- /// <param name="data">Data to write, address will be incremented after each byte</param>
- public void WriteCpu(ushort address, params byte[] data)
- {
- int wlength = data.Length;
- int pos = 0;
- while (wlength > 0)
- {
- var wdata = new byte[Math.Min(MaxWritePacketSize, wlength)];
- Array.Copy(data, pos, wdata, 0, wdata.Length);
- WriteCpuBlock(address, wdata);
- address += (ushort)wdata.Length;
- pos += wdata.Length;
- wlength -= wdata.Length;
- }
- return;
- }
-
- private void WriteCpuBlock(ushort address, byte[] data)
- {
- int length = data.Length;
- var buffer = new byte[4 + length];
- buffer[0] = (byte)(address & 0xFF);
- buffer[1] = (byte)((address >> 8) & 0xFF);
- buffer[2] = (byte)(length & 0xFF);
- buffer[3] = (byte)((length >> 8) & 0xFF);
- Array.Copy(data, 0, buffer, 4, length);
- SendCommand(DumperCommand.PRG_WRITE_REQUEST, buffer);
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.PRG_WRITE_DONE)
- throw new IOException($"Invalid data received: {Command}");
- }
-
- /// <summary>
- /// Erase COOLBOY/GOOLGIRL current flash sector
- /// </summary>
- public void EraseFlashSector()
- {
- SendCommand(DumperCommand.FLASH_ERASE_SECTOR_REQUEST, Array.Empty<byte>());
- var (Command, Data) = RecvCommand();
- if (Command == DumperCommand.FLASH_ERASE_ERROR)
- throw new IOException($"Flash erase error (0x{Data[0]:X2})");
- else if (Command == DumperCommand.FLASH_ERASE_TIMEOUT)
- throw new TimeoutException($"Flash erase timeout");
- else if (Command != DumperCommand.PRG_WRITE_DONE)
- throw new IOException($"Invalid data received: {Command}");
- }
-
- /// <summary>
- /// Write COOLBOY/GOOLGIRL flash memory
- /// </summary>
- /// <param name="address">Address to write to</param>
- /// <param name="data">Data to write, address will be incremented after each byte</param>
- public void WriteFlash(ushort address, byte[] data)
- {
- int wlength = data.Length;
- int pos = 0;
- while (wlength > 0)
- {
- var wdata = new byte[Math.Min(MaxWritePacketSize, wlength)];
- Array.Copy(data, pos, wdata, 0, wdata.Length);
- if (data.Select(b => b != 0xFF).Any()) // if there is any not FF byte
- WriteCpuFlashBlock(address, wdata);
- address += (ushort)wdata.Length;
- pos += wdata.Length;
- wlength -= wdata.Length;
- }
- }
-
- private void WriteCpuFlashBlock(ushort address, byte[] data)
- {
- int length = data.Length;
- var buffer = new byte[4 + length];
- buffer[0] = (byte)(address & 0xFF);
- buffer[1] = (byte)((address >> 8) & 0xFF);
- buffer[2] = (byte)(length & 0xFF);
- buffer[3] = (byte)((length >> 8) & 0xFF);
- Array.Copy(data, 0, buffer, 4, length);
- SendCommand(DumperCommand.FLASH_WRITE_REQUEST, buffer);
- var (Command, Data) = RecvCommand();
- if (Command == DumperCommand.FLASH_WRITE_ERROR)
- throw new IOException($"Flash write error");
- else if (Command == DumperCommand.FLASH_WRITE_TIMEOUT)
- throw new IOException($"Flash write timeout");
- else if (Command != DumperCommand.PRG_WRITE_DONE)
- throw new IOException($"Invalid data received: {Command}");
- }
-
- /// <summary>
- /// Read single byte from PPU (CHR) bus
- /// </summary>
- /// <param name="address">Address to read from</param>
- /// <returns>Data from PPU (CHR) bus</returns>
- public byte ReadPpu(ushort address) => ReadPpu(address, 1)[0];
-
- /// <summary>
- /// Read data from PPU (CHR) bus
- /// </summary>
- /// <param name="address">Address to read from</param>
- /// <param name="length">Number of bytes to read</param>
- /// <returns>Data from PPU (CHR) bus</returns>
- public byte[] ReadPpu(ushort address, int length)
- {
- var result = new List<byte>();
- while (length > 0)
- {
- result.AddRange(ReadPpuBlock(address, Math.Min(MaxReadPacketSize, length)));
- address += MaxReadPacketSize;
- length -= MaxReadPacketSize;
- }
- return result.ToArray();
- }
-
- private byte[] ReadPpuBlock(ushort address, int length)
- {
- var buffer = new byte[4];
- buffer[0] = (byte)(address & 0xFF);
- buffer[1] = (byte)((address >> 8) & 0xFF);
- buffer[2] = (byte)(length & 0xFF);
- buffer[3] = (byte)((length >> 8) & 0xFF);
- SendCommand(DumperCommand.CHR_READ_REQUEST, buffer);
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.CHR_READ_RESULT)
- throw new IOException($"Invalid data received: {Command}");
- return Data;
- }
-
- /// <summary>
- /// Read CRC16 checksum of data at PPU (CHR) bus
- /// </summary>
- /// <param name="address">Address to read from</param>
- /// <param name="length">Number of bytes to read</param>
- /// <returns>Checksum</returns>
- public ushort ReadPpuCrc(ushort address, int length)
- {
- var buffer = new byte[4];
- buffer[0] = (byte)(address & 0xFF);
- buffer[1] = (byte)((address >> 8) & 0xFF);
- buffer[2] = (byte)(length & 0xFF);
- buffer[3] = (byte)((length >> 8) & 0xFF);
- SendCommand(DumperCommand.CHR_CRC_READ_REQUEST, buffer);
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.CHR_READ_RESULT)
- throw new IOException($"Invalid data received: {Command}");
- var crc = (ushort)(Data[0] | (Data[1] << 8));
- return crc;
- }
-
- /// <summary>
- /// Write data to PPU (CHR) bus
- /// </summary>
- /// <param name="address">Address to write to</param>
- /// <param name="data">Data to write, address will be incremented after each byte</param>
- public void WritePpu(ushort address, params byte[] data)
- {
- int wlength = data.Length;
- int pos = 0;
- while (wlength > 0)
- {
- var wdata = new byte[Math.Min(MaxWritePacketSize, wlength)];
- Array.Copy(data, pos, wdata, 0, wdata.Length);
- WritePpuBlock(address, wdata);
- address += (ushort)wdata.Length;
- pos += wdata.Length;
- wlength -= wdata.Length;
- }
- return;
- }
-
- private void WritePpuBlock(ushort address, byte[] data)
- {
- int length = data.Length;
- var buffer = new byte[4 + length];
- buffer[0] = (byte)(address & 0xFF);
- buffer[1] = (byte)((address >> 8) & 0xFF);
- buffer[2] = (byte)(length & 0xFF);
- buffer[3] = (byte)((length >> 8) & 0xFF);
- Array.Copy(data, 0, buffer, 4, length);
- SendCommand(DumperCommand.CHR_WRITE_REQUEST, buffer);
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.CHR_WRITE_DONE)
- throw new IOException($"Invalid data received: {Command}");
- }
-
- /// <summary>
- /// Read Famicom Disk System blocks
- /// </summary>
- /// <param name="startBlock">First block number to read (zero-based)</param>
- /// <param name="maxBlockCount">Maximum number of blocks to read</param>
- /// <returns>Array of Famicom Disk System blocks</returns>
- public IFdsBlock[] ReadFdsBlocks(byte startBlock = 0, byte maxBlockCount = byte.MaxValue)
- {
- if (ProtocolVersion < 3)
- throw new NotSupportedException("Dumper firmware version is too old, update it to read/write FDS cards");
- var blocks = new List<IFdsBlock>();
- var buffer = new byte[2];
- buffer[0] = startBlock;
- buffer[1] = maxBlockCount;
- SendCommand(DumperCommand.FDS_READ_REQUEST, buffer);
- bool receiving = true;
- int currentBlock = startBlock;
- while (receiving)
- {
- var (Command, Data) = RecvCommand();
- switch (Command)
- {
- case DumperCommand.FDS_READ_RESULT_BLOCK:
- {
- var data = Data.Take(Data.Length - 2).ToArray();
- IFdsBlock newBlock;
- if (currentBlock == 0)
- newBlock = FdsBlockDiskInfo.FromBytes(data);
- else if (currentBlock == 1)
- newBlock = FdsBlockFileAmount.FromBytes(data);
- else if ((currentBlock % 2) == 0)
- newBlock = FdsBlockFileHeader.FromBytes(data);
- else
- newBlock = FdsBlockFileData.FromBytes(data);
- newBlock.CrcOk = Data[^2] != 0;
- newBlock.EndOfHeadMeet = Data[^1] != 0;
- blocks.Add(newBlock);
- currentBlock++;
- }
- break;
- case DumperCommand.FDS_READ_RESULT_END:
- receiving = false;
- break;
- case DumperCommand.FDS_NOT_CONNECTED:
- throw new IOException("RAM adapter IO error, is it connected?");
- case DumperCommand.FDS_DISK_NOT_INSERTED:
- throw new IOException("Disk card is not set");
- case DumperCommand.FDS_BATTERY_LOW:
- throw new IOException("Battery voltage is low or power supply is not connected");
- case DumperCommand.FDS_TIMEOUT:
- throw new IOException("FDS read timeout");
- case DumperCommand.FDS_END_OF_HEAD:
- throw new IOException("End of head");
- case DumperCommand.FDS_BLOCK_CRC_ERROR:
- throw new IOException("Block CRC error");
- default:
- throw new IOException($"Invalid data received: {Command}");
- }
- }
- return blocks.ToArray();
- }
-
- /// <summary>
- /// Write blocks to Famicom Disk System card
- /// </summary>
- /// <param name="blockNumbers">Block numbers to write (zero-based)</param>
- /// <param name="blocks">Raw blocks data</param>
- public void WriteFdsBlocks(byte[] blockNumbers, params byte[][] blocks)
- {
- if (ProtocolVersion < 3)
- throw new NotSupportedException("Dumper firmware version is too old, update it to read/write FDS cards");
- if (blockNumbers.Length != blocks.Length)
- throw new ArgumentException("blockNumbers.Length != blocks.Length");
- var buffer = new byte[1 + blocks.Length + blocks.Length * 2 + blocks.Sum(e => e.Length)];
- buffer[0] = (byte)(blocks.Length);
- for (int i = 0; i < blocks.Length; i++)
- {
- buffer[1 + i] = blockNumbers[i];
- }
- for (int i = 0; i < blocks.Length; i++)
- {
- buffer[1 + blocks.Length + i * 2] = (byte)(blocks[i].Length & 0xFF);
- buffer[1 + blocks.Length + i * 2 + 1] = (byte)((blocks[i].Length >> 8) & 0xFF);
- }
- int pos = 1 + blocks.Length + blocks.Length * 2;
- foreach (var block in blocks)
- {
- Array.Copy(block, 0, buffer, pos, block.Length);
- pos += block.Length;
- }
- SendCommand(DumperCommand.FDS_WRITE_REQUEST, buffer);
- var (Command, Data) = RecvCommand();
- switch (Command)
- {
- case DumperCommand.FDS_WRITE_DONE:
- return;
- case DumperCommand.FDS_NOT_CONNECTED:
- throw new IOException("RAM adapter IO error, is it connected?");
- case DumperCommand.FDS_DISK_NOT_INSERTED:
- throw new IOException("Disk card is not set");
- case DumperCommand.FDS_DISK_WRITE_PROTECTED:
- throw new IOException("Disk card is write protected");
- case DumperCommand.FDS_BATTERY_LOW:
- throw new IOException("Battery voltage is low or power supply is not connected");
- case DumperCommand.FDS_TIMEOUT:
- throw new IOException("FDS read timeout");
- case DumperCommand.FDS_END_OF_HEAD:
- throw new IOException("End of head");
- case DumperCommand.FDS_BLOCK_CRC_ERROR:
- throw new IOException("Block CRC error");
- case DumperCommand.FDS_READ_RESULT_END:
- throw new IOException("Unexpected end of data");
- default:
- throw new IOException($"Invalid data received: {Command}");
- }
- }
-
- /// <summary>
- /// Write blocks to Famicom Disk System card
- /// </summary>
- /// <param name="blockNumbers">Block numbers to write (zero-based)</param>
- /// <param name="blocks">Blocks data</param>
- public void WriteFdsBlocks(byte[] blockNumbers, IEnumerable<IFdsBlock> blocks)
- => WriteFdsBlocks(blockNumbers, blocks.Select(b => b.ToBytes()).ToArray());
-
- /// <summary>
- /// Write single block to Famicom Disk System card
- /// </summary>
- /// <param name="blockNumbers">Block numbers to write (zero-based)</param>
- /// <param name="block">Block data</param>
- public void WriteFdsBlocks(byte blockNumber, byte[] block)
- => WriteFdsBlocks(new byte[] { blockNumber }, block);
-
- /// <summary>
- /// Write single block to Famicom Disk System card
- /// </summary>
- /// <param name="blockNumbers">Block numbers to write (zero-based)</param>
- /// <param name="block">Block data</param>
- public void WriteFdsBlocks(byte blockNumber, IFdsBlock block)
- => WriteFdsBlocks(new byte[] { blockNumber }, block.ToBytes());
-
- /// <summary>
- /// Read raw mirroring values (CIRAM A10 pin states for different states of PPU A10 and A11)
- /// </summary>
- /// <returns>Values of CIRAM A10 pin for $2000-$23FF, $2400-$27FF, $2800-$2BFF and $2C00-$2FFF</returns>
- public bool[] GetMirroringRaw()
- {
- SendCommand(DumperCommand.MIRRORING_REQUEST, Array.Empty<byte>());
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.MIRRORING_RESULT)
- throw new IOException($"Invalid data received: {Command}");
- var mirroringRaw = Data;
- return mirroringRaw.Select(v => v != 0).ToArray();
- }
-
- /// <summary>
- /// Read decoded current mirroring mode
- /// </summary>
- /// <returns>Current mirroring</returns>
- public NesFile.MirroringType GetMirroring()
- {
- var mirroringRaw = GetMirroringRaw();
- if (mirroringRaw.Length == 1)
- {
- // Backward compatibility with old firmwares
- return mirroringRaw[0] ? NesFile.MirroringType.Vertical : NesFile.MirroringType.Horizontal;
- }
- else if (mirroringRaw.Length == 4)
- {
- var mirrstr = $"{(mirroringRaw[0] ? 1 : 0)}{(mirroringRaw[1] ? 1 : 0)}{(mirroringRaw[2] ? 1 : 0)}{(mirroringRaw[3] ? 1 : 0)}";
- switch (mirrstr)
- {
- case "0011":
- return NesFile.MirroringType.Horizontal; // Horizontal
- case "0101":
- return NesFile.MirroringType.Vertical; // Vertical
- case "0000":
- return NesFile.MirroringType.OneScreenA; // One-screen A
- case "1111":
- return NesFile.MirroringType.OneScreenB; // One-screen B
- }
- }
- return NesFile.MirroringType.Unknown; // Unknown
- }
-
- /// <summary>
- /// Set maximum number of bytes in multi-byte flash program
- /// </summary>
- /// <param name="pageSize"></param>
- public void SetMaximumNumberOfBytesInMultiProgram(uint pageSize)
- {
- if (ProtocolVersion < 3)
- throw new NotSupportedException("Dumper firmware version is too old");
- var buffer = new byte[2];
- buffer[0] = (byte)(pageSize & 0xFF);
- buffer[1] = (byte)((pageSize >> 8) & 0xFF);
- SendCommand(DumperCommand.SET_FLASH_BUFFER_SIZE, buffer);
- var (Command, Data) = RecvCommand();
- if (Command != DumperCommand.SET_VALUE_DONE)
- throw new IOException($"Invalid data received: {Command}");
- }
-
- public void Bootloader()
- {
- SendCommand(DumperCommand.BOOTLOADER, Array.Empty<byte>());
- }
-
- public void Dispose()
- {
- Close();
- GC.SuppressFinalize(this);
- }
- }
-}
diff --git a/FamicomDumperConnection/FamicomDumperConnection.csproj b/FamicomDumperConnection/FamicomDumperConnection.csproj index 3364150..e67de60 100644 --- a/FamicomDumperConnection/FamicomDumperConnection.csproj +++ b/FamicomDumperConnection/FamicomDumperConnection.csproj @@ -14,6 +14,10 @@ </ItemGroup>
<ItemGroup>
+ <None Include="..\.editorconfig" Link=".editorconfig" />
+ </ItemGroup>
+
+ <ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.37.0" />
<PackageReference Include="System.IO.Ports" Version="5.0.1" />
</ItemGroup>
diff --git a/FamicomDumperConnection/FamicomDumperService.cs b/FamicomDumperConnection/FamicomDumperService.cs index 4a03935..390c1b8 100644 --- a/FamicomDumperConnection/FamicomDumperService.cs +++ b/FamicomDumperConnection/FamicomDumperService.cs @@ -387,8 +387,13 @@ namespace com.clusterrr.Famicom.DumperConnection blocks = dumper.ReadFdsBlocks((byte)request.StartBlock, (byte)request.MaxBlockCount);
else
blocks = dumper.ReadFdsBlocks((byte)request.StartBlock);
- var blocksRaw = blocks.Select(block => ByteString.CopyFrom(block.ToBytes()));
- result.FdsBlocks.AddRange(blocksRaw);
+ result.FdsBlocks.AddRange(blocks.Select(block => new FdsBlock()
+ {
+ BlockType = block.ValidTypeID,
+ BlockData = ByteString.CopyFrom(block.ToBytes()),
+ CrcOk = block.CrcOk,
+ EndOfHeadMeet = block.EndOfHeadMeet
+ }));
Console.WriteLine("OK");
}
catch (Exception ex)
@@ -411,7 +416,7 @@ namespace com.clusterrr.Famicom.DumperConnection Console.Write($"Writing FDS block(s) {string.Join(", ", request.BlockNumbers)}... ");
dumper.WriteFdsBlocks(
request.BlockNumbers.Select(b => (byte)b).ToArray(),
- request.FdsBlocks.Select(block => block.ToByteArray()).ToArray());
+ request.FdsBlocks.Select(block => block.BlockData.ToByteArray()).ToArray());
Console.WriteLine("OK");
}
catch (Exception ex)
|