diff options
| author | Keith Packard <keithp@keithp.com> | 2010-10-31 22:51:48 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-10-31 22:51:48 -0700 |
| commit | c983b2d670dfe6bace2c6d776e34eaafa25db9bb (patch) | |
| tree | 97c4fc61432b0a09b7a31211cbc08e6496f6ba4c | |
| parent | 6b17b75ed5dc4e4fcc7278c715479bb921b644d5 (diff) | |
teleterra: audio amp is enabled by bringing audio_en (P2_4) high
The external audio amplifier is placed in 'suspend' mode most of the
time to save power. When audio is being sent, turn it on.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/ao_audio.c | 18 | ||||
| -rw-r--r-- | src/ao_pins.h | 11 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/ao_audio.c b/src/ao_audio.c index 0d521973..5d8fdfb5 100644 --- a/src/ao_audio.c +++ b/src/ao_audio.c @@ -584,6 +584,12 @@ ao_audio_send(__xdata uint8_t *samples, uint16_t nsamples) __reentrant { ao_mutex_get(&ao_audio_mutex); +#if AUDIO_STANDBY_ON_P2_4 + /* + * Turn on the audio amp + */ + P2_4 = 1; +#endif /* * Turn on timer 4. Free running from 0 to 0xff, with P2_0 * 'on' interval controlled by the value in T4CC0. Run this @@ -641,6 +647,12 @@ ao_audio_send(__xdata uint8_t *samples, uint16_t nsamples) __reentrant P2_0 = 0; P2SEL = (P2SEL & ~P2SEL_SELP2_0_MASK) | P2SEL_SELP2_0_GPIO; +#if AUDIO_STANDBY_ON_P2_4 + /* + * Turn off the audio amp + */ + P2_4 = 0; +#endif ao_mutex_put(&ao_audio_mutex); } @@ -665,6 +677,12 @@ ao_audio_init(void) P2SEL = (P2SEL & ~P2SEL_SELP2_0_MASK) | P2SEL_SELP2_0_GPIO; PERCFG = (PERCFG & ~PERCFG_T4CFG_ALT_MASK) | PERCFG_T4CFG_ALT_2; +#if AUDIO_STANDBY_ON_P2_4 + P2_4 = 0; + P2SEL &= ~P2SEL_SELP2_4_PERIPHERAL; + P2DIR |= (1 << 4); +#endif + /* Timer 3 is used to clock the DMA transfers from the audio data buffer * to the timer 4 */ diff --git a/src/ao_pins.h b/src/ao_pins.h index 7836d95a..9849dfe4 100644 --- a/src/ao_pins.h +++ b/src/ao_pins.h @@ -31,6 +31,7 @@ #define AO_LED_RED 1 #define LEDS_AVAILABLE (AO_LED_RED) #define HAS_EXTERNAL_TEMP 0 + #define AUDIO_STANDBY_ON_P2_4 0 #endif #if defined(TELEDONGLE_V_0_2) @@ -45,6 +46,7 @@ #define AO_LED_RED 1 #define AO_LED_GREEN 2 #define LEDS_AVAILABLE (AO_LED_RED|AO_LED_GREEN) + #define AUDIO_STANDBY_ON_P2_4 0 #endif #if defined(TELEMETRUM_V_0_1) @@ -60,6 +62,7 @@ #define AO_LED_GREEN 1 #define LEDS_AVAILABLE (AO_LED_RED|AO_LED_GREEN) #define HAS_EXTERNAL_TEMP 1 + #define AUDIO_STANDBY_ON_P2_4 0 #endif #if defined(TELEDONGLE_V_0_1) @@ -74,6 +77,7 @@ #define AO_LED_RED 2 #define AO_LED_GREEN 1 #define LEDS_AVAILABLE (AO_LED_RED|AO_LED_GREEN) + #define AUDIO_STANDBY_ON_P2_4 0 #endif #if defined(TELETERRA_V_0_1) @@ -88,6 +92,7 @@ #define AO_LED_RED 1 #define AO_LED_GREEN 2 #define LEDS_AVAILABLE (AO_LED_RED|AO_LED_GREEN) + #define AUDIO_STANDBY_ON_P2_4 1 #endif #if defined(TIDONGLE) @@ -101,6 +106,7 @@ #define PACKET_HAS_SLAVE 0 #define AO_LED_RED 2 #define LEDS_AVAILABLE (AO_LED_RED) + #define AUDIO_STANDBY_ON_P2_4 0 #endif #if DBG_ON_P1 @@ -163,4 +169,9 @@ #error Please define PACKET_HAS_SLAVE #endif + +#ifndef AUDIO_STANDBY_ON_P2_4 +#error Please define AUDIO_STANDBY_ON_P2_4 +#endif + #endif /* _AO_PINS_H_ */ |