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

Commit bb2923c2 authored by Tom Turney's avatar Tom Turney
Browse files

Revert "Remove position dependent lookup tables in AT command parser" 

This reverts commit b551ee2d.

Revert Reason: This CL causes regressions b/30367872, b/30368041,
b/30368763.

Change-Id: I48da5caac1e9fe32462c236385f768b896fa6542
parent b551ee2d

system/bta/ag/bta_ag_at.c

+2 −6
Original line number Diff line number Diff line
@@ -149,16 +149,12 @@ void bta_ag_process_at(tBTA_AG_AT_CB *p_cb) 
                else

                {



                    (*p_cb->p_cmd_cback)(p_cb->p_user,

                                         p_cb->p_at_tbl[idx].command_id,

                                         arg_type, p_arg, int_arg);

                    (*p_cb->p_cmd_cback)(p_cb->p_user, idx, arg_type, p_arg, int_arg);

                }

            }

            else

            {

                (*p_cb->p_cmd_cback)(p_cb->p_user,

                                     p_cb->p_at_tbl[idx].command_id,

                                     arg_type, p_arg, int_arg);

                (*p_cb->p_cmd_cback)(p_cb->p_user, idx, arg_type, p_arg, int_arg);

            }

        }

        /* else error */

system/bta/ag/bta_ag_at.h

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
typedef struct

{

    const char  *p_cmd;         /* AT command string */

    size_t      command_id;     /* passed to the callback on p_cmd match */

    UINT8       arg_type;       /* allowable argument type syntax */

    UINT8       fmt;            /* whether arg is int or string */

    UINT8       min;            /* minimum value for int arg */
@@ -55,7 +54,7 @@ typedef struct 
} tBTA_AG_AT_CMD;



/* callback function executed when command is parsed */

typedef void (tBTA_AG_AT_CMD_CBACK)(void *p_user, UINT16 command_id, UINT8 arg_type,

typedef void (tBTA_AG_AT_CMD_CBACK)(void *p_user, UINT16 cmd, UINT8 arg_type,

                                    char *p_arg, INT16 int_arg);



/* callback function executed to send "ERROR" result code */

system/bta/ag/bta_ag_cmd.c

+408 −211

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/ag/bta_ag_int.h

+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,16 @@ 
#include "bta_ag_api.h"

#include "bta_ag_at.h"



/* Send RING & CLIP in one AT cmd */

#ifndef BTA_AG_MULTI_RESULT_INCLUDED

#define BTA_AG_MULTI_RESULT_INCLUDED      FALSE

#endif



/* Replace : in VGS and VGM for HSP */

#ifndef BTA_HSP_RESULT_REPLACE_COLON

#define BTA_HSP_RESULT_REPLACE_COLON      TRUE

#endif



/*****************************************************************************

**  Constants

*****************************************************************************/