From 052c5541b5bc8951f916d218aa4c464afaff0a11 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 10 May 2016 11:28:46 -0700 Subject: [PATCH] Fixed XML config files to reflect to new file locations --- apps/c1p/6502/JP/ASSEMBLER-1.TXT | Bin 3204 -> 0 bytes apps/c1p/6502/JP/ASSEMBLER-2.TXT | Bin 33 -> 0 bytes apps/c1p/6502/JP/BASICEXT.65V | 1247 ------------------------------ apps/c1p/6502/JP/LIFE.65V | 1 - apps/c1p/all.xml | 8 +- modules/c1pjs/lib/serial.js | 14 +- 6 files changed, 12 insertions(+), 1258 deletions(-) delete mode 100644 apps/c1p/6502/JP/ASSEMBLER-1.TXT delete mode 100644 apps/c1p/6502/JP/ASSEMBLER-2.TXT delete mode 100644 apps/c1p/6502/JP/BASICEXT.65V delete mode 100644 apps/c1p/6502/JP/LIFE.65V diff --git a/apps/c1p/6502/JP/ASSEMBLER-1.TXT b/apps/c1p/6502/JP/ASSEMBLER-1.TXT deleted file mode 100644 index 9d2cb636538eab23df3b27c211c3d041faf93a9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3204 zcmY*beQaA-6@UIn;yCr{CMV9zhwHZwRmrGar=Ko=K%ecG+TLwqY^!rNp_&P4PH9m2 zkD;OsgisXa84n~BhAKT?5z0&J)U482s-~n}Km42z-K;`gfodK|kZ#0#VU5nQaFEsf_#C4fSzdFGwu0OW1@m6{;4p8{w8xSu%qS|L~v(vE( zT{jxX@JH_<8Hr9UTCi#nqzUbiRpf~X2oX?<_|6`#J9-ar0%zqo&J$?as&h$+gpNq5 zlqf}p!eUyC#KO2fI&?%jDyGu0h!p7Gy=U*f{Re^v#ZWjR4fy?A{FxsAFzW~Kjy(f~P&ix)g;PdI`dT1#Bt}Dnk~@?jiO|vT$TRF|Wd78VmNg^u-dXS{ z4Z==_BL*u(p&fVRWQP#%sB*?(#kM*J?F@}{U9mC79Z-G3y&L(b`B4d?8aFxsQ{!&S z*d%Jq;h$ZOfU4YucB8R^Kl-mMS?#C>%v({WX_FB_EbN2jWiUM2wxwmDThL(nIx}9r z0c62LWZpE#_`_7+U)7Pj7utJe*ks#afxG zo8?H?nePs_jXc*;bs5d*2zpOOn77lcI!lk6lEzVzYE!u21Hn@+ee!+56P!1NItY8*1sBpSKsReJ^$P zc}Uf#Tj_p0jJ<>iaXNE_9mQ6N7TYk-&qEHukV8~pnDLY!U4Y;{H||+rr#yNG?P50% z;my7#!-?y@jb?_l9HVwqdya%W`Zn682`cwLfWA+*dXX8mVOSAE^PP(O&ifc`X5o&( zYfx%dx%_p=-+-Y18jMXk@u%3G{_Ehs!C*wDI&~NI6t6Ql7jG~`<1HR}nPM;PEMCJl zXd~b5T)qiPeeou?)8(>BY^AmnH-Wt8Wpw*?_Utj&FL=pMdEH4Hg~LE@^LiI`FH7t) z>&43h=GlvMTeZb-u3|ivF)A&9QAR^-q`ylS3jfrfE!8S++p4ju3q}K`i`s;aF62=x z)rLS5X041!MhIkQ7v9W@nc-9-e-(n-mbC?l)%g+2D2{=?E)2f>WLLGJkgMQz1VnF_ z{#ANt4Btw_oiBB5#_6fqOPD8y8ODO>!;<)KIoMc=E_qC-iLj_%61YG-J4`YYhqaqO-$qi)DDNhu=Kmn?g ziD*F))48hO@X*;x?%XL)CD6>j@TjMBw&LEvp1q7sqG@pvsE)d`=+YOyXxx$x^v7xo z`9(LT4vjpBOmaH#bTQkQ+|k*X6egp@a*@p!E?Y{JjPA2uN&cn zmwoG;@MI%kIyIKVaCgv!+CGk$dsNnm7en!;~>Ym+F7RLoVPZ^-VYfKzIfKVgk}Gy;yLfq z0MJ{S6(=XQ7IT6|$pe0~RcvL$1{)9#8?(7!*2vjTvd5@?BSrtegH4BA2z10)9duHNw+V! zwg{!pG6E=I9UH^msn-ATuy;-}&^^5!%kksMz&c|r7$)Ow_idDd20PGIyUvEe+uj+p z6Vn+pn)D�BPEuAMxc+_-4wGKkmzq`m}eai<~9TS!yG`+6f - 6502 DISASSEMBLER-1 (JP) - 6502 DISASSEMBLER-2 (JP) - 6502 BASIC MODS (JP) - 6502 LIFE (JP) + 6502 DISASSEMBLER-1 (JP) + 6502 DISASSEMBLER-2 (JP) + 6502 BASIC MODS (JP) + 6502 LIFE (JP) 6502 BCD TESTS 6502 VFLAG TESTS CHECKERS (JP) diff --git a/modules/c1pjs/lib/serial.js b/modules/c1pjs/lib/serial.js index 33e0cc3bf..35f66bc71 100644 --- a/modules/c1pjs/lib/serial.js +++ b/modules/c1pjs/lib/serial.js @@ -75,8 +75,8 @@ C1PSerialPort.prototype.reset = function() this.bInput = 0; this.cbInput = 0; + this.iInput = 0; this.sInput = "10 PRINT \"HELLO OSI #" + this.getMachineNum() + "\"\n"; - this.iInputNext = 0; // this.sOutput = new Array(0); // this.iOutputNext = 0; @@ -242,12 +242,12 @@ C1PSerialPort.prototype.loadFile = function(sFileName, sFileData, nResponse) } this.autoLoad = 0; - this.iInputNext = 0; + this.iInput = 0; this.sInput = sFileData; /* * The following code adds support for loading "65V" files encoded as JSON, which is a cleaner - * way to deliver those files when they contain binary (non-ASCII) data. + * way to store and deliver those files when they contain binary (non-ASCII) data. * * For example, my 6502 ASSEMBLER/DISASSEMBLER program starts with a conventional "65V" loading * sequence, which loads and launches a small program loader that loads the rest of the program @@ -335,7 +335,7 @@ C1PSerialPort.prototype.getByte = function(addr, addrFrom) * An EVEN address implies they're looking, so if we have a fresh buffer, * then prime the pump. */ - if (this.sInput && !this.iInputNext) + if (this.sInput && !this.iInput) this.advanceInput(); } else { /* @@ -374,14 +374,16 @@ C1PSerialPort.prototype.advanceInput = function() if (this.sInput !== undefined) { this.bInput = 0; this.cbInput = 0; - if (this.iInputNext < this.sInput.length) { - var b = this.sInput.charCodeAt(this.iInputNext++) & 0xff; + if (this.iInput < this.sInput.length) { + var b = this.sInput.charCodeAt(this.iInput++) & 0xff; if (b == 0x0a) b = 0x0d; this.bInput = b; this.cbInput = 1; // if (DEBUG) this.log("advanceInput(" + str.toHexByte(b) + ")"); } else { + this.sInput = ""; + this.iInput = 0; if (DEBUG) this.log("advanceInput(): out of data"); if (this.autoLoad == 1 && this.kbd) { this.kbd.injectKeys(" \nRUN\n");