diff options
| author |   Tai Vuong <tvuong@audiokinetic.com> | 2017-11-04 10:45:28 -0400 |
|---|---|---|
| committer | Tai Vuong <tvuong@audiokinetic.com> | 2017-11-04 10:45:28 -0400 |
| commit | 8bd61adc2b75634e1e5136ac3c1403b26edd209f (patch) | |
| tree | d223b5501b2b4876091458dfada78c9d237b8247 /HDA-intel/IntelHdaHAL.c | |
| parent | 3b86d29aa97cbd0b51c59fb1038807a565f69777 (diff) | |
| parent | b93f9134f7342fcbf9fb15399e19f830401a7fe7 (diff) | |
Merge branch 'master' of github.com:fulup-bzh/hal-sample-4a
Diffstat (limited to 'HDA-intel/IntelHdaHAL.c')
| -rw-r--r-- | HDA-intel/IntelHdaHAL.c | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/HDA-intel/IntelHdaHAL.c b/HDA-intel/IntelHdaHAL.c index affc020..25b267c 100644 --- a/HDA-intel/IntelHdaHAL.c +++ b/HDA-intel/IntelHdaHAL.c @@ -136,17 +136,32 @@ STATIC alsaHalMapT alsaHalMap[]= { { .tag=Shutdown_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampShutdown}, .info="Ramp-up Shutdown Volume", .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Shutdown_Ramp", .minval=0, .maxval=100, .step=1, .value=80 } }, - + // Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255] - { .tag=Guidance_Playback_Volume , .ctl={.name="Guidance_Volume", .minval=0, .maxval=255, .step=1, .value=204 } }, - { .tag=Entertainment_Playback_Volume , .ctl={.name="Entertainment_Volume", .minval=0, .maxval=255, .step=1, .value=204 } }, - { .tag=Notification_Playback_Volume , .ctl={.name="Notification_Volume", .minval=0, .maxval=255, .step=1, .value=204 } }, - { .tag=Communication_Playback_Volume , .ctl={.name="Communications_Volume", .minval=0, .maxval=255, .step=1, .value=204 } }, - { .tag=Warning_Playback_Volume , .ctl={.name="Warning_Volume", .minval=0, .maxval=255, .step=1, .value=204 } }, - { .tag=System_Playback_Volume , .ctl={.name="System_Volume", .minval=0, .maxval=255, .step=1, .value=204 } }, - { .tag=Startup_Playback_Volume , .ctl={.name="Startup_Volume", .minval=0, .maxval=255, .step=1, .value=204 } }, - { .tag=Shutdown_Playback_Volume , .ctl={.name="Shutdown_Volume", .minval=0, .maxval=255, .step=1, .value=204 } }, - // Could have similar controls for input side + { .tag=Guidance_Playback_Volume , + .ctl={.name="Guidance_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Entertainment_Playback_Volume , + .ctl={.name="Entertainment_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Notification_Playback_Volume , + .ctl={.name="Notification_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Communication_Playback_Volume , + .ctl={.name="Communications_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Warning_Playback_Volume , + .ctl={.name="Warning_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204} + }, + { .tag=System_Playback_Volume , + .ctl={.name="System_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, + { .tag=Startup_Playback_Volume , + .ctl={.name="Startup_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204} + }, + { .tag=Shutdown_Playback_Volume , + .ctl={.name="Shutdown_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } + }, { .tag=EndHalCrlTag} /* marker for end of the array */ } ; |