diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2018-12-22 20:10:52 -0500 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2018-12-22 20:12:10 -0500 |
commit | eee3f0ce79eb0b2ae2f272e814e10e6e9524c381 (patch) | |
tree | c51bf7d9c97e28dcea57f05369fd682b72d1445a | |
parent | 6416c22b45a6cd0a86b6e6a27573b2c263d83353 (diff) | |
download | rockbox-eee3f0ce79eb0b2ae2f272e814e10e6e9524c381.tar.gz rockbox-eee3f0ce79eb0b2ae2f272e814e10e6e9524c381.zip |
FS#12610 - Clip+ Ticking Noise Fixed in Radio
Patch taken from Igor Poretsky's tree.
Original clip-radio-tick.patch modified to acts only when screen is
deemed, or when recording, in order to preserve indicators
functionality.
Change-Id: I62afb24a0dad7ad2ecc9272c24810b37f032408d
-rw-r--r-- | firmware/drivers/tuner/rda5802.c | 8 | ||||
-rw-r--r-- | firmware/drivers/tuner/si4700.c | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/firmware/drivers/tuner/rda5802.c b/firmware/drivers/tuner/rda5802.c index 7b9bea721d..377bdd1e6f 100644 --- a/firmware/drivers/tuner/rda5802.c +++ b/firmware/drivers/tuner/rda5802.c | |||
@@ -30,6 +30,8 @@ | |||
30 | #include "tuner.h" /* tuner abstraction interface */ | 30 | #include "tuner.h" /* tuner abstraction interface */ |
31 | #include "fmradio.h" | 31 | #include "fmradio.h" |
32 | #include "fmradio_i2c.h" /* physical interface driver */ | 32 | #include "fmradio_i2c.h" /* physical interface driver */ |
33 | #include "audio.h" | ||
34 | #include "backlight.h" | ||
33 | 35 | ||
34 | #define SEEK_THRESHOLD 0x16 | 36 | #define SEEK_THRESHOLD 0x16 |
35 | 37 | ||
@@ -328,15 +330,15 @@ int rda5802_get(int setting) | |||
328 | break; | 330 | break; |
329 | 331 | ||
330 | case RADIO_TUNED: | 332 | case RADIO_TUNED: |
331 | val = rda5802_tuned(); | 333 | val = ((audio_status() & AUDIO_STATUS_RECORD) || !is_backlight_on(true)) ? 1 : rda5802_tuned(); |
332 | break; | 334 | break; |
333 | 335 | ||
334 | case RADIO_STEREO: | 336 | case RADIO_STEREO: |
335 | val = rda5802_st(); | 337 | val = ((audio_status() & AUDIO_STATUS_RECORD) || !is_backlight_on(true)) ? 1 : rda5802_st(); |
336 | break; | 338 | break; |
337 | 339 | ||
338 | case RADIO_RSSI: | 340 | case RADIO_RSSI: |
339 | val = rda5802_rssi(); | 341 | val = ((audio_status() & AUDIO_STATUS_RECORD) || !is_backlight_on(true)) ? RSSI_MAX : rda5802_rssi(); |
340 | break; | 342 | break; |
341 | 343 | ||
342 | case RADIO_RSSI_MIN: | 344 | case RADIO_RSSI_MIN: |
diff --git a/firmware/drivers/tuner/si4700.c b/firmware/drivers/tuner/si4700.c index af5795a83f..88ff6c69f7 100644 --- a/firmware/drivers/tuner/si4700.c +++ b/firmware/drivers/tuner/si4700.c | |||
@@ -31,6 +31,8 @@ | |||
31 | #ifdef HAVE_RDS_CAP | 31 | #ifdef HAVE_RDS_CAP |
32 | #include "rds.h" | 32 | #include "rds.h" |
33 | #endif | 33 | #endif |
34 | #include "audio.h" | ||
35 | #include "backlight.h" | ||
34 | 36 | ||
35 | #if defined(SANSA_CLIP) || defined(SANSA_E200V2) || defined(SANSA_FUZE) || defined(SANSA_C200V2) \ | 37 | #if defined(SANSA_CLIP) || defined(SANSA_E200V2) || defined(SANSA_FUZE) || defined(SANSA_C200V2) \ |
36 | || defined(SANSA_FUZEPLUS) | 38 | || defined(SANSA_FUZEPLUS) |
@@ -510,15 +512,15 @@ int si4700_get(int setting) | |||
510 | break; | 512 | break; |
511 | 513 | ||
512 | case RADIO_TUNED: | 514 | case RADIO_TUNED: |
513 | val = si4700_tuned(); | 515 | val = ((audio_status() & AUDIO_STATUS_RECORD) || !is_backlight_on(true)) ? 1 : si4700_tuned(); |
514 | break; | 516 | break; |
515 | 517 | ||
516 | case RADIO_STEREO: | 518 | case RADIO_STEREO: |
517 | val = si4700_st(); | 519 | val = ((audio_status() & AUDIO_STATUS_RECORD) || !is_backlight_on(true)) ? 1 : si4700_st(); |
518 | break; | 520 | break; |
519 | 521 | ||
520 | case RADIO_RSSI: | 522 | case RADIO_RSSI: |
521 | val = STATUSRSSI_RSSIr(si4700_read_reg(STATUSRSSI)); | 523 | val = ((audio_status() & AUDIO_STATUS_RECORD) || !is_backlight_on(true)) ? RADIO_RSSI_MAX : STATUSRSSI_RSSIr(si4700_read_reg(STATUSRSSI)); |
522 | break; | 524 | break; |
523 | 525 | ||
524 | case RADIO_RSSI_MIN: | 526 | case RADIO_RSSI_MIN: |