revoke

game-ctrl/Makefile

@@ -11,7 +11,7 @@ CFLAGS=-Wall -mmcu=$(MCU) -std=gnu99 -I $(TOOLCHAIN_PREFIX)/include -O1 -g0
 
 LDFLAGS=-mmcu=$(MCU) -L $(TOOLCHAIN_PREFIX)/include
 
-$(ARTIFACT).elf:	main.o spi.o scheduler.o canvas.o shapes.o game.o buttons.o myrand.o display.o
+$(ARTIFACT).elf:	main.o spi.o scheduler.o canvas.o shapes.o game.o buttons.o myrand.o display.o sound.o
 	$(CC) -o $@ $(LDFLAGS) $^
 	$(OBJDUMP) -D $(ARTIFACT).elf > $(ARTIFACT).txt
 

game-ctrl/buttons.c

@@ -1,11 +1,13 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <msp430g2553.h>
 
 #include "buttons.h"
 #include "scheduler.h"
 #include "shapes.h"
 #include "canvas.h"
+#include "sound.h"
 
 
 static uint8_t buttonsMoveLeftPressed() {
@@ -45,6 +47,11 @@ static uint8_t buttonsMoveDownPressed() {
 }
 
 void buttonsExec(void *handle) {
+  static uint32_t unmuteTimestamp;
+  uint32_t currentTimestamp = getSeconds();
+  static bool unmuteFlag = true;
+
+
   if (! stoneIsValid()) {
     // don't do anything, the stone has not been initialized
     return;
@@ -54,27 +61,43 @@ void buttonsExec(void *handle) {
 
   if (buttonsMoveLeftPressed()) {
     stoneMoveLeft();
+    soundCtrl(SOUND_MOTION);
     buttonPressed = 1;
   }
   if (buttonsMoveRightPressed()) {
     stoneMoveRight();
+    soundCtrl(SOUND_MOTION);
     buttonPressed = 1;
   }
   if (buttonsRotateLeftPressed()) {
     stoneRotateLeft();
+    soundCtrl(SOUND_MOTION);
     buttonPressed = 1;
   }
   if (buttonsRotateRightPressed()) {
     stoneRotateRight();
+    soundCtrl(SOUND_MOTION);
     buttonPressed = 1;
   }
   if (buttonsMoveDownPressed()) {
     stoneMoveDown();
+    soundCtrl(SOUND_MOTION);
     buttonPressed = 1;
   }
 
   if (buttonPressed == 1) {
     canvasShow();
+
+    if (! unmuteFlag) {
+      soundCtrl(SOUND_UNMUTE);
+      unmuteFlag = true;
+    }
+    unmuteTimestamp = currentTimestamp;
+  }
+
+  if (unmuteFlag && (unmuteTimestamp + MUTE_DELAY < currentTimestamp)) {
+    soundCtrl(SOUND_MUTE);
+    unmuteFlag = false;
   }
 }
 

game-ctrl/game.c

@@ -7,6 +7,7 @@
 #include "canvas.h"
 #include "../rgb-driver/colors.h"
 #include "display.h"
+#include "sound.h"
 
 
 #define GAME_CYCLE_TIME 100
@@ -40,6 +41,7 @@ void gameExec(void *handle) {
 // --- phase: game --------------------------------------------------------
     case e_Start:
       canvasClear();
+      soundCtrl(SOUND_START);
       level = 1;
       score = 0;
       displaySetValue(score);
@@ -71,6 +73,7 @@ void gameExec(void *handle) {
       
     case e_Down:
       if (! stoneMoveDown()) {
+        soundCtrl(SOUND_LOCK);
         state = e_NewStone;
       } else {
         proceedDelay = delayFactor(level);
@@ -80,6 +83,7 @@ void gameExec(void *handle) {
 
 // --- phase: game over ---------------------------------------------------
     case e_GameOver:
+      soundCtrl(SOUND_GAMEOVER);
       rowIndex = CANVAS_HEIGHT;
       phase = e_Phase_GameOver;
       state = e_GameOverFill;
@@ -113,17 +117,23 @@ void gameExec(void *handle) {
 
   canvasShow();
   if (phase == e_Phase_Game) {
+    uint8_t wipeCnt = 0;
     for (uint8_t r = 0; r < CANVAS_HEIGHT; r++) {
       if (canvasIsRowFilled(r)) {
         score += level;
         displaySetValue(score);
         canvasWipeRow(r);
         canvasShow();
+        wipeCnt += 1;
       }
     }
+    if (wipeCnt != 0) {
+      soundCtrl(SOUND_FANFARE); 
+    }
   }
 }
 
 void gameInit() {
   schAdd(gameExec, NULL, 0, GAME_CYCLE_TIME);
 }
+

game-ctrl/scheduler.c

@@ -12,6 +12,7 @@
 
 tTask tasks[MAX_NUM_OF_TASKS];
 
+uint32_t seconds;
 
 void schInit() {
   TACCR0 = 32;
@@ -25,9 +26,18 @@ void schInit() {
     tasks[i].exec = NULL;
     tasks[i].handle = NULL;
   }
+
+  seconds = 0;
 }
 
 void __attribute__ ((interrupt (TIMER0_A0_VECTOR))) schUpdate() {
+  static uint16_t milliSeconds = 0;
+  if (milliSeconds >= 1000) {
+    seconds += 1;
+    milliSeconds = 0;
+  }
+  milliSeconds += 1;
+
   for (uint16_t i = 0; i < MAX_NUM_OF_TASKS; i++) {
     if (tasks[i].exec != NULL) {
       if (tasks[i].delay == 0) {
@@ -89,4 +99,13 @@ void schExec() {
   }
 }
 
+uint32_t getSeconds() {
+  uint32_t s;
+
+  __disable_interrupt();
+  s = seconds;
+  __enable_interrupt();
+
+  return s;
+}
 

game-ctrl/scheduler.h

@@ -31,6 +31,7 @@ void schDel(void (*exec)(void *), void *handle);
 void schExec();
 void schUpdate();
 uint8_t schTaskCnt();
+uint32_t getSeconds();
 
 
 #endif /* PONTCOOPSCHEDULER_H_ */

game-ctrl/sound.c

@@ -0,0 +1,18 @@
+#include <stdint.h>
+#include "sound.h"
+#include "spi.h"
+
+
+
+void soundInit() {
+}
+
+
+void soundCtrl(uint8_t cmd) {
+  spiSendBegin(e_SPI_SOUND);
+
+  spiSendOctet(cmd);
+
+  spiSendEnd(e_SPI_SOUND);
+}
+

game-ctrl/sound.h

@@ -0,0 +1,15 @@
+#ifndef _SOUND_H_
+#define _SOUND_H_
+
+#include <stdint.h>
+
+#define MUTE_DELAY 30 // seconds
+
+#include "../sound-driver/soundCodes.h"
+
+void soundInit();
+void soundCtrl(uint8_t cmd);
+
+
+
+#endif // _SOUND_H_

sound-driver/Makefile

@@ -4,20 +4,25 @@ OBJDUMP=$(TOOLCHAIN_PREFIX)/bin/msp430-elf-objdump
 
 ARTIFACT=firmware
 MCU=msp430g2553
-CFLAGS=-Wall -mmcu=$(MCU) -std=gnu99 -I $(TOOLCHAIN_PREFIX)/include -O1 -g0
+COMMONFLAGS=-Wall -mmcu=$(MCU) -I $(TOOLCHAIN_PREFIX)/include -O0 -g0
+CFLAGS=$(COMMONFLAGS) -std=gnu99 
+ASFLAGS=$(COMMONFLAGS) -D__ASSEMBLER__
 
 # for debugging
 CFLAGS+= -g3 -ggdb -gdwarf-2
 
 LDFLAGS=-mmcu=$(MCU) -L $(TOOLCHAIN_PREFIX)/include
 
-$(ARTIFACT).elf:	main.o scheduler.o spi.o psg.o sequencer.o melody.o
+$(ARTIFACT).elf:	main.o scheduler.o spi.o spi_init.o sequencer.o melody_tetris.o melody_tusch1.o ay_3_8913.o mute.o
 	$(CC) -o $@ $(LDFLAGS) $^
 	$(OBJDUMP) -D $(ARTIFACT).elf > $(ARTIFACT).txt
 
 .c.o:	
 	$(CC) $(CFLAGS) -c $<
 
+.S.o:	
+	$(CC) $(ASFLAGS) -c $<
+
 
 .PHONY: all
 all:	$(ARTIFACT).elf

sound-driver/ay_3_8913.c

@@ -24,6 +24,8 @@ const uint16_t frequencyCodes[8][12] = {
 #define BUS_CTRL_REG P1OUT
 #define BC1 BIT3
 #define BDIR BIT1
+#define _CS0 BIT2
+#define _CS1 BIT0
 
 #define R0 0
 #define CHANNEL_A_TONE_PERIOD_FINE_REG R0
@@ -54,7 +56,7 @@ const uint16_t frequencyCodes[8][12] = {
 #define R15 015
 #define ENVELOPE_SHAPE_REG R15
 
-uint8_t psgShadowRegisters[14];
+uint8_t psgShadowRegisters[2][14];
 
 inline static void BUS_OP_NACT() {
   BUS_CTRL_REG &= ~(BDIR | BC1);
@@ -66,7 +68,20 @@ inline static void BUS_OP_DWS() {
   BUS_CTRL_REG |= BDIR;
   BUS_CTRL_REG &= ~BC1;
 }
+inline static void BUS_OP_CS0_ENABLE() {
+  BUS_CTRL_REG &= ~_CS0;
+}
+inline static void BUS_OP_CS0_DISABLE() {
+  BUS_CTRL_REG |= _CS0;
+}
+inline static void BUS_OP_CS1_ENABLE() {
+  BUS_CTRL_REG &= ~_CS1;
+}
+inline static void BUS_OP_CS1_DISABLE() {
+  BUS_CTRL_REG |= _CS1;
+}
 
+#if 0
 static void delay() {
 asm volatile (
     "push r12\n"
@@ -77,16 +92,23 @@ asm volatile (
     "pop r12\n"
 );
 }
+#endif
 
-uint8_t psgReadShadow(uint8_t address) {
-  return psgShadowRegisters[address];
+static uint8_t psgReadShadow(uint8_t chip, uint8_t address) {
+  return psgShadowRegisters[chip][address];
 }
 
-void psgWrite(uint8_t address, uint8_t data) {
-  psgShadowRegisters[address] = data;
+static void psgWrite(uint8_t chip, uint8_t address, uint8_t data) {
+  psgShadowRegisters[chip][address] = data;
 
   // according to "State Timing" (p. 15) of datasheet
 
+  if (chip == 0) {
+    BUS_OP_CS0_ENABLE();
+  } else {
+    BUS_OP_CS1_ENABLE();
+  }
+
   // put bus into inactive state
   BUS_OP_NACT();
 
@@ -107,24 +129,31 @@ void psgWrite(uint8_t address, uint8_t data) {
 
   // set inactive again
   BUS_OP_NACT();
-}
 
-void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode) {
-  psgWrite(CHANNEL_A_TONE_PERIOD_FINE_REG + (channel * 2), (frequencyCode & 0x00ff));
-  psgWrite(CHANNEL_A_TONE_PERIOD_COARSE_REG + (channel * 2), ((frequencyCode >> 8) & 0x000f));
-}
-
-void psgPlayTone(uint8_t channel, t_octave octave, t_note note) {
-  if (note == e_Pause) {
-    psgWrite(_ENABLE_REG, psgReadShadow(_ENABLE_REG) | (1 << channel));
+  if (chip == 0) {
+    BUS_OP_CS0_DISABLE();
   } else {
-    psgWrite(_ENABLE_REG, psgReadShadow(_ENABLE_REG) & ~(1 << channel));
-    psgWriteFrequency(channel, frequencyCodes[octave][note]);
+    BUS_OP_CS1_DISABLE();
   }
 }
 
-void psgAmplitude(uint8_t channel, uint8_t volume) {
-  psgWrite(CHANNEL_A_AMPLITUDE_REG + channel, volume);
+static void psgWriteFrequency(uint8_t chip, uint8_t channel, uint16_t frequencyCode) {
+  psgWrite(chip, CHANNEL_A_TONE_PERIOD_FINE_REG + (channel * 2), (frequencyCode & 0x00ff));
+  psgWrite(chip, CHANNEL_A_TONE_PERIOD_COARSE_REG + (channel * 2), ((frequencyCode >> 8) & 0x000f));
+}
+
+void psgPlayTone(uint8_t chip, uint8_t channel, uint8_t volume, t_octave octave, t_note note) {
+  if (note == e_Pause) {
+    psgWrite(chip, _ENABLE_REG, psgReadShadow(chip, _ENABLE_REG) | (1 << channel));
+  } else {
+    psgWrite(chip, _ENABLE_REG, psgReadShadow(chip, _ENABLE_REG) & ~(1 << channel));
+    psgAmplitude(chip, channel, volume);
+    psgWriteFrequency(chip, channel, frequencyCodes[octave][note]);
+  }
+}
+
+void psgAmplitude(uint8_t chip, uint8_t channel, uint8_t volume) {
+  psgWrite(chip, CHANNEL_A_AMPLITUDE_REG + channel, volume);
 }
 
 void psgInit() {
@@ -133,31 +162,18 @@ void psgInit() {
   P2SEL = 0;
   P2SEL2 = 0;
 
-  // sound chip reset
-  // BIT2: /RST
-  P1DIR |= BIT2;
-
-  // put sound chip into reset state
-  P1OUT &= ~BIT2;
-  delay();
-  delay();
-  delay();
-  
   // bus control lines
   // BIT3: BC1
   // BIT1: BDIR
-  P1DIR |= BIT1 | BIT3;
+  // BIT0: _CS1
+  // BIT2: _CS0
+  P1DIR |= BIT0 | BIT1 | BIT2 | BIT3 ;
 
   // put bus into inactive state
   BUS_CTRL_REG &= ~(BDIR | BC1);
   
-  // release sound chip from reset state
-  P1OUT |= BIT2;
-  delay();
-  delay();
-  delay();
-
   // disable everything
-  psgWrite(_ENABLE_REG, 0xff);
+  psgWrite(0, _ENABLE_REG, 0xff);
+  psgWrite(1, _ENABLE_REG, 0xff);
 }
 

sound-driver/main.c

@@ -6,7 +6,9 @@
 #include "psg.h"
 #include "scheduler.h"
 #include "sequencer.h"
-#include "melody.h"
+#include "melody_tetris.h"
+#include "melody_tusch1.h"
+#include "mute.h"
 
 int main() {
   WDTCTL = WDTPW | WDTHOLD;
@@ -24,12 +26,12 @@ int main() {
 
   spiInit();
   psgInit();
+  muteInit();
   sequencerInit();
 
   __enable_interrupt();
 
-  melodyInit();
-
+  // playMelodyTetris();
 
   while (1) {
     schExec();

sound-driver/melody.h

@@ -1,8 +0,0 @@
-#ifndef _MELODY_H_
-#define _MELODY_H_
-
-
-void melodyInit();
-
-
-#endif // _MELODY_H_

sound-driver/melody_tetris.h

@@ -0,0 +1,9 @@
+#ifndef _MELODY_TETRIS_H_
+#define _MELODY_TETRIS_H_
+
+
+void playMelodyTetris();
+void stopMelodyTetris();
+
+
+#endif // _MELODY_TETRIS_H_

sound-driver/melody_tusch1.c

@@ -0,0 +1,85 @@
+#include <stdbool.h>
+#include <stddef.h>
+#include "psg.h"
+#include "sequencer.h"
+#include "scheduler.h"
+
+const t_tone tusch1voice1[] = {
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_5,    .note = e_F,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_5,    .note = e_F,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_5,    .note = e_F,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_StopMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
+};
+
+const t_tone tusch1voice2[] = {
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_HoldMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
+};
+
+const t_tone tusch1voice3[] = {
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8,     .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_2,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_HoldMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
+};
+
+t_melodies tusch1 = {
+  .melodies = { { .chip = 1, .amplitude = 12, .tones = tusch1voice1 }, { .chip = 1, .amplitude = 12, .tones = tusch1voice2 }, { .chip = 1, .amplitude = 12, .tones = tusch1voice3 } },
+  .numOfMelodies = 3,
+  .pace = 200,
+  .slotMask = 0x02
+};
+
+void playTusch1() {
+  sequencerPlayMelodies(&tusch1);
+}
+
+
+

sound-driver/melody_tusch1.h

@@ -0,0 +1,8 @@
+#ifndef _MELODY_TUSCH1_H_
+#define _MELODY_TUSCH1_H_
+
+
+void playTusch1();
+
+
+#endif // _MELODY_TUSCH1_H_

sound-driver/mute.c

@@ -0,0 +1,20 @@
+#include <msp430g2553.h>
+#include "mute.h"
+
+
+
+void muteInit() {
+  // BIT6: MuteCtrl
+  P1DIR |= BIT6;
+  P1OUT &= ~BIT6;
+}
+
+void mute() {
+  P1OUT |= BIT6;
+}
+
+void unMute() {
+  P1OUT &= ~BIT6;
+}
+
+

sound-driver/mute.h

@@ -0,0 +1,8 @@
+#ifndef _MUTE_H_
+#define _MUTE_H_
+
+void muteInit();
+void mute();
+void unMute();
+
+#endif // _MUTE_H_

sound-driver/psg.h

@@ -39,14 +39,8 @@ typedef enum {
 
 void psgInit();
 
-void psgPlayTone(uint8_t channel, t_octave octave, t_note note);
-void psgAmplitude(uint8_t channel, uint8_t volume);
+void psgPlayTone(uint8_t chip, uint8_t channel, uint8_t volume, t_octave octave, t_note note);
+void psgAmplitude(uint8_t chip, uint8_t channel, uint8_t volume);
 
-// low level
-void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode);
-
-// very low level
-void psgWrite(uint8_t address, uint8_t data);
-uint8_t psgReadShadow(uint8_t address);
 
 #endif // _PSG_H_

sound-driver/scheduler.c

@@ -6,7 +6,6 @@ tTask tasks[MAX_NUM_OF_TASKS];
 
 
 void schInit() {
-  P1DIR |= BIT0;
   TACCR0 = 19600;
   TACCTL0 = CCIE;
   TACTL = MC_1 | ID_0 | TASSEL_2 | TACLR;
@@ -21,7 +20,6 @@ void schInit() {
 }
 
 void __attribute__ ((interrupt (TIMER0_A0_VECTOR))) schUpdate() {
-  P1OUT ^= BIT0;
   for (uint16_t i = 0; i < MAX_NUM_OF_TASKS; i++) {
     if (tasks[i].exec != NULL) {
       if (tasks[i].delay == 0) {

sound-driver/scheduler.h

@@ -6,7 +6,7 @@
 
 
 
-#define MAX_NUM_OF_TASKS 8
+#define MAX_NUM_OF_TASKS 4
 
 
 typedef struct {

sound-driver/sequencer.c

@@ -1,60 +1,129 @@
+#include <stdint.h>
+#include <stdbool.h>
+#include <sys/param.h>
 #include "sequencer.h"
 #include "scheduler.h"
 #include "psg.h"
 
 
+uint8_t slots;
 
 void sequencerInit() {
+  slots = 0;
 }
 
-void sequencerExec(void *handle) {  
-  t_melody *melody = (t_melody*) handle;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch"
+#pragma GCC diagnostic ignored "-Wreturn-type"
+static uint16_t calcLength(t_melodies *m, t_noteLength l) {
+  switch (l) {
+    case e_L_1:
+      return m->quarterLength << 2;
+    case e_L_1_2:
+      return m->quarterLength << 1;
+    case e_L_1_4:
+      return m->quarterLength;
+    case e_L_1_8:
+      return m->quarterLength >> 1;
+    case e_L_1_16:
+      return m->quarterLength >> 2;
+    case e_L_1_32:
+      return m->quarterLength >> 4;
+  }
+}
+#pragma GCC diagnostic pop
 
-  switch (melody->state) {
-    case e_Init:
-      psgAmplitude(melody->channel, melody->amplitude);
-      melody->state = e_PlayTone;
-      break;
-    case e_PlayTone:
-      if (melody->tones[melody->idx].length == e_L_EndMark) {
-        melody->idx = 0;
-      }
-      psgPlayTone(melody->channel, melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
-      melody->lengthCnt = (melody->tones[melody->idx].staccato) ? (melody->tones[melody->idx].length / 2) : melody->tones[melody->idx].length;
-      melody->state = e_HoldTone;
-      break;
-    case e_HoldTone:
-      melody->lengthCnt -= 1;
-      if (melody->lengthCnt == 0) {
-        melody->state = (melody->tones[melody->idx].staccato) ? e_StaccatoBreak : e_SeparateTone;
-      }
-      break;
-    case e_StaccatoBreak:
-      psgPlayTone(melody->channel, e_O_Null, e_Pause);
-      melody->lengthCnt = melody->tones[melody->idx].length / 2;
-      melody->state = e_HoldStaccatoBreak;
-      break;
-    case e_HoldStaccatoBreak:
-      melody->lengthCnt -= 1;
-      if (melody->lengthCnt == 0) {
-        melody->state = e_SeparateTone;
-      }
-      break;
-    case e_SeparateTone:
-      if (! (melody->tones[melody->idx].legato)) {
-        psgPlayTone(melody->channel, e_O_Null, e_Pause);
-      }
-      melody->idx += 1;
-      melody->state = e_PlayTone;
-      break;
+
+void sequencerExec(void *handle) {  
+  t_melodies *melodies = (t_melodies*) handle;
+
+  for (uint8_t channel = 0; channel < melodies->numOfMelodies; channel++) {
+    t_melody *melody = &(melodies->melodies[channel]);
+
+    switch (melody->state) {
+      case e_Init:
+        melody->state = e_PlayTone;
+        break;
+      case e_PlayTone:
+        if (melody->tones[melody->idx].length == e_L_SyncMark) {
+          if (melodies->sync == 0) {
+            melodies->sync = melodies->numOfMelodies;
+          }
+          melodies->sync -= 1;
+          melody->state = e_Sync;
+        } else if (melody->tones[melody->idx].length == e_L_HoldMark) {
+          melody->state = e_Hold;
+        } else if (melody->tones[melody->idx].length == e_L_StopMark) {
+          melody->state = e_Terminate;
+        } else {
+          if (melody->tones[melody->idx].length == e_L_EndMark) {
+            melody->idx = 0;
+          }
+          psgPlayTone(melody->chip, channel, melody->amplitude, melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
+          melody->lengthCnt = (melody->tones[melody->idx].staccato) ? 
+            (calcLength(melodies, melody->tones[melody->idx].length) / 2) : 
+            calcLength(melodies, melody->tones[melody->idx].length);
+          melody->state = e_HoldTone;
+        }
+        break;
+      case e_Sync:
+        if (melodies->sync == 0) {
+          melody->state = e_SeparateTone;
+        }
+        break;
+      case e_HoldTone:
+        melody->lengthCnt -= 1;
+        if (melody->lengthCnt == 0) {
+          melody->state = (melody->tones[melody->idx].staccato) ? e_StaccatoBreak : e_SeparateTone;
+        }
+        break;
+      case e_StaccatoBreak:
+        psgPlayTone(melody->chip, channel, 0, e_O_Null, e_Pause);
+        melody->lengthCnt = calcLength(melodies, melody->tones[melody->idx].length) / 2;
+        melody->state = e_HoldStaccatoBreak;
+        break;
+      case e_HoldStaccatoBreak:
+        melody->lengthCnt -= 1;
+        if (melody->lengthCnt == 0) {
+          melody->state = e_SeparateTone;
+        }
+        break;
+      case e_SeparateTone:
+        if (! (melody->tones[melody->idx].legato)) {
+          psgPlayTone(melody->chip, channel, 0, e_O_Null, e_Pause);
+        }
+        melody->idx += 1;
+        melody->state = e_PlayTone;
+        break;
+      case e_Hold:
+        break;
+      case e_Terminate:
+        schDel(melodies->taskId);
+        slots &= ~(melodies->slotMask);
+        break;
+    }
   }
 }
 
-uint16_t sequencerPlayMelody(t_melody *melody) {
-  melody->idx = 0;
-  melody->lengthCnt = 0;
-  melody->state = e_Init;
+void sequencerPlayMelodies(t_melodies *melodies) {
+  if ((slots & melodies->slotMask) != 0) {
+    return;
+  }
 
-  return schAdd(sequencerExec, (void*) melody, 0, melody->pace);
+  slots |= melodies->slotMask;
+  for (uint8_t i = 0; i < NUM_OF_CHANNELS; i++) {
+    melodies->melodies[i].idx = 0;
+    melodies->melodies[i].lengthCnt = 0;
+    melodies->melodies[i].state = e_Init;
+  }
+  melodies->sync = 0;
+  melodies->quarterLength = 60000 / melodies->pace / SEQUENCER_PERIOD; // duration of a 1/4 tone in ms
+
+  melodies->taskId = schAdd(sequencerExec, (void*) melodies, 0, SEQUENCER_PERIOD);
+}
+
+void sequencerStopMelodies(t_melodies *melodies) {
+  slots &= ~(melodies->slotMask);
+  schDel(melodies->taskId);
 }
 

sound-driver/sequencer.h

@@ -7,13 +7,17 @@
 #include "psg.h"
 
 typedef enum {
-  e_L_EndMark = 0,
-  e_L_1 = 320,
-  e_L_1_2 = 160,
-  e_L_1_4 = 80,
-  e_L_1_8 = 40,
-  e_L_1_16 = 20,
-  e_L_1_32 = 10,
+  e_L_1 = 0,
+  e_L_1_2 = 1,
+  e_L_1_4 = 2,
+  e_L_1_8 = 3,
+  e_L_1_16 = 4,
+  e_L_1_32 = 5,
+  e_L_LengthEnd = 6,
+  e_L_HoldMark = 252,
+  e_L_StopMark = 253,
+  e_L_EndMark = 254,
+  e_L_SyncMark = 255,
 } t_noteLength;
 
 typedef struct {
@@ -27,24 +31,38 @@ typedef struct {
 typedef enum { 
   e_Init,
   e_PlayTone, 
+  e_Sync,
   e_HoldTone, 
   e_StaccatoBreak,
   e_HoldStaccatoBreak,
-  e_SeparateTone 
+  e_SeparateTone,
+  e_Hold,
+  e_Terminate
 } t_sequencerState;
 
 typedef struct {
   uint16_t idx;
-  uint8_t lengthCnt;
+  uint8_t chip;
+  uint16_t lengthCnt;
   t_sequencerState state;
-  uint8_t pace;
   uint8_t amplitude;
-  uint8_t channel;
   const t_tone *tones;
 } t_melody;
 
-void sequencerInit();
-uint16_t sequencerPlayMelody(t_melody *melody);
+#define SEQUENCER_PERIOD 4 // ms
+#define NUM_OF_CHANNELS 3
+typedef struct {
+  uint8_t slotMask;
+  uint8_t taskId;
+  uint16_t quarterLength;
+  uint8_t numOfMelodies;
+  uint8_t pace; // quarter notes per minute
+  uint8_t sync;
+  t_melody melodies[NUM_OF_CHANNELS];
+} t_melodies;
 
+void sequencerInit();
+void sequencerPlayMelodies(t_melodies *melodies);
+void sequencerStopMelodies(t_melodies *melodies);
 
 #endif // _SEQUENCER_H_

sound-driver/sn76489an.c

@@ -0,0 +1,171 @@
+#include <msp430g2553.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "psg.h"
+#include "scheduler.h"
+
+
+// generated using utils/calc-76489an.py
+const uint16_t frequencyCodes[8][12] = {
+  { 3420, 3229, 3047, 2876, 2715, 2562, 2419, 2283, 2155, 2034, 1920, 1812 }, 
+  { 1710, 1614, 1524, 1438, 1357, 1281, 1209, 1141, 1077, 1017, 960, 906 }, 
+  { 855, 807, 762, 719, 679, 641, 605, 571, 539, 508, 480, 453 }, 
+  { 428, 404, 381, 360, 339, 320, 302, 285, 269, 254, 240, 226 }, 
+  { 214, 202, 190, 180, 170, 160, 151, 143, 135, 127, 120, 113 }, 
+  { 107, 101, 95, 90, 85, 80, 76, 71, 67, 64, 60, 57 }, 
+  { 53, 50, 48, 45, 42, 40, 38, 36, 34, 32, 30, 28 }, 
+  { 27, 25, 24, 22, 21, 20, 19, 18, 17, 16, 15, 14 }
+};
+
+
+#define ADDR_DATA_REG P2OUT
+#define BUS_CTRL_REG P1OUT
+#define BUS_CTRL_IN_REG P1IN
+#define _CS0 BIT0
+#define _CS1 BIT1
+#define _WE BIT2
+#define READY BIT3
+
+#define CHANNEL_A_PERIOD_ADDR 0
+#define CHANNEL_A_ATTEN_ADDR 1
+#define CHANNEL_B_PERIOD_ADDR 2
+#define CHANNEL_B_ATTEN_ADDR 3
+#define CHANNEL_C_PERIOD_ADDR 4
+#define CHANNEL_C_ATTEN_ADDR 5
+
+#define IGNORE_OCTET 0xff
+
+uint8_t psgAmplitudeShadowValue[3];
+
+static void delay() {
+  asm volatile (
+      "push r12\n"
+      "mov.w #5, r12\n"
+      "loop:\n"
+      "dec.w r12\n"
+      "jnz loop\n"
+      "pop r12\n"
+  );
+}
+
+inline static void WRITE_CYCLE(uint8_t chipNo) {
+  if (chipNo == 0) {
+    BUS_CTRL_REG &= ~_CS0;
+  } else {
+    BUS_CTRL_REG &= ~_CS1;
+  }
+
+  BUS_CTRL_REG &= ~_WE;
+
+  delay();
+
+  while ((BUS_CTRL_IN_REG & READY) == 0);
+
+  BUS_CTRL_REG |= _WE;
+
+  if (chipNo == 0) {
+    BUS_CTRL_REG |= _CS0;
+  } else {
+    BUS_CTRL_REG |= _CS1;
+  }
+
+  delay();
+}
+
+static void psgWrite(uint8_t chipNo, uint8_t value) {
+  ADDR_DATA_REG = value;
+  WRITE_CYCLE(chipNo);
+}
+
+static void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode) {
+  uint8_t chipNo = channel / 3;
+  uint8_t regAddr = (channel % 3) * 2;
+
+  // bit order in frequncyCode and order in octet on data bus are reversed
+  // see datacheat cp. 1 and cp. 6
+  uint8_t firstOctet = 0x01;
+  firstOctet |= ((regAddr & 0x04) > 1);
+  firstOctet |= ((regAddr & 0x02) < 1);
+  firstOctet |= ((regAddr & 0x01) < 3);
+  uint8_t lowerPart = frequencyCode & 0x0f;
+  firstOctet |= ((lowerPart & 0x08) << 1);
+  firstOctet |= ((lowerPart & 0x04) << 3);
+  firstOctet |= ((lowerPart & 0x02) << 5);
+  firstOctet |= ((lowerPart & 0x01) << 7);
+
+  uint8_t secondOctet = 0;
+  uint8_t upperPart = (frequencyCode & 0x03f0) >> 4;
+  secondOctet |= ((upperPart & 0x20) >> 3);
+  secondOctet |= ((upperPart & 0x10) >> 1);
+  secondOctet |= ((upperPart & 0x08) << 1);
+  secondOctet |= ((upperPart & 0x04) << 3);
+  secondOctet |= ((upperPart & 0x02) << 5);
+  secondOctet |= ((upperPart & 0x01) << 7);
+
+  ADDR_DATA_REG = firstOctet;
+  WRITE_CYCLE(chipNo);
+
+  ADDR_DATA_REG = secondOctet;
+  WRITE_CYCLE(chipNo);
+}
+
+void psgAmplitude(uint8_t channel, uint8_t volume) {
+  psgAmplitudeShadowValue[channel] = volume;
+  uint8_t chipNo = channel / 3;
+  uint8_t regAddr = ((channel % 3) * 2) + 1;
+
+  uint8_t attenuation = 15 - volume;
+
+  uint8_t firstOctet = 0x01;
+  firstOctet |= ((regAddr & 0x04) >> 1);
+  firstOctet |= ((regAddr & 0x02) << 1);
+  firstOctet |= ((regAddr & 0x01) << 3);
+  firstOctet |= ((attenuation & 0x01) << 7);
+  firstOctet |= ((attenuation & 0x02) << 5);
+  firstOctet |= ((attenuation & 0x04) << 3);
+  firstOctet |= ((attenuation & 0x08) << 1);
+
+  ADDR_DATA_REG = firstOctet;
+  WRITE_CYCLE(chipNo);
+}
+
+void psgPlayTone(uint8_t channel, uint8_t volume, t_octave octave, t_note note) {
+  if (note == e_Pause) {
+    psgAmplitude(channel, 0);
+  } else {
+//    if (psgAmplitudeShadowValue[channel] == 0) {
+      psgAmplitude(channel, volume);
+//    }
+    psgWriteFrequency(channel, frequencyCodes[octave][note]);
+  }
+}
+
+void psgInit() {
+  // address/data bus
+  P2DIR = 0xff;
+  P2SEL = 0;
+  P2SEL2 = 0;
+
+  // bus control lines
+  //   output:
+  //     BIT0: /CS chip 0
+  //     BIT1: /CS chip 1
+  //     BIT2: /WE
+  //   input:
+  //     BIT3: READY
+  P1DIR |= BIT0 | BIT1 | BIT2;
+  P1DIR &= ~BIT3;
+  // immediately disable all outputs, all are active low
+  P1OUT |= BIT0 | BIT1 | BIT2;
+
+  // shutdown all channels including noise
+  psgWrite(0, 0b11111001);
+  psgWrite(0, 0b11111101);
+  psgWrite(0, 0b11111011);
+  psgWrite(0, 0b11111111);
+
+//  psgPlayTone(0, 5, e_O_3, e_A);
+  psgAmplitude(0, 3);
+}
+

sound-driver/soundCodes.h

@@ -0,0 +1,14 @@
+#ifndef _SOUND_CODES_H_
+#define _SOUND_CODES_H_
+
+#define SOUND_IDLE 0x00
+#define SOUND_MUTE 0x01
+#define SOUND_UNMUTE 0x02
+#define SOUND_START 0x04
+#define SOUND_GAMEOVER 0x08
+#define SOUND_FANFARE 0x10
+#define SOUND_LOCK 0x20
+#define SOUND_MOTION 0x40
+#define SOUND_SPEED_UP 0x80
+
+#endif // _SOUND_CODES_H_

sound-driver/spi.S

@@ -0,0 +1,70 @@
+#include <msp430g2553.h>
+#include "soundCodes.h"
+
+  .section ".data"
+  .global cmd
+cmd:
+  .byte   
+
+  .section ".text","ax",@progbits
+receive_isr:
+  bit     #UCB0RXIFG, &UC0IFG
+  jz      receive_isr_no_data
+  bis     UCB0RXBUF, &cmd
+receive_isr_no_data:
+  reti
+
+  .global spiCmdHandler
+spiCmdHandler:
+spiCmdHandler_1:
+  bit     #SOUND_MUTE, &cmd
+  jz      spiCmdHandler_2
+  call    #mute
+  bic     #SOUND_MUTE, &cmd
+spiCmdHandler_2:
+  bit     #SOUND_UNMUTE, &cmd
+  jz      spiCmdHandler_3
+  call    #unMute
+  bic     #SOUND_UNMUTE, &cmd
+spiCmdHandler_3:
+  bit     #SOUND_START, &cmd
+  jz      spiCmdHandler_4
+  call    #playMelodyTetris
+  bic     #SOUND_START, &cmd
+spiCmdHandler_4:
+  bit     #SOUND_GAMEOVER, &cmd
+  jz      spiCmdHandler_5
+  ;; insert a call here
+  bic     #SOUND_GAMEOVER, &cmd
+spiCmdHandler_5:
+  bit     #SOUND_FANFARE, &cmd
+  jz      spiCmdHandler_6
+  call    #playTusch1
+  bic     #SOUND_FANFARE, &cmd
+spiCmdHandler_6:
+  bit     #SOUND_LOCK, &cmd
+  jz      spiCmdHandler_7
+  ;; insert a call here
+  bic     #SOUND_LOCK, &cmd
+spiCmdHandler_7:
+  bit     #SOUND_MOTION, &cmd
+  jz      spiCmdHandler_8
+  ;; insert a call here
+  bic     #SOUND_MOTION, &cmd
+spiCmdHandler_8:
+  bit     #SOUND_SPEED_UP, &cmd
+  jz      spiCmdHandler_end
+  ;; insert a call here
+  bic     #SOUND_SPEED_UP, &cmd
+spiCmdHandler_end:
+  ret
+
+ 
+
+
+
+  .section "__interrupt_vector_8","ax",@progbits
+  .word   receive_isr
+
+
+  .end

sound-driver/spi.h

@@ -3,7 +3,7 @@
 
 
 void spiInit();
-
+void spiCmdHandler();
 
 
 #endif // _SPI_H_

sound-driver/spi_init.c

@@ -1,13 +1,12 @@
+#include <stddef.h>
 #include <msp430g2553.h>
+#include <stdint.h>
+#include "scheduler.h"
 #include "spi.h"
+#include "soundCodes.h"
 
 
-void __attribute__ ((interrupt (USCIAB0RX_VECTOR))) receive() {
-  if (UC0IFG & UCB0RXIFG) {
-    // receive an octet
-  }
-}
-
+extern uint8_t cmd;
 
 void spiInit() {
   // SPI slave
@@ -15,8 +14,8 @@ void spiInit() {
   // BIT5: UCB0CLK
   // BIT6: UCB0SOMI
   // BIT7: UCB0SIMO
-  P1SEL |= BIT4 | BIT5 | BIT6 | BIT7;
-  P1SEL2 |= BIT4 | BIT5 | BIT6 | BIT7;
+  P1SEL |= BIT4 | BIT5 | BIT7;
+  P1SEL2 |= BIT4 | BIT5 | BIT7;
 
   // most significant bit first, enable STE
   UCB0CTL0 = UCSYNC | UCMSB | UCMODE_2;
@@ -24,6 +23,9 @@ void spiInit() {
 
   // enable RX interrupt
   UC0IE |= UCB0RXIE;
+
+  cmd = SOUND_IDLE;
+  schAdd(spiCmdHandler, NULL, 0, 100);
 }
 
 

sound-driver/utils/calc-76489an.py

@@ -0,0 +1,64 @@
+N = 3579545.0
+factor = 1.0594631
+base = 440.0
+
+frequencies = []
+
+BEFORE_A = 46
+f = base
+for i in range (BEFORE_A):
+    idx = BEFORE_A - i - 1
+    print(f"{idx}: {f}")
+    frequencies.append(f)
+    f = base / factor
+    base = f
+frequencies.reverse()
+
+AFTER_A = 50
+base = 440.0
+for i in range(AFTER_A):
+    idx = BEFORE_A + i
+    f = base * factor
+    print(f"{idx}: {f}")
+    frequencies.append(f)
+    base = f
+
+# print(f"{frequencies}")
+
+codes = []
+for i in range(len(frequencies)):
+    codes.append(round(N / (32.0 * frequencies[i])))
+
+
+#const uint16_t frequencyCodes[8][12] = {
+#  //    C,   Cis,     D,   Dis,     E,     F,   Fis,     G,   Gis,     A,   Ais,     H
+#  { 06535, 06234, 05747, 05474, 05233, 05002, 04563, 04353, 04153, 03762, 03600, 03424 },  // Octave 1
+#  { 03256, 03116, 02764, 02636, 02515, 02401, 02271, 02165, 02065, 01771, 01700, 01612 },  // Octave 2
+#  { 01527, 01447, 01372, 01317, 01247, 01201, 01135, 01073, 01033, 00774, 00740, 00705 },  // Octave 3
+#  { 00654, 00624, 00575, 00550, 00523, 00500, 00456, 00435, 00415, 00376, 00360, 00342 },  // Octave 4
+#  { 00326, 00312, 00276, 00264, 00252, 00240, 00227, 00217, 00207, 00177, 00170, 00161 },  // Octave 5
+#  { 00153, 00145, 00137, 00132, 00125, 00120, 00114, 00107, 00103, 00100, 00074, 00071 },  // Octave 6
+#  { 00065, 00062, 00060, 00055, 00052, 00050, 00046, 00044, 00042, 00040, 00036, 00034 },  // Octave 7
+#  { 00033, 00031, 00030, 00026, 00025, 00024, 00023, 00022, 00021, 00020, 00017, 00016 }   // Octave 8
+#};
+
+
+
+print("const uint16_t frequencyCodes[8][12] = {")
+step = 12
+for i in range(len(codes)):
+    if (i % step == 0):
+        print("  { ", end='')
+    print(f"{codes[i]}", end='')
+    if ((i+1) % step != 0):
+        print(", ", end='')
+    if ((i+1) % step == 0):
+        print(" }", end='')
+        if ((i+1) != len(codes)):
+            print(", ")
+        else:
+            print()
+print("};")
+
+
+