diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml index b97f12307..480c4c9b5 100644 --- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml @@ -1,6 +1,6 @@ - + IBM PC XT (Model 5160), CGA, 256K, WIN101 diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml index 4832ca7ec..45edd6bab 100644 --- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml +++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml @@ -1,6 +1,6 @@ - + IBM PC XT (Model 5160), CGA, 512K, WIN101 diff --git a/modules/filedump/lib/filedump.js b/modules/filedump/lib/filedump.js index dc0fe38b7..fd3050dfb 100644 --- a/modules/filedump/lib/filedump.js +++ b/modules/filedump/lib/filedump.js @@ -399,11 +399,12 @@ FileDump.prototype.dumpBuffer = function(sKey, buf, len, cbItem, offData) FileDump.prototype.loadMap = function(sFilePath, done) { /* - * The HEX format doesn't support MAP files. For all other (JSON) formats, we assume that the JSON + * The BYTES and HEX formats don't support MAP files, because the clients expect those format requests + * to return an Array of bytes, not an Object. For all other (JSON) formats, we assume that the JSON * is "unwrapped" at this point, and that even if loadMap() doesn't find a map file, it will still wrap * the resulting JSON with braces. */ - if (this.sFormat != DumpAPI.FORMAT.HEX) { + if (this.sFormat != DumpAPI.FORMAT.BYTES && this.sFormat != DumpAPI.FORMAT.HEX) { var obj = this; var sMapPath = sFilePath.replace(/\.(rom|json)$/, ".map"); if (str.endsWith(sMapPath, ".map")) {