Skip to content

Commit cc0d65e

Browse files
committed
include:ril: Remove instance of bool
Replace bool with u8 (unsigned char) in RIL Signed-off-by: Ajay Bhargav <[email protected]>
1 parent fb48445 commit cc0d65e

File tree

6 files changed

+9
-13
lines changed

6 files changed

+9
-13
lines changed

include/ril/ril.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
#define NULL ((void *) 0)
2929
#endif
3030

31-
#ifdef bool
32-
#define bool unsigned char
33-
#endif
34-
3531
#define RIL_MAX_URC_PREFIX_LEN 50 /**< Maximum allowed URC keyword length */
3632
#define PHONE_NUMBER_MAX_LEN 41 /**< Maximum phone number length */
3733

include/ril/ril_audio.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ s32 RIL_AUD_RegisterPlayCB(RIL_AUD_PLAY_IND audCB);
108108
* RIL_AT_SUCCESS, this function succeeds.
109109
* Or, please see the definition of Enum_ATSndError.
110110
*****************************************************************************/
111-
s32 RIL_AUD_PlayFile(char* filePath, bool isRepeated);
111+
s32 RIL_AUD_PlayFile(char* filePath, u8 isRepeated);
112112

113113
/*****************************************************************************
114114
* FUNCTION
@@ -234,7 +234,7 @@ s32 RIL_AUD_SetChannel(Enum_AudChannel audChannel);
234234
* RIL_AT_SUCCESS, this function succeeds.
235235
* Or, please see the definition of Enum_ATSndError.
236236
*****************************************************************************/
237-
s32 RIL_AUD_PlayMem(u32 mem_addr, u32 mem_size, u8 aud_format, bool repeat);
237+
s32 RIL_AUD_PlayMem(u32 mem_addr, u32 mem_size, u8 aud_format, u8 repeat);
238238

239239
/*****************************************************************************
240240
* FUNCTION

include/ril/ril_bluetooth.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ s32 RIL_BT_PairReq(BT_DEV_HDL hdlDevice);
534534
* RIL_AT_INVALID_PARAM, invalid input parameter.
535535
* RIL_AT_UNINITIALIZED, RIL is not ready, need to wait for MSG_ID_RIL_READY
536536
*****************************************************************/
537-
s32 RIL_BT_PairConfirm(bool accept, char* pinCode);
537+
s32 RIL_BT_PairConfirm(u8 accept, char* pinCode);
538538

539539

540540

@@ -650,7 +650,7 @@ s32 RIL_BT_SPP_DirectConn(char* btMacAddr, u8 mode, char* pinCode);
650650
* RIL_AT_INVALID_PARAM, invalid input parameter.
651651
* RIL_AT_UNINITIALIZED, RIL is not ready, need to wait for MSG_ID_RIL_READY
652652
*****************************************************************/
653-
s32 RIL_BT_ConnAccept(bool accept , u8 mode);
653+
s32 RIL_BT_ConnAccept(u8 accept , u8 mode);
654654

655655

656656
/*****************************************************************

include/ril/ril_ftp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ typedef enum
5656

5757
}ENUM_FTP_STATUS;
5858

59-
s32 RIL_FTP_QFTPOPEN(u8* hostName, u32 port,u8* userName,u8* password, bool mode);
59+
s32 RIL_FTP_QFTPOPEN(u8* hostName, u32 port,u8* userName,u8* password, u8 mode);
6060

6161
s32 RIL_FTP_QFTPCLOSE(void);
6262

include/ril/ril_sms.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ typedef struct
114114

115115
typedef struct
116116
{
117-
bool conPres; //FALSE: This is a normal SMS. TRUE: This is a concatenate SMS
117+
u8 conPres; //FALSE: This is a normal SMS. TRUE: This is a concatenate SMS
118118
ST_RIL_SMS_Con con;
119119
} ST_RIL_SMS_SendExt;
120120

@@ -124,7 +124,7 @@ typedef struct
124124
char oa[RIL_SMS_PHONE_NUMBER_MAX_LEN];
125125
char scts[RIL_SMS_TIME_STAMP_STR_MAX_LEN];
126126

127-
bool conPres; //FALSE: This is a normal SMS. TRUE: This is a concatenate SMS
127+
u8 conPres; //FALSE: This is a normal SMS. TRUE: This is a concatenate SMS
128128
ST_RIL_SMS_Con con;
129129

130130
u8 data[RIL_SMS_TEXT_DATA_MAX_LEN];
@@ -136,7 +136,7 @@ typedef struct
136136
u8 alpha; //It's value is same as 'LIB_SMS_DCSAlphaEnum'
137137
char da[RIL_SMS_PHONE_NUMBER_MAX_LEN];
138138

139-
bool conPres; //FALSE: This is a normal SMS. TRUE: This is a concatenate SMS
139+
u8 conPres; //FALSE: This is a normal SMS. TRUE: This is a concatenate SMS
140140
ST_RIL_SMS_Con con;
141141

142142
u8 data[RIL_SMS_TEXT_DATA_MAX_LEN];

include/ril/ril_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ typedef enum {
4646
(((alpha_char >= CHAR_0) && (alpha_char <= CHAR_9) ) ? 1 : 0)
4747

4848
extern s32 ril_strprefixmatch(const char* str, const char *prefix);
49-
extern bool ril_hexstrtoint(u8 *str, u32 *val);
49+
extern u8 ril_hexstrtoint(u8 *str, u32 *val);
5050
extern char* ril_strtoupper(char* str);
5151

5252
/******************************************************************************

0 commit comments

Comments
 (0)