music

[bootcard] / bootcard.asm

diff --git a/bootcard.asm b/bootcard.asm
index e582ebd..b5c42f9 100644 (file)
--- a/bootcard.asm
+++ b/bootcard.asm
@@ -8,15 +8,16 @@
 
 data_start     equ 7e00h
 nticks         equ data_start
-muscur         equ nticks + 4
+tmoffs         equ nticks + 4
+muscur         equ tmoffs + 4
+spkstat                equ muscur + 4
+vol            equ spkstat + 4
+data_end       equ vol + 4
 
-osc_freq       equ 1193182
+OSC_FREQ       equ 1193182
 PIT_DATA0      equ 40h
-PIT_DATA2      equ 42h
 PIT_CMD                equ 43h
 PIT_CMD_CHAN0  equ 00h
-PIT_CMD_CHAN1  equ 40h
-PIT_CMD_CHAN2  equ 80h
 PIT_CMD_HILO   equ 30h
 PIT_CMD_SQWAVE equ 06h
 KB_CTRL                equ 61h
@@ -49,17 +50,21 @@ KB_CTRL             equ 61h
        out PIT_DATA0 + %1, al
 %endmacro
 
-       xor ax, ax
+       xor eax, eax
        mov ds, ax
+       mov es, ax
        mov ss, ax
        mov sp, 7c00h
 
-       mov dword [nticks], 0
-       mov dword [muscur], 0
+       mov di, data_start
+       mov cx, (data_end - data_start) / 2
+       rep stosw
+
+       ;mov word [vol], 04h
        mov word [32], timer_intr
        mov word [34], 0
 
-       settimer 0, DIV_ROUND(osc_freq, 250)
+       settimer 0, DIV_ROUND(OSC_FREQ, 100)
 
        mov ax, 13h
        int 10h
@@ -96,46 +101,104 @@ textout:
 .done: ret
 
 timer_intr:
+       pusha
        mov ax, [nticks]
        inc ax
        mov [nticks], ax
 
-       mov bx, [muscur]
+       sub ax, [tmoffs]
+.pmus: mov bx, [muscur]
        shl bx, 2
-       mov cx, [music + bx]
+       mov cx, [music + bx]    ; event time
        cmp cx, 0ffffh
-       jz .off
+       jz .loop
        cmp ax, cx
-       jb .eoi
+       jb .dopwm
 
        inc dword [muscur]
-       mov ax, [music + 2 + bx] ; grab timeout
+       mov ax, [music + 2 + bx] ; event counter reload
        test ax, ax
        jz .off
        mov bx, ax
-
        settimer 2, bx
        spkon
-       jmp .eoi
+       mov word [spkstat], 1
+       jmp .dopwm
 
 .off:  spkoff
+       mov word [spkstat], 0
+       jmp .eoi
+
+       ; PWM for volume control
+.dopwm:        jmp .eoi
+       spkoff
+       mov ax, [spkstat]
+       test ax, ax
+       jz .eoi
+       mov ax, [nticks]
+       and ax, 0fh
+       cmp ax, [vol]
+       jae .pwmoff
+       spkon
+       jmp .eoi
+.pwmoff:
+       spkoff
 
 .eoi:  mov al, 20h
        out 20h, al     ; EOI
+       popa
        iret
 
+.loop: neg cx
+       mov [muscur], cx
+       mov ax, [nticks]
+       mov [tmoffs], ax
+       jmp .pmus
+       
+
 str1:  db 'message message blah',0
 str2:  db 'Michael & Athina',0
 
-music:
-       dw 0, 500
-       dw 10, 0
-       dw 20, 2000
-       dw 30, 0
-       dw 40, 500
-       dw 50, 0
-       dw 60, 2000
-       dw 70, 0
+G1     equ 24351
+C2     equ 18243
+D2     equ 16252
+B1     equ 19328
+F2     equ 13666
+E2     equ 14479
+
+%define TM(x)  (40 + (x) * 2)
+
+music: dw 0, 0
+       dw TM(0),       G1
+       dw TM(40),      C2
+       dw TM(70),      C2
+
+       dw TM(80),      C2
+       dw TM(140),     0
+
+       dw TM(160),     G1
+       dw TM(200),     D2
+       dw TM(230),     B1
+
+       dw TM(240),     C2
+       dw TM(300),     0
+
+       dw TM(320),     G1
+       dw TM(360),     C2
+       dw TM(390),     F2
+
+       dw TM(400),     F2
+       dw TM(440),     E2
+       dw TM(470),     D2
+
+       dw TM(480),     C2
+       dw TM(520),     B1
+       dw TM(550),     C2
+
+       dw TM(560),     D2
+       dw TM(640),     0
+
+       dw TM(680),     0
        dw 0ffffh, 0
 
        times 446-($-$$) db 0