directory structure cleanup

Makefile

@@ -3,15 +3,15 @@
 
 SRC_COMMON            = $(wildcard c64/aliases/*.s)
 SRC_BASIC_COMMON      = $(SRC_COMMON) $(wildcard c64/basic/*.s)
-SRC_KERNAL_COMMON     = $(SRC_COMMON) $(wildcard c64/kernal/*.s)
+SRC_KERNAL_COMMON     = $(SRC_COMMON) $(wildcard c64/kernal/*.s c64/kernal/jumptable/*.s c64/kernal/iec/*.s)
 
-SRC_BASIC_generic     = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,platform_generic/*.s)
-SRC_BASIC_mega65      = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,platform_mega65/*.s)
-SRC_BASIC_ultimate64  = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,platform_ultimate64/*.s)
+SRC_BASIC_generic     = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,target_generic/*.s)
+SRC_BASIC_mega65      = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,target_mega65/*.s)
+SRC_BASIC_ultimate64  = $(SRC_BASIC_COMMON) $(wildcard c64/basic/,target_ultimate64/*.s)
 
-SRC_KERNAL_generic    = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,platform_generic/*.s)
-SRC_KERNAL_mega65     = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,platform_mega65/*.s)
-SRC_KERNAL_ultimate64 = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,platform_ultimate64/*.s)
+SRC_KERNAL_generic    = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,target_generic/*.s)
+SRC_KERNAL_mega65     = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,target_mega65/*.s)
+SRC_KERNAL_ultimate64 = $(SRC_KERNAL_COMMON) $(wildcard c64/kernal/,target_ultimate64/*.s)
 
 # List of tools
 
@@ -68,22 +68,22 @@ build/chargen: $(TOOL_PNGPREPARE) assets/8x8font.png
 
 # Dependencies - XXX, why they need to be stated separately?
 
-build/basic_generic/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_generic) build/basic/packed_messages.s
+build/basic_generic/OUT.BIN:  Ophis $(TOOLS_LIST) $(SRC_BASIC_generic) build/basic/packed_messages.s
 build/kernal_generic/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_KERNAL_generic)
-build/newrom_generic: build/basic_generic/OUT.BIN build/kernal_generic/OUT.BIN
-build/newkern_generic: build/newrom_generic Makefile
+build/newrom_generic:   build/basic_generic/OUT.BIN build/kernal_generic/OUT.BIN
+build/newkern_generic:  build/newrom_generic Makefile
 build/newbasic_generic: build/newrom_generic Makefile
 
-build/basic_mega65/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_mega65) build/basic/packed_messages.s
+build/basic_mega65/OUT.BIN:  Ophis $(TOOLS_LIST) $(SRC_BASIC_mega65) build/basic/packed_messages.s
 build/kernal_mega65/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_KERNAL_mega65)
-build/newrom_mega65: build/basic_mega65/OUT.BIN build/kernal_mega65/OUT.BIN
-build/newkern_mega65: build/newrom_mega65 Makefile
+build/newrom_mega65:   build/basic_mega65/OUT.BIN build/kernal_mega65/OUT.BIN
+build/newkern_mega65:  build/newrom_mega65 Makefile
 build/newbasic_mega65: build/newrom_mega65 Makefile
 
-build/basic_ultimate64/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_BASIC_ultimate64) build/basic/packed_messages.s
+build/basic_ultimate64/OUT.BIN:  Ophis $(TOOLS_LIST) $(SRC_BASIC_ultimate64) build/basic/packed_messages.s
 build/kernal_ultimate64/OUT.BIN: Ophis $(TOOLS_LIST) $(SRC_KERNAL_ultimate64)
-build/newrom_ultimate64: build/basic_ultimate64/OUT.BIN build/kernal_ultimate64/OUT.BIN
-build/newkern_ultimate64: build/newrom_ultimate64 Makefile
+build/newrom_ultimate64:   build/basic_ultimate64/OUT.BIN build/kernal_ultimate64/OUT.BIN
+build/newkern_ultimate64:  build/newrom_ultimate64 Makefile
 build/newbasic_ultimate64: build/newrom_ultimate64 Makefile
 
 

c64/basic/,platform_generic/,hooks_generic.s

@@ -1,9 +0,0 @@
-
-;; Platform-specific hooks
-
-
-.macro PLATFORM_HOOK_BANNER
-
-	.byte $05, "  OPEN ROMS, ", $00
-
-.macend

c64/basic/,target_generic/,hooks_generic.s

@@ -0,0 +1,9 @@
+
+;; Target-specific hooks
+
+
+.macro TARGET_HOOK_BANNER
+
+	.byte $05, "  OPEN ROMS, ", $00
+
+.macend

c64/basic/,target_mega65/,hooks_mega65.s

@@ -1,8 +1,8 @@
 
-;; Platform-specific hooks
+;; Target-specific hooks
 
 
-.macro PLATFORM_HOOK_BANNER
+.macro TARGET_HOOK_BANNER
 
 	;; New banner from Retrofan
 	.byte $9a, $12, $20, $20, $7f, $a9, $20, $20, $1f, $20, $9a, $20, $20, $20

c64/basic/,target_ultimate64/,hooks_ultimate64.s

@@ -1,8 +1,8 @@
 
-;; Platform-specific hooks
+;; Target-specific hooks
 
 
-.macro PLATFORM_HOOK_BANNER
+.macro TARGET_HOOK_BANNER
 
 	.byte $05, "  OPEN ROMS FOR ULTIMATE 64", $0D, $0D, "  ", $00
 

c64/basic/basic_cold_start.s

@@ -15,7 +15,7 @@ basic_cold_start:
 ; Used 217 bytes
 startup_banner:
 
-	`PLATFORM_HOOK_BANNER
+	`TARGET_HOOK_BANNER
 
 	;; Work out free bytes, and display
 	jsr basic_do_new

c64/kernal/,platform_generic/,hooks_generic.s

@@ -1,6 +0,0 @@
-
-;; Platform-specific hooks
-
-
-.macro PLATFORM_HOOK_LOAD
-.macend

c64/kernal/,platform_mega65/,hooks_mega65.s

@@ -1,6 +0,0 @@
-
-;; Platform-specific hooks
-
-
-.macro PLATFORM_HOOK_LOAD
-.macend

c64/kernal/,target_generic/,hooks_generic.s

@@ -0,0 +1,6 @@
+
+;; Target-specific hooks
+
+
+.macro TARGET_HOOK_LOAD
+.macend

c64/kernal/,target_mega65/,hooks_mega65.s

@@ -0,0 +1,6 @@
+
+;; Target-specific hooks
+
+
+.macro TARGET_HOOK_LOAD
+.macend

c64/kernal/,target_ultimate64/,hooks_ultimate64.s

@@ -1,8 +1,8 @@
 
-;; Platform-specific hooks
+;; Target-specific hooks
 
 
-.macro PLATFORM_HOOK_LOAD
+.macro TARGET_HOOK_LOAD
 	;; XXX disabled for now - the current file opening API is not
 	;;     really suitable for easy usage from Kernal
 	;; jsr u64_load

c64/kernal/load.s

@@ -36,7 +36,7 @@ load:
 	jsr install_ram_routines
 
 	;; Allow platform-specific routine to takeover the flow
-	`PLATFORM_HOOK_LOAD
+	`TARGET_HOOK_LOAD
 
 	;; Check whether we support the requested device
 	lda current_device_number