From 5979c9e8b97a2b667488f9c7d5e7218bf2b93116 Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 7 Jan 2024 01:32:52 +0100 Subject: [PATCH 1/4] Fix include file name for the pn8510. --- .github/workflows/release.yml | 2 +- arch/brother/pn8510/BUILD | 4 ++-- arch/brother/pn8510/README.md | 2 +- arch/brother/pn8510/bios.z80 | 2 +- arch/brother/pn8510/boot.z80 | 2 +- arch/brother/pn8510/floppy.z80 | 2 +- .../pn8510/include/{brotherpowernote.lib => pn8510.lib} | 0 arch/brother/pn8510/keyboard.z80 | 2 +- arch/brother/pn8510/tty.z80 | 2 +- arch/brother/pn8800/README.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename arch/brother/pn8510/include/{brotherpowernote.lib => pn8510.lib} (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c35d95c..d0b9160 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,7 @@ jobs: token: ${{ github.token }} tag: dev assets: | - brotherpowernote.img + pn8510.img pn8510.img pn8800.img brotherop2.img diff --git a/arch/brother/pn8510/BUILD b/arch/brother/pn8510/BUILD index 35634f3..63389e5 100644 --- a/arch/brother/pn8510/BUILD +++ b/arch/brother/pn8510/BUILD @@ -45,7 +45,7 @@ BIOS_SRCS = [ "//include:cpmish.lib", "//include:z180.lib", ":keytab_inc", - "//arch/brother/pn8510/include:brotherpowernote.lib", + "//arch/brother/pn8510/include:pn8510.lib", "//arch/common/utils:tty.lib", "//arch/common/utils:print.lib", ":addresses", @@ -80,7 +80,7 @@ zmac( "//include:cpm.lib", "//include:cpmish.lib", "//include:z180.lib", - "//arch/brother/pn8510/include:brotherpowernote.lib", + "//arch/brother/pn8510/include:pn8510.lib", ":addresses", ], ) diff --git a/arch/brother/pn8510/README.md b/arch/brother/pn8510/README.md index d068a58..5c26f8a 100644 --- a/arch/brother/pn8510/README.md +++ b/arch/brother/pn8510/README.md @@ -37,7 +37,7 @@ How to use it Build cpmish. -Use `dd` or your favourite disk imager to write the `brotherpowernote.img` file +Use `dd` or your favourite disk imager to write the `pn8510.img` file to an HD 3.5" floppy. You're probably best off formatting this on a PC as the way the disk system works means that you want 1:1 interleave. diff --git a/arch/brother/pn8510/bios.z80 b/arch/brother/pn8510/bios.z80 index c6824bd..d852a95 100644 --- a/arch/brother/pn8510/bios.z80 +++ b/arch/brother/pn8510/bios.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherpowernote + maclib pn8510 maclib addresses extern BDMA diff --git a/arch/brother/pn8510/boot.z80 b/arch/brother/pn8510/boot.z80 index 2eb34da..6fbf4ca 100644 --- a/arch/brother/pn8510/boot.z80 +++ b/arch/brother/pn8510/boot.z80 @@ -11,7 +11,7 @@ maclib cpmish maclib cpm - maclib brotherpowernote + maclib pn8510 maclib addresses extrn FDBUF diff --git a/arch/brother/pn8510/floppy.z80 b/arch/brother/pn8510/floppy.z80 index 9c4d018..c247ff5 100644 --- a/arch/brother/pn8510/floppy.z80 +++ b/arch/brother/pn8510/floppy.z80 @@ -3,7 +3,7 @@ ; See COPYING.cpmish in the distribution root directory for more information. maclib cpm - maclib brotherpowernote + maclib pn8510 extrn TTYPUTC extrn TTYPUT8 diff --git a/arch/brother/pn8510/include/brotherpowernote.lib b/arch/brother/pn8510/include/pn8510.lib similarity index 100% rename from arch/brother/pn8510/include/brotherpowernote.lib rename to arch/brother/pn8510/include/pn8510.lib diff --git a/arch/brother/pn8510/keyboard.z80 b/arch/brother/pn8510/keyboard.z80 index 4db574b..a362354 100644 --- a/arch/brother/pn8510/keyboard.z80 +++ b/arch/brother/pn8510/keyboard.z80 @@ -3,7 +3,7 @@ ; See COPYING.cpmish in the distribution root directory for more information. maclib cpm - maclib brotherpowernote + maclib pn8510 extrn TTYPUTC extrn TTYPUT8 diff --git a/arch/brother/pn8510/tty.z80 b/arch/brother/pn8510/tty.z80 index 7618908..a9916aa 100644 --- a/arch/brother/pn8510/tty.z80 +++ b/arch/brother/pn8510/tty.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherpowernote + maclib pn8510 extrn SYSIN extrn SYSOUT diff --git a/arch/brother/pn8800/README.md b/arch/brother/pn8800/README.md index 34c2d03..78bf998 100644 --- a/arch/brother/pn8800/README.md +++ b/arch/brother/pn8800/README.md @@ -37,7 +37,7 @@ How to use it Build cpmish. -Use `dd` or your favourite disk imager to write the `brotherpowernote.img` file +Use `dd` or your favourite disk imager to write the `pn8510.img` file to an HD 3.5" floppy. You're probably best off formatting this on a PC as the way the disk system works means that you want 1:1 interleave. From d30e473e8742b3d86b411e9f470837329ed71114 Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 7 Jan 2024 01:39:12 +0100 Subject: [PATCH 2/4] Rename brotherop2 to lw30. --- .github/workflows/ccpp.yml | 4 ++-- .github/workflows/release.yml | 3 ++- BUILD | 2 +- README.md | 2 +- arch/{brotherop2 => brother/lw30}/BUILD | 8 ++++---- arch/{brotherop2 => brother/lw30}/README.md | 2 +- arch/{brotherop2 => brother/lw30}/bios.z80 | 2 +- arch/{brotherop2 => brother/lw30}/boot.z80 | 2 +- arch/{brotherop2 => brother/lw30}/fat.z80 | 0 arch/{brotherop2 => brother/lw30}/floppy.z80 | 2 +- arch/{brotherop2 => brother/lw30}/include/BUILD | 0 .../brotherop2.lib => brother/lw30/include/lw30.lib} | 0 arch/{brotherop2 => brother/lw30}/tty.z80 | 2 +- arch/{brotherop2 => brother/lw30}/utils/BUILD | 0 arch/{brotherop2 => brother/lw30}/utils/fontconvert.c | 0 15 files changed, 15 insertions(+), 14 deletions(-) rename arch/{brotherop2 => brother/lw30}/BUILD (90%) rename arch/{brotherop2 => brother/lw30}/README.md (98%) rename arch/{brotherop2 => brother/lw30}/bios.z80 (99%) rename arch/{brotherop2 => brother/lw30}/boot.z80 (99%) rename arch/{brotherop2 => brother/lw30}/fat.z80 (100%) rename arch/{brotherop2 => brother/lw30}/floppy.z80 (99%) rename arch/{brotherop2 => brother/lw30}/include/BUILD (100%) rename arch/{brotherop2/include/brotherop2.lib => brother/lw30/include/lw30.lib} (100%) rename arch/{brotherop2 => brother/lw30}/tty.z80 (99%) rename arch/{brotherop2 => brother/lw30}/utils/BUILD (100%) rename arch/{brotherop2 => brother/lw30}/utils/fontconvert.c (100%) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 766b943..1a17273 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -32,9 +32,9 @@ jobs: path: | bazel-bin/arch/brother/pn8510/diskimage.img bazel-bin/arch/brother/pn8800/diskimage.img - bazel-bin/arch/brotherop2/diskimage.img + bazel-bin/arch/brother/lw30/diskimage.img + bazel-bin/arch/brother/wp2450/diskimage.img bazel-bin/arch/brotherwp1/diskimage.img bazel-bin/arch/kayproii/diskimage.img bazel-bin/arch/nc200/diskimage.img - bazel-bin/arch/wp2450/diskimage.img \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0b9160..008bef4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,6 +53,7 @@ jobs: pn8510.img pn8800.img brotherop2.img + lw30.img brotherwp1.img kayproii.img nc200.img @@ -67,7 +68,7 @@ jobs: files: | pn8510.img pn8800.img - brotherop2.img + lw30.img brotherwp1.img kayproii.img nc200.img diff --git a/BUILD b/BUILD index d365648..45cea3e 100644 --- a/BUILD +++ b/BUILD @@ -8,7 +8,7 @@ filegroup( "//arch/brother/pn8510:diskimage", "//arch/brother/pn8800:diskimage", "//arch/brother/wp2450:diskimage", - "//arch/brotherop2:diskimage", + "//arch/brother/lw30:diskimage", "//arch/brotherwp1:diskimage", "//arch/kayproii:diskimage", "//arch/nc200:diskimage", diff --git a/README.md b/README.md index d945229..b132aad 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Currently it supports these platforms: - [the Amstrad NC200 laptop](arch/nc200/README.md) - [the Kaypro II](arch/kayproii/README.md) - [the Brother WP-1 typewriter (and probably others)](arch/brotherwp1/README.md) - - [the Brother LW-30 typewriter (and probably others)](arch/brotherop2/README.md) + - [the Brother LW-30 typewriter (and probably others)](arch/lw30/README.md) - [the Brother WP-2450DS typewriter (and probably others)](arch/brother/wp2450/README.md) - [the Brother PN-8510MDS SuperPowerNote laptop (and probably others)](arch/brother/pn8510/README.md) - [the Brother PN-8800FXB SuperPowerNote laptop (and probably others)](arch/brother/pn8800/README.md) diff --git a/arch/brotherop2/BUILD b/arch/brother/lw30/BUILD similarity index 90% rename from arch/brotherop2/BUILD rename to arch/brother/lw30/BUILD index a7991d2..40a00b5 100644 --- a/arch/brotherop2/BUILD +++ b/arch/brother/lw30/BUILD @@ -7,10 +7,10 @@ package(default_visibility = ["//visibility:public"]) genrule( name = "font_inc", - tools = [ "//arch/brotherop2/utils:fontconvert" ], + tools = [ "//arch/brother/lw30/utils:fontconvert" ], srcs = [ "//utils:6x7font.bdf" ], outs = [ "font.inc" ], - cmd = "$(location //arch/brotherop2/utils:fontconvert) $< > $@" + cmd = "$(location //arch/brother/lw30/utils:fontconvert) $< > $@" ) zmac( @@ -18,7 +18,7 @@ zmac( z180 = True, srcs = [ "boot.z80", - "//arch/brotherop2/include:brotherop2.lib", + "//arch/brother/lw30/include:lw30.lib", "//arch/common/utils:tty.lib", "//include:cpmish.lib", "//include:z180.lib", @@ -40,7 +40,7 @@ ld80( z180 = True, srcs = [ n + ".z80", - "//arch/brotherop2/include:brotherop2.lib", + "//arch/brother/lw30/include:lw30.lib", "//arch/common/utils:print.lib", "//arch/common/utils:tty.lib", "//include:cpm.lib", diff --git a/arch/brotherop2/README.md b/arch/brother/lw30/README.md similarity index 98% rename from arch/brotherop2/README.md rename to arch/brother/lw30/README.md index d00412e..2c8ab54 100644 --- a/arch/brotherop2/README.md +++ b/arch/brother/lw30/README.md @@ -48,7 +48,7 @@ Build cpmish. Use FluxEngine to write this to a DD 3.5" floppy, using a command line like: - fluxengine write brother -i brotherop2.img + fluxengine write brother -i lw30.img Insert the disk into the machine's drive, power on, and press FILE to open the disk menu. diff --git a/arch/brotherop2/bios.z80 b/arch/brother/lw30/bios.z80 similarity index 99% rename from arch/brotherop2/bios.z80 rename to arch/brother/lw30/bios.z80 index 0bd2c05..3e3cf84 100644 --- a/arch/brotherop2/bios.z80 +++ b/arch/brother/lw30/bios.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherop2 + maclib lw30 public SYSIN public SYSOUT diff --git a/arch/brotherop2/boot.z80 b/arch/brother/lw30/boot.z80 similarity index 99% rename from arch/brotherop2/boot.z80 rename to arch/brother/lw30/boot.z80 index 6bf1e67..9fab0b6 100644 --- a/arch/brotherop2/boot.z80 +++ b/arch/brother/lw30/boot.z80 @@ -6,7 +6,7 @@ ; gets loaded with BBR=CBR=0x60, CBAR=0x55, which means that DRAM from ; physical addresses 0x65000 to 0x6ffff is mapped to logical 0x5000 to 0xffff. - maclib brotherop2 + maclib lw30 maclib cpmish start: diff --git a/arch/brotherop2/fat.z80 b/arch/brother/lw30/fat.z80 similarity index 100% rename from arch/brotherop2/fat.z80 rename to arch/brother/lw30/fat.z80 diff --git a/arch/brotherop2/floppy.z80 b/arch/brother/lw30/floppy.z80 similarity index 99% rename from arch/brotherop2/floppy.z80 rename to arch/brother/lw30/floppy.z80 index 60366cd..06e9cad 100644 --- a/arch/brotherop2/floppy.z80 +++ b/arch/brother/lw30/floppy.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherop2 + maclib lw30 extrn SYSIN extrn SYSOUT diff --git a/arch/brotherop2/include/BUILD b/arch/brother/lw30/include/BUILD similarity index 100% rename from arch/brotherop2/include/BUILD rename to arch/brother/lw30/include/BUILD diff --git a/arch/brotherop2/include/brotherop2.lib b/arch/brother/lw30/include/lw30.lib similarity index 100% rename from arch/brotherop2/include/brotherop2.lib rename to arch/brother/lw30/include/lw30.lib diff --git a/arch/brotherop2/tty.z80 b/arch/brother/lw30/tty.z80 similarity index 99% rename from arch/brotherop2/tty.z80 rename to arch/brother/lw30/tty.z80 index 1b96c03..c305c56 100644 --- a/arch/brotherop2/tty.z80 +++ b/arch/brother/lw30/tty.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherop2 + maclib lw30 extrn SYSIN extrn SYSOUT diff --git a/arch/brotherop2/utils/BUILD b/arch/brother/lw30/utils/BUILD similarity index 100% rename from arch/brotherop2/utils/BUILD rename to arch/brother/lw30/utils/BUILD diff --git a/arch/brotherop2/utils/fontconvert.c b/arch/brother/lw30/utils/fontconvert.c similarity index 100% rename from arch/brotherop2/utils/fontconvert.c rename to arch/brother/lw30/utils/fontconvert.c From 415181b63e6a1a436e19e11333f0fe87b176d97d Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 7 Jan 2024 01:43:04 +0100 Subject: [PATCH 3/4] Rename brotherwp1 to wp1. --- .github/workflows/ccpp.yml | 2 +- .github/workflows/release.yml | 4 ++-- BUILD | 2 +- README.md | 2 +- arch/{brotherwp1 => brother/wp1}/BUILD | 6 +++--- arch/{brotherwp1 => brother/wp1}/HARDWARE.md | 0 arch/{brotherwp1 => brother/wp1}/README.md | 2 +- arch/{brotherwp1 => brother/wp1}/bios.z80 | 2 +- arch/{brotherwp1 => brother/wp1}/boot.z80 | 0 arch/{brotherwp1 => brother/wp1}/floppy.z80 | 2 +- arch/{brotherwp1 => brother/wp1}/fs.z80 | 0 arch/{brotherwp1 => brother/wp1}/include/BUILD | 0 .../include/brotherwp1.lib => brother/wp1/include/wp1.lib} | 0 arch/{brotherwp1 => brother/wp1}/keyboard.z80 | 2 +- arch/{brotherwp1 => brother/wp1}/tools/pterm.z80 | 0 arch/{brotherwp1 => brother/wp1}/tty.z80 | 2 +- arch/{brotherwp1 => brother/wp1}/utils/BUILD | 0 arch/{brotherwp1 => brother/wp1}/utils/mkkeytab.c | 0 18 files changed, 13 insertions(+), 13 deletions(-) rename arch/{brotherwp1 => brother/wp1}/BUILD (95%) rename arch/{brotherwp1 => brother/wp1}/HARDWARE.md (100%) rename arch/{brotherwp1 => brother/wp1}/README.md (98%) rename arch/{brotherwp1 => brother/wp1}/bios.z80 (99%) rename arch/{brotherwp1 => brother/wp1}/boot.z80 (100%) rename arch/{brotherwp1 => brother/wp1}/floppy.z80 (99%) rename arch/{brotherwp1 => brother/wp1}/fs.z80 (100%) rename arch/{brotherwp1 => brother/wp1}/include/BUILD (100%) rename arch/{brotherwp1/include/brotherwp1.lib => brother/wp1/include/wp1.lib} (100%) rename arch/{brotherwp1 => brother/wp1}/keyboard.z80 (99%) rename arch/{brotherwp1 => brother/wp1}/tools/pterm.z80 (100%) rename arch/{brotherwp1 => brother/wp1}/tty.z80 (99%) rename arch/{brotherwp1 => brother/wp1}/utils/BUILD (100%) rename arch/{brotherwp1 => brother/wp1}/utils/mkkeytab.c (100%) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 1a17273..1ef4565 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -34,7 +34,7 @@ jobs: bazel-bin/arch/brother/pn8800/diskimage.img bazel-bin/arch/brother/lw30/diskimage.img bazel-bin/arch/brother/wp2450/diskimage.img - bazel-bin/arch/brotherwp1/diskimage.img + bazel-bin/arch/brother/wp1/diskimage.img bazel-bin/arch/kayproii/diskimage.img bazel-bin/arch/nc200/diskimage.img \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 008bef4..b424e5d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,7 +54,7 @@ jobs: pn8800.img brotherop2.img lw30.img - brotherwp1.img + wp1.img kayproii.img nc200.img wp2450.img @@ -69,7 +69,7 @@ jobs: pn8510.img pn8800.img lw30.img - brotherwp1.img + wp1.img kayproii.img nc200.img wp2450.img diff --git a/BUILD b/BUILD index 45cea3e..df1af89 100644 --- a/BUILD +++ b/BUILD @@ -9,7 +9,7 @@ filegroup( "//arch/brother/pn8800:diskimage", "//arch/brother/wp2450:diskimage", "//arch/brother/lw30:diskimage", - "//arch/brotherwp1:diskimage", + "//arch/brother/wp1:diskimage", "//arch/kayproii:diskimage", "//arch/nc200:diskimage", ] diff --git a/README.md b/README.md index b132aad..c6471e1 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Currently it supports these platforms: - [the Amstrad NC200 laptop](arch/nc200/README.md) - [the Kaypro II](arch/kayproii/README.md) - - [the Brother WP-1 typewriter (and probably others)](arch/brotherwp1/README.md) + - [the Brother WP-1 typewriter (and probably others)](arch/brother/wp1/README.md) - [the Brother LW-30 typewriter (and probably others)](arch/lw30/README.md) - [the Brother WP-2450DS typewriter (and probably others)](arch/brother/wp2450/README.md) - [the Brother PN-8510MDS SuperPowerNote laptop (and probably others)](arch/brother/pn8510/README.md) diff --git a/arch/brotherwp1/BUILD b/arch/brother/wp1/BUILD similarity index 95% rename from arch/brotherwp1/BUILD rename to arch/brother/wp1/BUILD index 24d6966..c757085 100644 --- a/arch/brotherwp1/BUILD +++ b/arch/brother/wp1/BUILD @@ -52,7 +52,7 @@ BIOS_SRCS = [ "//include:cpm.lib", "//include:cpmish.lib", "//include:z180.lib", - "//arch/brotherwp1/include:brotherwp1.lib", + "//arch/brother/wp1/include:wp1.lib", "//arch/common/utils:tty.lib", "//arch/common/utils:print.lib", ":addresses", @@ -64,10 +64,10 @@ BIOS_SRCS = [ genrule( name = "keytab", - tools = [ "//arch/brotherwp1/utils:mkkeytab" ], + tools = [ "//arch/brother/wp1/utils:mkkeytab" ], srcs = [], outs = [ "keytab.inc" ], - cmd = "$(location //arch/brotherwp1/utils:mkkeytab) > $@" + cmd = "$(location //arch/brother/wp1/utils:mkkeytab) > $@" ) # This is a 64kB file containing the entire CP/M memory image. diff --git a/arch/brotherwp1/HARDWARE.md b/arch/brother/wp1/HARDWARE.md similarity index 100% rename from arch/brotherwp1/HARDWARE.md rename to arch/brother/wp1/HARDWARE.md diff --git a/arch/brotherwp1/README.md b/arch/brother/wp1/README.md similarity index 98% rename from arch/brotherwp1/README.md rename to arch/brother/wp1/README.md index 60b5d66..bbcc306 100644 --- a/arch/brotherwp1/README.md +++ b/arch/brother/wp1/README.md @@ -47,7 +47,7 @@ Build cpmish. Use FluxEngine to write this to a DD 3.5" floppy, using a command line like: - fluxengine write brother120 -i brotherwp1.img + fluxengine write brother120 -i wp1.img Insert the disk into the machine's drive, and then power on while holding CODE+Q. The machine will boot from the disk. diff --git a/arch/brotherwp1/bios.z80 b/arch/brother/wp1/bios.z80 similarity index 99% rename from arch/brotherwp1/bios.z80 rename to arch/brother/wp1/bios.z80 index 9f2ae66..1cbb46f 100644 --- a/arch/brotherwp1/bios.z80 +++ b/arch/brother/wp1/bios.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherwp1 + maclib wp1 maclib addresses public SYSIN diff --git a/arch/brotherwp1/boot.z80 b/arch/brother/wp1/boot.z80 similarity index 100% rename from arch/brotherwp1/boot.z80 rename to arch/brother/wp1/boot.z80 diff --git a/arch/brotherwp1/floppy.z80 b/arch/brother/wp1/floppy.z80 similarity index 99% rename from arch/brotherwp1/floppy.z80 rename to arch/brother/wp1/floppy.z80 index 34b7a1d..0be6364 100644 --- a/arch/brotherwp1/floppy.z80 +++ b/arch/brother/wp1/floppy.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherwp1 + maclib wp1 extrn SYSIN extrn SYSOUT diff --git a/arch/brotherwp1/fs.z80 b/arch/brother/wp1/fs.z80 similarity index 100% rename from arch/brotherwp1/fs.z80 rename to arch/brother/wp1/fs.z80 diff --git a/arch/brotherwp1/include/BUILD b/arch/brother/wp1/include/BUILD similarity index 100% rename from arch/brotherwp1/include/BUILD rename to arch/brother/wp1/include/BUILD diff --git a/arch/brotherwp1/include/brotherwp1.lib b/arch/brother/wp1/include/wp1.lib similarity index 100% rename from arch/brotherwp1/include/brotherwp1.lib rename to arch/brother/wp1/include/wp1.lib diff --git a/arch/brotherwp1/keyboard.z80 b/arch/brother/wp1/keyboard.z80 similarity index 99% rename from arch/brotherwp1/keyboard.z80 rename to arch/brother/wp1/keyboard.z80 index 50df7d5..130c768 100644 --- a/arch/brotherwp1/keyboard.z80 +++ b/arch/brother/wp1/keyboard.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherwp1 + maclib wp1 public KBDINIT public KBDSTAT diff --git a/arch/brotherwp1/tools/pterm.z80 b/arch/brother/wp1/tools/pterm.z80 similarity index 100% rename from arch/brotherwp1/tools/pterm.z80 rename to arch/brother/wp1/tools/pterm.z80 diff --git a/arch/brotherwp1/tty.z80 b/arch/brother/wp1/tty.z80 similarity index 99% rename from arch/brotherwp1/tty.z80 rename to arch/brother/wp1/tty.z80 index 48703dd..0d46aad 100644 --- a/arch/brotherwp1/tty.z80 +++ b/arch/brother/wp1/tty.z80 @@ -4,7 +4,7 @@ maclib cpm maclib cpmish - maclib brotherwp1 + maclib wp1 extrn SYSIN extrn SYSOUT diff --git a/arch/brotherwp1/utils/BUILD b/arch/brother/wp1/utils/BUILD similarity index 100% rename from arch/brotherwp1/utils/BUILD rename to arch/brother/wp1/utils/BUILD diff --git a/arch/brotherwp1/utils/mkkeytab.c b/arch/brother/wp1/utils/mkkeytab.c similarity index 100% rename from arch/brotherwp1/utils/mkkeytab.c rename to arch/brother/wp1/utils/mkkeytab.c From 49e609df8ed39337e045ff245b616e98ea0e6f72 Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 7 Jan 2024 01:43:39 +0100 Subject: [PATCH 4/4] Typo fix. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c6471e1..e742167 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Currently it supports these platforms: - [the Amstrad NC200 laptop](arch/nc200/README.md) - [the Kaypro II](arch/kayproii/README.md) - [the Brother WP-1 typewriter (and probably others)](arch/brother/wp1/README.md) - - [the Brother LW-30 typewriter (and probably others)](arch/lw30/README.md) + - [the Brother LW-30 typewriter (and probably others)](arch/brother/lw30/README.md) - [the Brother WP-2450DS typewriter (and probably others)](arch/brother/wp2450/README.md) - [the Brother PN-8510MDS SuperPowerNote laptop (and probably others)](arch/brother/pn8510/README.md) - [the Brother PN-8800FXB SuperPowerNote laptop (and probably others)](arch/brother/pn8800/README.md)