From aa8e828e6019956273ea892d13c404bc2120ae0e Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Sat, 18 Jul 2015 16:41:10 -0700
Subject: [PATCH] Fixed pre-80386 control panels

---
 devices/pc/machine/5160/ega/640kb/array/machine.xml | 2 +-
 versions/pcjs/1.18.4/pc.js                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index dca5d9de3..4f9144c73 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -8,7 +8,7 @@
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
-	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-640autolock.xml"/>
+	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolock640.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" binding="setSpeed">Fast</control>
diff --git a/versions/pcjs/1.18.4/pc.js b/versions/pcjs/1.18.4/pc.js
index e1b9309c4..aeadf5390 100644
--- a/versions/pcjs/1.18.4/pc.js
+++ b/versions/pcjs/1.18.4/pc.js
@@ -98,8 +98,8 @@ function Zd(a,b,c){a.Ke=b;a.P=b.$b(a.Id=c,1);return a.O&1?0:a.dc(a.P)}function G
 function be(a,b,c){a.Ke=b;a.pa=a.P=b.$b(a.Id=c,a.ma);return a.O&1?0:a.sc(a.P)}function M(a,b){return be(a,a.U,b&a.Y)}function N(a,b){return be(a,a.W,b&a.Y)}function O(a,b){a.O&2||a.pd(a.Ke.Tb(a.Id,1),b)}function P(a,b){a.O&2||a.Ic(a.Ke.Tb(a.Id,a.ma),b)}function uc(a,b,c){return a.sc(b.$b(c,a.ma))}f.X=function(){var a=this.dc(this.ga);Ed(this,1);return a};function ce(a){var b=a.na(a.ga);Ed(a,2);return b}function S(a){var b=a.mi(a.ga);Ed(a,a.Nc);return b}
 f.ka=function(){var a=this.sc(this.ga);Ed(this,this.ma);return a};f.M=function(){var a=this.dc(this.ga)<<24>>24;Ed(this,1);return a};function T(a,b){var c=a.dc(a.ga);Ed(a,1);return de[c].call(a,b)}f.Ma=function(){var a=this.sc(this.$a);this.$a=this.$a+this.ma|0;var b=this.rg-this.$a|0;0>b&&0<=(this.rg^this.$a)&&(8088>=this.ha||!this.ia.Od&&this.ia.yb==this.ia.Y||this.ia.Od&&!this.ia.yb?k(this,this.$a-this.ia.Fa&this.ia.Y):-1>b&&h.call(this,12,0));return a};
 function r(a,b){a.$a=a.$a-a.ma|0;0>(a.$a-a.sg|0)&&0<=(a.sg^a.$a)&&(8088>=a.ha||!a.ia.Od&&a.ia.yb==a.ia.Y||a.ia.Od&&!a.ia.yb?k(a,a.$a-a.ia.Fa&a.ia.Y):h.call(a,12,0));a.Ic(a.$a,b)}function ee(a,b,c){var d=4;1==b.length&&(d=1,c=c?1:0);if(80386>a.ha)2<b.length&&(b=b.substr(1,2));else if("PS"==b||2<b.length)d=8;a.ra[b]&&(void 0===c&&($a(a,"Value for "+b+" is invalid"),cc(a)),d=!a.ja.Db||a.ja.Ci?da(c,d):"--------".substr(0,d),a.ra[b].textContent!=d&&(a.ra[b].textContent=d))}
-f.Zc=function(a){if(this.ji&&(a||!this.ja.Db||this.ja.Ci)){ee(this,"EAX",this.G);ee(this,"EBX",this.D);ee(this,"ECX",this.F);ee(this,"EDX",this.H);ee(this,"ESP",l(this));ee(this,"EBP",this.L);ee(this,"ESI",this.K);ee(this,"EDI",this.I);ee(this,"CS",this.ea.xa);ee(this,"DS",this.Ga.xa);ee(this,"SS",this.ia.xa);ee(this,"ES",this.ua.xa);ee(this,"FS",this.Yb.xa);ee(this,"GS",this.Zb.xa);ee(this,"EIP",t(this));var b=vc(this);ee(this,"PS",b);ee(this,"V",b&2048);ee(this,"D",b&1024);ee(this,"I",b&512);ee(this,
-"T",b&256);ee(this,"S",b&128);ee(this,"Z",b&64);ee(this,"A",b&16);ee(this,"P",b&4);ee(this,"C",b&1);ee(this,"CR0",this.Ea);ee(this,"CR2",this.Qc);ee(this,"CR3",this.Sc)}if(b=this.ra.speed)b.textContent=this.ja.Db&&this.V.hd?this.V.hd.toFixed(2)+"Mhz":"Stopped";this.parent.Zc.call(this,a)};
+f.Zc=function(a){if(this.ji&&(a||!this.ja.Db||this.ja.Ci)){ee(this,"EAX",this.G);ee(this,"EBX",this.D);ee(this,"ECX",this.F);ee(this,"EDX",this.H);ee(this,"ESP",l(this));ee(this,"EBP",this.L);ee(this,"ESI",this.K);ee(this,"EDI",this.I);ee(this,"CS",this.ea.xa);ee(this,"DS",this.Ga.xa);ee(this,"SS",this.ia.xa);ee(this,"ES",this.ua.xa);ee(this,"EIP",t(this));var b=vc(this);ee(this,"PS",b);ee(this,"V",b&2048);ee(this,"D",b&1024);ee(this,"I",b&512);ee(this,"T",b&256);ee(this,"S",b&128);ee(this,"Z",b&
+64);ee(this,"A",b&16);ee(this,"P",b&4);ee(this,"C",b&1);80386==this.ha&&(ee(this,"FS",this.Yb.xa),ee(this,"GS",this.Zb.xa),ee(this,"CR0",this.Ea),ee(this,"CR2",this.Qc),ee(this,"CR3",this.Sc))}if(b=this.ra.speed)b.textContent=this.ja.Db&&this.V.hd?this.V.hd.toFixed(2)+"Mhz":"Stopped";this.parent.Zc.call(this,a)};
 f.Wi=function(a){this.ja.ne=!0;this.ja.uj=!1;this.ja.Di=!1;this.gc=this.A=a;this.Z&&!a&&lc(this.Z);a||this.Za(1024)||(this.O|=4);do{if(a=this.O&12528)this.la|=a;else if(this.Ia=this.ga,this.U=this.Ga,this.W=this.ia,this.P=this.pa=-1,this.la&12288&&wd(this),this.la=this.O&256,this.Ca){a:{if(!(this.O&4)){a=80286>this.ha?0:1;for(var b=0;2>b;b++){switch(a){case 0:if(this.Ca&1&&this.T&512){var c=fe(this.Z);if(-1<=c&&(this.Ca&=-2,0<=c)){this.Ca&=-5;ge.call(this,c,null,11);break a}}break;case 1:if(this.Ca&
 2){this.Ca&=-3;ge.call(this,1,null,11);break a}}a=1-a}}if(a=this.Ca&8){a=this.Z;b=!1;for(c=0;c<a.F;c++)for(var d=a.F[c],e=0;e<d.wb.length;e++){var m=d.wb[e];m.Rc||(he(a,m),m.Rc||(b=!0))}a=!b}a&&(this.Ca&=-9)}if(this.Ca&4){this.O=this.A=0;break}}this.O=0;this.sa[this.X()].call(this)}while(0<this.A);return this.ja.ne?this.gc-this.A:void 0===this.ja.ne?0:-1};Da(function(){for(var a=Wa(window.document,"pcjs","cpu"),b=0;b<a.length;b++){var c=a[b],d=Ua(c),d=new yc(d);Va(d,c)}});
 function ie(a,b){var c=a+b+Td(this)|0;Hd(this,a,b,c,191);this.A-=-1===this.pa?-1===this.P?this.B.Eb:this.B.qb:this.B.Qb;return c&255}function je(a,b){var c=a+b+Td(this)|0;Hd(this,a,b,c,this.dataType|63);this.A-=-1===this.pa?-1===this.P?this.B.Eb:this.B.qb:this.B.Qb;return c&this.C}function ke(a,b){var c=a+b|0;Hd(this,a,b,c,191);this.A-=-1===this.pa?-1===this.P?this.B.Eb:this.B.qb:this.B.Qb;return c&255}