diff options
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/pcm-telechips.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/lcd-ssd1815.c | 17 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/logikdax/audio-logikdax.c | 43 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/m200/audio-m200.c | 43 | ||||
-rw-r--r-- | firmware/target/arm/wmcodec-telechips.c | 2 |
5 files changed, 93 insertions, 16 deletions
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c index 63f50f7d78..b3fd9216dc 100644 --- a/firmware/target/arm/pcm-telechips.c +++ b/firmware/target/arm/pcm-telechips.c | |||
@@ -94,6 +94,10 @@ void pcm_play_dma_init(void) | |||
94 | BCLKCTR |= DEV_DAI; | 94 | BCLKCTR |= DEV_DAI; |
95 | /* Master mode, 256->64fs, 16bit LSB*/ | 95 | /* Master mode, 256->64fs, 16bit LSB*/ |
96 | DAMR = 0x3cce20; | 96 | DAMR = 0x3cce20; |
97 | #elif defined(LOGIK_DAX) | ||
98 | /* TODO */ | ||
99 | #elif defined(SANSA_M200) | ||
100 | /* TODO */ | ||
97 | #else | 101 | #else |
98 | #error "Target isn't supported" | 102 | #error "Target isn't supported" |
99 | #endif | 103 | #endif |
diff --git a/firmware/target/arm/tcc77x/lcd-ssd1815.c b/firmware/target/arm/tcc77x/lcd-ssd1815.c index a6e4481fb2..b41c8d26ef 100644 --- a/firmware/target/arm/tcc77x/lcd-ssd1815.c +++ b/firmware/target/arm/tcc77x/lcd-ssd1815.c | |||
@@ -129,21 +129,8 @@ void lcd_set_invert_display(bool yesno) | |||
129 | /* turn the display upside down (call lcd_update() afterwards) */ | 129 | /* turn the display upside down (call lcd_update() afterwards) */ |
130 | void lcd_set_flip(bool yesno) | 130 | void lcd_set_flip(bool yesno) |
131 | { | 131 | { |
132 | /* TODO: flip mode isn't working. The commands in the else part of | 132 | (void)yesno; |
133 | this function are how the original firmware inits the LCD */ | 133 | /* TODO */ |
134 | |||
135 | if (yesno) | ||
136 | { | ||
137 | lcd_write_command(LCD_SET_SEGMENT_REMAP | 0x01); | ||
138 | lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION); | ||
139 | xoffset = 132 - LCD_WIDTH; /* 132 colums minus the 128 we have */ | ||
140 | } | ||
141 | else | ||
142 | { | ||
143 | lcd_write_command(LCD_SET_SEGMENT_REMAP); | ||
144 | lcd_write_command(LCD_SET_COM_OUTPUT_SCAN_DIRECTION | 0x08); | ||
145 | xoffset = 0; | ||
146 | } | ||
147 | } | 134 | } |
148 | 135 | ||
149 | 136 | ||
diff --git a/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c b/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c new file mode 100644 index 0000000000..bd85e0b573 --- /dev/null +++ b/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c | |||
@@ -0,0 +1,43 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2007 by Michael Sevakis | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #include "system.h" | ||
22 | #include "cpu.h" | ||
23 | #include "audio.h" | ||
24 | #include "sound.h" | ||
25 | |||
26 | int audio_channels = 2; | ||
27 | int audio_output_source = AUDIO_SRC_PLAYBACK; | ||
28 | |||
29 | void audiohw_enable_output(bool on) | ||
30 | { | ||
31 | (void)on; | ||
32 | } | ||
33 | |||
34 | void audio_set_output_source(int source) | ||
35 | { | ||
36 | (void)source; | ||
37 | } | ||
38 | |||
39 | void audio_input_mux(int source, unsigned flags) | ||
40 | { | ||
41 | (void)source; | ||
42 | (void)flags; | ||
43 | } | ||
diff --git a/firmware/target/arm/tcc77x/m200/audio-m200.c b/firmware/target/arm/tcc77x/m200/audio-m200.c new file mode 100644 index 0000000000..bd85e0b573 --- /dev/null +++ b/firmware/target/arm/tcc77x/m200/audio-m200.c | |||
@@ -0,0 +1,43 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2007 by Michael Sevakis | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #include "system.h" | ||
22 | #include "cpu.h" | ||
23 | #include "audio.h" | ||
24 | #include "sound.h" | ||
25 | |||
26 | int audio_channels = 2; | ||
27 | int audio_output_source = AUDIO_SRC_PLAYBACK; | ||
28 | |||
29 | void audiohw_enable_output(bool on) | ||
30 | { | ||
31 | (void)on; | ||
32 | } | ||
33 | |||
34 | void audio_set_output_source(int source) | ||
35 | { | ||
36 | (void)source; | ||
37 | } | ||
38 | |||
39 | void audio_input_mux(int source, unsigned flags) | ||
40 | { | ||
41 | (void)source; | ||
42 | (void)flags; | ||
43 | } | ||
diff --git a/firmware/target/arm/wmcodec-telechips.c b/firmware/target/arm/wmcodec-telechips.c index 5fcc46154b..de3a29c8c7 100644 --- a/firmware/target/arm/wmcodec-telechips.c +++ b/firmware/target/arm/wmcodec-telechips.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #if defined(COWON_D2) | 34 | #if defined(COWON_D2) |
35 | /* The D2's audio codec uses an I2C address of 0x34 */ | 35 | /* The D2's audio codec uses an I2C address of 0x34 */ |
36 | #define I2C_AUDIO_ADDRESS 0x34 | 36 | #define I2C_AUDIO_ADDRESS 0x34 |
37 | #elif defined (IAUDIO_7) | 37 | #elif defined (IAUDIO_7) || defined(LOGIK_DAX) || defined(SANSA_M200) |
38 | #define I2C_AUDIO_ADDRESS 0x34 | 38 | #define I2C_AUDIO_ADDRESS 0x34 |
39 | #else | 39 | #else |
40 | #error wmcodec not implemented for this target! | 40 | #error wmcodec not implemented for this target! |