github.com/livingcomputermuseum.ContrAlto
1
0
Fork 0
mirror of https://github.com/livingcomputermuseum/ContrAlto.git synced 2026-01-24 03:16:49 +00:00
Code Issues Releases Wiki Activity

Commiting misc. changes and notes.

Browse Source
This commit is contained in:
Josh Dersch 2015-12-03 10:51:48 -08:00
parent 2c2ea68a63
commit 2ee3d64f6c
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Contralto/IO/DiskController.cs
View File

@ -52,9 +52,7 @@ namespace Contralto.IO
_syncWordWritten = false;
// "In addition, it causes the head address bit to be loaded from KDATA[13]."
int newHead = (_kDataWrite & 0x4) >> 2;
_disk = ((_kDataWrite & 0x2) >> 1) ^ (_kAdr & 0x1);
int newHead = (_kDataWrite & 0x4) >> 2;
if (newHead != _head)
{
@ -83,18 +81,7 @@ namespace Contralto.IO
(_kDataWrite & 0x2) >> 1,
(_kDataWrite & 0x1));
Log.Write(LogComponent.DiskController, " -Selected disk is {0}", _disk);
if (((_kAdr & 0xc) >> 2) == 2 ||
((_kAdr & 0xc) >> 2) == 3)
{
Console.WriteLine("DATA WRITE");
}
if (_disk != 0)
{
Console.WriteLine("*** DISK 1 SELECTED ***");
}
Log.Write(LogComponent.DiskController, " -Selected disk is {0}", _disk);
if ((_kDataWrite & 0x1) != 0)
{
@ -125,6 +112,18 @@ namespace Contralto.IO
{
_wdInit = true;
}
if (_sendAdr)
{
// Select disk if _sendAdr is true
_disk = ((_kDataWrite & 0x2) >> 1) ^ (_kAdr & 0x1);
if (_disk != 0)
{
Console.WriteLine("*** DISK 1 SELECTED ***");
}
}
}
}
@ -507,7 +506,7 @@ namespace Contralto.IO
// microcode via KDATA, log it.
if (_debugRead)
{
Console.WriteLine("--- missed sector word {0}({1}) ---", _sectorWordIndex, _kDataRead);
Log.Write(LogType.Warning, LogComponent.DiskController, "--- missed sector word {0}({1}) ---", _sectorWordIndex, _kDataRead);
}
Log.Write(LogType.Verbose, LogComponent.DiskWordTask, "Sector {0} Word {1} read into KDATA", _sector, Conversion.ToOctal(diskWord));
@ -517,7 +516,7 @@ namespace Contralto.IO
else
{
// Write
Log.Write(LogType.Normal, LogComponent.DiskController, "Sector {0} Word {1} (rec {2}) to be written with {3} from KDATA", _sector, _sectorWordIndex, _recNo, Conversion.ToOctal(_kDataWrite));
Log.Write(LogType.Verbose, LogComponent.DiskController, "Sector {0} Word {1} (rec {2}) to be written with {3} from KDATA", _sector, _sectorWordIndex, _recNo, Conversion.ToOctal(_kDataWrite));
if (_kDataWriteLatch)
{
@ -528,14 +527,12 @@ namespace Contralto.IO
if (_syncWordWritten && _sectorWordIndex < _sectorData.Length)
{
if (_sectorData[_sectorWordIndex].Type == CellType.Data)
{
Console.WriteLine("Data written to data section.");
{
_sectorData[_sectorWordIndex].Data = _kDataWrite;
}
else
{
Console.WriteLine("Data written to non-data section.");
_sectorData[_sectorWordIndex].Data = _kDataWrite;
Log.Write(LogType.Warning, LogComponent.DiskController, "Data written to non-data section (Sector {0} Word {1} Rec {2} Data {3})", _sector, _sectorWordIndex, _recNo, Conversion.ToOctal(_kDataWrite));
}
_sectorModified = true;
@ -780,7 +777,7 @@ namespace Contralto.IO
// $MIR0BL $177775; DISK INTERRECORD PREAMBLE IS 3 WORDS <<-- writing
// $MRPAL $177775; DISK READ POSTAMBLE LENGTH IS 3 WORDS
// $MWPAL $177773; DISK WRITE POSTAMBLE LENGTH IS 5 WORDS <<-- writing, clearly.
private static double _scale = 1.5;
private static double _scale = 1.75;
private static ulong _sectorDuration = (ulong)((40.0 / 12.0) * Conversion.MsecToNsec * _scale); // time in nsec for one sector
private static int _sectorWordCount = 269 + 22 + 34; // Based on : 269 data words (+ cksums) / sector, + X words for delay / preamble / sync
private static ulong _wordDuration = (ulong)((_sectorDuration / (ulong)(_sectorWordCount)) * _scale); // time in nsec for one word

2
Contralto/Logging/Log.cs
View File

@ -44,7 +44,7 @@ namespace Contralto.Logging
static Log()
{
// TODO: make configurable
_components = LogComponent.DiskController | LogComponent.DiskSectorTask;
_components = LogComponent.None; // LogComponent.DiskController | LogComponent.DiskSectorTask;
_type = LogType.Normal | LogType.Warning | LogType.Error;
}

13
Contralto/Notes.txt
View File

@ -51,3 +51,16 @@ Current issues are around how the "INIT" mode of RWC works (the mysterious fourt
The logic is
12/3/15:
Project is on backburner while working on SUPDUP; notes for myself on current status:
- Disk reads/writes work (code is a bit hacky, but it's bound to be), need to allow persisting in-memory disk image back to disk image file.
- Drive selection logic seems to be correct, but "drive" logic needs to be decoupled from "controller" logic before multiple drives can be implemented
- Certain programs hang waiting for the disk to complete an action, the disk is inactive, so there is a deadlock. Unsure exactly, but suspect a race condition
where the Alto code writes a new DCB (and expects the disk to notice it), but the DCB pointer gets clobbered by the controller after completing a previous task.
- Keyboard input has a few bugs (SHIFT gets stuck on occasionally) and UI needs major cleanup / refactoring.
- Disk controller is currently running 75% slower than normal to allow it to work properly; need to figure out why this is necessary -- are my timing calculations
off or are there issues with the microcode engine?
-