diff options
Diffstat (limited to 'firmware/sound.c')
-rw-r--r-- | firmware/sound.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/firmware/sound.c b/firmware/sound.c index 6bd9b70029..0c4c153797 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -464,10 +464,10 @@ static void set_prescaled_volume(void) | |||
464 | #if CONFIG_CODEC == MAS3507D | 464 | #if CONFIG_CODEC == MAS3507D |
465 | mas_writereg(MAS_REG_KPRESCALE, prescale_table[prescale/10]); | 465 | mas_writereg(MAS_REG_KPRESCALE, prescale_table[prescale/10]); |
466 | #elif defined(HAVE_UDA1380) | 466 | #elif defined(HAVE_UDA1380) |
467 | uda1380_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale)); | 467 | audiohw_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale)); |
468 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ | 468 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
469 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) | 469 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) |
470 | wmcodec_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale)); | 470 | audiohw_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale)); |
471 | #endif | 471 | #endif |
472 | 472 | ||
473 | if (current_volume == VOLUME_MIN) | 473 | if (current_volume == VOLUME_MIN) |
@@ -491,16 +491,16 @@ static void set_prescaled_volume(void) | |||
491 | #if CONFIG_CODEC == MAS3507D | 491 | #if CONFIG_CODEC == MAS3507D |
492 | dac_volume(tenthdb2reg(l), tenthdb2reg(r), false); | 492 | dac_volume(tenthdb2reg(l), tenthdb2reg(r), false); |
493 | #elif defined(HAVE_UDA1380) | 493 | #elif defined(HAVE_UDA1380) |
494 | uda1380_set_master_vol(tenthdb2master(l), tenthdb2master(r)); | 494 | audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r)); |
495 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ | 495 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
496 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) | 496 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) |
497 | wmcodec_set_master_vol(tenthdb2master(l), tenthdb2master(r)); | 497 | audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r)); |
498 | #if defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8751) | 498 | #if defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8751) |
499 | wmcodec_set_lineout_vol(tenthdb2master(0), tenthdb2master(0)); | 499 | audiohw_set_lineout_vol(tenthdb2master(0), tenthdb2master(0)); |
500 | #endif | 500 | #endif |
501 | 501 | ||
502 | #elif defined(HAVE_TLV320) | 502 | #elif defined(HAVE_TLV320) |
503 | tlv320_set_headphone_vol(tenthdb2master(l), tenthdb2master(r)); | 503 | audiohw_set_headphone_vol(tenthdb2master(l), tenthdb2master(r)); |
504 | #endif | 504 | #endif |
505 | } | 505 | } |
506 | #endif /* (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 */ | 506 | #endif /* (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 */ |
@@ -649,13 +649,13 @@ void sound_set_bass(int value) | |||
649 | current_bass = value * 10; | 649 | current_bass = value * 10; |
650 | set_prescaled_volume(); | 650 | set_prescaled_volume(); |
651 | #elif defined(HAVE_UDA1380) | 651 | #elif defined(HAVE_UDA1380) |
652 | uda1380_set_bass(value >> 1); | 652 | audiohw_set_bass(value >> 1); |
653 | current_bass = value * 10; | 653 | current_bass = value * 10; |
654 | set_prescaled_volume(); | 654 | set_prescaled_volume(); |
655 | #elif defined HAVE_WM8975 || defined HAVE_WM8758 \ | 655 | #elif defined HAVE_WM8975 || defined HAVE_WM8758 \ |
656 | || defined HAVE_WM8731 || defined(HAVE_WM8721) || defined(HAVE_WM8751) | 656 | || defined HAVE_WM8731 || defined(HAVE_WM8721) || defined(HAVE_WM8751) |
657 | current_bass = value * 10; | 657 | current_bass = value * 10; |
658 | wmcodec_set_bass(value); | 658 | audiohw_set_bass(value); |
659 | set_prescaled_volume(); | 659 | set_prescaled_volume(); |
660 | #elif CONFIG_CPU == PNX0101 || defined(HAVE_PP5024_CODEC) | 660 | #elif CONFIG_CPU == PNX0101 || defined(HAVE_PP5024_CODEC) |
661 | /* TODO: implement for iFP and Sansa */ | 661 | /* TODO: implement for iFP and Sansa */ |
@@ -675,12 +675,12 @@ void sound_set_treble(int value) | |||
675 | current_treble = value * 10; | 675 | current_treble = value * 10; |
676 | set_prescaled_volume(); | 676 | set_prescaled_volume(); |
677 | #elif defined(HAVE_UDA1380) | 677 | #elif defined(HAVE_UDA1380) |
678 | uda1380_set_treble(value >> 1); | 678 | audiohw_set_treble(value >> 1); |
679 | current_treble = value * 10; | 679 | current_treble = value * 10; |
680 | set_prescaled_volume(); | 680 | set_prescaled_volume(); |
681 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ | 681 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
682 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) | 682 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) |
683 | wmcodec_set_treble(value); | 683 | audiohw_set_treble(value); |
684 | current_treble = value * 10; | 684 | current_treble = value * 10; |
685 | set_prescaled_volume(); | 685 | set_prescaled_volume(); |
686 | #elif CONFIG_CPU == PNX0101 || defined(HAVE_PP5024_CODEC) | 686 | #elif CONFIG_CPU == PNX0101 || defined(HAVE_PP5024_CODEC) |