aboutsummaryrefslogtreecommitdiffstats
path: root/Rcar-M3
diff options
context:
space:
mode:
Diffstat (limited to 'Rcar-M3')
-rw-r--r--Rcar-M3/Rcar-M3-HAL.c186
1 files changed, 118 insertions, 68 deletions
diff --git a/Rcar-M3/Rcar-M3-HAL.c b/Rcar-M3/Rcar-M3-HAL.c
index 5f1ec5c..50304b0 100644
--- a/Rcar-M3/Rcar-M3-HAL.c
+++ b/Rcar-M3/Rcar-M3-HAL.c
@@ -18,7 +18,7 @@
* To find out which control your sound card uses
* aplay -l # Check sndcard name name in between []
* amixer -D hw:v1340 controls # get supported controls
- * amixer -Dhw:v1340 cget name=Power-Switch
+ * amixer -Dhw:v1340 cget name=Power-Switch
* amixer -Dhw:v1340 cset name=Power-Switch true
*
*/
@@ -40,62 +40,89 @@ STATIC halVolRampT volRampMaster= {
};
//Solvol Ramping Value can be customize by Audio Role and Hardwar card
-STATIC halVolRampT volRampGuidance= {
- .slave = Guidance_Playback_Volume,
+STATIC halVolRampT volRampEmergency= {
+ .slave = Emergency_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 10,
+};
+
+STATIC halVolRampT volRampWarning= {
+ .slave = Warning_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 10,
+};
+
+STATIC halVolRampT volRampCustomHigh= {
+ .slave = CustomHigh_Playback_Volume,
.delay = 50*1000, // ramping delay in us
.stepDown= 2,
.stepUp = 4,
};
-STATIC halVolRampT volRampCommunication= {
- .slave = Communication_Playback_Volume,
+STATIC halVolRampT volRampPhone= {
+ .slave = Phone_Playback_Volume,
.delay = 50*1000, // ramping delay in us
- .stepDown= 6,
+ .stepDown= 2,
.stepUp = 4,
};
-STATIC halVolRampT volRampEntertainment= {
- .slave = Entertainment_Playback_Volume,
- .delay = 100*1000, // ramping delay in us
- .stepDown= 4,
- .stepUp = 2,
+STATIC halVolRampT volRampNavigation= {
+ .slave = Navigation_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 4,
};
-STATIC halVolRampT volRampNotification= {
- .slave = Notification_Playback_Volume,
+STATIC halVolRampT volRampCustomMedium= {
+ .slave = CustomMedium_Playback_Volume,
.delay = 50*1000, // ramping delay in us
- .stepDown= 6,
+ .stepDown= 2,
.stepUp = 4,
};
-STATIC halVolRampT volRampWarning= {
- .slave = Warning_Playback_Volume,
- .delay = 10*1000, // ramping delay in us
- .stepDown= 6,
- .stepUp = 10,
+STATIC halVolRampT volRampVideo= {
+ .slave = Video_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 4,
};
-STATIC halVolRampT volRampSystem= {
- .slave = System_Playback_Volume,
- .delay = 20*100, // ramping delay in us
- .stepDown= 6,
- .stepUp = 10,
+STATIC halVolRampT volRampStreaming= {
+ .slave = Streaming_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 4,
};
-STATIC halVolRampT volRampStartup= {
- .slave = Startup_Playback_Volume,
- .delay = 20*100, // ramping delay in us
- .stepDown= 6,
- .stepUp = 10,
+STATIC halVolRampT volRampMultimedia= {
+ .slave = Multimedia_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 4,
};
-STATIC halVolRampT volRampShutdown= {
- .slave = Shutdown_Playback_Volume,
- .delay = 20*100, // ramping delay in us
- .stepDown= 6,
- .stepUp = 10,
+STATIC halVolRampT volRampRadio= {
+ .slave = Radio_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 4,
};
+STATIC halVolRampT volRampCustomLow= {
+ .slave = CustomLow_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 4,
+};
+
+STATIC halVolRampT volRampFallback= {
+ .slave = Fallback_Playback_Volume,
+ .delay = 50*1000, // ramping delay in us
+ .stepDown= 2,
+ .stepUp = 4,
+};
// Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities.
STATIC alsaHalMapT alsaHalMap[]= {
@@ -106,60 +133,83 @@ STATIC alsaHalMapT alsaHalMap[]= {
// Sound card does not have hardware volume ramping
{ .tag=Master_Playback_Ramp , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="ramp volume linearly according to current ramp setting",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Rampup Master", .value=100}
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Rampup_Master", .value=100}
},
// Implement Rampup Volume for Virtual Channels (0-100)
- { .tag=Guidance_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampGuidance}, .info="RampUp Guidance Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Guidance_Ramp", .value=80 }
+ { .tag=Emergency_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampEmergency}, .info="RampUp Emergency Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Emergency_Ramp", .value=80 }
},
- { .tag=Entertainment_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampEntertainment}, .info="Rampup Entertainment Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Entertainment_Ramp", .value=80 }
+ { .tag=Warning_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampWarning}, .info="RampUp Warning Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Warning_Ramp", .value=80 }
},
- { .tag=Notification_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampNotification}, .info="Ramp-up Notification Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Notification_Ramp", .value=80 }
+ { .tag=CustomHigh_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCustomHigh}, .info="RampUp CustomHigh Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="CustomHigh_Ramp", .value=80 }
},
- { .tag=Communication_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCommunication}, .info="RampUp Communication Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Communication_Ramp", .value=80 }
+ { .tag=Phone_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampPhone}, .info="RampUp Phone Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Phone_Ramp", .value=80 }
},
- { .tag=Warning_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampWarning}, .info="Ramp-up Warning Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Warning_Ramp", .value=80 }
+ { .tag=Navigation_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampNavigation}, .info="RampUp Navigation Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Navigation_Ramp", .value=80 }
},
-
- { .tag=System_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampSystem}, .info="Ramp-up System Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="System_Ramp", .value=80 }
+ { .tag=CustomMedium_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCustomMedium}, .info="RampUp CustomMedium Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="CustomMedium_Ramp", .value=80 }
+ },
+ { .tag=Video_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampVideo}, .info="RampUp Video Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Video_Ramp", .value=80 }
+ },
+ { .tag=Streaming_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampStreaming}, .info="RampUp Streaming Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Streaming_Ramp", .value=80 }
},
- { .tag=Startup_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampStartup}, .info="Ramp-up Startup Volume",
- .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Startup_Ramp", .value=80 }
+ { .tag=Multimedia_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampMultimedia}, .info="RampUp Multimedia Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Multimedia_Ramp", .value=80 }
},
- { .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", .value=80 }
+ { .tag=Radio_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampRadio}, .info="RampUp Radio Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Radio_Ramp", .value=80 }
+ },
+ { .tag=CustomLow_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCustomLow}, .info="RampUp CustomLow Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="CustomLow_Ramp", .value=80 }
+ },
+ { .tag=Fallback_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampFallback}, .info="RampUp Fallback Volume",
+ .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Fallback_Ramp", .value=80 }
},
// Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255]
- { .tag=Guidance_Playback_Volume ,
- .ctl={.name="Guidance_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 }
+ { .tag=Emergency_Playback_Volume ,
+ .ctl={.name="Emergency_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=CustomHigh_Playback_Volume ,
+ .ctl={.name="CustomHigh_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 }
+ },
+ { .tag=Phone_Playback_Volume ,
+ .ctl={.name="Phone_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 }
+ },
+ { .tag=Navigation_Playback_Volume ,
+ .ctl={.name="Navigation_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=CustomMedium_Playback_Volume ,
+ .ctl={.name="CustomMedium_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=Video_Playback_Volume ,
+ .ctl={.name="Video_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=Streaming_Playback_Volume ,
+ .ctl={.name="Streaming_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=Multimedia_Playback_Volume ,
+ .ctl={.name="Multimedia_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=Radio_Playback_Volume ,
+ .ctl={.name="Radio_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=CustomLow_Playback_Volume ,
+ .ctl={.name="CustomLow_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=Fallback_Playback_Volume ,
+ .ctl={.name="Fallback_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 }
},
// Could have similar controls for input side