Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 338c50a2 authored by Manish Dewangan's avatar Manish Dewangan
Browse files

audio-hal: 64 bit hal porting changes 

-Use long for mixer control with integer type to match with
 kernel snd_ctl_elem_value definition.
-Use packed structure for mixer controls with byte type

Change-Id: I9fbb1d10c5ee212348b58fc4b27a3d74403d8bda
parent adbbe4f9

hal/audio_extn/audio_defs.h

+3 −3
Original line number Diff line number Diff line
@@ -122,13 +122,13 @@ struct source_tracking_param { 
    uint16_t  doa_speech;

    uint16_t  doa_noise[3];

    uint8_t   polar_activity[360];

};

} __attribute__((packed));



struct sound_focus_param {

    uint16_t  start_angle[MAX_SECTORS];

    uint8_t   enable[MAX_SECTORS];

    uint16_t  gain_step;

};

} __attribute__((packed));



struct aptx_dec_bt_addr {

    uint32_t nap;
@@ -162,7 +162,7 @@ struct audio_avt_device_drift_param { 
     * timer in microseconds.

     */

    uint32_t        ref_timer_abs_ts_msw;

};

} __attribute__((packed));



/*use these for setting infine window.i.e free run mode */

#define AUDIO_MAX_RENDER_START_WINDOW 0x8000000000000000

hal/audio_extn/audio_extn.c

+2 −2
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ static int32_t afe_proxy_set_channel_mapping(struct audio_device *adev, 
{

    struct mixer_ctl *ctl;

    const char *mixer_ctl_name = "Playback Device Channel Map";

    int set_values[8] = {0};

    long set_values[8] = {0};

    int ret;

    ALOGV("%s channel_count:%d",__func__, channel_count);
@@ -650,7 +650,7 @@ static int32_t afe_proxy_set_channel_mapping(struct audio_device *adev, 
              __func__, mixer_ctl_name);

        return -EINVAL;

    }

    ALOGV("AFE: set mapping(%d %d %d %d %d %d %d %d) for channel:%d",

    ALOGV("AFE: set mapping(%ld %ld %ld %ld %ld %ld %ld %ld) for channel:%d",

        set_values[0], set_values[1], set_values[2], set_values[3], set_values[4],

        set_values[5], set_values[6], set_values[7], channel_count);

    ret = mixer_ctl_set_array(ctl, set_values, channel_count);

hal/audio_extn/dolby.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void send_ddp_endp_params_stream(struct stream_out *out, 
                                 bool set_cache __unused)

{

    int idx, i;

    int ddp_endp_params_data[2*DDP_ENDP_NUM_PARAMS + 1];

    long ddp_endp_params_data[2*DDP_ENDP_NUM_PARAMS + 1];

    int length = 0;

    for(idx=0; idx<DDP_ENDP_NUM_DEVICES; idx++) {

        if(ddp_endp_params[idx].device & device) {

hal/audio_extn/hfp.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ int hfp_set_mic_mute(struct audio_device *adev, bool state) 
{

    struct mixer_ctl *ctl;

    const char *mixer_ctl_name = "HFP TX Mute";

    uint32_t set_values[ ] = {0};

    long set_values[ ] = {0};



    ALOGI("%s: enter, state=%d", __func__, state);

hal/audio_extn/keep_alive.c

+2 −1
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ void audio_extn_keep_alive_start() 
{

    struct audio_device * adev = (struct audio_device *)ka.userdata;

    char mixer_ctl_name[MAX_LENGTH_MIXER_CONTROL_IN_INT];

    int app_type_cfg[MAX_LENGTH_MIXER_CONTROL_IN_INT], len = 0, rc;

    long app_type_cfg[MAX_LENGTH_MIXER_CONTROL_IN_INT];

    int len = 0, rc;

    struct mixer_ctl *ctl;

    int acdb_dev_id, snd_device;

    struct listnode *node;