github.com/livingcomputermuseum.Darkstar
1
0
Fork 0
mirror of https://github.com/livingcomputermuseum/Darkstar.git synced 2026-04-08 23:00:45 +00:00
Code Issues Releases Wiki Activity

Updated UI for minor version update. Cleaned up hard disk commit code to deal with failure cases without destroying original images. Tweaked Ethernet config to allow on-the-fly host adapter changes. Updated readme.

Browse Source
This commit is contained in:
Josh Dersch
2019-03-29 12:08:09 -07:00
parent b6d1bb5837
commit 1349734125
10 changed files with 87 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
D/Configuration.cs
View File

@@ -89,7 +89,7 @@ namespace D
//
// Sanity-check settings that need sanity-checking.
//
if (MemorySize > 1024 ||
if (MemorySize > 768 ||
MemorySize == 0 ||
(MemorySize % 128) != 0)
{

66
D/Ethernet/EthernetController.cs
View File

@@ -57,24 +57,8 @@ namespace D.Ethernet
_pendingPackets = new Queue<MemoryStream>();
_crc32 = new CRC32();
// Attach real Ethernet device if user has specified one, otherwise leave unattached; output data
// will go into a bit-bucket.
try
{
if (Configuration.HostRawEthernetInterfacesAvailable &&
!string.IsNullOrWhiteSpace(Configuration.HostPacketInterfaceName))
{
_hostInterface = new HostEthernetEncapsulation(Configuration.HostPacketInterfaceName);
_hostInterface.RegisterReceiveCallback(OnHostPacketReceived);
}
}
catch (Exception e)
{
_hostInterface = null;
Log.Write(LogComponent.HostEthernet, "Unable to configure network interface. Error {0}", e.Message);
}
AttachHostEthernet();
_readerLock = new ReaderWriterLockSlim();
@@ -84,6 +68,15 @@ namespace D.Ethernet
Reset();
}
public void Shutdown()
{
if (_hostInterface != null)
{
_hostInterface.Shutdown();
_hostInterface = null;
}
}
public void Reset()
{
_turnOff_ = false;
@@ -116,6 +109,20 @@ namespace D.Ethernet
_crc32.Reset();
}
public void HostInterfaceChanged()
{
//
// Shut down previous host interface (if any) and attach a new one:
//
if (_hostInterface != null)
{
_hostInterface.Shutdown();
_hostInterface = null;
}
AttachHostEthernet();
}
public int EtherDisp()
{
//
@@ -869,7 +876,28 @@ namespace D.Ethernet
if (Log.Enabled) Log.Write(LogComponent.EthernetControl, "Sleeping Ethernet task.");
_system.CP.SleepTask(TaskType.Ethernet);
}
}
}
private void AttachHostEthernet()
{
// Attach real Ethernet device if user has specified one, otherwise leave unattached; output data
// will go into a bit-bucket.
try
{
if (Configuration.HostRawEthernetInterfacesAvailable &&
!string.IsNullOrWhiteSpace(Configuration.HostPacketInterfaceName))
{
_hostInterface = new HostEthernetEncapsulation(Configuration.HostPacketInterfaceName);
_hostInterface.RegisterReceiveCallback(OnHostPacketReceived);
}
}
catch (Exception e)
{
_hostInterface = null;
Log.Write(LogComponent.HostEthernet, "Unable to configure network interface. Error {0}", e.Message);
}
}
private DSystem _system;

15
D/IO/SA1000.cs
View File

@@ -98,7 +98,14 @@ namespace D.IO
public void Save(string path)
{
using (FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write))
//
// We commit to a temporary file first, then replace the original with the
// temporary file if successful. This ensures that if something goes wrong
// during the Save operation that at the very least the original image file
// is left unscathed.
string tempPath = Path.GetTempFileName();
using (FileStream fs = new FileStream(tempPath, FileMode.Create, FileAccess.Write))
{
//
// Format is:
@@ -119,9 +126,11 @@ namespace D.IO
}
}
}
_diskImagePath = path;
}
// Complete: Move temporary file to final location.
File.Copy(tempPath, path, true /* overwrite */);
_diskImagePath = path;
}
public void Load(string path)

2
D/Program.cs
View File

@@ -68,7 +68,7 @@ namespace D
private static void PrintHerald()
{
Console.WriteLine("Darkstar v{0}", typeof(Program).Assembly.GetName().Version);
Console.WriteLine("(c) 2017, 2018 Living Computers: Museum+Labs");
Console.WriteLine("(c) 2017-2019 Living Computers: Museum+Labs");
Console.WriteLine("Bug reports to joshd@livingcomputers.org");
Console.WriteLine();
}

6
D/Properties/AssemblyInfo.cs
View File

@@ -39,7 +39,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Living Computers: Museum+Labs")]
[assembly: AssemblyProduct("Darkstar")]
[assembly: AssemblyCopyright("Copyright © 2017, 2018")]
[assembly: AssemblyCopyright("Copyright © 2017-2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0.1")]
[assembly: AssemblyFileVersion("1.0.0.1")]

2
D/System.cs
View File

@@ -125,7 +125,9 @@ namespace D
public void Shutdown(bool commitDisks)
{
Console.WriteLine("Saving disk images and shutting down. Please wait...");
_hardDrive.Save();
_ethernetController.Shutdown();
}
public bool IsExecuting

4
D/UI/AboutBox.Designer.cs generated
View File

@@ -89,9 +89,9 @@ namespace D.UI
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(56, 54);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(235, 13);
this.label3.Size = new System.Drawing.Size(232, 13);
this.label3.TabIndex = 2;
this.label3.Text = "(c) 2017, 2018 Living Computers: Museum+Labs";
this.label3.Text = "(c) 2017-2019 Living Computers: Museum+Labs";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label4

2
D/UI/ConfigurationDialog.cs
View File

@@ -60,7 +60,7 @@ namespace D.UI
{
// System Tab
MemorySizeComboBox.Items.Clear();
for (int i = 128; i <= 1024; i+= 128)
for (int i = 128; i <= 768; i+= 128)
{
MemorySizeComboBox.Items.Add(string.Format("{0}KW", i));
if (i == MemorySize)

6
D/UI/DWindow.cs
View File

@@ -315,7 +315,8 @@ namespace D.UI
if (configDialog.HostPacketInterfaceName != Configuration.HostPacketInterfaceName)
{
MessageBox.Show("Changes to ethernet interface will not take effect until the system is restarted.");
Configuration.HostPacketInterfaceName = configDialog.HostPacketInterfaceName;
_system.EthernetController.HostInterfaceChanged();
}
if (configDialog.TODSetMode != Configuration.TODSetMode ||
@@ -334,8 +335,7 @@ namespace D.UI
}
}
Configuration.MemorySize = configDialog.MemorySize;
Configuration.HostPacketInterfaceName = configDialog.HostPacketInterfaceName;
Configuration.MemorySize = configDialog.MemorySize;
Configuration.ThrottleSpeed = configDialog.ThrottleSpeed;
Configuration.DisplayScale = configDialog.DisplayScale;
Configuration.SlowPhosphor = configDialog.SlowPhosphor;

27
D/readme.txt
View File

@@ -15,7 +15,7 @@ used to refer to any of the above machines.
Darkstar currently emulates the following Star hardware:
- Standard 8010/1108 Central Processor (CP) with 4KW of microcode store
- i8085-based IO Processor (IOP)
- Up to 1MW of main memory
- Up to 768KW of main memory
- Bitmapped Display
- Keyboard / Mouse
- 10, 40, or 80mb hard drives (SA1000 interface)
@@ -363,12 +363,8 @@ Each tab is explained in detail in the following subsections.
The System Configuration tab provides configuration for three options:
- Memory Size (KW): Configures the amount of memory installed in the system,
From 128KW to 1024KW in 128KW increments. This defaults to 768KW.
Changes made here will not take effect until the system is reset. Note
that memory sizes over 768KW (1.5MB) never officially existed on real Star
hardware and may cause issues with some software that isn't prepared for
it. In particular, Interlisp-D releases later than Harmony will crash
after startup.
From 128KW to 768KW in 128KW increments. This defaults to 768KW.
Changes made here will not take effect until the system is reset.
- Host ID (MAC Address): Configures the Star's Ethernet MAC Address (also used
as the system's Host ID for licensing.) If you have multiple instances of
@@ -457,11 +453,10 @@ synopsis of the various commands at your disposal.
6.0 Known Issues
================
- Interlisp-D releases after Harmony do not run properly.
- The Ethernet hardware has not been thoroughly tested.
- Speed throttling is not implemented on Unix platforms.
- SDL is forced to software-rendering mode due to an odd bug that has yet to
be solved. Performance may suffer as a result.
- SDL is forced to software-rendering mode on Unix platformst
due to an odd bug that has yet to be solved. Performance may suffer as a
result.
7.0 Reporting Bugs
@@ -553,6 +548,14 @@ https://github.com/flibitijibibo/SDL2-CS.
11.0 Change History
===================
V1.0
v1.0.0.1
--------
- Fixed Ethernet receiver; Ethernet controller now works reliably.
- Cleaned up shutdown code, made hard disk image saving more robust in the face
of failure
- Removed 1MW memory option since it was never a shipping configuration and
causes issues with various Xerox software.
v1.0
----
Initial release.