dead code dropped

sound-driver/Makefile

@@ -13,7 +13,7 @@ CFLAGS+= -g3 -ggdb -gdwarf-2
 
 LDFLAGS=-mmcu=$(MCU) -L $(TOOLCHAIN_PREFIX)/include
 
-$(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 effects.o
+$(ARTIFACT).elf:	main.o scheduler.o spi.o spi_init.o sequencer.o melody_tetris.o melody_tusch1.o psg.o mute.o
 	$(CC) -o $@ $(LDFLAGS) $^
 	$(OBJDUMP) -D $(ARTIFACT).elf > $(ARTIFACT).txt
 

sound-driver/effects.c

@@ -1,18 +0,0 @@
-#include "effects.h"
-#include "psg.h"
-
-
-void effectsInit() {
-
-}
-
-
-void playEffect1() {
-  psgWrite(1, NOISE_PERIOD_REG, 0);
-  psgWrite(1, _ENABLE_REG, psgReadShadow(1, _ENABLE_REG) & ~0b00111000);
-  psgWrite(1, CHANNEL_A_AMPLITUDE_REG, 020);
-  psgWrite(1, CHANNEL_B_AMPLITUDE_REG, 020);
-  psgWrite(1, CHANNEL_C_AMPLITUDE_REG, 020);
-  psgWrite(1, ENVELOPE_PERIOD_COARSE_REG, 070);
-  psgWrite(1, ENVELOPE_SHAPE_REG, 0);
-}

sound-driver/effects.h

@@ -1,9 +0,0 @@
-#ifndef _EFFECTS_H_
-#define _EFFECTS_H_
-
-
-void effectsInit();
-
-
-
-#endif // _EFFECTS_H_

sound-driver/main.c

@@ -9,7 +9,6 @@
 #include "melody_tetris.h"
 #include "melody_tusch1.h"
 #include "mute.h"
-#include "effects.h"
 
 int main() {
   WDTCTL = WDTPW | WDTHOLD;
@@ -29,10 +28,11 @@ int main() {
   psgInit();
   muteInit();
   sequencerInit();
-  effectsInit();
 
   __enable_interrupt();
 
+  // playMelodyTetris();
+
   while (1) {
     schExec();
   }

sound-driver/mute.c

@@ -6,7 +6,9 @@
 void muteInit() {
   // BIT6: MuteCtrl
   P1DIR |= BIT6;
-  P1OUT &= ~BIT6;
+
+  // initially, mute
+  P1OUT |= BIT6;
 }
 
 void mute() {

sound-driver/psg.c

@@ -27,6 +27,35 @@ const uint16_t frequencyCodes[8][12] = {
 #define _CS0 BIT2
 #define _CS1 BIT0
 
+#define R0 0
+#define CHANNEL_A_TONE_PERIOD_FINE_REG R0
+#define R1 1
+#define CHANNEL_A_TONE_PERIOD_COARSE_REG R1
+#define R2 2
+#define CHANNEL_B_TONE_PERIOD_FINE_REG R2
+#define R3 3
+#define CHANNEL_B_TONE_PERIOD_COARSE_REG R3
+#define R4 4
+#define CHANNEL_C_TONE_PERIOD_FINE_REG R4
+#define R5 5
+#define CHANNEL_C_TONE_PERIOD_COARSE_REG R5
+#define R6 6
+#define NOISE_PERIOD_REG R6
+#define R7 7
+#define _ENABLE_REG R7
+#define R10 010
+#define CHANNEL_A_AMPLITUDE_REG R10
+#define R11 011
+#define CHANNEL_B_AMPLITUDE_REG R11
+#define R12 012
+#define CHANNEL_C_AMPLITUDE_REG R12
+#define R13 013
+#define ENVELOPE_PERIOD_FINE_REG R13
+#define R14 014
+#define ENVELOPE_PERIOD_COARSE_REG R13
+#define R15 015
+#define ENVELOPE_SHAPE_REG R15
+
 uint8_t psgShadowRegisters[2][14];
 
 inline static void BUS_OP_NACT() {
@@ -65,11 +94,11 @@ asm volatile (
 }
 #endif
 
-uint8_t psgReadShadow(uint8_t chip, uint8_t address) {
+static uint8_t psgReadShadow(uint8_t chip, uint8_t address) {
   return psgShadowRegisters[chip][address];
 }
 
-void psgWrite(uint8_t chip, uint8_t address, uint8_t 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

sound-driver/psg.h

@@ -36,41 +36,11 @@ typedef enum {
 #define e_As e_Gis
 #define e_B e_Ais
 
-#define R0 0
-#define CHANNEL_A_TONE_PERIOD_FINE_REG R0
-#define R1 1
-#define CHANNEL_A_TONE_PERIOD_COARSE_REG R1
-#define R2 2
-#define CHANNEL_B_TONE_PERIOD_FINE_REG R2
-#define R3 3
-#define CHANNEL_B_TONE_PERIOD_COARSE_REG R3
-#define R4 4
-#define CHANNEL_C_TONE_PERIOD_FINE_REG R4
-#define R5 5
-#define CHANNEL_C_TONE_PERIOD_COARSE_REG R5
-#define R6 6
-#define NOISE_PERIOD_REG R6
-#define R7 7
-#define _ENABLE_REG R7
-#define R10 010
-#define CHANNEL_A_AMPLITUDE_REG R10
-#define R11 011
-#define CHANNEL_B_AMPLITUDE_REG R11
-#define R12 012
-#define CHANNEL_C_AMPLITUDE_REG R12
-#define R13 013
-#define ENVELOPE_PERIOD_FINE_REG R13
-#define R14 014
-#define ENVELOPE_PERIOD_COARSE_REG R13
-#define R15 015
-#define ENVELOPE_SHAPE_REG R15
-
 
 void psgInit();
 
 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);
-uint8_t psgReadShadow(uint8_t chip, uint8_t address);
-void psgWrite(uint8_t chip, uint8_t address, uint8_t data);
+
 
 #endif // _PSG_H_

sound-driver/sn76489an.c

@@ -1,171 +0,0 @@
-#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/spi.S

@@ -44,7 +44,6 @@ spiCmdHandler_5:
 spiCmdHandler_6:
   bit     #SOUND_LOCK, &cmd
   jz      spiCmdHandler_7
-  call    #playEffect1
   ;; insert a call here
   bic     #SOUND_LOCK, &cmd
 spiCmdHandler_7: