github.com/livingcomputermuseum.ContrAlto
1
0
Fork 0
mirror of https://github.com/livingcomputermuseum/ContrAlto.git synced 2026-02-19 22:05:53 +00:00
Code Issues Releases Wiki Activity

Implemented Alto Keyset at long last, cleaned up Trident controller somewhat. Finished Trident commandset for SDL console. Updated readme files and installer WXS in preparation for 1.2.2 release.

Browse Source
This commit is contained in:
Josh Dersch
2017-09-14 13:16:26 -07:00
parent 38124350fb
commit 3e281b318b
13 changed files with 728 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Contralto/AltoSystem.cs
View File

@@ -41,7 +41,7 @@ namespace Contralto
_keyboard = new Keyboard();
_diskController = new DiskController(this);
_displayController = new DisplayController(this);
_mouse = new Mouse();
_mouseAndKeyset = new MouseAndKeyset();
_ethernetController = new EthernetController(this);
_orbitController = new OrbitController(this);
_audioDAC = new AudioDAC(this);
@@ -53,7 +53,7 @@ namespace Contralto
// Attach memory-mapped devices to the bus
_memBus.AddDevice(_mem);
_memBus.AddDevice(_keyboard);
_memBus.AddDevice(_mouse);
_memBus.AddDevice(_mouseAndKeyset);
_memBus.AddDevice(_audioDAC);
_memBus.AddDevice(_organKeyboard);
@@ -71,7 +71,7 @@ namespace Contralto
_diskController.Reset();
_displayController.Reset();
_keyboard.Reset();
_mouse.Reset();
_mouseAndKeyset.Reset();
_cpu.Reset();
_ethernetController.Reset();
_orbitController.Reset();
@@ -231,11 +231,11 @@ namespace Contralto
if (newImage)
{
newPack = InMemoryDiskPack.CreateEmpty(geometry, path);
newPack = FileBackedDiskPack.CreateEmpty(geometry, path);
}
else
{
newPack = InMemoryDiskPack.Load(geometry, path);
newPack = FileBackedDiskPack.Load(geometry, path);
}
_tridentController.Drives[drive].LoadPack(newPack);
@@ -301,9 +301,9 @@ namespace Contralto
get { return _keyboard; }
}
public Mouse Mouse
public MouseAndKeyset MouseAndKeyset
{
get { return _mouse; }
get { return _mouseAndKeyset; }
}
public EthernetController EthernetController
@@ -330,7 +330,7 @@ namespace Contralto
private MemoryBus _memBus;
private Memory.Memory _mem;
private Keyboard _keyboard;
private Mouse _mouse;
private MouseAndKeyset _mouseAndKeyset;
private DiskController _diskController;
private DisplayController _displayController;
private EthernetController _ethernetController;