diff --git a/_posts/2014-03-30-running-on-azure.md b/_posts/2014-03-30-running-on-azure.md index 0ca561bc4..4080b0c64 100644 --- a/_posts/2014-03-30-running-on-azure.md +++ b/_posts/2014-03-30-running-on-azure.md @@ -21,10 +21,10 @@ while I can understand some whitespace inconsistencies across web servers, I wou on the server to modify file contents. I finally confirmed that the files were indeed modified on the server, by using Azure's FTP browser. For example, -[keyboard-minimal.xml](/devices/pc/keyboard/keyboard-minimal.xml) is currently 622 bytes locally, but on the Azure -server, the reported size is 632 bytes -- one extra CR for each of the file's 10 lines. After a little more digging, -I [learned something new](http://git-scm.com/book/ch7-1.html#Formatting-and-Whitespace) about **Git**: it has a -setting called `core.autocrlf` which, for me on OS X, defaults to `input` (meaning "convert CR/LF to LF on commit +[us83-buttons-minimal.xml](/devices/pc/keyboard/us83-buttons-minimal.xml) is currently 622 bytes locally, but on the +Azure server, the reported size is 632 bytes -- one extra CR for each of the file's 10 lines. After a little more +digging, I [learned something new](http://git-scm.com/book/ch7-1.html#Formatting-and-Whitespace) about **Git**: it +has a setting called `core.autocrlf` which, for me on OS X, defaults to `input` (meaning "convert CR/LF to LF on commit but do NOT convert LF back to CR/LF on check-out"). But Azure apparently sets this to `true`, causing all LFs to be converted to CR/LF. diff --git a/_posts/2015-04-16-compaq-deskpro-386-update.md b/_posts/2015-04-16-compaq-deskpro-386-update.md index 811596b0b..9a2b15663 100644 --- a/_posts/2015-04-16-compaq-deskpro-386-update.md +++ b/_posts/2015-04-16-compaq-deskpro-386-update.md @@ -18,7 +18,7 @@ There's still a problem with the hard disk controller, which I haven't looked in but booting from a floppy works. While working through issues with this ROM BIOS, I created some lightly-annotated -[source code](/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.nasm) that can be re-assembled +[source code](/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.asm) that can be re-assembled with [NASM](http://www.nasm.us/). The initial process of creating the source code is explained [here](/devices/pc/bios/compaq/deskpro386/#recreating-rom-source-code). diff --git a/devices/pc/keyboard/README.md b/devices/pc/keyboard/README.md index ce00f132e..5eeeb8317 100644 --- a/devices/pc/keyboard/README.md +++ b/devices/pc/keyboard/README.md @@ -30,7 +30,7 @@ The following IBM keyboard configuration files are currently available: - [us83-buttons-arrows.xml](us83-buttons-arrows.xml) - [us83-buttons-functions.xml](us83-buttons-functions.xml) - [us83-buttons-minimal.xml](us83-buttons-minimal.xml) - - [us83-buttons-softkeys.xml](us83-buttons-softkeys.xml) + - [us83-softkeys.xml](us83-softkeys.xml) - [us84-buttons-arrows.xml](us84-buttons-arrows.xml) - [us84-buttons-functions.xml](us84-buttons-functions.xml) diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md index dd18faecf..ebd85cfe6 100644 --- a/devices/pc/machine/README.md +++ b/devices/pc/machine/README.md @@ -57,7 +57,8 @@ a predefined state, which automatically restores the machine and the specified a state, while others include a hard disk with preinstalled software. However, most simply boot an early version of DOS, and the hard disk, if any, will generally be unformatted. -From there, you can other disks and install other software. +From there, you can load other disks from the [Disk Library](/disks/pc/) (or mount your own disks) and install +other software. ### Model 5150 Machine Configurations diff --git a/devices/pc/rom/compaq/bios/README.md b/devices/pc/rom/compaq/bios/README.md index 4ea28d6ac..af34562dd 100644 --- a/devices/pc/rom/compaq/bios/README.md +++ b/devices/pc/rom/compaq/bios/README.md @@ -2,7 +2,7 @@ layout: post title: COMPAQ BIOS ROMs date: 2016-02-24 14:00:00 -permalink: /blog/2016/02/24/ +permalink: /devices/pc/rom/compaq/bios/ --- COMPAQ BIOS ROMs diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.nasm b/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.asm similarity index 100% rename from devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.nasm rename to devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.asm diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/makefile b/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/makefile index 5499bec10..9316e607a 100644 --- a/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/makefile +++ b/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/makefile @@ -13,10 +13,10 @@ tmp: tmp/1988-01-28.rom: 1988-01-28.json $(FILEDUMP) --file=1988-01-28.json --output=tmp/1988-01-28.rom --format=rom -tmp/1988-01-28-regen.nasm: tmp/1988-01-28.rom - ndisasm -o0x8000 -se105h -se05ah -se6ffh -sf025h -sf8aah tmp/1988-01-28.rom > tmp/1988-01-28-regen.nasm - $(TEXTOUT) --file=tmp/1988-01-28-regen.nasm --nasm > tmp/t.nasm - mv tmp/t.nasm tmp/1988-01-28-regen.nasm +tmp/1988-01-28-regen.asm: tmp/1988-01-28.rom + ndisasm -o0x8000 -se105h -se05ah -se6ffh -sf025h -sf8aah tmp/1988-01-28.rom > tmp/1988-01-28-regen.asm + $(TEXTOUT) --file=tmp/1988-01-28-regen.asm --nasm > tmp/t.asm + mv tmp/t.asm tmp/1988-01-28-regen.asm -tmp/1988-01-28-regen.rom: tmp/1988-01-28-regen.nasm - nasm -f bin tmp/1988-01-28-regen.nasm -l tmp/1988-01-28-regen.lst -o tmp/1988-01-28-regen.rom +tmp/1988-01-28-regen.rom: tmp/1988-01-28-regen.asm + nasm -f bin tmp/1988-01-28-regen.asm -l tmp/1988-01-28-regen.lst -o tmp/1988-01-28-regen.rom diff --git a/devices/pc/rom/compaq/bios/deskpro386/README.md b/devices/pc/rom/compaq/bios/deskpro386/README.md index 4d381903c..f87053670 100644 --- a/devices/pc/rom/compaq/bios/deskpro386/README.md +++ b/devices/pc/rom/compaq/bios/deskpro386/README.md @@ -86,7 +86,7 @@ In the current directory, an original ROM can be regenerated from the JSON-encod The ROM can then be fed into NDISASM, the disassembler included with NASM: - ndisasm -o0x8000 -se105h -se05ah -se6ffh -sf025h -sf8aah 1988-01-28.rom > 1988-01-28.nasm + ndisasm -o0x8000 -se105h -se05ah -se6ffh -sf025h -sf8aah 1988-01-28.rom > 1988-01-28.asm The `-o0x8000` argument is required to "org" the file at the proper starting address, but the `-s` arguments are optional; they simply establish a few sync points within the ROM image that save a little cleanup effort, by @@ -94,13 +94,13 @@ preventing disassembly in the middle of instructions. Next, the PCjs [TextOut](/modules/textout/) command, with the *--nasm* option, prepares the code for reassembly: - node ../../../../../../modules/textout/bin/textout --file=1988-01-28.nasm --nasm > temp.nasm - mv temp.nasm 1988-01-28.nasm + node ../../../../../../modules/textout/bin/textout --file=1988-01-28.asm --nasm > temp.asm + mv temp.asm 1988-01-28.asm -The result, [1988-01-28.nasm](1988-01-28/1988-01-28.nasm), after a small amount of manual cleanup, can now be +The result, [1988-01-28.asm](1988-01-28/1988-01-28.asm), after a small amount of manual cleanup, can now be successfully reassembled: - nasm -f bin 1988-01-28.nasm -l 1988-01-28.lst -o 1988-01-28.rom + nasm -f bin 1988-01-28.asm -l 1988-01-28.lst -o 1988-01-28.rom However, it does NOT produce a binary identical to the original ROM, in part because of instruction ambiguities (ie, instructions that can be assembled multiple ways). It's possible the reassembled ROM may still work, but more research diff --git a/devices/pc/video/ati/vga/README.md b/devices/pc/video/ati/vga/README.md index 8dc5b5765..b3c3aee3a 100644 --- a/devices/pc/video/ati/vga/README.md +++ b/devices/pc/video/ati/vga/README.md @@ -17,7 +17,7 @@ Each ROM chip apparently contains 32Kb of data, but only the upper 16Kb of each VGA_Wonder_V3-1.02_EVEN.BIN VGA_Wonder_V3-1.02_ODD.BIN -and merge them into a single 64Kb file, using the PCjs [FileDump](/modules/filedump/lib/) utility: +and merge them into a single 64Kb file, using the PCjs [FileDump](/modules/filedump/) utility: filedump --file=1988-11-11/archive/VGA_Wonder_V3-1.02_EVEN.BIN --merge=1988-11-11/archive/VGA_Wonder_V3-1.02_ODD.BIN --format=rom --output=1988-11-11/archive/VGA_Wonder_V3-1.02.rom diff --git a/docs/pcjs/keyboard/README.md b/docs/pcjs/keyboard/README.md index a89367f04..8810d9fbd 100644 --- a/docs/pcjs/keyboard/README.md +++ b/docs/pcjs/keyboard/README.md @@ -43,7 +43,8 @@ Example --- -See [/devices/pc/keyboard/us83.xml](/devices/pc/keyboard/keyboard-us83.xml) for an example that provides a complete "soft keyboard". +See [/devices/pc/keyboard/us83-softkeys.xml](/devices/pc/keyboard/us83-softkeys.xml) for an example that provides a +complete "soft keyboard". Output ---