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

Commit 08dbcfc1 authored by Ravi Kumar Alamanda's avatar Ravi Kumar Alamanda Committed by Vineeta Srivastava
Browse files

hal: avoid usage of extern functions and tables 

If there is any difference in the signature of a function declared
as extern, it will not be reported by the compiler and may result
in unexpected results when executed.
All the API functions should be declared in a header file.

Change-Id: I89662e23da8118c3a9eac728b389498ed52e19c2
parent 235c3482

hal/audio_hw.h

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ typedef int snd_device_t; 
 * Each usecase is mapped to a specific PCM device.

 * Refer to pcm_device_table[].

 */

typedef enum {

enum {

    USECASE_INVALID = -1,

    /* Playback usecases */

    USECASE_AUDIO_PLAYBACK_DEEP_BUFFER = 0,
@@ -77,7 +77,9 @@ typedef enum { 
    USECASE_INCALL_REC_DOWNLINK,

    USECASE_INCALL_REC_UPLINK_AND_DOWNLINK,

    AUDIO_USECASE_MAX

} audio_usecase_t;

};



const char * const use_case_table[AUDIO_USECASE_MAX];



#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))

hal/voice.c

+5 −7
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ struct pcm_config pcm_config_voice_call = { 
    .format = PCM_FORMAT_S16_LE,

};



extern const char * const use_case_table[AUDIO_USECASE_MAX];



static struct voice_session *voice_get_session_from_use_case(struct audio_device *adev,

                              audio_usecase_t usecase_id)

{
@@ -53,7 +51,7 @@ static struct voice_session *voice_get_session_from_use_case(struct audio_device 
    return session;

}



int stop_call(struct audio_device *adev, audio_usecase_t usecase_id)

int voice_stop_usecase(struct audio_device *adev, audio_usecase_t usecase_id)

{

    int i, ret = 0;

    struct audio_usecase *uc_info;
@@ -97,7 +95,7 @@ int stop_call(struct audio_device *adev, audio_usecase_t usecase_id) 
    return ret;

}



int start_call(struct audio_device *adev, audio_usecase_t usecase_id)

int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id)

{

    int i, ret = 0;

    struct audio_usecase *uc_info;
@@ -166,7 +164,7 @@ int start_call(struct audio_device *adev, audio_usecase_t usecase_id) 
    goto done;



error_start_voice:

    stop_call(adev, usecase_id);

    voice_stop_usecase(adev, usecase_id);



done:

    ALOGD("%s: exit: status(%d)", __func__, ret);
@@ -331,7 +329,7 @@ int voice_start_call(struct audio_device *adev) 


    ret = voice_extn_start_call(adev);

    if (ret == -ENOSYS) {

        ret = start_call(adev, USECASE_VOICE_CALL);

        ret = voice_start_usecase(adev, USECASE_VOICE_CALL);

    }

    adev->voice.in_call = true;
@@ -345,7 +343,7 @@ int voice_stop_call(struct audio_device *adev) 
    adev->voice.in_call = false;

    ret = voice_extn_stop_call(adev);

    if (ret == -ENOSYS) {

        ret = stop_call(adev, USECASE_VOICE_CALL);

        ret = voice_stop_usecase(adev, USECASE_VOICE_CALL);

    }



    return ret;

hal/voice.h

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct audio_device; 
struct str_parms;

struct stream_in;

struct stream_out;

typedef int audio_usecase_t;



struct call_state {

    int current;
@@ -68,6 +69,9 @@ enum { 
    INCALL_REC_UPLINK_AND_DOWNLINK,

};



int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id);

int voice_stop_usecase(struct audio_device *adev, audio_usecase_t usecase_id);



int voice_start_call(struct audio_device *adev);

int voice_stop_call(struct audio_device *adev);

int voice_set_parameters(struct audio_device *adev, struct str_parms *parms);

hal/voice_extn/voice_extn.c

+4 −6
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ struct pcm_config pcm_config_incall_music = { 
    .avail_min = LOW_LATENCY_OUTPUT_PERIOD_SIZE / 4,

};



extern int start_call(struct audio_device *adev, audio_usecase_t usecase_id);

extern int stop_call(struct audio_device *adev, audio_usecase_t usecase_id);

int voice_extn_is_call_state_active(struct audio_device *adev, bool *is_call_active);



static bool is_valid_call_state(int call_state)
@@ -165,9 +163,9 @@ static int update_calls(struct audio_device *adev) 
            {

            case CALL_INACTIVE:

                ALOGD("%s: INACTIVE -> ACTIVE vsid:%x", __func__, session->vsid);

                ret = start_call(adev, usecase_id);

                ret = voice_start_usecase(adev, usecase_id);

                if(ret < 0) {

                    ALOGE("%s: voice_start_call() failed for usecase: %d\n",

                    ALOGE("%s: voice_start_usecase() failed for usecase: %d\n",

                          __func__, usecase_id);

                } else {

                    session->state.current = session->state.new;
@@ -203,9 +201,9 @@ static int update_calls(struct audio_device *adev) 
            case CALL_HOLD:

            case CALL_LOCAL_HOLD:

                ALOGD("%s: ACTIVE/HOLD/LOCAL_HOLD -> INACTIVE vsid:%x", __func__, session->vsid);

                ret = stop_call(adev, usecase_id);

                ret = voice_stop_usecase(adev, usecase_id);

                if(ret < 0) {

                    ALOGE("%s: voice_end_call() failed for usecase: %d\n",

                    ALOGE("%s: voice_stop_usecase() failed for usecase: %d\n",

                          __func__, usecase_id);

                } else {

                    session->state.current = session->state.new;