diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-07-13 02:41:45 +0200 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-07-13 02:42:17 +0200 |
| commit | bbe94e2b246d7bec307df7666416025b42d9a6f7 (patch) | |
| tree | 23a5d6016bacc836fc15fbc98b4860ebab2f2c0d /firmware/target/arm/imx233/audioout-imx233.c | |
| parent | 8c91d05543aebb8de874270f0b770ef3e56b00bb (diff) | |
| download | rockbox-bbe94e2b246d7bec307df7666416025b42d9a6f7.tar.gz rockbox-bbe94e2b246d7bec307df7666416025b42d9a6f7.zip | |
imx233: fix audio debug screen
Change-Id: Iaadd43a28907ebd425a0b7199f067a4fab8e9653
Diffstat (limited to 'firmware/target/arm/imx233/audioout-imx233.c')
| -rw-r--r-- | firmware/target/arm/imx233/audioout-imx233.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/arm/imx233/audioout-imx233.c b/firmware/target/arm/imx233/audioout-imx233.c index 66664acdf7..0ad78d224a 100644 --- a/firmware/target/arm/imx233/audioout-imx233.c +++ b/firmware/target/arm/imx233/audioout-imx233.c | |||
| @@ -251,14 +251,14 @@ struct imx233_audioout_info_t imx233_audioout_get_info(void) | |||
| 251 | /* 6*10^6*basemult/(src_frac*8*(src_hold+1)) in Hz */ | 251 | /* 6*10^6*basemult/(src_frac*8*(src_hold+1)) in Hz */ |
| 252 | info.freq = 60000000 * BF_RD(AUDIOOUT_DACSRR, BASEMULT) / 8 / | 252 | info.freq = 60000000 * BF_RD(AUDIOOUT_DACSRR, BASEMULT) / 8 / |
| 253 | BF_RD(AUDIOOUT_DACSRR, SRC_FRAC) / (1 + BF_RD(AUDIOOUT_DACSRR, SRC_HOLD)); | 253 | BF_RD(AUDIOOUT_DACSRR, SRC_FRAC) / (1 + BF_RD(AUDIOOUT_DACSRR, SRC_HOLD)); |
| 254 | info.hp_line1 = BF_RD(AUDIOOUT_HPVOL, SELECT); | 254 | info.hpselect = BF_RD(AUDIOOUT_HPVOL, SELECT); |
| 255 | /* convert half-dB to tenth-dB */ | 255 | /* convert half-dB to tenth-dB */ |
| 256 | info.dacvol[0] = MAX((int)BF_RD(AUDIOOUT_DACVOLUME, VOLUME_LEFT) - 0xff, -100) * 5; | 256 | info.dacvol[0] = MAX((int)BF_RD(AUDIOOUT_DACVOLUME, VOLUME_LEFT) - 0xff, -100) * 5; |
| 257 | info.dacvol[1] = MAX((int)BF_RD(AUDIOOUT_DACVOLUME, VOLUME_RIGHT) - 0xff, -100) * 5; | 257 | info.dacvol[1] = MAX((int)BF_RD(AUDIOOUT_DACVOLUME, VOLUME_RIGHT) - 0xff, -100) * 5; |
| 258 | info.dacmute[0] = BF_RD(AUDIOOUT_DACVOLUME, MUTE_LEFT); | 258 | info.dacmute[0] = BF_RD(AUDIOOUT_DACVOLUME, MUTE_LEFT); |
| 259 | info.dacmute[1] = BF_RD(AUDIOOUT_DACVOLUME, MUTE_RIGHT); | 259 | info.dacmute[1] = BF_RD(AUDIOOUT_DACVOLUME, MUTE_RIGHT); |
| 260 | info.hpvol[0] = (info.hp_line1 ? 120 : 60) - 5 * BF_RD(AUDIOOUT_HPVOL, VOL_LEFT); | 260 | info.hpvol[0] = (info.hpselect ? 120 : 60) - 5 * BF_RD(AUDIOOUT_HPVOL, VOL_LEFT); |
| 261 | info.hpvol[1] = (info.hp_line1 ? 120 : 60) - 5 * BF_RD(AUDIOOUT_HPVOL, VOL_RIGHT); | 261 | info.hpvol[1] = (info.hpselect ? 120 : 60) - 5 * BF_RD(AUDIOOUT_HPVOL, VOL_RIGHT); |
| 262 | info.hpmute[0] = info.hpmute[1] = BF_RD(AUDIOOUT_HPVOL, MUTE); | 262 | info.hpmute[0] = info.hpmute[1] = BF_RD(AUDIOOUT_HPVOL, MUTE); |
| 263 | info.spkrvol[0] = info.spkrvol[1] = 155; | 263 | info.spkrvol[0] = info.spkrvol[1] = 155; |
| 264 | info.spkrmute[0] = info.spkrmute[1] = BF_RD(AUDIOOUT_SPEAKERCTRL, MUTE); | 264 | info.spkrmute[0] = info.spkrmute[1] = BF_RD(AUDIOOUT_SPEAKERCTRL, MUTE); |