MirrorRepos
/
RomWBW
mirror of https://github.com/wwarthen/RomWBW.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #125 from b1ackmai1er/dev 

Initial sound driver update for spk.asm
pull/126/head
Wayne Warthen 6 years ago
committed by GitHub
parent
33da94a4bd 989fa57047
commit
f871b5561e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 173 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Source/Apps/Tune/Tune.asm
  2. 1
      Source/Apps/Tune/hbios.inc
  3. 11
      Source/HBIOS/ay38910.asm
  4. 4
      Source/HBIOS/hbios.asm
  5. 4
      Source/HBIOS/hbios.inc
  6. 207
      Source/HBIOS/spk.asm

4
Source/Apps/Tune/Tune.asm
View File

@ -2017,7 +2017,7 @@ PLAYVIAHBIOS:
; ;
LD BC, (BF_SNDPRD*256)+0 ; SET PERIOD LD BC, (BF_SNDPRD*256)+0 ; SET PERIOD
LD HL, (AYREGS+TonA) ; DEVICE 0 LD HL, (AYREGS+TonA) ; DEVICE 0
ld A, H ; GET 12-BIT ONE PERIOD
LD A, H ; GET 12-BIT ONE PERIOD
AND $0F ; MASK OFF HIGH AND $0F ; MASK OFF HIGH
LD H, A ; NIBBLE LD H, A ; NIBBLE
RST 08 RST 08
@ -2061,7 +2061,7 @@ PLAYVIAHBIOS:
; ;
LD BC, (BF_SNDPRD*256)+0 ; SET PERIOD LD BC, (BF_SNDPRD*256)+0 ; SET PERIOD
LD HL, (AYREGS+TonC) ; DEVICE 0 LD HL, (AYREGS+TonC) ; DEVICE 0
ld A, H ; GET 12-BIT ONE PERIOD
LD A, H ; GET 12-BIT ONE PERIOD
AND $0F ; MASK OFF HIGH AND $0F ; MASK OFF HIGH
LD H, A ; NIBBLE LD H, A ; NIBBLE
RST 08 RST 08

1
Source/Apps/Tune/hbios.inc
View File

@ -6,7 +6,6 @@ RMN .EQU 1 ; intended CBIOS version - minor
BF_SYSVER .EQU $F1 ; BIOS: VER function BF_SYSVER .EQU $F1 ; BIOS: VER function
BF_SYSGET .EQU $F8 ; HBIOS: SYSGET function BF_SYSGET .EQU $F8 ; HBIOS: SYSGET function
; ;
BF_SND .EQU $50 BF_SND .EQU $50
BF_SNDRESET .EQU BF_SND + 0 ; RESET SOUND SYSTEM BF_SNDRESET .EQU BF_SND + 0 ; RESET SOUND SYSTEM
BF_SNDVOL .EQU BF_SND + 1 ; REQUEST SOUND VOL - L CONTAINS VOLUME (255 MAX, 0 SILENT) - SCALED AS REQUIRED BY DRIVER (EG: MAPS TO JUST 4 BIT RESOLUTION FOR SN76489) BF_SNDVOL .EQU BF_SND + 1 ; REQUEST SOUND VOL - L CONTAINS VOLUME (255 MAX, 0 SILENT) - SCALED AS REQUIRED BY DRIVER (EG: MAPS TO JUST 4 BIT RESOLUTION FOR SN76489)

11
Source/HBIOS/ay38910.asm
View File

@ -356,10 +356,9 @@ AY_QUERY:
RET RET
; ;
AY_QUERY_CHCNT: AY_QUERY_CHCNT:
LD B, AY_TONECNT ; RETURN NUMBER OF
LD C, AY_NOISECNT ; TONE AND NOISE
XOR A ; CHANNELS IN BC
RET
LD BC,(AY_TONECNT*256)+AY_NOISECNT ; RETURN NUMBER OF
XOR A ; TONE AND NOISE
RET ; CHANNELS IN BC
; ;
AY_QUERY_PERIOD: AY_QUERY_PERIOD:
LD HL, (AY_PENDING_PERIOD) ; RETURN 16-BIT PERIOD LD HL, (AY_PENDING_PERIOD) ; RETURN 16-BIT PERIOD
@ -370,7 +369,7 @@ AY_QUERY_VOLUME:
LD A, (AY_PENDING_VOLUME) ; RETURN 8-BIT VOLUME LD A, (AY_PENDING_VOLUME) ; RETURN 8-BIT VOLUME
LD L, A ; IN L REGISTER LD L, A ; IN L REGISTER
XOR A XOR A
LD H, A
; LD H, A
RET RET
; ;
AY_QUERY_DEV: AY_QUERY_DEV:
@ -653,7 +652,7 @@ AY3NOTETBL:
.DW AY_RATIO / 84269 .DW AY_RATIO / 84269
.DW AY_RATIO / 85495 .DW AY_RATIO / 85495
.DW AY_RATIO / 86738 .DW AY_RATIO / 86738
.DW AY_RATIO / 88000 ; # A5
.DW AY_RATIO / 88000 ; #A5
.DW AY_RATIO / 89280 .DW AY_RATIO / 89280
.DW AY_RATIO / 90579 .DW AY_RATIO / 90579
.DW AY_RATIO / 91896 .DW AY_RATIO / 91896

4
Source/HBIOS/hbios.asm
View File

@ -1283,7 +1283,7 @@ HB_CPU2:
; ;
LD A,FORCECON ; CALCULATE PRE-INIT TABLE ; A IS INDEX OF CONSOLE DEVICE ENTRY LD A,FORCECON ; CALCULATE PRE-INIT TABLE ; A IS INDEX OF CONSOLE DEVICE ENTRY
RLCA ; ENTRY THAT WE WANT TO ; A IS OFFSET OF CONSOLE DEVICE ENTRY RLCA ; ENTRY THAT WE WANT TO ; A IS OFFSET OF CONSOLE DEVICE ENTRY
LD DE,(HB_PCINITTBL) ; EXECUTE FIRST ; DE IS VALUE OF TOP ENTRY
LD DE,(HB_PCINITTBL) ; EXECUTE FIRST ; DE IS VALUE OF TOP ENTRY
LD HL,HB_PCINITTBL ; HL IS ADDRESS OF TOP OF TABLE LD HL,HB_PCINITTBL ; HL IS ADDRESS OF TOP OF TABLE
PUSH HL ; PUSH (1) TOP OF TABLE PUSH HL ; PUSH (1) TOP OF TABLE
PUSH DE ; PUSH (2) VALUE OF TOP ENTRY PUSH DE ; PUSH (2) VALUE OF TOP ENTRY
@ -1669,7 +1669,7 @@ HB_INITTBL:
.DW CTC_INIT .DW CTC_INIT
#ENDIF #ENDIF
#IF (SPKENABLE) #IF (SPKENABLE)
.DW SPK_INIT ; AUDIBLE INDICATOR OF BOOT START
.DW SP_INIT ; AUDIBLE INDICATOR OF BOOT START
#ENDIF #ENDIF
#IF (SN76489ENABLE) #IF (SN76489ENABLE)
.DW SN76489_INIT .DW SN76489_INIT

4
Source/HBIOS/hbios.inc
View File

@ -69,11 +69,11 @@ BF_SNDQ_CHCNT .EQU BF_SNDQ_STATUS + 1 ; RETURN COUNT OF CHANNELS
BF_SNDQ_VOLUME .EQU BF_SNDQ_STATUS + 2 ; 8 BIT NUMBER BF_SNDQ_VOLUME .EQU BF_SNDQ_STATUS + 2 ; 8 BIT NUMBER
BF_SNDQ_PERIOD .EQU BF_SNDQ_STATUS + 3 ; 16 BIT NUMBER BF_SNDQ_PERIOD .EQU BF_SNDQ_STATUS + 3 ; 16 BIT NUMBER
BF_SNDQ_DEV .EQU BF_SNDQ_STATUS + 4 ; RETURN DEVICE TYPE CODE AND IO PORTS - TYPE IN B, PORTS IN DE, HL BF_SNDQ_DEV .EQU BF_SNDQ_STATUS + 4 ; RETURN DEVICE TYPE CODE AND IO PORTS - TYPE IN B, PORTS IN DE, HL
;
BF_SNDDEV .EQU 0 ; TYPES OF SOUND DRIVERS BF_SNDDEV .EQU 0 ; TYPES OF SOUND DRIVERS
BF_SND_SN76489 .EQU BF_SNDDEV + 1 BF_SND_SN76489 .EQU BF_SNDDEV + 1
BF_SND_AY38910 .EQU BF_SNDDEV + 2 BF_SND_AY38910 .EQU BF_SNDDEV + 2
BF_SND_BITMODE .EQU BF_SNDDEV + 3
; ;
BF_SYS .EQU $F0 BF_SYS .EQU $F0
BF_SYSRESET .EQU BF_SYS + 0 ; SOFT RESET HBIOS BF_SYSRESET .EQU BF_SYS + 0 ; SOFT RESET HBIOS

207
Source/HBIOS/spk.asm
View File

@ -1,46 +1,161 @@
;======================================================================
;
; BIT MODE SOUND DRIVER FOR SBC V2 USING BIT 0 OF RTC DRIVER
;
;======================================================================
;
; DRIVER FUNCTION TABLE AND INSTANCE DATA
;
SP_FNTBL:
.DW SP_RESET
.DW SP_VOLUME
.DW SP_PERIOD
.DW SP_NOTE
.DW SP_PLAY
.DW SP_QUERY
;
#IF (($ - SP_FNTBL) != (SND_FNCNT * 2))
.ECHO "*** INVALID SND FUNCTION TABLE ***\n"
!!!!!
#ENDIF
;
SP_IDAT .EQU 0 ; NO INSTANCE DATA ASSOCIATED WITH THIS DEVICE
;
SP_TONECNT .EQU 1 ; COUNT NUMBER OF TONE CHANNELS
SP_NOISECNT .EQU 0 ; COUNT NUMBER OF NOISE CHANNELS
;
SP_PENDING_PERIOD .DW SP_NOTE_C8 ; PENDING PERIOD (16 BITS)
SP_PENDING_VOLUME .DB $FF ; PENDING VOL (8 BITS)
; ;
;====================================================================== ;======================================================================
; I/O BIT DRIVER FOR CONSOLE BELL FOR SBC V2 USING BIT 0 OF RTC DRIVER
; DRIVER INITIALIZATION
;====================================================================== ;======================================================================
; ;
SPK_INIT:
CALL NEWLINE ; FORMATTING
SP_INIT:
LD IY, SP_IDAT ; SETUP FUNCTION TABLE
LD BC, SP_FNTBL ; POINTER TO INSTANCE DATA
LD DE, SP_IDAT ; BC := FUNCTION TABLE ADDRESS
CALL SND_ADDENT ; DE := INSTANCE DATA PTR
;
CALL NEWLINE ; ANNOUNCE DEVICE
PRTS("SPK: IO=0x$") PRTS("SPK: IO=0x$")
LD A,RTCIO LD A,RTCIO
CALL PRTHEXBYTE CALL PRTHEXBYTE
CALL SPK_SETTBL
CALL SPK_BEEP ; PLAY A NOTE
CALL SP_SETTBL ; SETUP TONE TABLE
CALL SP_PLAY ; PLAY DEFAULT NOTE
XOR A XOR A
RET RET
; ;
; SETUP THE SPEAKER NOTE TABLE ACCORDING TO THE CPU SPEED.
; FREQUENCY ACCURACY DECREASES AS CLOCK SPEED MULITPLIER INCREASES.
; 1MHZ ERROR MAY OCCUR IF CPU CLOCK IS UNDER. I.E 3.999 = 3MHZ
SPK_SETTBL:
;======================================================================
; SOUND DRIVER FUNCTION - RESET
;======================================================================
;
SP_RESET:
; XOR A ; SUCCESSFULL RESET
; RET
;
;======================================================================
; SOUND DRIVER FUNCTION - VOLUME
;======================================================================
;
SP_VOLUME:
XOR A ; SIGNAL SUCCESS
RET
;
;======================================================================
; SOUND DRIVER FUNCTION - PERIOD
;======================================================================
;
SP_PERIOD:
LD (SP_PENDING_PERIOD), HL ; SAVE AND RETURN SUCCESSFUL
XOR A
RET
;
;======================================================================
; SOUND DRIVER FUNCTION - NOTE
;======================================================================
;
SP_NOTE:
PUSH HL
PUSH DE ; ON ENTRY L IS A NOTE INDEX
LD H,0 ; CONVERT THIS NOTE INDEX
ADD HL,HL ; TO THE ASSOCIATED ENTRY
ADD HL,HL ; IN THE TUNE ABLE.
LD DE,SP_TUNTBL ; SAVE THIS ADDRESS AS
ADD HL,DE ; THE PERIOD
LD (SP_PENDING_PERIOD),HL
POP DE
POP HL
RET
;
;======================================================================
; SOUND DRIVER FUNCTION - QUERY AND SUBFUNCTIONS
;======================================================================
;
SP_QUERY:
LD A, E
CP BF_SNDQ_CHCNT ; SUB FUNCTION 01
JR Z, SP_QUERY_CHCNT
;
CP BF_SNDQ_VOLUME ; SUB FUNCTION 02
JR Z, SP_QUERY_VOLUME
;
CP BF_SNDQ_PERIOD ; SUB FUNCTION 03
JR Z, SP_QUERY_PERIOD
;
CP BF_SNDQ_DEV ; SUB FUNCTION 04
JR Z, SP_QUERY_DEV
;
OR $FF ; SIGNAL FAILURE
RET
;
SP_QUERY_CHCNT:
LD BC,(SP_TONECNT*256)+SP_NOISECNT ; RETURN NUMBER OF
XOR A ; TONE AND NOISE
RET ; CHANNELS IN BC
;
SP_QUERY_PERIOD:
LD HL, (SP_PENDING_PERIOD) ; RETURN 16-BIT PERIOD
XOR A ; IN HL REGISTER
RET
;
SP_QUERY_VOLUME:
LD L, 255 ; RETURN 8-BIT VOLUME
XOR A ; IN L REGISTER
RET
;
SP_QUERY_DEV:
LD B, BF_SND_BITMODE ; RETURN DEVICE IDENTIFIER
LD DE, 0 ; AND ADDRESS AND DATA PORT
XOR A
RET
;
;======================================================================
; INITIALIZE THE TONE TABLE
;======================================================================
;
SP_SETTBL:
LD A,(CB_CPUMHZ) ; GET CPU SPEED. LD A,(CB_CPUMHZ) ; GET CPU SPEED.
LD C,A LD C,A
LD B,SPK_NOTCNT ; SET NUMBER OF NOTES TO
LD HL,SPK_TUNTBL+2 ; ADJUST AND START POINT
SPK_SETTBL2:
LD B,SP_NOTCNT ; SET NUMBER OF NOTES TO
LD HL,SP_TUNTBL+2 ; ADJUST AND START POINT
;
SP_SETTBL2:
PUSH HL PUSH HL
LD A,(HL) ; READ
LD E,A ; IN
INC HL ; THE
LD A,(HL) ; 1MHZ
LD D,A ; NOTE
LD E,(HL) ; READ IN
INC HL ; THE 1MHZ
LD D,(HL) ; NOTE
;
PUSH BC PUSH BC
LD B,C LD B,C
LD HL,0 ; MULTIPLY LD HL,0 ; MULTIPLY
SPK_SETTBL1: ; 1MHZ NOTE
SP_SETTBL1: ; 1MHZ NOTE
ADD HL,DE ; VALUE BY ADD HL,DE ; VALUE BY
DJNZ SPK_SETTBL1 ; SYSTEM MHZ
DJNZ SP_SETTBL1 ; SYSTEM MHZ
POP BC POP BC
; ;
LD DE,30 ; ADD OVEREAD
LD DE,30 ; ADD OVERHEAD
ADD HL,DE ; COMPENSATION ADD HL,DE ; COMPENSATION
; ;
POP DE ; RECALL NOTE POP DE ; RECALL NOTE
@ -52,34 +167,35 @@ SPK_SETTBL1: ; 1MHZ NOTE
INC HL ; NOTE INC HL ; NOTE
INC HL ; AND MOVE INC HL ; AND MOVE
INC HL ; TO NEXT INC HL ; TO NEXT
DJNZ SPK_SETTBL2 ; NEXT NOTE
;
DJNZ SP_SETTBL2 ; NEXT NOTE
RET RET
SPK_BEEP:
LD HL,SPK_NOTE_C8 ; SELECT NOTE
; ;
LD A,(HL) ; LOAD 1ST ARG
;======================================================================
; SOUND DRIVER FUNCTION - PLAY
;======================================================================
;
SP_PLAY:
LD HL,(SP_PENDING_PERIOD) ; SELECT NOTE
;
LD E,(HL) ; LOAD 1ST ARG
INC HL ; IN DE INC HL ; IN DE
LD E,A
LD A,(HL)
LD D,(HL)
INC HL INC HL
LD D,A
;
LD A,(HL) ; LOAD 2ND ARG
LD C,(HL) ; LOAD 2ND ARG
INC HL ; IN BC INC HL ; IN BC
LD C,A
LD A,(HL)
LD B,(HL)
INC HL INC HL
LD B,A
;
PUSH BC ; SETUP ARG IN HL PUSH BC ; SETUP ARG IN HL
POP HL POP HL
; ;
CALL SPK_BEEPER ; PLAY
CALL SP_BEEPER ; PLAY
; ;
RET RET
; ;
; The following SPK_BEEPER routine is a modification of code from
; The following SP_BEEPER routine is a modification of code from
; "The Complete SPECTRUM ROM DISSASSEMBLY" by Dr Ian Logan & Dr Frank O’Hara ; "The Complete SPECTRUM ROM DISSASSEMBLY" by Dr Ian Logan & Dr Frank O’Hara
; ;
; https://www.esocop.org/docs/CompleteSpectrumROMDisassemblyThe.pdf ; https://www.esocop.org/docs/CompleteSpectrumROMDisassemblyThe.pdf
@ -87,7 +203,7 @@ SPK_BEEP:
; DE Number of passes to make through the sound generation loop ; DE Number of passes to make through the sound generation loop
; HL Loop delay parameter ; HL Loop delay parameter
; ;
SPK_BEEPER:
SP_BEEPER:
PUSH IX PUSH IX
DI ; Disable the interrupt for the duration of a 'beep'. DI ; Disable the interrupt for the duration of a 'beep'.
LD A,L ; Save L temporarily. LD A,L ; Save L temporarily.
@ -146,13 +262,13 @@ BE_END:
POP IX POP IX
RET RET
; ;
; STANDARD ONE SECOND TONE TABLES AT 1MHZ (UNCOMPENSATED). FOR SPK_BEEPER, FIRST WORD LOADED INTO DE, SECOND INTO HL
; STANDARD ONE SECOND TONE TABLES AT 1MHZ (UNCOMPENSATED). FOR SP_BEEPER, FIRST WORD LOADED INTO DE, SECOND INTO HL
; ;
; EXCEL SPREADSHEET FOR CALCULATION CAN BE FOUND HERE: ; EXCEL SPREADSHEET FOR CALCULATION CAN BE FOUND HERE:
; ;
; https://www.retrobrewcomputers.org/lib/exe/fetch.php?media=boards:sbc:sbc_v2:sbc_v2-004:spk_beep_tuntbl.xlsx ; https://www.retrobrewcomputers.org/lib/exe/fetch.php?media=boards:sbc:sbc_v2:sbc_v2-004:spk_beep_tuntbl.xlsx
; ;
SPK_TUNTBL:
SP_TUNTBL:
.DW $13, $191A ; D .DW $13, $191A ; D
.DW $14, $17B3 ; E0 .DW $14, $17B3 ; E0
.DW $15, $165E ; F0 .DW $15, $165E ; F0
@ -246,7 +362,7 @@ SPK_TUNTBL:
.DW $DC0, $23 ; A7 .DW $DC0, $23 ; A7
.DW $E91, $21 ; A .DW $E91, $21 ; A
.DW $F6F, $1F ; B7 .DW $F6F, $1F ; B7
SPK_NOTE_C8:
SP_NOTE_C8:
.DW $105A, $1D ; C8 .DW $105A, $1D ; C8
.DW $1152, $1C ; C .DW $1152, $1C ; C
.DW $125A, $1A ; D8 .DW $125A, $1A ; D8
@ -259,5 +375,6 @@ SPK_NOTE_C8:
.DW $1B80, $11 ; A8 .DW $1B80, $11 ; A8
.DW $1D22, $10 ; A .DW $1D22, $10 ; A
.DW $1EDE, $F ; B8 .DW $1EDE, $F ; B8
SPK_NOTCNT .EQU ($-SPK_TUNTBL) / 4
;
SP_NOTCNT .EQU ($-SP_TUNTBL-1) / 4
;

Write Preview
Loading…
Cancel
Save