aboutsummaryrefslogtreecommitdiffstats
path: root/HDA-intel
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2017-11-04 15:05:18 +0100
committerFulup Ar Foll <fulup@iot.bzh>2017-11-04 15:05:18 +0100
commitb93f9134f7342fcbf9fb15399e19f830401a7fe7 (patch)
tree73656f5afb700729301d0507e27782e3f393881c /HDA-intel
parente866930eade8dbc24e21b8f814d83fed4049e3df (diff)
Updated HAL to match with latest Alsa-Core API
Diffstat (limited to 'HDA-intel')
-rw-r--r--HDA-intel/IntelHdaHAL.c35
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 */
} ;