Move clock driver sources into clocks/ subdir to tidy top level

This commit is contained in:
Joshua Bell 2022-11-18 18:23:03 -08:00
parent c4c14419fe
commit 8f658437ab
23 changed files with 66 additions and 47 deletions

View File

@ -1,4 +1,4 @@
targets := ns.clock cricket dclock romx fujinet selectors ram.drv util textcolors
targets := clocks selectors ram.drv util textcolors
.PHONY: all $(targets) package

19
clocks/Makefile Normal file
View File

@ -0,0 +1,19 @@
targets := ns.clock cricket dclock romx fujinet
.PHONY: all $(targets)
all: $(targets)
# Build all targets
$(targets):
@tput setaf 3 && echo "Building: $@" && tput sgr0
@$(MAKE) -C $@ \
&& (tput setaf 2 && echo "make $@ good" && tput sgr0) \
|| (tput blink && tput setaf 1 && echo "MAKE $@ BAD" && tput sgr0 && false)
# Clean all temporary/target files
clean:
@for dir in $(targets); do \
tput setaf 2 && echo "cleaning $$dir" && tput sgr0; \
$(MAKE) -C $$dir clean; \
done

View File

@ -14,13 +14,13 @@
.include "apple2.mac"
.include "opcodes.inc"
.include "../inc/apple2.inc"
.include "../inc/macros.inc"
.include "../inc/prodos.inc"
.include "../inc/ascii.inc"
.include "../../inc/apple2.inc"
.include "../../inc/macros.inc"
.include "../../inc/prodos.inc"
.include "../../inc/ascii.inc"
;;; ************************************************************
.include "../inc/driver_preamble.inc"
.include "../../inc/driver_preamble.inc"
;;; ************************************************************
;;; ============================================================
@ -310,5 +310,5 @@ done: pla ; restore saved command state
.assert sizeof_driver <= 125, error, "Clock code must be <= 125 bytes"
;;; ************************************************************
.include "../inc/driver_postamble.inc"
.include "../../inc/driver_postamble.inc"
;;; ************************************************************

View File

@ -6,8 +6,8 @@
.include "apple2.inc"
.include "opcodes.inc"
.include "../inc/apple2.inc"
.include "../inc/prodos.inc"
.include "../../inc/apple2.inc"
.include "../../inc/prodos.inc"
.org $300

View File

@ -8,9 +8,9 @@
.include "apple2.inc"
.include "apple2.mac"
.include "../inc/apple2.inc"
.include "../inc/macros.inc"
.include "../inc/ascii.inc"
.include "../../inc/apple2.inc"
.include "../../inc/macros.inc"
.include "../../inc/ascii.inc"
.org $2000

View File

@ -8,9 +8,9 @@
.include "apple2.inc"
.include "apple2.mac"
.include "../inc/apple2.inc"
.include "../inc/macros.inc"
.include "../inc/ascii.inc"
.include "../../inc/apple2.inc"
.include "../../inc/macros.inc"
.include "../../inc/ascii.inc"
.org $2000

View File

@ -11,9 +11,9 @@
.include "apple2.mac"
.include "opcodes.inc"
.include "../inc/apple2.inc"
.include "../inc/macros.inc"
.include "../inc/ascii.inc"
.include "../../inc/apple2.inc"
.include "../../inc/macros.inc"
.include "../../inc/ascii.inc"
.org $2000

View File

@ -20,9 +20,9 @@
.include "apple2.mac"
.include "opcodes.inc"
.include "../inc/apple2.inc"
.include "../inc/macros.inc"
.include "../inc/prodos.inc"
.include "../../inc/apple2.inc"
.include "../../inc/macros.inc"
.include "../../inc/prodos.inc"
; zero page locations
SCRATCH := $0B ; scratch value for BCD range checks
@ -43,7 +43,7 @@ DPTRH := SLOT4IO+2 ; Slinky data ptr high
DATA := SLOT4IO+3 ; Slinky data byte
;;; ************************************************************
.include "../inc/driver_preamble.inc"
.include "../../inc/driver_preamble.inc"
;;; ************************************************************
;;; ============================================================
@ -380,5 +380,5 @@ regulk = * - 1
.assert sizeof_driver <= 125, error, "Clock code must be <= 125 bytes"
;;; ************************************************************
.include "../inc/driver_postamble.inc"
.include "../../inc/driver_postamble.inc"
;;; ************************************************************

View File

@ -9,13 +9,13 @@
.include "apple2.mac"
.include "opcodes.inc"
.include "../inc/apple2.inc"
.include "../inc/macros.inc"
.include "../inc/prodos.inc"
.include "../inc/ascii.inc"
.include "../../inc/apple2.inc"
.include "../../inc/macros.inc"
.include "../../inc/prodos.inc"
.include "../../inc/ascii.inc"
;;; ************************************************************
.include "../inc/driver_preamble.inc"
.include "../../inc/driver_preamble.inc"
.include "./smartport.inc"
;;; ************************************************************
@ -182,5 +182,5 @@ loop: lda driver,y
;;; ************************************************************
.include "../inc/driver_postamble.inc"
.include "../../inc/driver_postamble.inc"
;;; ************************************************************

View File

@ -13,12 +13,12 @@
.include "apple2.mac"
.include "opcodes.inc"
.include "../inc/apple2.inc"
.include "../inc/macros.inc"
.include "../inc/prodos.inc"
.include "../../inc/apple2.inc"
.include "../../inc/macros.inc"
.include "../../inc/prodos.inc"
;;; ************************************************************
.include "../inc/driver_preamble.inc"
.include "../../inc/driver_preamble.inc"
;;; ************************************************************
;;; ============================================================
@ -289,5 +289,5 @@ unlock:
;;; ************************************************************
.include "../inc/driver_postamble.inc"
.include "../../inc/driver_postamble.inc"
;;; ************************************************************

View File

@ -16,16 +16,16 @@
.include "apple2.mac"
.include "opcodes.inc"
.include "../inc/apple2.inc"
.include "../inc/macros.inc"
.include "../inc/prodos.inc"
.include "../../inc/apple2.inc"
.include "../../inc/macros.inc"
.include "../../inc/prodos.inc"
;;; Uncomment the following to "fake" a clock with a fixed date.
;;; Used for testing without a real ROMX around.
;;; FAKE_CLOCK = 1
;;; ************************************************************
.include "../inc/driver_preamble.inc"
.include "../../inc/driver_preamble.inc"
;;; ************************************************************
ZipSlo := $C0E0 ; ZIP CHIP slowdown
@ -313,5 +313,5 @@ ClockDrvSize = ClockDrvEnd - ClockDrv
.sprintf("Clock driver must be <= 125 bytes, was %d bytes", ClockDrvSize)
;;; ************************************************************
.include "../inc/driver_postamble.inc"
.include "../../inc/driver_postamble.inc"
;;; ************************************************************

View File

@ -18,14 +18,14 @@ add_file () {
cadius ADDFILE "$IMGFILE" "$3" "$PACKDIR/$2" --no-case-bits --quiet
}
add_file "cricket/out/cricket.system.SYS" "cricket.system#FF0000" "/$VOLNAME"
add_file "cricket/out/set.date.BIN" "set.date#062000" "/$VOLNAME/CRICKET.UTIL"
add_file "cricket/out/set.time.BIN" "set.time#062000" "/$VOLNAME/CRICKET.UTIL"
add_file "cricket/out/test.BIN" "test#062000" "/$VOLNAME/CRICKET.UTIL"
add_file "dclock/out/dclock.system.SYS" "dclock.system#FF0000" "/$VOLNAME"
add_file "ns.clock/out/ns.clock.system.SYS" "ns.clock.system#FF0000" "/$VOLNAME"
add_file "romx/out/romxrtc.system.SYS" "romxrtc.system#FF0000" "/$VOLNAME"
add_file "fujinet/out/fn.clock.system.SYS" "fn.clock.system#FF0000" "/$VOLNAME"
add_file "clocks/cricket/out/cricket.system.SYS" "cricket.system#FF0000" "/$VOLNAME"
add_file "clocks/cricket/out/set.date.BIN" "set.date#062000" "/$VOLNAME/CRICKET.UTIL"
add_file "clocks/cricket/out/set.time.BIN" "set.time#062000" "/$VOLNAME/CRICKET.UTIL"
add_file "clocks/cricket/out/test.BIN" "test#062000" "/$VOLNAME/CRICKET.UTIL"
add_file "clocks/dclock/out/dclock.system.SYS" "dclock.system#FF0000" "/$VOLNAME"
add_file "clocks/ns.clock/out/ns.clock.system.SYS" "ns.clock.system#FF0000" "/$VOLNAME"
add_file "clocks/romx/out/romxrtc.system.SYS" "romxrtc.system#FF0000" "/$VOLNAME"
add_file "clocks/fujinet/out/fn.clock.system.SYS" "fn.clock.system#FF0000" "/$VOLNAME"
add_file "ram.drv/out/ram.drv.system.SYS" "ram.drv.system#FF0000" "/$VOLNAME"
add_file "selectors/out/bbb.system.SYS" "bbb.system#FF0000" "/$VOLNAME"
add_file "selectors/out/buhbye.system.SYS" "buhbye.system#FF0000" "/$VOLNAME"