Tidying Brother.

.github/workflows/ccpp.yml

@@ -36,5 +36,5 @@ jobs:
           bazel-bin/arch/brotherwp1/diskimage.img
           bazel-bin/arch/kayproii/diskimage.img
           bazel-bin/arch/nc200/diskimage.img
-          bazel-bin/arch/wp2450ds/diskimage.img
+          bazel-bin/arch/wp2450/diskimage.img
 

.github/workflows/release.yml

@@ -56,6 +56,7 @@ jobs:
           brotherwp1.img
           kayproii.img
           nc200.img
+          wp2450.img
           wp2450ds.img
         fail-if-no-assets: false
 
@@ -70,7 +71,7 @@ jobs:
           brotherwp1.img
           kayproii.img
           nc200.img
-          wp2450ds.img
+          wp2450.img
         tag_name: dev
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

BUILD

@@ -7,11 +7,11 @@ filegroup(
 	srcs = [
 		"//arch/brother/pn8510:diskimage",
 		"//arch/brother/pn8800:diskimage",
+		"//arch/brother/wp2450:diskimage",
 		"//arch/brotherop2:diskimage",
 		"//arch/brotherwp1:diskimage",
 		"//arch/kayproii:diskimage",
 		"//arch/nc200:diskimage",
-		"//arch/wp2450ds:diskimage",
 	]
 )
 

Makefile

@@ -2,7 +2,7 @@ all:
 	bazel test -c dbg //...
 	bazel build -c opt //:diskimages
 	for a in $$(dirname bazel-bin/arch/*/diskimage.img bazel-bin/arch/*/*/diskimage.img); do \
-		f=$$(basename $$a); ln -sf $$a/diskimage.img $$f.img; chmod a+rw $$f.img; done
+		f=$$(basename $$a); cp $$a/diskimage.img $$f.img; chmod +rw $$f.img; done
 
 verbose:
 	bazel test -s -c dbg //...

README.md

@@ -40,7 +40,7 @@ Currently it supports these platforms:
   - [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-2450DS typewriter (and probably others)](arch/wp2450ds/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/wp2450ds/BUILD → arch/brother/wp2450/BUILD

@@ -21,17 +21,17 @@ package(default_visibility = ["//visibility:public"])
 
 genrule(
     name = "keytab_inc",
-	tools = [ "//arch/wp2450ds/utils:mkkeytab" ],
+	tools = [ "//arch/brother/wp2450/utils:mkkeytab" ],
     outs = [ "keytab.inc" ],
-	cmd = "$(location //arch/wp2450ds/utils:mkkeytab) > $@"
+	cmd = "$(location //arch/brother/wp2450/utils:mkkeytab) > $@"
 )
 
 genrule(
 	name = "font_inc",
-	tools = [ "//arch/wp2450ds/utils:fontconvert" ],
+	tools = [ "//arch/brother/wp2450/utils:fontconvert" ],
 	srcs = [ "//utils:6x7font.bdf" ],
 	outs = [ "font.inc" ],
-	cmd = "$(location //arch/wp2450ds/utils:fontconvert) $< > $@"
+	cmd = "$(location //arch/brother/wp2450/utils:fontconvert) $< > $@"
 )
 
 # Libraries -----------------------------------------------------------------
@@ -48,7 +48,7 @@ zmac(
 		"//include:z180.lib",
 		"//arch/common/utils:tty.lib",
 		"//arch/common/utils:print.lib",
-		"//arch/wp2450ds/include:wp2450ds.lib",
+		"//arch/brother/wp2450/include:wp2450.lib",
 		":font_inc"
     ],
 )
@@ -63,7 +63,7 @@ zmac(
 		"//include:z180.lib",
 		"//arch/common/utils:upd765.lib",
 		"//arch/common/utils:deblocker.lib",
-		"//arch/wp2450ds/include:wp2450ds.lib",
+		"//arch/brother/wp2450/include:wp2450.lib",
     ],
 )
 
@@ -75,7 +75,7 @@ zmac(
 		"//include:cpm.lib",
 		"//include:cpmish.lib",
 		"//include:z180.lib",
-		"//arch/wp2450ds/include:wp2450ds.lib",
+		"//arch/brother/wp2450/include:wp2450.lib",
 		":keytab_inc",
 	]
 )
@@ -94,7 +94,7 @@ zmac(
 		"//include:cpm.lib",
 		"//include:cpmish.lib",
 		"//include:z180.lib",
-		"//arch/wp2450ds/include:wp2450ds.lib",
+		"//arch/brother/wp2450/include:wp2450.lib",
 		":addresses",
 	],
 )
@@ -119,7 +119,7 @@ zmac(
 		"//include:cpm.lib",
 		"//include:cpmish.lib",
 		"//include:z180.lib",
-		"//arch/wp2450ds/include:wp2450ds.lib",
+		"//arch/brother/wp2450/include:wp2450.lib",
 		":addresses",
 	],
 )
@@ -185,7 +185,7 @@ unix2cpm(
 
 diskimage(
 	name = "diskimage",
-	format = "brother-wp2450ds",
+	format = "brother-wp2450",
 	bootfile = ":bootfile_img",
 	map = {
         "-readme.txt": ":readme",

arch/wp2450ds/README.md → arch/brother/wp2450/README.md

@@ -41,7 +41,7 @@ How to use it
 
 Build cpmish.
 
-Use `dd` or your favourite disk imager to write the `wp2450ds.img` file to a DD
+Use `dd` or your favourite disk imager to write the `wp2450.img` file to a DD
 3.5" floppy. You're probably best off formatting this on the machine itself, to
 get optimal interleave for the very slow machine.
 

arch/wp2450ds/bios.z80 → arch/brother/wp2450/bios.z80

@@ -8,7 +8,7 @@
 
     maclib cpm
     maclib cpmish
-    maclib wp2450ds
+    maclib wp2450
     maclib addresses
 
     extrn TTYINIT

arch/wp2450ds/boot.z80 → arch/brother/wp2450/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 wp2450ds
+    maclib wp2450
     maclib cpmish
     maclib cpm
     maclib addresses

arch/wp2450ds/keyboard.z80 → arch/brother/wp2450/keyboard.z80

@@ -2,7 +2,7 @@
 ; This file is distributable under the terms of the 2-clause BSD license.
 ; See COPYING.cpmish in the distribution root directory for more information.
 
-    maclib wp2450ds
+    maclib wp2450
     maclib cpmish
     maclib cpm
 

arch/wp2450ds/tty.z80 → arch/brother/wp2450/tty.z80

@@ -1,10 +1,10 @@
-; Brother WP2450DS cpmish BIOS © 2020 David Given
+; Brother wp2450 cpmish BIOS © 2020 David Given
 ; This file is distributable under the terms of the 2-clause BSD license.
 ; See COPYING.cpmish in the distribution root directory for more information.
 
     maclib cpm
     maclib cpmish
-    maclib wp2450ds
+    maclib wp2450
 
     extrn SYSIN
     extrn SYSOUT

arch/wp2450ds/upd765.z80 → arch/brother/wp2450/upd765.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 wp2450ds
+    maclib wp2450
     maclib cpmish
     maclib cpm
 

diskdefs

@@ -68,7 +68,7 @@ end
 # Brother WP2450DS 720kB disk image
 # This is just a 720kB DOS disk with enough reserved sectors to allow
 # the CCP/BDOS/BIOS to live in the first two tracks.
-diskdef brother-wp2450ds
+diskdef brother-wp2450
 	seclen 512
 	tracks 80
 	sectrk 18