diff options
Diffstat (limited to 'HAL-afb/Jabra-Solemate')
| -rw-r--r-- | HAL-afb/Jabra-Solemate/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | HAL-afb/Jabra-Solemate/JabraUsbHAL.c | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/HAL-afb/Jabra-Solemate/CMakeLists.txt b/HAL-afb/Jabra-Solemate/CMakeLists.txt index 41d6915..25c2626 100644 --- a/HAL-afb/Jabra-Solemate/CMakeLists.txt +++ b/HAL-afb/Jabra-Solemate/CMakeLists.txt @@ -32,7 +32,7 @@ PROJECT_TARGET_ADD(hal-jabra-usb) ) # Library dependencies (include updates automatically) - TARGET_LINK_LIBRARIES(${TARGET_NAME} + TARGET_LINK_LIBRARIES(${TARGET_NAME} hal-interface audio-common ) diff --git a/HAL-afb/Jabra-Solemate/JabraUsbHAL.c b/HAL-afb/Jabra-Solemate/JabraUsbHAL.c index 7eeab90..03d53d8 100644 --- a/HAL-afb/Jabra-Solemate/JabraUsbHAL.c +++ b/HAL-afb/Jabra-Solemate/JabraUsbHAL.c @@ -13,18 +13,18 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * - * + * + * * To find out which control your sound card uses * aplay -l # Check sndcard name name in between [] * amixer -D hw:USB controls # get supported controls * amixer -Dhw:USB cget name=Power-Switch * amixer -Dhw:USB cset name=Power-Switch true - * + * */ -#define _GNU_SOURCE +#define _GNU_SOURCE #include "hal-interface.h" -#include "audio-common.h" +#include "audio-common.h" // Define few private tag for not standard functions #define PCM_Volume_Multimedia 1000 @@ -61,8 +61,8 @@ STATIC halVolRampT volRampEmergency= { .stepUp = 3, }; -// Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities. -STATIC alsaHalMapT alsaHalMap[]= { +// Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities. +STATIC alsaHalMapT alsaHalMap[]= { { .tag=Master_Playback_Volume, . ctl={.name="PCM Playback Volume" } }, { .tag=PCM_Playback_Volume , .ctl={.name="PCM Playback Volume" } }, { .tag=PCM_Playback_Switch , .ctl={.name="PCM Playback Switch" } }, @@ -74,7 +74,7 @@ STATIC alsaHalMapT alsaHalMap[]= { }, // Implement Rampup Volume for Virtual Channels - { .tag=Multimedia_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampMultimedia}, .info="Rampup Multimedia Volume", + { .tag=Multimedia_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampMultimedia}, .info="Rampup Multimedia Volume", .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Playback Multimedia Ramp"} }, { .tag=Navigation_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampNavigation}, .info="RampUp Navigation Volume", @@ -83,9 +83,9 @@ STATIC alsaHalMapT alsaHalMap[]= { { .tag=Emergency_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampEmergency}, .info="Rampup Emergency Volume", .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Playback Emergency Ramp"} }, - + // Sound Card does not support hardware channel volume mixer (note softvol default range 0-256) - { .tag=PCM_Volume_Multimedia, .info="Playback Multimedia Softvol", + { .tag=PCM_Volume_Multimedia, .info="Playback Multimedia Softvol", .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255, .value=200, .name="Playback Multimedia"} }, { .tag=PCM_Volume_Navigation, .info="Playback Navigation Softvol", @@ -94,8 +94,8 @@ STATIC alsaHalMapT alsaHalMap[]= { { .tag=PCM_Volume_Emergency, .info="Playback Emergency Softvol", .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255, .value=200, .name="Playback Emergency"} }, - - + + { .tag=EndHalCrlTag} /* marker for end of the array */ } ; |