fixed

sound-driver/Makefile

@@ -7,7 +7,7 @@ MCU=msp430g2553
 CFLAGS=-Wall -mmcu=$(MCU) -std=gnu99 -I $(TOOLCHAIN_PREFIX)/include -O1 -g0
 
 # for debugging
-CFLAGS+= -g3 -ggdb -gdwarf-2
+#CFLAGS+= -g3 -ggdb -gdwarf-2
 
 LDFLAGS=-mmcu=$(MCU) -L $(TOOLCHAIN_PREFIX)/include
 

sound-driver/ay_3_8913.c

@@ -56,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);
@@ -94,16 +94,20 @@ asm volatile (
 }
 #endif
 
-static uint8_t psgReadShadow(uint8_t address) {
+static uint8_t psgReadShadow(uint8_t chip, uint8_t address) {
-  return psgShadowRegisters[address];
+  return psgShadowRegisters[chip][address];
 }
 
-static void psgWrite(uint8_t address, uint8_t data) {
+static void psgWrite(uint8_t chip, uint8_t address, uint8_t data) {
-  psgShadowRegisters[address] = 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();
@@ -126,26 +130,30 @@ static void psgWrite(uint8_t address, uint8_t data) {
   // set inactive again
   BUS_OP_NACT();
 
-  BUS_OP_CS1_DISABLE();
+  if (chip == 0) {
-}
+    BUS_OP_CS0_DISABLE();
-
-static 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, uint8_t volume, t_octave octave, t_note note) {
-  if (note == e_Pause) {
-    psgWrite(_ENABLE_REG, psgReadShadow(_ENABLE_REG) | (1 << channel));
   } else {
-    psgWrite(_ENABLE_REG, psgReadShadow(_ENABLE_REG) & ~(1 << channel));
+    BUS_OP_CS1_DISABLE();
-    psgAmplitude(channel, volume);
-    psgWriteFrequency(channel, frequencyCodes[octave][note]);
   }
 }
 
-void psgAmplitude(uint8_t channel, uint8_t volume) {
+static void psgWriteFrequency(uint8_t chip, uint8_t channel, uint16_t frequencyCode) {
-  psgWrite(CHANNEL_A_AMPLITUDE_REG + channel, volume);
+  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() {
@@ -154,18 +162,6 @@ void psgInit() {
   P2SEL = 0;
   P2SEL2 = 0;
 
-  // sound chip reset
-  // BIT2: /RST
-  // P1DIR |= BIT2;
-
-#if 0
-  // put sound chip into reset state
-  P1OUT &= ~BIT2;
-  delay();
-  delay();
-  delay();
-#endif
-  
   // bus control lines
   // BIT3: BC1
   // BIT1: BDIR
@@ -176,15 +172,8 @@ void psgInit() {
   // put bus into inactive state
   BUS_CTRL_REG &= ~(BDIR | BC1);
   
-#if 0
-  // release sound chip from reset state
-  P1OUT |= BIT2;
-  delay();
-  delay();
-  delay();
-#endif
-
   // disable everything
-  psgWrite(_ENABLE_REG, 0xff);
+  psgWrite(0, _ENABLE_REG, 0xff);
+  psgWrite(1, _ENABLE_REG, 0xff);
 }
 

sound-driver/melody.c

@@ -1,6 +1,8 @@
 #include <stdbool.h>
+#include <stddef.h>
 #include "psg.h"
 #include "sequencer.h"
+#include "scheduler.h"
 
 /*
  * most simple Tetris from https://de.wikipedia.org/wiki/Korobeiniki
@@ -74,27 +76,29 @@ const t_tone notes[] = {
 */
 
 const t_tone tonleiter[] = {
-  { .octave = e_O_6,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_6,    .note = e_C,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_6,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_6,    .note = e_D,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_6,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_6,    .note = e_E,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_6,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_6,    .note = e_F,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_6,    .note = e_G,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_6,    .note = e_G,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_6,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_6,    .note = e_A,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_6,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_6,    .note = e_H,     .length = e_L_1_16,     .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 tonleiter2[] = {
-  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_4,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_D,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_4,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_F,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_4,    .note = e_G,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_G,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_A,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_4,    .note = e_H,     .length = e_L_1_16,     .legato = false, .staccato = false },
 
   { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
 
@@ -102,13 +106,13 @@ const t_tone tonleiter2[] = {
 };
 
 const t_tone tonleiter3[] = {
-  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_5,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_D,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_5,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_F,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_5,    .note = e_G,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_G,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_5,    .note = e_A,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_A,     .length = e_L_1_16,     .legato = false, .staccato = false },
-  { .octave = e_O_5,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_H,     .length = e_L_1_16,     .legato = false, .staccato = false },
 
   { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
 
@@ -1032,20 +1036,141 @@ const t_tone voice3[] = {
   { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
 };
 
+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 },
+};
+
+const t_tone tusch2voice1[] = {
+  { .octave = e_O_4,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_4,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_4,    .note = e_G,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_2,     .legato = false, .staccato = true  },
+
+  { .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 tusch2voice2[] = {
+  { .octave = e_O_3,    .note = e_G,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_3,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_4,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_4,    .note = e_Fis,   .length = e_L_1_2,     .legato = false, .staccato = true  },
+
+  { .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 tusch2voice3[] = {
+  { .octave = e_O_2,    .note = e_B,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_3,    .note = e_D,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_3,    .note = e_F,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_3,    .note = e_B,     .length = e_L_1_2,     .legato = false, .staccato = true  },
+
+  { .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 tetrisTheme = {
-  .melodies = { { .amplitude = 3, .tones = voice1 }, { .amplitude = 3, .tones = voice2 }, { .amplitude = 3, .tones = voice3 } },
+  .melodies = { { .chip = 0, .amplitude = 3, .tones = voice1 }, { .chip = 0, .amplitude = 3, .tones = voice2 }, { .chip = 0, .amplitude = 3, .tones = voice3 } },
   .numOfMelodies = 3,
   .pace = 160
 };
 
 t_melodies tonleiterTheme = {
-  .melodies = { { .amplitude = 3, .tones = tonleiter }, { .amplitude = 3, .tones = tonleiter2 }, { .amplitude = 3, .tones = tonleiter3 } },
+  .melodies = { { .chip = 1, .amplitude = 3, .tones = tonleiter }, { .chip = 1, .amplitude = 3, .tones = tonleiter2 }, { .chip = 1, .amplitude = 3, .tones = tonleiter3 } },
+  .numOfMelodies = 3,
+  .pace = 160
+};
+t_melodies tusch1 = {
+  .melodies = { { .chip = 1, .amplitude = 8, .tones = tusch1voice1 }, { .chip = 1, .amplitude = 8, .tones = tusch1voice2 }, { .chip = 1, .amplitude = 8, .tones = tusch1voice3 } },
+  .numOfMelodies = 3,
+  .pace = 200
+};
+t_melodies tusch2 = {
+  .melodies = { { .chip = 1, .amplitude = 1, .tones = tusch2voice1 }, { .chip = 1, .amplitude = 1, .tones = tusch2voice2 }, { .chip = 1, .amplitude = 1, .tones = tusch2voice3 } },
   .numOfMelodies = 3,
   .pace = 160
 };
 
+void playTusch1(void *handle) {
+  sequencerPlayMelodies(&tusch1);
+  schAdd(playTusch1, NULL, 30000, 0);
+}
+
 void melodyInit() {
   sequencerPlayMelodies(&tetrisTheme);
+  schAdd(playTusch1, NULL, 2000, 0);
 }
 
 

sound-driver/psg.h

@@ -39,8 +39,8 @@ typedef enum {
 
 void psgInit();
 
-void psgPlayTone(uint8_t channel, uint8_t volume, t_octave octave, t_note note);
+void psgPlayTone(uint8_t chip, uint8_t channel, uint8_t volume, t_octave octave, t_note note);
-void psgAmplitude(uint8_t channel, uint8_t volume);
+void psgAmplitude(uint8_t chip, uint8_t channel, uint8_t volume);
 
 
 #endif // _PSG_H_

sound-driver/sequencer.c

@@ -10,25 +10,31 @@
 void sequencerInit() {
 }
 
+#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
+
+
 void sequencerExec(void *handle) {  
-  static uint16_t lengths[e_L_LengthEnd];
   t_melodies *melodies = (t_melodies*) handle;
 
-  if (melodies->firstRun) {
-    melodies->firstRun = false;
-
-    lengths[e_L_1_4]  = 60000 / melodies->pace; // duration of a 1/4 tone in ms
-    lengths[e_L_1_2]  = lengths[e_L_1_4] << 1;
-    lengths[e_L_1]    = lengths[e_L_1_4] << 2;
-    lengths[e_L_1_8]  = lengths[e_L_1_4] >> 1;
-    lengths[e_L_1_16] = lengths[e_L_1_4] >> 2;
-    lengths[e_L_1_32] = lengths[e_L_1_4] >> 4;
-
-    for (uint8_t i = 0; i < e_L_LengthEnd; i++) {
-      lengths[i] /= SEQUENCER_PERIOD;
-    }
-  }
-
   for (uint8_t channel = 0; channel < melodies->numOfMelodies; channel++) {
     t_melody *melody = &(melodies->melodies[channel]);
 
@@ -43,12 +49,18 @@ void sequencerExec(void *handle) {
           }
           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(channel, melody->amplitude, melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
+          psgPlayTone(melody->chip, channel, melody->amplitude, melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
-          melody->lengthCnt = (melody->tones[melody->idx].staccato) ? (lengths[melody->tones[melody->idx].length] / 2) : lengths[melody->tones[melody->idx].length];
+          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;
@@ -64,8 +76,8 @@ void sequencerExec(void *handle) {
         }
         break;
       case e_StaccatoBreak:
-        psgPlayTone(channel, 0, e_O_Null, e_Pause);
+        psgPlayTone(melody->chip, channel, 0, e_O_Null, e_Pause);
-        melody->lengthCnt = lengths[melody->tones[melody->idx].length] / 2;
+        melody->lengthCnt = calcLength(melodies, melody->tones[melody->idx].length) / 2;
         melody->state = e_HoldStaccatoBreak;
         break;
       case e_HoldStaccatoBreak:
@@ -76,11 +88,16 @@ void sequencerExec(void *handle) {
         break;
       case e_SeparateTone:
         if (! (melody->tones[melody->idx].legato)) {
-          psgPlayTone(channel, 0, e_O_Null, e_Pause);
+          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);
+        break;
     }
   }
 }
@@ -92,8 +109,10 @@ uint16_t sequencerPlayMelodies(t_melodies *melodies) {
     melodies->melodies[i].state = e_Init;
   }
   melodies->sync = 0;
-  melodies->firstRun = true;
+  melodies->quarterLength = 60000 / melodies->pace / SEQUENCER_PERIOD; // duration of a 1/4 tone in ms
 
-  return schAdd(sequencerExec, (void*) melodies, 0, SEQUENCER_PERIOD);
+  melodies->taskId = schAdd(sequencerExec, (void*) melodies, 0, SEQUENCER_PERIOD);
+
+  return melodies->taskId;
 }
 

sound-driver/sequencer.h

@@ -14,6 +14,8 @@ typedef enum {
   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;
@@ -33,11 +35,14 @@ typedef enum {
   e_HoldTone, 
   e_StaccatoBreak,
   e_HoldStaccatoBreak,
-  e_SeparateTone 
+  e_SeparateTone,
+  e_Hold,
+  e_Terminate
 } t_sequencerState;
 
 typedef struct {
   uint16_t idx;
+  uint8_t chip;
   uint16_t lengthCnt;
   t_sequencerState state;
   uint8_t amplitude;
@@ -47,8 +52,9 @@ typedef struct {
 #define SEQUENCER_PERIOD 4 // ms
 #define NUM_OF_CHANNELS 3
 typedef struct {
+  uint8_t taskId;
+  uint16_t quarterLength;
   uint8_t numOfMelodies;
-  bool firstRun;
   uint8_t pace; // quarter notes per minute
   uint8_t sync;
   t_melody melodies[NUM_OF_CHANNELS];