diff --git a/emulator/B5500CentralControl.js b/emulator/B5500CentralControl.js index 62d1d91..c176fe5 100644 --- a/emulator/B5500CentralControl.js +++ b/emulator/B5500CentralControl.js @@ -108,7 +108,7 @@ B5500CentralControl.unitIndex = [ [null, 47,null, 46, 31, 45, 29, 44, 30, 43, 24, 42, 28, 41, 23, 40, 17, 39, 20, 38, 19, 37,null, 36,null, 35,null, 34,null, 33, 22, 32]]; -// The following object maps the unit mnemonics from B5500SystemConfiguration.Units +// The following object maps the unit mnemonics from B5500SystemConfiguration.units // to the attributes needed to configure the CC unit[] array. B5500CentralControl.unitSpecs = { @@ -814,7 +814,7 @@ B5500CentralControl.prototype.configureSystem = function() { function makeChange(cc, maskBit) { return function(ready) { cc.unitStatusMask = (ready ? cc.bitSet(cc.unitStatusMask, maskBit) - : cc.bitReset(cc.unitStatusMask, maskBit); + : cc.bitReset(cc.unitStatusMask, maskBit)); }; } @@ -865,18 +865,15 @@ B5500CentralControl.prototype.configureSystem = function() { } // Configure the peripheral units - for (mnem in cfg.Units) { - if (cfg.Units[mnem]) { + for (mnem in cfg.units) { + if (cfg.units[mnem]) { specs = B5500CentralControl.unitSpecs[mnem]; if (specs) { unitClass = specs.unitClass || B5500DummyUnit; if (unitClass) { u = new unitClass(mnem, specs.index, specs.designate, - makeChange(this, specs.index), makeSignal(this, mnem); + makeChange(this, specs.index), makeSignal(this, mnem)); this.unit[specs.index] = u; - u.mnemonic = mnem; - u.index = specs.index; - u.designate = specs.designate; } } } diff --git a/emulator/B5500IOUnit.js b/emulator/B5500IOUnit.js index 941efdc..bb88927 100644 --- a/emulator/B5500IOUnit.js +++ b/emulator/B5500IOUnit.js @@ -549,7 +549,7 @@ B5500IOUnit.prototype.finish = function () { }; /**************************************/ -B5500IOUnit.prototype.makeFinish(f) { +B5500IOUnit.prototype.makeFinish = function(f) { /* Utility function to create a closure for I/O finish handlers */ var that = this; diff --git a/emulator/B5500SystemConfiguration.js b/emulator/B5500SystemConfiguration.js index f4679f1..5d01fcc 100644 --- a/emulator/B5500SystemConfiguration.js +++ b/emulator/B5500SystemConfiguration.js @@ -27,7 +27,7 @@ var B5500SystemConfiguration = { IO3: false, // I/O Unit 3 available IO4: false, // I/O Unit 4 available - MemMod: [ + memMod: [ true, // Memory module 0 available (4KW) true, // Memory module 1 available (4KW) false, // Memory module 2 available (4KW) @@ -37,7 +37,7 @@ var B5500SystemConfiguration = { false, // Memory module 6 available (4KW) false], // Memory module 7 available (4KW) - Units: { + units: { SPO: true, // SPO keyboard/printer DKA: false, // Disk File Control A DKB: false, // Disk File Control B @@ -68,5 +68,5 @@ var B5500SystemConfiguration = { MTP: false, // Magnetic Tape Unit P MTR: false, // Magnetic Tape Unit R MTS: false, // Magnetic Tape Unit S - MTT: false}; // Magnetic Tape Unit X + MTT: false}, // Magnetic Tape Unit X }; diff --git a/webUI/B5500Console.html b/webUI/B5500Console.html index fc7ee85..049f337 100644 --- a/webUI/B5500Console.html +++ b/webUI/B5500Console.html @@ -7,83 +7,105 @@ + + + + + + + @@ -103,10 +125,8 @@ window.onload = function() { - - + + + + + \ No newline at end of file