From 7423b1d3eed5daa17700ee63638817b7a95aff39 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 21 Feb 2018 20:32:40 -0500
Subject: [PATCH] chiptune_player: reads in the KRW file

---
 asm_routines/dos33_routines.s     |  37 ++++++++++++++++++++++++------
 chiptune_player/INTRO2.KRW        | Bin 0 -> 9356 bytes
 chiptune_player/Makefile          |   4 ++--
 chiptune_player/chiptune_player.s |  37 +++++++++++++++---------------
 4 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 chiptune_player/INTRO2.KRW

diff --git a/asm_routines/dos33_routines.s b/asm_routines/dos33_routines.s
index f8c7594e..db05df04 100644
--- a/asm_routines/dos33_routines.s
+++ b/asm_routines/dos33_routines.s
@@ -3,11 +3,9 @@
 
 ; FIXME: make these a parameter
 ; filename
-;disk_buff	EQU	$6000
-;read_size	EQU	$2A00	; (3*256*14)
 
-disk_buff	EQU	$4000
-read_size	EQU	$1000	; 4kB
+disk_buff	EQU	$2000
+read_size	EQU	$4000	; 16kB
 
 ;; For the disk-read code
 ;RWTSL		EQU $F0
@@ -40,7 +38,8 @@ FILEMANAGER        EQU $3D6
 	;================================
 	; read from disk
 	;================================
-	;
+	; FILENAME pointed to by INH:INL
+	;	OUTH:OUTL trashed
 	;
 read_file:
 	jsr     LOCATE_FILEM_PARAM  	; $3DC entry point
@@ -54,6 +53,30 @@ read_file:
 ;	lda	#0			; 0 = text
 ;	sta	(FILEML),y
 
+
+	; copy filename into place
+	ldy	#0
+	lda	#<filename		; combine with below? (filename-8?)
+	sta	OUTL
+	lda	#>filename
+	sta	OUTH
+
+filename_copy_loop:
+	lda	(INL),y			; load byte
+	beq	filename_pad_spaces	; if zero, done
+	ora	#$80			; convert to apple ascii
+	sta	(OUTL),y		; store out
+	iny
+	bne	filename_copy_loop
+
+filename_pad_spaces:
+	lda	#$A0			; filename needs ' ' padded
+	sta	(OUTL),y
+	iny
+	cpy	#31			; fill 30 bytes
+	bne	filename_pad_spaces
+
+
 	ldy	#8			; filename ptr offset = 8
 	lda	#<filename
 	sta	(FILEML),y
@@ -243,8 +266,8 @@ dos33_read:
 
 filename:
 ; OUT.0
-.byte 'O'+$80,'U'+$80,'T'+$80,'.'+$80,'L'+$80
-.byte 'Z'+$80,'4'+$80,$A0,$A0,$A0
+.byte 'I'+$80,'N'+$80,'T'+$80,'R'+$80,'O'+$80
+.byte '2'+$80,'.'+$80,'K'+$80,'R'+$80,'W'+$80
 .byte $A0,$A0,$A0,$A0,$A0
 .byte $A0,$A0,$A0,$A0,$A0
 .byte $A0,$A0,$A0,$A0,$A0
diff --git a/chiptune_player/INTRO2.KRW b/chiptune_player/INTRO2.KRW
new file mode 100644
index 0000000000000000000000000000000000000000..5de2719b62f13e8a4b7b78a0e2baa295117a2997
GIT binary patch
literal 9356
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

literal 0
HcmV?d00001

diff --git a/chiptune_player/Makefile b/chiptune_player/Makefile
index 7f7f55db..b4e78f42 100644
--- a/chiptune_player/Makefile
+++ b/chiptune_player/Makefile
@@ -7,8 +7,8 @@ all:	chiptune_player.dsk
 
 chiptune_player.dsk:	CHIPTUNE_PLAYER OUT.0
 	$(DOS33) -y chiptune_player.dsk BSAVE -a 0x1000 CHIPTUNE_PLAYER
-	$(DOS33) -y chiptune_player.dsk SAVE B OUT.0
-	$(DOS33) -y chiptune_player.dsk SAVE B OUT.LZ4
+	$(DOS33) -y chiptune_player.dsk SAVE B INTRO2.KRW
+#	$(DOS33) -y chiptune_player.dsk SAVE B OUT.LZ4
 #	$(DOS33) -y chiptune_player.dsk BSAVE -a 0x6000 OUT.0
 
 
diff --git a/chiptune_player/chiptune_player.s b/chiptune_player/chiptune_player.s
index 042cbdb1..36d7d832 100644
--- a/chiptune_player/chiptune_player.s
+++ b/chiptune_player/chiptune_player.s
@@ -2,8 +2,8 @@
 
 .include	"zp.inc"
 
-LZ4_BUFFER	EQU	$4000
-CHUNK_BUFFER	EQU	$6000
+LZ4_BUFFER	EQU	$2000		; 16k for now, FIXME: expand
+CHUNK_BUFFER	EQU	$6000		; 10.5k, $2A00
 CHUNKSIZE	EQU	$3
 
 	;=============================
@@ -322,7 +322,7 @@ new_song:
 
 	jsr	clear_bottoms		; clear bottom of page 0/1
 
-	lda	#0
+	lda	#0			; print LOADING message
 	sta	CH
 	lda	#21
 	sta	CV
@@ -338,6 +338,10 @@ new_song:
 	; init pointer to the music
 	;===========================
 
+	lda	#<krw_file
+	sta	INL
+	lda	#>krw_file
+	sta	INH
 
 	jsr	read_file
 
@@ -358,11 +362,11 @@ new_song:
 
 	jsr	clear_bottoms		; clear bottom of page 0/1
 
-	lda     #<file_info
-        sta     OUTL
-        lda     #>file_info
-        sta     OUTH
-	ldy	#0
+;	lda	#<file_info
+;	sta	OUTL
+;	lda	#>file_info
+;	sta	OUTH
+;	ldy	#0
 
 ; FIXME: optimize
 
@@ -424,6 +428,12 @@ bloop3:
 
 	rts
 
+;==========
+; filenames
+;==========
+krw_file:
+	.asciiz "INTRO2.KRW"
+
 ;=========
 ;routines
 ;=========
@@ -440,17 +450,6 @@ bloop3:
 .include	"rasterbars.s"
 .include	"volume_bars.s"
 
-;===========
-; File info
-;===========
-file_info:
-.byte	1
-.asciiz	"INTRO2: JUNGAR OF BIT WORLD FROM KIEV"
-.byte	5
-.asciiz	"BY: SURGEON (ALEKSEY LUTSENKO)"
-.byte	15
-.asciiz "0:00 / 0:00"
-
 ;=========
 ; strings
 ;=========