Merge pull request #64 from davidgiven/brother

Even more Brother organisation.

.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/brotherwp1/diskimage.img
+          bazel-bin/arch/brother/lw30/diskimage.img
+          bazel-bin/arch/brother/wp2450/diskimage.img
+          bazel-bin/arch/brother/wp1/diskimage.img
           bazel-bin/arch/kayproii/diskimage.img
           bazel-bin/arch/nc200/diskimage.img
-          bazel-bin/arch/wp2450/diskimage.img
       

.github/workflows/release.yml

@@ -49,11 +49,12 @@ jobs:
         token: ${{ github.token }}
         tag: dev
         assets: | 
-          brotherpowernote.img
+          pn8510.img
           pn8510.img
           pn8800.img
           brotherop2.img
-          brotherwp1.img
+          lw30.img
+          wp1.img
           kayproii.img
           nc200.img
           wp2450.img
@@ -67,8 +68,8 @@ jobs:
         files: |
           pn8510.img
           pn8800.img
-          brotherop2.img
-          brotherwp1.img
+          lw30.img
+          wp1.img
           kayproii.img
           nc200.img
           wp2450.img

BUILD

@@ -8,8 +8,8 @@ filegroup(
 		"//arch/brother/pn8510:diskimage",
 		"//arch/brother/pn8800:diskimage",
 		"//arch/brother/wp2450:diskimage",
-		"//arch/brotherop2:diskimage",
-		"//arch/brotherwp1:diskimage",
+		"//arch/brother/lw30:diskimage",
+		"//arch/brother/wp1:diskimage",
 		"//arch/kayproii:diskimage",
 		"//arch/nc200:diskimage",
 	]

README.md

@@ -38,8 +38,8 @@ 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 WP-1 typewriter (and probably others)](arch/brother/wp1/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)

arch/brotherop2/BUILD → arch/brother/lw30/BUILD

@@ -7,18 +7,18 @@ 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(
     name = "boot_o",
 	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",

arch/brotherop2/README.md → 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.

arch/brotherop2/bios.z80 → arch/brother/lw30/bios.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherop2
+    maclib lw30
 
     public SYSIN
     public SYSOUT

arch/brotherop2/boot.z80 → 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:

arch/brotherop2/floppy.z80 → arch/brother/lw30/floppy.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherop2
+    maclib lw30
 
     extrn SYSIN
     extrn SYSOUT

arch/brotherop2/tty.z80 → arch/brother/lw30/tty.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherop2
+    maclib lw30
 
     extrn SYSIN
     extrn SYSOUT

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",
     ],
 )

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.
 

arch/brother/pn8510/bios.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherpowernote
+    maclib pn8510
     maclib addresses
 
     extern BDMA

arch/brother/pn8510/boot.z80

@@ -11,7 +11,7 @@
 
     maclib cpmish
     maclib cpm
-    maclib brotherpowernote
+    maclib pn8510
     maclib addresses
 
     extrn FDBUF

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

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

arch/brother/pn8510/tty.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherpowernote
+    maclib pn8510
 
     extrn SYSIN
     extrn SYSOUT

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.
 

arch/brotherwp1/BUILD → 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.

arch/brotherwp1/README.md → 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.

arch/brotherwp1/bios.z80 → arch/brother/wp1/bios.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherwp1
+    maclib wp1
     maclib addresses
 
     public SYSIN

arch/brotherwp1/floppy.z80 → arch/brother/wp1/floppy.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherwp1
+    maclib wp1
 
     extrn SYSIN
     extrn SYSOUT

arch/brotherwp1/keyboard.z80 → arch/brother/wp1/keyboard.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherwp1
+    maclib wp1
 
     public KBDINIT
     public KBDSTAT

arch/brotherwp1/tty.z80 → arch/brother/wp1/tty.z80

@@ -4,7 +4,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib brotherwp1
+    maclib wp1
 
     extrn SYSIN
     extrn SYSOUT