diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-19 03:51:57 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-19 03:51:57 +0000 |
commit | 9e3f473492353852d07ce359c10540c6f1fbd14a (patch) | |
tree | ba644a53940166ad7760478233254359cc116038 | |
parent | 23f6bc9b3d2a5a79fc8ab78b373e830cad514116 (diff) | |
download | rockbox-9e3f473492353852d07ce359c10540c6f1fbd14a.tar.gz rockbox-9e3f473492353852d07ce359c10540c6f1fbd14a.zip |
FS#11417 by Joe Balough: fix audio/tuner on philips hdd6330
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26952 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8731.c | 2 | ||||
-rw-r--r-- | firmware/drivers/tuner/tea5767.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/wmcodec-pp.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/docs/CREDITS b/docs/CREDITS index b6491f2998..7fe0301cd4 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -548,6 +548,7 @@ Aaron Rothbaum | |||
548 | Nejc Lotric | 548 | Nejc Lotric |
549 | Hinrik Örn Sigurðsson | 549 | Hinrik Örn Sigurðsson |
550 | Stephen Carroll | 550 | Stephen Carroll |
551 | Joe Balough | ||
551 | 552 | ||
552 | The libmad team | 553 | The libmad team |
553 | The wavpack team | 554 | The wavpack team |
diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c index 41c6757525..71050454f3 100644 --- a/firmware/drivers/audio/wm8731.c +++ b/firmware/drivers/audio/wm8731.c | |||
@@ -201,7 +201,7 @@ void audiohw_postinit(void) | |||
201 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) | 201 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) |
202 | /* We need to enable bit 4 of GPIOL for output for sound on H10 */ | 202 | /* We need to enable bit 4 of GPIOL for output for sound on H10 */ |
203 | GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 0x10); | 203 | GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 0x10); |
204 | #elif defined(PHILIPS_HDD1630) | 204 | #elif defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) |
205 | GPO32_ENABLE |= 0x2; | 205 | GPO32_ENABLE |= 0x2; |
206 | GPO32_VAL &= ~0x2; | 206 | GPO32_VAL &= ~0x2; |
207 | #endif | 207 | #endif |
diff --git a/firmware/drivers/tuner/tea5767.c b/firmware/drivers/tuner/tea5767.c index 7c6d5b59ef..5888e00781 100644 --- a/firmware/drivers/tuner/tea5767.c +++ b/firmware/drivers/tuner/tea5767.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "fmradio.h" | 28 | #include "fmradio.h" |
29 | #include "fmradio_i2c.h" /* physical interface driver */ | 29 | #include "fmradio_i2c.h" /* physical interface driver */ |
30 | 30 | ||
31 | #if defined(PHILIPS_HDD1630) || defined(ONDA_VX747) || defined(ONDA_VX777) | 31 | #if defined(PHILIPS_HDD1630) || defined(ONDA_VX747) || defined(ONDA_VX777) || defined(PHILIPS_HDD6330) |
32 | #define I2C_ADR 0x60 | 32 | #define I2C_ADR 0x60 |
33 | #else | 33 | #else |
34 | #define I2C_ADR 0xC0 | 34 | #define I2C_ADR 0xC0 |
diff --git a/firmware/target/arm/wmcodec-pp.c b/firmware/target/arm/wmcodec-pp.c index e6fbf47f0d..839fd90676 100644 --- a/firmware/target/arm/wmcodec-pp.c +++ b/firmware/target/arm/wmcodec-pp.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "wmcodec.h" | 33 | #include "wmcodec.h" |
34 | 34 | ||
35 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || \ | 35 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || \ |
36 | defined(MROBE_100) || defined(PHILIPS_HDD1630) || \ | 36 | defined(MROBE_100) || defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) || \ |
37 | defined(PBELL_VIBE500) | 37 | defined(PBELL_VIBE500) |
38 | /* The H10's audio codec uses an I2C address of 0x1b */ | 38 | /* The H10's audio codec uses an I2C address of 0x1b */ |
39 | #define I2C_AUDIO_ADDRESS 0x1b | 39 | #define I2C_AUDIO_ADDRESS 0x1b |