diff options
author | Andre Eisenbach <andre@broadcom.com> | 2012-09-18 01:35:44 -0700 |
---|---|---|
committer | Matthew Xie <mattx@google.com> | 2012-09-18 10:06:32 -0700 |
commit | cc914cffd521b2e6e1be804c82aea2388b843ebf (patch) | |
tree | a4859572083eb29c931cc5066645f9c0a2929d71 /bta/include | |
parent | 6ed67e2ac54c83d18701d2b4ee1b9d729e99a38c (diff) | |
download | external_bluetooth_bluedroid-cc914cffd521b2e6e1be804c82aea2388b843ebf.zip external_bluetooth_bluedroid-cc914cffd521b2e6e1be804c82aea2388b843ebf.tar.gz external_bluetooth_bluedroid-cc914cffd521b2e6e1be804c82aea2388b843ebf.tar.bz2 |
Header file and whitespace cleanups
Also fixed file permission to remove executable bit
from source files.
Change-Id: I6954c2d16190bc35b1b0d38386543253696b1112
Diffstat (limited to 'bta/include')
28 files changed, 627 insertions, 627 deletions
diff --git a/bta/include/bd.h b/bta/include/bd.h index 0fd0cf8..272bb34 100644 --- a/bta/include/bd.h +++ b/bta/include/bd.h @@ -38,9 +38,9 @@ extern const BD_ADDR bd_addr_null; ** Function bdcpy ** ** Description Copy bd addr b to a. -** ** -** Returns void +** +** Returns void ** *******************************************************************************/ extern void bdcpy(BD_ADDR a, const BD_ADDR b); @@ -50,7 +50,7 @@ extern void bdcpy(BD_ADDR a, const BD_ADDR b); ** Function bdcmp ** ** Description Compare bd addr b to a. -** +** ** ** Returns Zero if b==a, nonzero otherwise (like memcmp). ** @@ -62,7 +62,7 @@ extern int bdcmp(const BD_ADDR a, const BD_ADDR b); ** Function bdcmpany ** ** Description Compare bd addr to "any" bd addr. -** +** ** ** Returns Zero if a equals bd_addr_any. ** @@ -74,7 +74,7 @@ extern int bdcmpany(const BD_ADDR a); ** Function bdsetany ** ** Description Set bd addr to "any" bd addr. -** +** ** ** Returns void ** diff --git a/bta/include/bta_ag_api.h b/bta/include/bta_ag_api.h index 32473ed..19321fe 100644 --- a/bta/include/bta_ag_api.h +++ b/bta/include/bta_ag_api.h @@ -66,7 +66,7 @@ typedef UINT8 tBTA_AG_STATUS; #define BTA_AG_IND_RES 5 /* Update an indicator value */ #define BTA_AG_BVRA_RES 6 /* Update voice recognition state */ #define BTA_AG_CNUM_RES 7 /* Send subscriber number response for AT+CNUM */ -#define BTA_AG_BTRH_RES 8 /* Send CCAP incoming call hold */ +#define BTA_AG_BTRH_RES 8 /* Send CCAP incoming call hold */ #define BTA_AG_CLCC_RES 9 /* Query list of calls */ #define BTA_AG_COPS_RES 10 /* Read network operator */ #define BTA_AG_IN_CALL_RES 11 /* Indicate incoming phone call */ @@ -357,7 +357,7 @@ extern "C" ** ** Function BTA_AgEnable ** -** Description Enable the audio gateway service. When the enable +** Description Enable the audio gateway service. When the enable ** operation is complete the callback function will be ** called with a BTA_AG_ENABLE_EVT. This function must ** be called before other function in the AG API are @@ -373,7 +373,7 @@ BTA_API tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode, tBTA_AG_CBACK *p ** Function BTA_AgDisable ** ** Description Disable the audio gateway service -** +** ** ** Returns void ** @@ -398,7 +398,7 @@ BTA_API void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask, ** Function BTA_AgDeregister ** ** Description Deregister an audio gateway service. -** +** ** ** Returns void ** @@ -413,7 +413,7 @@ BTA_API void BTA_AgDeregister(UINT16 handle); ** When connection is open callback function is called ** with a BTA_AG_OPEN_EVT. Only the data connection is ** opened. The audio connection is not opened. -** +** ** ** Returns void ** @@ -426,7 +426,7 @@ BTA_API void BTA_AgOpen(UINT16 handle, BD_ADDR bd_addr, tBTA_SEC sec_mask, tBTA_ ** ** Description Close the current connection to a headset or a handsfree ** Any current audio connection will also be closed -** +** ** ** Returns void ** @@ -439,7 +439,7 @@ BTA_API void BTA_AgClose(UINT16 handle); ** ** Description Opens an audio connection to the currently connected ** headset or hnadsfree -** +** ** ** Returns void ** @@ -452,7 +452,7 @@ BTA_API void BTA_AgAudioOpen(UINT16 handle); ** ** Description Close the currently active audio connection to a headset ** or hnadsfree. The data connection remains open -** +** ** ** Returns void ** @@ -464,7 +464,7 @@ BTA_API void BTA_AgAudioClose(UINT16 handle); ** Function BTA_AgResult ** ** Description Send an AT result code to a headset or hands-free device. -** This function is only used when the AG parse mode is set +** This function is only used when the AG parse mode is set ** to BTA_AG_PARSE. ** ** @@ -477,9 +477,9 @@ BTA_API void BTA_AgResult(UINT16 handle, tBTA_AG_RES result, tBTA_AG_RES_DATA *p ** ** Function BTA_AgSetCodec ** -** Description Specify the codec type to be used for the subsequent -** audio connection. -** +** Description Specify the codec type to be used for the subsequent +** audio connection. +** ** ** ** Returns void diff --git a/bta/include/bta_ag_ci.h b/bta/include/bta_ag_ci.h index 5fc5a61..b41a3bc 100644 --- a/bta/include/bta_ag_ci.h +++ b/bta/include/bta_ag_ci.h @@ -26,11 +26,11 @@ extern "C" ** ** Function bta_ag_ci_rx_write ** -** Description This function is called to send data to the AG when the AG +** Description This function is called to send data to the AG when the AG ** is configured for AT command pass-through. The function -** copies data to an event buffer and sends it. +** copies data to an event buffer and sends it. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_ag_ci_rx_write(UINT16 handle, char *p_data, UINT16 len); @@ -39,11 +39,11 @@ BTA_API extern void bta_ag_ci_rx_write(UINT16 handle, char *p_data, UINT16 len); ** ** Function bta_ag_ci_slc_ready ** -** Description This function is called to notify AG that SLC is up at +** Description This function is called to notify AG that SLC is up at ** the application. This funcion is only used when the app ** is running in pass-through mode. ** -** Returns void +** Returns void ** ******************************************************************************/ BTA_API extern void bta_ag_ci_slc_ready(UINT16 handle); @@ -56,7 +56,7 @@ BTA_API extern void bta_ag_ci_slc_ready(UINT16 handle); ** Description This function is called to notify AG that a WBS command is ** received ** -** Returns void +** Returns void ** ******************************************************************************/ BTA_API extern void bta_ag_ci_wbs_command (UINT16 handle, char *p_data, UINT16 len); diff --git a/bta/include/bta_ag_co.h b/bta/include/bta_ag_co.h index 81927aa..48a463a 100644 --- a/bta/include/bta_ag_co.h +++ b/bta/include/bta_ag_co.h @@ -27,8 +27,8 @@ ** Description This callout function is executed by AG when it is ** started by calling BTA_AgEnable(). This function can be ** used by the phone to initialize audio paths or for other -** initialization purposes. -** +** initialization purposes. +** ** ** Returns Void. ** @@ -41,7 +41,7 @@ BTA_API extern void bta_ag_co_init(void); ** ** Description This function is called by the AG before the audio connection ** is brought up, after it comes up, and after it goes down. -** +** ** Parameters handle - handle of the AG instance ** state - Audio state ** BTA_AG_CO_AUD_STATE_OFF - Audio has been turned off @@ -62,7 +62,7 @@ BTA_API extern void bta_ag_co_audio_state(UINT16 handle, UINT8 app_id, UINT8 sta ** is opened. The phone can use this function to set ** up data paths or perform any required initialization or ** set up particular to the connected service. -** +** ** ** Returns void ** @@ -75,7 +75,7 @@ BTA_API extern void bta_ag_co_data_open(UINT16 handle, tBTA_SERVICE_ID service); ** ** Description This function is called by AG when a service level ** connection is closed -** +** ** ** Returns void ** @@ -86,10 +86,10 @@ BTA_API extern void bta_ag_co_data_close(UINT16 handle); ** ** Function bta_ag_co_tx_write ** -** Description This function is called by the AG to send data to the +** Description This function is called by the AG to send data to the ** phone when the AG is configured for AT command pass-through. -** The implementation of this function must copy the data to -** the phone’s memory. +** The implementation of this function must copy the data to +** the phone’s memory. ** ** Returns void ** diff --git a/bta/include/bta_api.h b/bta/include/bta_api.h index b8a4f50..39488bf 100644 --- a/bta/include/bta_api.h +++ b/bta/include/bta_api.h @@ -2,7 +2,7 @@ ** ** Name: bta_api.h ** -** Description: This is the public interface file for BTA, Widcomm's +** Description: This is the public interface file for BTA, Widcomm's ** Bluetooth application layer for mobile phones. ** ** Copyright (c) 2003-2010, Broadcom Corp., All Rights Reserved. @@ -11,7 +11,7 @@ *****************************************************************************/ #ifndef BTA_API_H #define BTA_API_H - + #include "data_types.h" #include "bt_target.h" #include "bt_types.h" @@ -37,10 +37,10 @@ typedef UINT8 tBTA_STATUS; /* - * Service ID + * Service ID * - * NOTES: When you add a new Service ID for BTA AND require to change the value of BTA_MAX_SERVICE_ID, - * make sure that the correct security ID of the new service from Security service definitions (btm_api.h) + * NOTES: When you add a new Service ID for BTA AND require to change the value of BTA_MAX_SERVICE_ID, + * make sure that the correct security ID of the new service from Security service definitions (btm_api.h) * should be added to bta_service_id_to_btm_srv_id_lkup_tbl table in bta_dm_act.c. */ @@ -195,8 +195,8 @@ typedef UINT16 tBTA_DM_CONN; #define BTA_DM_LIMITED_INQUIRY BTM_LIMITED_INQUIRY /* Perform limited inquiry. */ #if ((defined BLE_INCLUDED) && (BLE_INCLUDED == TRUE)) -#define BTA_BLE_INQUIRY_NONE BTM_BLE_INQUIRY_NONE -#define BTA_BLE_GENERAL_INQUIRY BTM_BLE_GENERAL_INQUIRY /* Perform LE general inquiry. */ +#define BTA_BLE_INQUIRY_NONE BTM_BLE_INQUIRY_NONE +#define BTA_BLE_GENERAL_INQUIRY BTM_BLE_GENERAL_INQUIRY /* Perform LE general inquiry. */ #define BTA_BLE_LIMITED_INQUIRY BTM_BLE_LIMITED_INQUIRY /* Perform LE limited inquiry. */ #endif typedef UINT8 tBTA_DM_INQ_MODE; @@ -211,7 +211,7 @@ typedef UINT8 tBTA_DM_INQ_FILT; /* Authorize Response */ #define BTA_DM_AUTH_PERM 0 /* Authorized for future connections to the service */ #define BTA_DM_AUTH_TEMP 1 /* Authorized for current connection only */ -#define BTA_DM_NOT_AUTH 2 /* Not authorized for the service */ +#define BTA_DM_NOT_AUTH 2 /* Not authorized for the service */ typedef UINT8 tBTA_AUTH_RESP; @@ -225,7 +225,7 @@ typedef UINT8 tBTA_PREF_ROLES; enum { - BTA_DM_NO_SCATTERNET, /* Device doesn't support scatternet, it might + BTA_DM_NO_SCATTERNET, /* Device doesn't support scatternet, it might support "role switch during connection" for an incoming connection, when it already has another connection in master role */ @@ -239,7 +239,7 @@ enum /* Inquiry filter device class condition */ -typedef struct +typedef struct { DEV_CLASS dev_class; /* device class of interest */ DEV_CLASS dev_class_mask; /* mask to determine the bits of device class of interest */ @@ -282,23 +282,23 @@ typedef struct #if BLE_INCLUDED == TRUE /* ADV data flag bit definition used for BTM_BLE_AD_TYPE_FLAG */ -#define BTA_BLE_LIMIT_DISC_FLAG BTM_BLE_LIMIT_DISC_FLAG -#define BTA_BLE_GEN_DISC_FLAG BTM_BLE_GEN_DISC_FLAG -#define BTA_BLE_BREDR_NOT_SPT BTM_BLE_BREDR_NOT_SPT -#define BTA_BLE_NON_LIMIT_DISC_FLAG BTM_BLE_NON_LIMIT_DISC_FLAG -#define BTA_BLE_ADV_FLAG_MASK BTM_BLE_ADV_FLAG_MASK -#define BTA_BLE_LIMIT_DISC_MASK BTM_BLE_LIMIT_DISC_MASK - -#define BTA_BLE_AD_BIT_DEV_NAME BTM_BLE_AD_BIT_DEV_NAME -#define BTA_BLE_AD_BIT_FLAGS BTM_BLE_AD_BIT_FLAGS -#define BTA_BLE_AD_BIT_MANU BTM_BLE_AD_BIT_MANU -#define BTA_BLE_AD_BIT_TX_PWR BTM_BLE_AD_BIT_TX_PWR -#define BTA_BLE_AD_BIT_ATTR BTM_BLE_AD_BIT_ATTR -#define BTA_BLE_AD_BIT_INT_RANGE BTM_BLE_AD_BIT_INT_RANGE -#define BTA_BLE_AD_BIT_SERVICE BTM_BLE_AD_BIT_SERVICE -#define BTA_BLE_AD_BIT_SERVICE_SOL BTM_BLE_AD_BIT_SERVICE_SOL -#define BTA_BLE_AD_BIT_SERVICE_DATA BTM_BLE_AD_BIT_SERVICE_DATA -#define BTA_BLE_AD_BIT_SIGN_DATA BTM_BLE_AD_BIT_SIGN_DATA +#define BTA_BLE_LIMIT_DISC_FLAG BTM_BLE_LIMIT_DISC_FLAG +#define BTA_BLE_GEN_DISC_FLAG BTM_BLE_GEN_DISC_FLAG +#define BTA_BLE_BREDR_NOT_SPT BTM_BLE_BREDR_NOT_SPT +#define BTA_BLE_NON_LIMIT_DISC_FLAG BTM_BLE_NON_LIMIT_DISC_FLAG +#define BTA_BLE_ADV_FLAG_MASK BTM_BLE_ADV_FLAG_MASK +#define BTA_BLE_LIMIT_DISC_MASK BTM_BLE_LIMIT_DISC_MASK + +#define BTA_BLE_AD_BIT_DEV_NAME BTM_BLE_AD_BIT_DEV_NAME +#define BTA_BLE_AD_BIT_FLAGS BTM_BLE_AD_BIT_FLAGS +#define BTA_BLE_AD_BIT_MANU BTM_BLE_AD_BIT_MANU +#define BTA_BLE_AD_BIT_TX_PWR BTM_BLE_AD_BIT_TX_PWR +#define BTA_BLE_AD_BIT_ATTR BTM_BLE_AD_BIT_ATTR +#define BTA_BLE_AD_BIT_INT_RANGE BTM_BLE_AD_BIT_INT_RANGE +#define BTA_BLE_AD_BIT_SERVICE BTM_BLE_AD_BIT_SERVICE +#define BTA_BLE_AD_BIT_SERVICE_SOL BTM_BLE_AD_BIT_SERVICE_SOL +#define BTA_BLE_AD_BIT_SERVICE_DATA BTM_BLE_AD_BIT_SERVICE_DATA +#define BTA_BLE_AD_BIT_SIGN_DATA BTM_BLE_AD_BIT_SIGN_DATA typedef UINT16 tBTA_BLE_AD_MASK; /* slave preferred connection interval range */ @@ -313,7 +313,7 @@ typedef struct typedef struct { UINT8 num_service; - BOOLEAN list_cmpl; + BOOLEAN list_cmpl; UINT16 *p_uuid; }tBTA_BLE_SERVICE; @@ -328,7 +328,7 @@ typedef struct #define BTA_BLE_NUM_AD_ATTR_MAX BTM_BLE_NUM_AD_ATTR_MAX /* attribute list contained in adv data */ -typedef struct +typedef struct { UINT8 num_attr; tBTA_BLE_ATTR attr_list[BTA_BLE_NUM_AD_ATTR_MAX]; @@ -355,7 +355,7 @@ typedef struct typedef struct { UINT8 conn_mode; - tBTA_BLE_AD_MASK ad_mask; /* mask of the valid adv data field */ + tBTA_BLE_AD_MASK ad_mask; /* mask of the valid adv data field */ UINT8 flag; UINT8 tx_power_level; UINT8 remote_name_len; @@ -443,15 +443,15 @@ typedef struct #define BTA_DM_AUTH_SMP_RSP_TIMEOUT (BTA_DM_AUTH_FAIL_BASE + SMP_RSP_TIMEOUT) /* connection parameter boundary value and dummy value */ -#define BTA_DM_BLE_SCAN_INT_MIN BTM_BLE_SCAN_INT_MIN -#define BTA_DM_BLE_SCAN_INT_MAX BTM_BLE_SCAN_INT_MAX -#define BTA_DM_BLE_SCAN_WIN_MIN BTM_BLE_SCAN_WIN_MIN -#define BTA_DM_BLE_SCAN_WIN_MAX BTM_BLE_SCAN_WIN_MAX -#define BTA_DM_BLE_CONN_INT_MIN BTM_BLE_CONN_INT_MIN -#define BTA_DM_BLE_CONN_INT_MAX BTM_BLE_CONN_INT_MAX -#define BTA_DM_BLE_CONN_LATENCY_MAX BTM_BLE_CONN_LATENCY_MAX -#define BTA_DM_BLE_CONN_SUP_TOUT_MIN BTM_BLE_CONN_SUP_TOUT_MIN -#define BTA_DM_BLE_CONN_SUP_TOUT_MAX BTM_BLE_CONN_SUP_TOUT_MAX +#define BTA_DM_BLE_SCAN_INT_MIN BTM_BLE_SCAN_INT_MIN +#define BTA_DM_BLE_SCAN_INT_MAX BTM_BLE_SCAN_INT_MAX +#define BTA_DM_BLE_SCAN_WIN_MIN BTM_BLE_SCAN_WIN_MIN +#define BTA_DM_BLE_SCAN_WIN_MAX BTM_BLE_SCAN_WIN_MAX +#define BTA_DM_BLE_CONN_INT_MIN BTM_BLE_CONN_INT_MIN +#define BTA_DM_BLE_CONN_INT_MAX BTM_BLE_CONN_INT_MAX +#define BTA_DM_BLE_CONN_LATENCY_MAX BTM_BLE_CONN_LATENCY_MAX +#define BTA_DM_BLE_CONN_SUP_TOUT_MIN BTM_BLE_CONN_SUP_TOUT_MIN +#define BTA_DM_BLE_CONN_SUP_TOUT_MAX BTM_BLE_CONN_SUP_TOUT_MAX #define BTA_DM_BLE_CONN_PARAM_UNDEF BTM_BLE_CONN_PARAM_UNDEF /* use this value when a specific value not to be overwritten */ @@ -489,13 +489,13 @@ typedef struct BT_OCTET16 dhk; }tBTA_BLE_LOCAL_ID_KEYS; -#define BTA_DM_SEC_GRANTED BTA_SUCCESS +#define BTA_DM_SEC_GRANTED BTA_SUCCESS #define BTA_DM_SEC_PAIR_NOT_SPT BTA_DM_AUTH_SMP_PAIR_NOT_SUPPORT #define BTA_DM_SEC_REP_ATTEMPTS BTA_DM_AUTH_SMP_REPEATED_ATTEMPT typedef UINT8 tBTA_DM_BLE_SEC_GRANT; -#define BTA_DM_BLE_ONN_NONE BTM_BLE_CONN_NONE +#define BTA_DM_BLE_ONN_NONE BTM_BLE_CONN_NONE #define BTA_DM_BLE_CONN_AUTO BTM_BLE_CONN_AUTO #define BTA_DM_BLE_CONN_SELECTIVE BTM_BLE_CONN_SELECTIVE typedef UINT8 tBTA_DM_BLE_CONN_TYPE; @@ -567,7 +567,7 @@ typedef struct BD_ADDR bd_addr; /* BD address peer device. */ tBTA_SIG_STRENGTH_MASK mask; /* mask for the values that are valid */ tBTA_DM_RSSI_VALUE rssi_value; - tBTA_DM_LINK_QUALITY_VALUE link_quality_value; + tBTA_DM_LINK_QUALITY_VALUE link_quality_value; } tBTA_DM_SIG_STRENGTH; @@ -612,7 +612,7 @@ typedef tBTM_LE_AUTH_REQ tBTA_LE_AUTH_REQ; /* combination of the abo #if BTM_OOB_INCLUDED == TRUE #define BTA_OOB_UNKNOWN BTM_OOB_UNKNOWN #endif -typedef tBTM_OOB_DATA tBTA_OOB_DATA; +typedef tBTM_OOB_DATA tBTA_OOB_DATA; /* Structure associated with BTA_DM_SP_CFM_REQ_EVT */ typedef struct @@ -639,7 +639,7 @@ enum typedef UINT8 tBTA_SP_KEY_TYPE; /* Structure associated with BTA_DM_SP_KEYPRESS_EVT */ -typedef struct +typedef struct { BD_ADDR bd_addr; /* peer address */ tBTA_SP_KEY_TYPE notif_type; @@ -704,7 +704,7 @@ typedef tBTM_VSC_CMPL_CB tBTA_VENDOR_CMPL_CBACK; #define BTA_DM_DISC_BLE_RES_EVT 3 /* Discovery result for BLE GATT based servoce on a peer device. */ #define BTA_DM_DISC_CMPL_EVT 4 /* Discovery complete. */ #define BTA_DM_DI_DISC_CMPL_EVT 5 /* Discovery complete. */ -#define BTA_DM_SEARCH_CANCEL_CMPL_EVT 6 /* Search cancelled */ +#define BTA_DM_SEARCH_CANCEL_CMPL_EVT 6 /* Search cancelled */ typedef UINT8 tBTA_DM_SEARCH_EVT; @@ -752,7 +752,7 @@ typedef struct // btla-specific ++ UINT8 * p_raw_data; /* Raw data for discovery DB */ UINT32 raw_data_size; /* size of raw data */ - tBT_DEVICE_TYPE device_type; /* device type in case it is BLE device */ + tBT_DEVICE_TYPE device_type; /* device type in case it is BLE device */ UINT32 num_uuids; UINT8 *p_uuid_list; // btla-specific -- @@ -787,16 +787,16 @@ typedef void (tBTA_DM_EXEC_CBACK) (void * p_param); /* Encryption callback*/ typedef void (tBTA_DM_ENCRYPT_CBACK) (BD_ADDR bd_addr, tBTA_STATUS result); - + #if BLE_INCLUDED == TRUE -#define BTA_DM_BLE_SEC_NONE BTM_BLE_SEC_NONE -#define BTA_DM_BLE_SEC_ENCRYPT BTM_BLE_SEC_ENCRYPT -#define BTA_DM_BLE_SEC_NO_MITM BTM_BLE_SEC_ENCRYPT_NO_MITM -#define BTA_DM_BLE_SEC_MITM BTM_BLE_SEC_ENCRYPT_MITM -typedef tBTM_BLE_SEC_ACT tBTA_DM_BLE_SEC_ACT; +#define BTA_DM_BLE_SEC_NONE BTM_BLE_SEC_NONE +#define BTA_DM_BLE_SEC_ENCRYPT BTM_BLE_SEC_ENCRYPT +#define BTA_DM_BLE_SEC_NO_MITM BTM_BLE_SEC_ENCRYPT_NO_MITM +#define BTA_DM_BLE_SEC_MITM BTM_BLE_SEC_ENCRYPT_MITM +typedef tBTM_BLE_SEC_ACT tBTA_DM_BLE_SEC_ACT; #else -typedef UINT8 tBTA_DM_BLE_SEC_ACT; -#endif +typedef UINT8 tBTA_DM_BLE_SEC_ACT; +#endif /* Maximum service name length */ #define BTA_SERVICE_NAME_LEN 35 @@ -877,7 +877,7 @@ typedef UINT8 tBTA_DM_ROUTE_PATH; /* Used to set the DI record */ typedef tSDP_DI_RECORD tBTA_DI_RECORD; /* Used to get the DI record */ -typedef tSDP_DI_GET_RECORD tBTA_DI_GET_RECORD; +typedef tSDP_DI_GET_RECORD tBTA_DI_GET_RECORD; /* SDP discovery database */ typedef tSDP_DISCOVERY_DB tBTA_DISCOVERY_DB; @@ -902,7 +902,7 @@ extern "C" ** typically called at startup or when Bluetooth services ** are required by the phone. This function must be called ** before calling any other API function. -** +** ** ** Returns BTA_SUCCESS if successful. ** BTA_FAIL if internal failure. @@ -917,7 +917,7 @@ BTA_API extern tBTA_STATUS BTA_EnableBluetooth(tBTA_DM_SEC_CBACK *p_cback); ** Description This function disables BTA and the Bluetooth protocol ** stack. It is called when BTA is no longer being used ** by any application in the system. -** +** ** ** Returns void ** @@ -929,9 +929,9 @@ BTA_API extern tBTA_STATUS BTA_DisableBluetooth(void); ** Function BTA_EnableTestMode ** ** Description Enables bluetooth device under test mode -** ** -** Returns tBTA_STATUS +** +** Returns tBTA_STATUS ** *******************************************************************************/ BTA_API extern tBTA_STATUS BTA_EnableTestMode(void); @@ -941,9 +941,9 @@ BTA_API extern tBTA_STATUS BTA_EnableTestMode(void); ** Function BTA_DisableTestMode ** ** Description Disable bluetooth device under test mode -** ** -** Returns None +** +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_DisableTestMode(void); @@ -955,10 +955,10 @@ BTA_API extern void BTA_DisableTestMode(void); ** Description This function tests whether the Bluetooth module is up ** and ready. This is a direct execution function that ** may lock task scheduling on some platforms. -** +** ** ** Returns TRUE if the module is ready. -** FALSE if the module is not ready. +** FALSE if the module is not ready. ** *******************************************************************************/ BTA_API extern BOOLEAN BTA_DmIsDeviceUp(void); @@ -968,7 +968,7 @@ BTA_API extern BOOLEAN BTA_DmIsDeviceUp(void); ** Function BTA_DmSetDeviceName ** ** Description This function sets the Bluetooth name of the local device. -** +** ** ** Returns void ** @@ -979,11 +979,11 @@ BTA_API extern void BTA_DmSetDeviceName(char *p_name); ** ** Function BTA_DmSetVisibility ** -** Description This function sets the Bluetooth connectable,discoverable, -** pairable and conn paired only modesmodes of the local device. +** Description This function sets the Bluetooth connectable,discoverable, +** pairable and conn paired only modesmodes of the local device. ** This controls whether other Bluetooth devices can find and connect to ** the local device. -** +** ** ** Returns void ** @@ -996,9 +996,9 @@ BTA_API extern void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode, tBTA_DM_CONN con ** ** Description This function sets the parameters for page scan and ** inquiry scan. -** ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API extern void BTA_DmSetScanParam (UINT16 page_scan_interval, UINT16 page_scan_window, @@ -1014,7 +1014,7 @@ BTA_API extern void BTA_DmSetScanParam (UINT16 page_scan_interval, UINT16 page_s ** In order to use this API, BTM_BYPASS_AMP_AUTO_AFH must be set ** to be TRUE ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void BTA_DmSetAfhChannels(UINT8 first, UINT8 last); @@ -1026,9 +1026,9 @@ BTA_API extern void BTA_DmSetAfhChannels(UINT8 first, UINT8 last); ** ** Description This function sends the vendor specific command ** to the controller -** ** -** Returns tBTA_STATUS +** +** Returns tBTA_STATUS ** *******************************************************************************/ BTA_API extern tBTA_STATUS BTA_DmVendorSpecificCommand (UINT16 opcode, UINT8 param_len,UINT8 *p_param_buf, tBTA_VENDOR_CMPL_CBACK *p_cback); @@ -1043,7 +1043,7 @@ BTA_API extern tBTA_STATUS BTA_DmVendorSpecificCommand (UINT16 opcode, UINT8 par ** inquiry it gets the remote name of the device. If ** parameter services is nonzero, service discovery will be ** performed on each device for the services specified. -** +** ** ** Returns void ** @@ -1057,7 +1057,7 @@ BTA_API extern void BTA_DmSearch(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK servic ** ** Description This function cancels a search that has been initiated ** by calling BTA_DmSearch(). -** +** ** ** Returns void ** @@ -1070,7 +1070,7 @@ BTA_API extern void BTA_DmSearchCancel(void); ** ** Description This function performs service discovery for the services ** of a particular peer device. -** +** ** ** Returns void ** @@ -1085,12 +1085,12 @@ BTA_API extern void BTA_DmDiscover(BD_ADDR bd_addr, tBTA_SERVICE_MASK services, ** ** Description This function performs service discovery for the services ** of a particular peer device. -** +** ** ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid, +BTA_API extern void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid, tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search); /******************************************************************************* @@ -1103,7 +1103,7 @@ BTA_API extern void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid, ** BTA_FAILURE if cached name is not available ** *******************************************************************************/ -tBTA_STATUS BTA_DmGetCachedRemoteName(BD_ADDR remote_device, UINT8 **pp_cached_name); +tBTA_STATUS BTA_DmGetCachedRemoteName(BD_ADDR remote_device, UINT8 **pp_cached_name); // btla-specific -- /******************************************************************************* @@ -1126,7 +1126,7 @@ BTA_API extern BOOLEAN BTA_DmIsMaster(BD_ADDR bd_addr); ** Description This function initiates a bonding procedure with a peer ** device. The bonding procedure enables authentication ** and optionally encryption on the Bluetooth link. -** +** ** ** Returns void ** @@ -1139,7 +1139,7 @@ BTA_API extern void BTA_DmBond(BD_ADDR bd_addr); ** ** Description This function cancels a bonding procedure with a peer ** device. -** +** ** ** Returns void ** @@ -1154,7 +1154,7 @@ BTA_API extern void BTA_DmBondCancel(BD_ADDR bd_addr); ** during a bonding procedure. The application should call ** this function after the security callback is called with ** a BTA_DM_PIN_REQ_EVT. -** +** ** ** Returns void ** @@ -1185,7 +1185,7 @@ BTA_API extern void BTA_DmLinkPolicy(BD_ADDR bd_addr, tBTA_DM_LP_MASK policy_mas ** Description This function retrieves the OOB data from local controller. ** The result is reported by bta_dm_co_loc_oob(). ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void BTA_DmLocalOob(void); @@ -1198,7 +1198,7 @@ BTA_API extern void BTA_DmLocalOob(void); ** Description This function accepts or rejects the numerical value of the ** Simple Pairing process on BTA_DM_SP_CFM_REQ_EVT ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void BTA_DmConfirm(BD_ADDR bd_addr, BOOLEAN accept); @@ -1210,7 +1210,7 @@ BTA_API extern void BTA_DmConfirm(BD_ADDR bd_addr, BOOLEAN accept); ** Description This function is called to cancel the simple pairing process ** reported by BTA_DM_SP_KEY_NOTIF_EVT ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void BTA_DmPasskeyCancel(BD_ADDR bd_addr); @@ -1241,7 +1241,7 @@ BTA_API extern void BTA_DmAddDevice(BD_ADDR bd_addr, DEV_CLASS dev_class, ** which added bd_name and features as input parameters. ** ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void BTA_DmAddDevWithName (BD_ADDR bd_addr, DEV_CLASS dev_class, @@ -1256,7 +1256,7 @@ BTA_API extern void BTA_DmAddDevWithName (BD_ADDR bd_addr, DEV_CLASS dev_class, ** Description This function removes a device from the security database. ** This is a direct execution function that may lock task ** scheduling on some platforms. -** +** ** ** Returns BTA_SUCCESS if successful. ** BTA_FAIL if operation failed. @@ -1272,7 +1272,7 @@ BTA_API extern tBTA_STATUS BTA_DmRemoveDevice(BD_ADDR bd_addr); ** authorization is requested by BTA. The application calls ** this function after the security callback is called with ** a BTA_DM_AUTHORIZE_EVT. -** +** ** ** Returns void ** @@ -1284,11 +1284,11 @@ BTA_API extern void BTA_DmAuthorizeReply(BD_ADDR bd_addr, tBTA_SERVICE_ID servic ** ** Function BTA_DmSignalStrength ** -** Description This function initiates RSSI and channnel quality +** Description This function initiates RSSI and channnel quality ** measurments. BTA_DM_SIG_STRENGTH_EVT is sent to ** application with the values of RSSI and channel ** quality -** +** ** ** Returns void ** @@ -1299,8 +1299,8 @@ BTA_API extern void BTA_DmSignalStrength(tBTA_SIG_STRENGTH_MASK mask, UINT16 per ** ** Function BTA_DmWriteInqTxPower ** -** Description This command is used to write the inquiry transmit power level -** used to transmit the inquiry (ID) data packets. +** Description This command is used to write the inquiry transmit power level +** used to transmit the inquiry (ID) data packets. ** ** Parameters tx_power - tx inquiry power to use, valid value is -70 ~ 20 @@ -1317,7 +1317,7 @@ BTA_API extern void BTA_DmWriteInqTxPower(INT8 tx_power); ** ** Parameters tBT_UUID - UUID ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_DmEirAddUUID (tBT_UUID *p_uuid); @@ -1330,7 +1330,7 @@ BTA_API extern void BTA_DmEirAddUUID (tBT_UUID *p_uuid); ** ** Parameters tBT_UUID - UUID ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_DmEirRemoveUUID (tBT_UUID *p_uuid); @@ -1345,7 +1345,7 @@ BTA_API extern void BTA_DmEirRemoveUUID (tBT_UUID *p_uuid); ** ** Parameters Pointer to User defined EIR config ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_DmSetEIRConfig (tBTA_DM_EIR_CONF *p_eir_cfg); @@ -1360,7 +1360,7 @@ BTA_API extern void BTA_DmSetEIRConfig (tBTA_DM_EIR_CONF *p_eir_cfg); ** type - finding EIR data type ** p_length - return the length of EIR data ** -** Returns pointer of EIR data +** Returns pointer of EIR data ** *******************************************************************************/ BTA_API extern UINT8 *BTA_CheckEirData( UINT8 *p_eir, UINT8 tag, UINT8 *p_length ); @@ -1374,7 +1374,7 @@ BTA_API extern UINT8 *BTA_CheckEirData( UINT8 *p_eir, UINT8 tag, UINT8 *p_length ** Parameters p_eir - pointer of EIR significant part ** p_services - return the BTA service mask ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GetEirService( UINT8 *p_eir, tBTA_SERVICE_MASK *p_services ); @@ -1401,21 +1401,21 @@ BTA_API extern BOOLEAN BTA_DmUseSsr( BD_ADDR bd_addr ); ** Returns BTA_SUCCESS if record set sucessfully, otherwise error code. ** *******************************************************************************/ -BTA_API extern tBTA_STATUS BTA_DmSetLocalDiRecord( tBTA_DI_RECORD *p_device_info, +BTA_API extern tBTA_STATUS BTA_DmSetLocalDiRecord( tBTA_DI_RECORD *p_device_info, UINT32 *p_handle ); /******************************************************************************* ** ** Function BTA_DmGetLocalDiRecord ** -** Description Get a specified DI record to the local SDP database. If no -** record handle is provided, the primary DI record will be -** returned. +** Description Get a specified DI record to the local SDP database. If no +** record handle is provided, the primary DI record will be +** returned. ** ** Returns BTA_SUCCESS if record set sucessfully, otherwise error code. ** *******************************************************************************/ -BTA_API extern tBTA_STATUS BTA_DmGetLocalDiRecord( tBTA_DI_GET_RECORD *p_device_info, +BTA_API extern tBTA_STATUS BTA_DmGetLocalDiRecord( tBTA_DI_GET_RECORD *p_device_info, UINT32 *p_handle ); /******************************************************************************* @@ -1462,7 +1462,7 @@ BTA_API extern void BTA_SysFeatures (UINT16 sys_features); ** This API was named in lower case because it is only intended ** for the internal customers(like BTIF). ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_dmexecutecallback (tBTA_DM_EXEC_CBACK* p_callback, void * p_param); @@ -1474,11 +1474,11 @@ BTA_API extern void bta_dmexecutecallback (tBTA_DM_EXEC_CBACK* p_callback, void ** ** Description initialize the down sample converter. ** -** src_sps: original samples per second (source audio data) +** src_sps: original samples per second (source audio data) ** (ex. 44100, 48000) ** bits: number of bits per pcm sample (16) ** n_channels: number of channels (i.e. mono(1), stereo(2)...) -** +** ** Returns none ** *******************************************************************************/ @@ -1495,10 +1495,10 @@ BTA_API extern void BTA_DmPcmInitSamples (UINT32 src_sps, UINT32 bits, UINT32 n_ ** in_bytes: Length of the input PCM sample buffer in byte. ** p_dst: pointer to the buffer which is to be used to store ** the converted PCM samples. -** +** ** ** Returns INT32: number of samples converted. -** +** **************************************************************************************/ BTA_API extern INT32 BTA_DmPcmResample (void *p_src, UINT32 in_bytes, void *p_dst); #endif @@ -1524,11 +1524,11 @@ BTA_API extern void BTA_DmBleSecurityGrant(BD_ADDR bd_addr, tBTA_DM_BLE_SEC_GRAN /******************************************************************************* ** ** Function BTA_DmBleSetBgConnType -** -** Description This function is called to set BLE connectable mode for a +** +** Description This function is called to set BLE connectable mode for a ** peripheral device. ** -** Parameters bg_conn_type: it can be auto connection, or selective connection. +** Parameters bg_conn_type: it can be auto connection, or selective connection. ** p_select_cback: callback function when selective connection procedure ** is being used. ** @@ -1545,7 +1545,7 @@ BTA_API extern void BTA_DmBleSetBgConnType(tBTA_DM_BLE_CONN_TYPE bg_conn_type, t ** ** Parameters: bd_addr - BD address of the peer ** accept - passkey entry sucessful or declined. -** passkey - passkey value, must be a 6 digit number, +** passkey - passkey value, must be a 6 digit number, ** can be lead by 0. ** ** Returns void @@ -1568,7 +1568,7 @@ BTA_API extern void BTA_DmBlePasskeyReply(BD_ADDR bd_addr, BOOLEAN accept, UINT3 ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_DmAddBleDevice(BD_ADDR bd_addr, tBLE_ADDR_TYPE addr_type, +BTA_API extern void BTA_DmAddBleDevice(BD_ADDR bd_addr, tBLE_ADDR_TYPE addr_type, tBT_DEVICE_TYPE dev_type); @@ -1576,8 +1576,8 @@ BTA_API extern void BTA_DmAddBleDevice(BD_ADDR bd_addr, tBLE_ADDR_TYPE addr_type ** ** Function BTA_DmAddBleKey ** -** Description Add/modify LE device information. This function will be -** normally called during host startup to restore all required +** Description Add/modify LE device information. This function will be +** normally called during host startup to restore all required ** information stored in the NVRAM. ** ** Parameters: bd_addr - BD address of the peer @@ -1587,14 +1587,14 @@ BTA_API extern void BTA_DmAddBleDevice(BD_ADDR bd_addr, tBLE_ADDR_TYPE addr_type ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_DmAddBleKey (BD_ADDR bd_addr, tBTA_LE_KEY_VALUE *p_le_key, +BTA_API extern void BTA_DmAddBleKey (BD_ADDR bd_addr, tBTA_LE_KEY_VALUE *p_le_key, tBTA_LE_KEY_TYPE key_type); /******************************************************************************* ** ** Function BTA_DmSetBlePrefConnParams ** -** Description This function is called to set the preferred connection +** Description This function is called to set the preferred connection ** parameters when default connection parameter is not desired. ** ** Parameters: bd_addr - BD address of the peripheral @@ -1603,11 +1603,11 @@ BTA_API extern void BTA_DmAddBleKey (BD_ADDR bd_addr, tBTA_LE_KEY_VALUE *p_le_ke ** slave_latency - preferred slave latency ** supervision_tout - preferred supervision timeout ** -** +** ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_DmSetBlePrefConnParams(BD_ADDR bd_addr, +BTA_API extern void BTA_DmSetBlePrefConnParams(BD_ADDR bd_addr, UINT16 min_conn_int, UINT16 max_conn_int, UINT16 slave_latency, UINT16 supervision_tout ); @@ -1615,57 +1615,57 @@ BTA_API extern void BTA_DmSetBlePrefConnParams(BD_ADDR bd_addr, ** ** Function BTA_DmSetBleConnScanParams ** -** Description This function is called to set scan parameters used in +** Description This function is called to set scan parameters used in ** BLE connection request ** ** Parameters: bd_addr - BD address of the peripheral ** scan_interval - scan interval ** scan_window - scan window -** +** ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_DmSetBleConnScanParams(UINT16 scan_interval, +BTA_API extern void BTA_DmSetBleConnScanParams(UINT16 scan_interval, UINT16 scan_window ); /******************************************************************************* ** ** Function BTA_DmSearchExt ** -** Description This function searches for peer Bluetooth devices. It performs -** an inquiry and gets the remote name for devices. Service +** Description This function searches for peer Bluetooth devices. It performs +** an inquiry and gets the remote name for devices. Service ** discovery is done if services is non zero -** +** ** Parameters p_dm_inq: inquiry conditions ** services: if service is not empty, service discovery will be done. -** for all GATT based service condition, put num_uuid, and +** for all GATT based service condition, put num_uuid, and ** p_uuid is the pointer to the list of UUID values. -** p_cback: callback functino when search is completed. -** -** +** p_cback: callback functino when search is completed. +** ** -** Returns void +** +** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_DmSearchExt(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK_EXT *p_services, +BTA_API extern void BTA_DmSearchExt(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK_EXT *p_services, tBTA_DM_SEARCH_CBACK *p_cback); /******************************************************************************* ** ** Function BTA_DmDiscoverExt ** -** Description This function does service discovery for services of a +** Description This function does service discovery for services of a ** peer device. When services.num_uuid is 0, it indicates all ** GATT based services are to be searched; other wise a list of -** UUID of interested services should be provided through +** UUID of interested services should be provided through ** services.p_uuid. -** ** ** -** Returns void +** +** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services, +BTA_API extern void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services, tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search); @@ -1681,13 +1681,13 @@ BTA_API extern void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_ ** Parameters: bd_addr - Address of the peer device ** p_callback - Pointer to callback function to indicat the ** link encryption status -** sec_act - This is the security action to indicate +** sec_act - This is the security action to indicate ** what knid of BLE security level is required for -** the BLE link if the BLE is supported +** the BLE link if the BLE is supported ** Note: This parameter is ignored for the BR/EDR link -** or the BLE is not supported -** -** Returns void +** or the BLE is not supported +** +** Returns void ** ** *******************************************************************************/ diff --git a/bta/include/bta_ar_api.h b/bta/include/bta_ar_api.h index bf66dca..ee15cc2 100644 --- a/bta/include/bta_ar_api.h +++ b/bta/include/bta_ar_api.h @@ -42,7 +42,7 @@ extern void bta_ar_init(void); ** ** Function bta_ar_reg_avdt ** -** Description This function is called to register to AVDTP. +** Description This function is called to register to AVDTP. ** ** Returns void ** @@ -53,7 +53,7 @@ extern void bta_ar_reg_avdt(tAVDT_REG *p_reg, tAVDT_CTRL_CBACK *p_cback, tBTA_SY ** ** Function bta_ar_dereg_avdt ** -** Description This function is called to de-register from AVDTP. +** Description This function is called to de-register from AVDTP. ** ** Returns void ** @@ -105,7 +105,7 @@ extern void bta_ar_dereg_avct(tBTA_SYS_ID sys_id); ** Returns void ** ******************************************************************************/ -extern void bta_ar_reg_avrc(UINT16 service_uuid, char *p_service_name, +extern void bta_ar_reg_avrc(UINT16 service_uuid, char *p_service_name, char *p_provider_name, UINT16 categories, tBTA_SYS_ID sys_id); /****************************************************************************** diff --git a/bta/include/bta_av_api.h b/bta/include/bta_av_api.h index 02bc30c..4d2f0dd 100644 --- a/bta/include/bta_av_api.h +++ b/bta/include/bta_av_api.h @@ -3,7 +3,7 @@ ** Name: bta_av_api.h ** ** Description: This is the public interface file for the advanced -** audio/video streaming (AV) subsystem of BTA, Widcomm's +** audio/video streaming (AV) subsystem of BTA, Widcomm's ** Bluetooth application layer for mobile phones. ** ** Copyright (c) 2004-2011, Broadcom Corp., All Rights Reserved. @@ -183,22 +183,22 @@ typedef UINT8 tBTA_AV_RC; typedef UINT8 tBTA_AV_STATE; /* command codes for BTA_AvVendorCmd */ -#define BTA_AV_CMD_CTRL AVRC_CMD_CTRL -#define BTA_AV_CMD_STATUS AVRC_CMD_STATUS -#define BTA_AV_CMD_SPEC_INQ AVRC_CMD_SPEC_INQ -#define BTA_AV_CMD_NOTIF AVRC_CMD_NOTIF +#define BTA_AV_CMD_CTRL AVRC_CMD_CTRL +#define BTA_AV_CMD_STATUS AVRC_CMD_STATUS +#define BTA_AV_CMD_SPEC_INQ AVRC_CMD_SPEC_INQ +#define BTA_AV_CMD_NOTIF AVRC_CMD_NOTIF #define BTA_AV_CMD_GEN_INQ AVRC_CMD_GEN_INQ typedef UINT8 tBTA_AV_CMD; /* response codes for BTA_AvVendorRsp */ -#define BTA_AV_RSP_NOT_IMPL AVRC_RSP_NOT_IMPL -#define BTA_AV_RSP_ACCEPT AVRC_RSP_ACCEPT -#define BTA_AV_RSP_REJ AVRC_RSP_REJ -#define BTA_AV_RSP_IN_TRANS AVRC_RSP_IN_TRANS +#define BTA_AV_RSP_NOT_IMPL AVRC_RSP_NOT_IMPL +#define BTA_AV_RSP_ACCEPT AVRC_RSP_ACCEPT +#define BTA_AV_RSP_REJ AVRC_RSP_REJ +#define BTA_AV_RSP_IN_TRANS AVRC_RSP_IN_TRANS #define BTA_AV_RSP_IMPL_STBL AVRC_RSP_IMPL_STBL -#define BTA_AV_RSP_CHANGED AVRC_RSP_CHANGED -#define BTA_AV_RSP_INTERIM AVRC_RSP_INTERIM +#define BTA_AV_RSP_CHANGED AVRC_RSP_CHANGED +#define BTA_AV_RSP_INTERIM AVRC_RSP_INTERIM typedef UINT8 tBTA_AV_CODE; @@ -208,7 +208,7 @@ typedef UINT8 tBTA_AV_CODE; #define BTA_AV_ERR_RESOURCE AVDT_ERR_RESOURCE /* Insufficient resources */ #define BTA_AV_ERR_BAD_CP_TYPE A2D_BAD_CP_TYPE /* The requested Content Protection Type is not supported */ #define BTA_AV_ERR_BAD_CP_FORMAT A2D_BAD_CP_FORMAT /* The format of Content Protection Data is not correct */ - + typedef UINT8 tBTA_AV_ERR; @@ -439,10 +439,10 @@ typedef union #define BTA_MAX_VENDOR_DEPENDENT_DATA_LEN (BTA_AVC_PACKET_LEN-BTA_VENDOR_DATA_OFFSET-BTA_VENDOR_HEADER_LEN) #define BTA_GROUP_NAVI_MSG_OP_DATA_LEN 5 -#define BTA_ERROR_INVALID_CMD AVRC_STS_BAD_CMD -#define BTA_ERROR_INVALID_PARAM AVRC_STS_BAD_PARAM -#define BTA_ERROR_BAD_CONTENTS AVRC_STS_NOT_FOUND -#define BTA_ERROR_INTERNAL AVRC_STS_INTERNAL_ERR +#define BTA_ERROR_INVALID_CMD AVRC_STS_BAD_CMD +#define BTA_ERROR_INVALID_PARAM AVRC_STS_BAD_PARAM +#define BTA_ERROR_BAD_CONTENTS AVRC_STS_NOT_FOUND +#define BTA_ERROR_INTERNAL AVRC_STS_INTERNAL_ERR #define BTA_AV_META_SINGLE_PACKET AVRC_PKT_SINGLE @@ -494,7 +494,7 @@ extern "C" ** ** Function BTA_AvEnable ** -** Description Enable the advanced audio/video service. When the enable +** Description Enable the advanced audio/video service. When the enable ** operation is complete the callback function will be ** called with a BTA_AV_ENABLE_EVT. This function must ** be called before other function in the AV API are @@ -511,7 +511,7 @@ BTA_API void BTA_AvEnable(tBTA_SEC sec_mask, tBTA_AV_FEAT features, ** Function BTA_AvDisable ** ** Description Disable the advanced audio/video service. -** +** ** ** Returns void ** @@ -522,7 +522,7 @@ BTA_API void BTA_AvDisable(void); ** ** Function BTA_AvRegister ** -** Description Register the audio or video service to stack. When the +** Description Register the audio or video service to stack. When the ** operation is complete the callback function will be ** called with a BTA_AV_REGISTER_EVT. This function must ** be called before AVDT stream is open. @@ -638,7 +638,7 @@ BTA_API void BTA_AvProtectReq(tBTA_AV_HNDL hndl, UINT8 *p_data, UINT16 len); ** Function BTA_AvProtectRsp ** ** Description Send a content protection response. This function must -** be called if a BTA_AV_PROTECT_REQ_EVT is received. +** be called if a BTA_AV_PROTECT_REQ_EVT is received. ** This function can only be used if AV is enabled with ** feature BTA_AV_FEAT_PROTECT. ** @@ -680,7 +680,7 @@ BTA_API void BTA_AvVendorCmd(UINT8 rc_handle, UINT8 label, tBTA_AV_CODE cmd_code ** Function BTA_AvVendorRsp ** ** Description Send a vendor dependent remote control response. -** This function must be called if a BTA_AV_VENDOR_CMD_EVT +** This function must be called if a BTA_AV_VENDOR_CMD_EVT ** is received. This function can only be used if AV is ** enabled with feature BTA_AV_FEAT_VENDOR. ** diff --git a/bta/include/bta_av_ci.h b/bta/include/bta_av_ci.h index c09e5e9..80cab79 100644 --- a/bta/include/bta_av_ci.h +++ b/bta/include/bta_av_ci.h @@ -31,7 +31,7 @@ extern "C" ** should call bta_av_co_audio_src_data_path() or ** bta_av_co_video_src_data_path(). ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl); @@ -46,7 +46,7 @@ BTA_API extern void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl); ** AVDT_SUCCESS if the codec configuration is ok, ** otherwise error. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_av_ci_setconfig(tBTA_AV_HNDL hndl, UINT8 err_code, diff --git a/bta/include/bta_av_co.h b/bta/include/bta_av_co.h index f2fa83b..4e4c735 100644 --- a/bta/include/bta_av_co.h +++ b/bta/include/bta_av_co.h @@ -66,8 +66,8 @@ typedef struct ** Description This callout function is executed by AV when it is ** started by calling BTA_AvEnable(). This function can be ** used by the phone to initialize audio paths or for other -** initialization purposes. -** +** initialization purposes. +** ** ** Returns Stream codec and content protection capabilities info. ** @@ -82,7 +82,7 @@ BTA_API extern BOOLEAN bta_av_co_audio_init(UINT8 *p_codec_type, UINT8 *p_codec_ ** Description This callout function is executed by AV to report the ** number of stream end points (SEP) were found during the ** AVDT stream discovery process. -** +** ** ** Returns void. ** @@ -97,7 +97,7 @@ BTA_API extern void bta_av_co_audio_disc_res(tBTA_AV_HNDL hndl, UINT8 num_seps, ** Description This callout function is executed by AV to report the ** number of stream end points (SEP) were found during the ** AVDT stream discovery process. -** +** ** ** Returns void. ** @@ -112,7 +112,7 @@ BTA_API extern void bta_av_co_video_disc_res(tBTA_AV_HNDL hndl, UINT8 num_seps, ** Description This callout function is executed by AV to retrieve the ** desired codec and content protection configuration for the ** audio stream. -** +** ** ** Returns Stream codec and content protection configuration info. ** @@ -128,7 +128,7 @@ BTA_API extern UINT8 bta_av_co_audio_getconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC ** Description This callout function is executed by AV to retrieve the ** desired codec and content protection configuration for the ** video stream. -** +** ** ** Returns Stream codec and content protection configuration info. ** @@ -142,10 +142,10 @@ BTA_API extern UINT8 bta_av_co_video_getconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC ** Function bta_av_co_audio_setconfig ** ** Description This callout function is executed by AV to set the -** codec and content protection configuration of the audio stream. -** +** codec and content protection configuration of the audio stream. ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API extern void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type, @@ -157,10 +157,10 @@ BTA_API extern void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC c ** Function bta_av_co_video_setconfig ** ** Description This callout function is executed by AV to set the -** codec and content protection configuration of the video stream. -** +** codec and content protection configuration of the video stream. ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API extern void bta_av_co_video_setconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type, @@ -180,8 +180,8 @@ BTA_API extern void bta_av_co_video_setconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC c ** Returns void ** *******************************************************************************/ -BTA_API extern void bta_av_co_audio_open(tBTA_AV_HNDL hndl, - tBTA_AV_CODEC codec_type, UINT8 *p_codec_info, +BTA_API extern void bta_av_co_audio_open(tBTA_AV_HNDL hndl, + tBTA_AV_CODEC codec_type, UINT8 *p_codec_info, UINT16 mtu); /******************************************************************************* @@ -190,13 +190,13 @@ BTA_API extern void bta_av_co_audio_open(tBTA_AV_HNDL hndl, ** ** Description This function is called by AV when the video stream connection ** is opened. -** +** ** ** Returns void ** *******************************************************************************/ -BTA_API extern void bta_av_co_video_open(tBTA_AV_HNDL hndl, - tBTA_AV_CODEC codec_type, UINT8 *p_codec_info, +BTA_API extern void bta_av_co_video_open(tBTA_AV_HNDL hndl, + tBTA_AV_CODEC codec_type, UINT8 *p_codec_info, UINT16 mtu); /******************************************************************************* @@ -222,7 +222,7 @@ BTA_API extern void bta_av_co_audio_close(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec ** ** Description This function is called by AV when the video stream connection ** is closed. -** +** ** ** Returns void ** @@ -236,7 +236,7 @@ BTA_API extern void bta_av_co_video_close(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec ** ** Description This function is called by AV when the audio streaming data ** transfer is started. -** +** ** ** Returns void ** @@ -250,7 +250,7 @@ BTA_API extern void bta_av_co_audio_start(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec ** ** Description This function is called by AV when the video streaming data ** transfer is started. -** +** ** ** Returns void ** @@ -264,7 +264,7 @@ BTA_API extern void bta_av_co_video_start(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec ** ** Description This function is called by AV when the audio streaming data ** transfer is stopped. -** +** ** ** Returns void ** @@ -277,7 +277,7 @@ BTA_API extern void bta_av_co_audio_stop(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_ ** ** Description This function is called by AV when the video streaming data ** transfer is stopped. -** +** ** ** Returns void ** @@ -303,7 +303,7 @@ BTA_API extern void * bta_av_co_audio_src_data_path(tBTA_AV_CODEC codec_type, ** Function bta_av_co_video_src_data_path ** ** Description This function is called to get the next data buffer from -** the video codec. +** the video codec. ** ** Returns NULL if data is not ready. ** Otherwise, a video data buffer (UINT8*). @@ -316,7 +316,7 @@ BTA_API extern void * bta_av_co_video_src_data_path(tBTA_AV_CODEC codec_type, ** ** Function bta_av_co_audio_drop ** -** Description An Audio packet is dropped. . +** Description An Audio packet is dropped. . ** It's very likely that the connected headset with this handle ** is moved far away. The implementation may want to reduce ** the encoder bit rate setting to reduce the packet size. @@ -356,7 +356,7 @@ BTA_API extern void bta_av_co_video_report_rr (UINT32 packet_lost); ** ** Description This function is called by AV when the audio stream connection ** needs to send the initial delay report to the connected SRC. -** +** ** ** Returns void ** @@ -369,7 +369,7 @@ BTA_API extern void bta_av_co_audio_delay(tBTA_AV_HNDL hndl, UINT16 delay); ** ** Description This function is called by AV when the video stream connection ** needs to send the initial delay report to the connected SRC. -** +** ** ** Returns void ** diff --git a/bta/include/bta_dm_ci.h b/bta/include/bta_dm_ci.h index f662f17..2eab178 100644 --- a/bta/include/bta_dm_ci.h +++ b/bta/include/bta_dm_ci.h @@ -30,7 +30,7 @@ extern "C" ** bta_dm_co_io_req(), if *p_oob_data is set to BTA_OOB_UNKNOWN ** by bta_dm_co_io_req(). ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_dm_ci_io_req(BD_ADDR bd_addr, tBTA_IO_CAP io_cap, @@ -44,7 +44,7 @@ BTA_API extern void bta_dm_ci_io_req(BD_ADDR bd_addr, tBTA_IO_CAP io_cap, ** bta_dm_co_rmt_oob() to provide the OOB data associated ** with the remote device. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_dm_ci_rmt_oob(BOOLEAN accept, BD_ADDR bd_addr, @@ -53,10 +53,10 @@ BTA_API extern void bta_dm_ci_rmt_oob(BOOLEAN accept, BD_ADDR bd_addr, ** ** Function bta_dm_sco_ci_data_ready ** -** Description This function sends an event to indicating that the phone +** Description This function sends an event to indicating that the phone ** has SCO data ready.. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_dm_sco_ci_data_ready(UINT16 event, UINT16 sco_handle); diff --git a/bta/include/bta_dm_co.h b/bta/include/bta_dm_co.h index cadf6bf..9bc5a79 100644 --- a/bta/include/bta_dm_co.h +++ b/bta/include/bta_dm_co.h @@ -32,8 +32,8 @@ typedef struct tBTA_SCO_CODEC_TYPE codec_type; }tBTA_CODEC_INFO; -#define BTA_DM_SCO_ROUTE_PCM BTM_SCO_ROUTE_PCM -#define BTA_DM_SCO_ROUTE_HCI BTM_SCO_ROUTE_HCI +#define BTA_DM_SCO_ROUTE_PCM BTM_SCO_ROUTE_PCM +#define BTA_DM_SCO_ROUTE_HCI BTM_SCO_ROUTE_HCI typedef tBTM_SCO_ROUTE_TYPE tBTA_DM_SCO_ROUTE_TYPE; @@ -52,13 +52,13 @@ typedef tBTM_SCO_ROUTE_TYPE tBTA_DM_SCO_ROUTE_TYPE; ** Parameters bd_addr - The peer device ** *p_io_cap - The local Input/Output capabilities ** *p_oob_data - TRUE, if OOB data is available for the peer device. -** *p_auth_req - TRUE, if MITM protection is required. +** *p_auth_req - TRUE, if MITM protection is required. ** ** Returns void. ** *******************************************************************************/ BTA_API extern void bta_dm_co_io_req(BD_ADDR bd_addr, tBTA_IO_CAP *p_io_cap, - tBTA_OOB_DATA *p_oob_data, tBTA_AUTH_REQ *p_auth_req, + tBTA_OOB_DATA *p_oob_data, tBTA_AUTH_REQ *p_auth_req, BOOLEAN is_orig); /******************************************************************************* @@ -71,7 +71,7 @@ BTA_API extern void bta_dm_co_io_req(BD_ADDR bd_addr, tBTA_IO_CAP *p_io_cap, ** Parameters bd_addr - The peer device ** io_cap - The remote Input/Output capabilities ** oob_data - TRUE, if OOB data is available for the peer device. -** auth_req - TRUE, if MITM protection is required. +** auth_req - TRUE, if MITM protection is required. ** ** Returns void. ** @@ -87,7 +87,7 @@ BTA_API extern void bta_dm_co_io_rsp(BD_ADDR bd_addr, tBTA_IO_CAP io_cap, ** platform wants allow link key upgrade ** ** Parameters bd_addr - The peer device -** *p_upgrade - TRUE, if link key upgrade is desired. +** *p_upgrade - TRUE, if link key upgrade is desired. ** ** Returns void. ** @@ -131,10 +131,10 @@ BTA_API extern void bta_dm_co_rmt_oob(BD_ADDR bd_addr); ** ** Function bta_dm_sco_co_init ** -** Description This function can be used by the phone to initialize audio +** Description This function can be used by the phone to initialize audio ** codec or for other initialization purposes before SCO connection -** is opened. -** +** is opened. +** ** ** Returns Void. ** @@ -148,7 +148,7 @@ BTA_API extern tBTA_DM_SCO_ROUTE_TYPE bta_dm_sco_co_init(UINT32 rx_bw, UINT32 tx ** Function bta_dm_sco_co_open ** ** Description This function is executed when a SCO connection is open. -** +** ** ** Returns void ** @@ -160,7 +160,7 @@ BTA_API extern void bta_dm_sco_co_open(UINT16 handle, UINT8 pkt_size, UINT16 eve ** Function bta_dm_sco_co_close ** ** Description This function is called when a SCO connection is closed -** +** ** ** Returns void ** @@ -171,7 +171,7 @@ BTA_API extern void bta_dm_sco_co_close(void); ** ** Function bta_dm_sco_co_out_data ** -** Description This function is called to send SCO data over HCI. +** Description This function is called to send SCO data over HCI. ** ** Returns void ** @@ -182,7 +182,7 @@ BTA_API extern void bta_dm_sco_co_out_data(BT_HDR **p_buf); ** ** Function bta_dm_sco_co_in_data ** -** Description This function is called to send incoming SCO data to application. +** Description This function is called to send incoming SCO data to application. ** ** Returns void ** @@ -201,19 +201,19 @@ BTA_API extern void bta_dm_sco_co_in_data(BT_HDR *p_buf, tBTM_SCO_DATA_FLAG sta ** Parameters bd_addr - The peer device ** *p_io_cap - The local Input/Output capabilities ** *p_oob_data - TRUE, if OOB data is available for the peer device. -** *p_auth_req - Auth request setting (Bonding and MITM required or not) +** *p_auth_req - Auth request setting (Bonding and MITM required or not) ** *p_max_key_size - max key size local device supported. ** *p_init_key - initiator keys. -** *p_resp_key - responder keys. +** *p_resp_key - responder keys. ** ** Returns void. ** *******************************************************************************/ -BTA_API extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr, tBTA_IO_CAP *p_io_cap, +BTA_API extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr, tBTA_IO_CAP *p_io_cap, tBTA_OOB_DATA *p_oob_data, tBTA_LE_AUTH_REQ *p_auth_req, - UINT8 *p_max_key_size, - tBTA_LE_KEY_TYPE *p_init_key, + UINT8 *p_max_key_size, + tBTA_LE_KEY_TYPE *p_init_key, tBTA_LE_KEY_TYPE *p_resp_key ); @@ -224,12 +224,12 @@ BTA_API extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr, tBTA_IO_CAP *p_io_cap ** Description This callout function is to load the local BLE keys if available ** on the device. ** -** Parameters none +** Parameters none ** ** Returns void. ** *******************************************************************************/ -BTA_API extern void bta_dm_co_ble_load_local_keys (tBTA_DM_BLE_LOCAL_KEY_MASK *p_key_mask, BT_OCTET16 er, +BTA_API extern void bta_dm_co_ble_load_local_keys (tBTA_DM_BLE_LOCAL_KEY_MASK *p_key_mask, BT_OCTET16 er, tBTA_BLE_LOCAL_ID_KEYS *p_id_keys); // btla-specific ++ @@ -243,19 +243,19 @@ BTA_API extern void bta_dm_co_ble_load_local_keys (tBTA_DM_BLE_LOCAL_KEY_MASK *p ** Parameters bd_addr - The peer device ** *p_io_cap - The local Input/Output capabilities ** *p_oob_data - TRUE, if OOB data is available for the peer device. -** *p_auth_req - Auth request setting (Bonding and MITM required or not) +** *p_auth_req - Auth request setting (Bonding and MITM required or not) ** *p_max_key_size - max key size local device supported. ** *p_init_key - initiator keys. -** *p_resp_key - responder keys. +** *p_resp_key - responder keys. ** ** Returns void. ** *******************************************************************************/ -BTA_API extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr, tBTA_IO_CAP *p_io_cap, +BTA_API extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr, tBTA_IO_CAP *p_io_cap, tBTA_OOB_DATA *p_oob_data, tBTA_LE_AUTH_REQ *p_auth_req, - UINT8 *p_max_key_size, - tBTA_LE_KEY_TYPE *p_init_key, + UINT8 *p_max_key_size, + tBTA_LE_KEY_TYPE *p_init_key, tBTA_LE_KEY_TYPE *p_resp_key ); // btla-specific -- diff --git a/bta/include/bta_fs_api.h b/bta/include/bta_fs_api.h index c0cb4f5..b1f11c4 100644 --- a/bta/include/bta_fs_api.h +++ b/bta/include/bta_fs_api.h @@ -24,7 +24,7 @@ typedef struct { UINT16 max_file_len; /* Maximum size file name */ UINT16 max_path_len; /* Maximum path length (includes appended file name) */ - char path_separator; /* 0x2f ('/'), or 0x5c ('\') */ + char path_separator; /* 0x2f ('/'), or 0x5c ('\') */ } tBTA_FS_CFG; extern tBTA_FS_CFG * p_bta_fs_cfg; diff --git a/bta/include/bta_fs_ci.h b/bta/include/bta_fs_ci.h index c60b3ba..dbf5761 100644 --- a/bta/include/bta_fs_ci.h +++ b/bta/include/bta_fs_ci.h @@ -85,7 +85,7 @@ extern "C" ** ** Function bta_fs_ci_write ** -** Description This function sends an event to BTA indicating the phone +** Description This function sends an event to BTA indicating the phone ** has written the number of bytes specified in the call-out ** function, bta_fs_co_write(), and is ready for more data. ** This function is used to control the TX data flow. @@ -98,7 +98,7 @@ extern "C" ** evt - Used Internally by BTA -> MUST be same value passed ** in call-out function. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_fs_ci_write(int fd, tBTA_FS_CO_STATUS status, UINT16 evt); @@ -112,7 +112,7 @@ BTA_API extern void bta_fs_ci_write(int fd, tBTA_FS_CO_STATUS status, UINT16 evt ** bta_fs_co_read() call-out function. It should only be called ** when the requested number of bytes has been read in, or aioer ** the end of the file has been detected. -** +** ** Parameters fd - file descriptor passed to the stack in the ** bta_fs_ci_open call-in function. ** num_bytes_read - number of bytes read into the buffer @@ -123,7 +123,7 @@ BTA_API extern void bta_fs_ci_write(int fd, tBTA_FS_CO_STATUS status, UINT16 evt ** evt - Used Internally by BTA -> MUST be same value passed ** in call-out function. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_fs_ci_read(int fd, UINT16 num_bytes_read, @@ -135,7 +135,7 @@ BTA_API extern void bta_fs_ci_read(int fd, UINT16 num_bytes_read, ** ** Description This function sends an event to BTA indicating the phone has ** finished opening a file for reading or writing. -** +** ** Parameters fd - file descriptor passed to the stack in the ** bta_fs_ci_open call-in function. ** status - BTA_FS_CO_OK if file was opened in mode specified @@ -147,7 +147,7 @@ BTA_API extern void bta_fs_ci_read(int fd, UINT16 num_bytes_read, ** evt - Used Internally by BTA -> MUST be same value passed ** in call-out function. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_fs_ci_open(int fd, tBTA_FS_CO_STATUS status, @@ -166,7 +166,7 @@ BTA_API extern void bta_fs_ci_open(int fd, tBTA_FS_CO_STATUS status, ** evt - Used Internally by BTA -> MUST be same value passed ** in call-out function. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_fs_ci_direntry(tBTA_FS_CO_STATUS status, UINT16 evt); @@ -186,7 +186,7 @@ BTA_API extern void bta_fs_ci_direntry(tBTA_FS_CO_STATUS status, UINT16 evt); ** evt - Used Internally by BTA -> MUST be same value passed ** in call-out function. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_fs_ci_resume (BD_ADDR_PTR p_addr, UINT8 *p_sess_info, @@ -206,7 +206,7 @@ BTA_API extern void bta_fs_ci_resume (BD_ADDR_PTR p_addr, UINT8 *p_sess_info, ** evt - Used Internally by BTA -> MUST be same value passed ** in call-out function. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_fs_ci_action(tBTA_FS_CO_STATUS status, UINT16 evt); @@ -217,7 +217,7 @@ BTA_API extern void bta_fs_ci_action(tBTA_FS_CO_STATUS status, UINT16 evt); ** ** Description This function sends an event to BTA indicating the phone has ** finished opening a file for reading or writing on resume. -** +** ** Parameters fd - file descriptor passed to the stack in the ** bta_fs_ci_open call-in function. ** status - BTA_FS_CO_OK if file was opened in mode specified @@ -230,7 +230,7 @@ BTA_API extern void bta_fs_ci_action(tBTA_FS_CO_STATUS status, UINT16 evt); ** evt - Used Internally by BTA -> MUST be same value passed ** in call-out function. ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_fs_ci_resume_op(int fd, tBTA_FS_CO_STATUS status, const char *p_file, diff --git a/bta/include/bta_fs_co.h b/bta/include/bta_fs_co.h index 6b068df..ffe37e9 100644 --- a/bta/include/bta_fs_co.h +++ b/bta/include/bta_fs_co.h @@ -74,11 +74,11 @@ typedef UINT16 tBTA_FS_CO_STATUS; */ #define BTA_FS_O_RDONLY GOEP_O_RDONLY #define BTA_FS_O_WRONLY GOEP_O_WRONLY -#define BTA_FS_O_RDWR GOEP_O_RDWR +#define BTA_FS_O_RDWR GOEP_O_RDWR -#define BTA_FS_O_CREAT GOEP_O_CREAT -#define BTA_FS_O_EXCL GOEP_O_EXCL -#define BTA_FS_O_TRUNC GOEP_O_TRUNC +#define BTA_FS_O_CREAT GOEP_O_CREAT +#define BTA_FS_O_EXCL GOEP_O_EXCL +#define BTA_FS_O_TRUNC GOEP_O_TRUNC #define BTA_FS_O_MODE_MASK(x) (((UINT16)(x)) & 0x0003) @@ -158,7 +158,7 @@ typedef struct ** Parameters void. ** ** Returns void -** +** ** *******************************************************************************/ BTA_API extern void bta_fs_co_init(void); @@ -168,7 +168,7 @@ BTA_API extern void bta_fs_co_init(void); ** Function bta_fs_co_open ** ** Description This function is executed by BTA when a file is opened. -** The phone uses this function to open +** The phone uses this function to open ** a file for reading or writing. ** ** Parameters p_path - Fully qualified path and file name. @@ -180,7 +180,7 @@ BTA_API extern void bta_fs_co_init(void); ** of the call-out function. ** ** Returns void -** +** ** Note: Upon completion of the request, a file descriptor (int), ** if successful, and an error code (tBTA_FS_CO_STATUS) ** are returned in the call-in function, bta_fs_ci_open(). @@ -203,7 +203,7 @@ BTA_API extern void bta_fs_co_open(const char *p_path, int oflags, UINT32 size, ** of the call-out function. ** ** Returns void -** +** *******************************************************************************/ BTA_API extern void bta_fs_co_session_info(BD_ADDR bd_addr, UINT8 *p_sess_info, UINT8 ssn, tBTA_FS_CO_SESS_ST new_st, char *p_path, UINT8 *p_info, UINT8 app_id); @@ -222,7 +222,7 @@ BTA_API extern void bta_fs_co_session_info(BD_ADDR bd_addr, UINT8 *p_sess_info, ** of the call-out function. ** ** Returns void -** +** *******************************************************************************/ BTA_API extern void bta_fs_co_resume_op(UINT32 offset, UINT16 evt, UINT8 app_id); @@ -242,7 +242,7 @@ BTA_API extern void bta_fs_co_resume_op(UINT32 offset, UINT16 evt, UINT8 app_id) ** of the call-out function. ** ** Returns void -** +** *******************************************************************************/ BTA_API extern void bta_fs_co_suspend(BD_ADDR bd_addr, UINT8 *p_sess_info, UINT8 ssn, UINT32 *p_timeout, UINT32 *p_offset, UINT8 info, UINT8 app_id); @@ -260,7 +260,7 @@ BTA_API extern void bta_fs_co_suspend(BD_ADDR bd_addr, UINT8 *p_sess_info, UINT8 ** of the call-out function. ** ** Returns void -** +** ** Note: Upon completion of the request, the related session information, ** if successful, and an error code (tBTA_FS_CO_STATUS) ** are returned in the call-in function, bta_fs_ci_resume(). @@ -283,7 +283,7 @@ BTA_API extern void bta_fs_co_resume(UINT16 evt, UINT8 app_id); ** of the call-out function. ** ** Returns void -** +** *******************************************************************************/ BTA_API extern void bta_fs_co_sess_ssn(int fd, UINT8 ssn, UINT8 app_id); @@ -291,7 +291,7 @@ BTA_API extern void bta_fs_co_sess_ssn(int fd, UINT8 ssn, UINT8 app_id); ** ** Function bta_fs_co_setdir ** -** Description This function is executed by BTA when the server changes the +** Description This function is executed by BTA when the server changes the ** local path ** ** Parameters p_path - the new path. @@ -300,7 +300,7 @@ BTA_API extern void bta_fs_co_sess_ssn(int fd, UINT8 ssn, UINT8 app_id); ** of the call-out function. ** ** Returns void -** +** *******************************************************************************/ BTA_API extern void bta_fs_co_setdir(const char *p_path, UINT8 app_id); @@ -341,7 +341,7 @@ BTA_API extern tBTA_FS_CO_STATUS bta_fs_co_close(int fd, UINT8 app_id); ** of the call-out function. ** ** Returns void -** +** ** Note: Upon completion of the request, bta_fs_ci_read() is ** called with the buffer of data, along with the number ** of bytes read into the buffer, and a status. The @@ -371,7 +371,7 @@ BTA_API extern void bta_fs_co_read(int fd, UINT8 *p_buf, UINT16 nbytes, UINT16 e ** of the call-out function. ** ** Returns void -** +** ** Note: Upon completion of the request, bta_fs_ci_write() is ** called with the file descriptor and the status. The ** call-in function should only be called when ALL requested @@ -386,7 +386,7 @@ BTA_API extern void bta_fs_co_write(int fd, const UINT8 *p_buf, UINT16 nbytes, U ** Function bta_fs_co_seek ** ** Description This function is called by io to move the file pointer -** of a previously opened file to the specified location for +** of a previously opened file to the specified location for ** the next read or write operation. ** ** Parameters fd - file descriptor of file. @@ -395,7 +395,7 @@ BTA_API extern void bta_fs_co_write(int fd, const UINT8 *p_buf, UINT16 nbytes, U ** or BTA_FS_SEEK_END. ** ** Returns void -** +** *******************************************************************************/ BTA_API extern void bta_fs_co_seek (int fd, INT32 offset, INT16 origin, UINT8 app_id); @@ -502,7 +502,7 @@ BTA_API extern tBTA_FS_CO_STATUS bta_fs_co_unlink(const char *p_path, UINT8 app_ ** of the call-out function. ** ** Returns void -** +** ** Note: Upon completion of the request, the status is passed ** in the bta_fs_ci_direntry() call-in function. ** BTA_FS_CO_OK is returned when p_entry is valid, @@ -532,7 +532,7 @@ BTA_API extern void bta_fs_co_getdirentry(const char *p_path, BOOLEAN first_item ** Returns (tBTA_FS_CO_STATUS) status of the call. ** [BTA_FS_CO_OK if successful] ** [BTA_FS_CO_EIS_DIR if p_src_path is a folder] -** [BTA_FS_CO_EACCES if p_dest_path already exists or could not be created (invalid path); +** [BTA_FS_CO_EACCES if p_dest_path already exists or could not be created (invalid path); ** or p_src_path is a directory and p_dest_path specifies a different path. ] ** [BTA_FS_CO_FAIL otherwise] ** @@ -555,7 +555,7 @@ BTA_API extern void bta_fs_co_copy(const char *p_src_path, const char *p_dest_pa ** ** Returns (tBTA_FS_CO_STATUS) status of the call. ** [BTA_FS_CO_OK if successful] -** [BTA_FS_CO_EACCES if p_dest_path already exists or could not be created (invalid path); +** [BTA_FS_CO_EACCES if p_dest_path already exists or could not be created (invalid path); ** or p_src_path is a directory and p_dest_path specifies a different path. ] ** [BTA_FS_CO_FAIL otherwise] ** @@ -577,7 +577,7 @@ BTA_API extern void bta_fs_co_rename(const char *p_src_path, const char *p_dest_ ** ** Returns (tBTA_FS_CO_STATUS) status of the call. ** [BTA_FS_CO_OK if successful] -** [BTA_FS_CO_EACCES if p_dest_path already exists or could not be created (invalid path); +** [BTA_FS_CO_EACCES if p_dest_path already exists or could not be created (invalid path); ** or p_src_path is a directory and p_dest_path specifies a different path. ] ** [BTA_FS_CO_FAIL otherwise] ** @@ -588,7 +588,7 @@ BTA_API extern void bta_fs_co_set_perms(const char *p_src_path, UINT8 *p_perms, ** ** Function bta_fs_co_sess_fopen ** -** Description This function is called by bta_fs_co_open to keep track of +** Description This function is called by bta_fs_co_open to keep track of ** the opened file (for reliable session suspend/resume.) ** ** Parameters p_path - Fully qualified path and file name. @@ -598,7 +598,7 @@ BTA_API extern void bta_fs_co_set_perms(const char *p_src_path, UINT8 *p_perms, ** of the call-out function. ** ** Returns void -** +** *******************************************************************************/ BTA_API extern void bta_fs_co_sess_fopen(const char *p_path, int oflags, UINT8 app_id); @@ -606,7 +606,7 @@ BTA_API extern void bta_fs_co_sess_fopen(const char *p_path, int oflags, UINT8 a ** ** Function bta_fs_co_sess_fclose ** -** Description This function is called by bta_fs_co_close +** Description This function is called by bta_fs_co_close ** ** Parameters app_id - application ID specified in the enable functions. ** It can be used to identify which profile is the caller @@ -621,7 +621,7 @@ BTA_API extern void bta_fs_co_sess_fclose(UINT8 app_id); ** ** Function bta_fs_co_sess_offset ** -** Description This function is called by bta_fs_co_write to keep track of +** Description This function is called by bta_fs_co_write to keep track of ** the last file offset (Only the receiving side needs to keep ** track of the file offset) ** diff --git a/bta/include/bta_gatt_api.h b/bta/include/bta_gatt_api.h index 02284a5..b498bda 100644 --- a/bta/include/bta_gatt_api.h +++ b/bta/include/bta_gatt_api.h @@ -43,7 +43,7 @@ typedef struct } tBTA_GATT_ID; /* Success code and error codes */ -#define BTA_GATT_OK GATT_SUCCESS +#define BTA_GATT_OK GATT_SUCCESS #define BTA_GATT_INVALID_HANDLE GATT_INVALID_HANDLE /* 0x0001 */ #define BTA_GATT_READ_NOT_PERMIT GATT_READ_NOT_PERMIT /* 0x0002 */ #define BTA_GATT_WRITE_NOT_PERMIT GATT_WRITE_NOT_PERMIT /* 0x0003 */ @@ -117,7 +117,7 @@ typedef struct #define BTA_GATT_CLT_CONFIG_INDICATION GATT_CLT_CONFIG_INDICATION /* 0x0002 */ typedef UINT16 tBTA_GATT_CLT_CHAR_CONFIG; -/* characteristic descriptor: server configuration value +/* characteristic descriptor: server configuration value */ #define BTA_GATT_SVR_CONFIG_NONE GATT_SVR_CONFIG_NONE /* 0x0000 */ #define BTA_GATT_SVR_CONFIG_BROADCAST GATT_SVR_CONFIG_BROADCAST /* 0x0001 */ @@ -145,7 +145,7 @@ typedef struct #define BTA_GATTC_TYPE_WRITE_NO_RSP GATT_WRITE_NO_RSP typedef UINT8 tBTA_GATTC_WRITE_TYPE; -#define BTA_GATT_CONN_UNKNOWN 0 +#define BTA_GATT_CONN_UNKNOWN 0 #define BTA_GATT_CONN_NO_RESOURCES GATT_CONN_NO_RESOURCES /* connection fail for l2cap resource failure */ #define BTA_GATT_CONN_TIMEOUT GATT_CONN_TIMEOUT /* 0x08 connection timeout */ #define BTA_GATT_CONN_TERMINATE_PEER_USER GATT_CONN_TERMINATE_PEER_USER /* 0x13 connection terminate by peer user */ @@ -165,19 +165,19 @@ typedef struct typedef struct { tBTA_GATT_SRVC_ID srvc_id; - tBTA_GATT_ID char_id; + tBTA_GATT_ID char_id; }tBTA_GATTC_CHAR_ID; typedef struct { - tBTA_GATTC_CHAR_ID char_id; + tBTA_GATTC_CHAR_ID char_id; tBT_UUID descr_type; }tBTA_GATTC_CHAR_DESCR_ID; typedef struct { - tBTA_GATT_SRVC_ID srvc_id; - tBTA_GATT_SRVC_ID incl_svc_id; + tBTA_GATT_SRVC_ID srvc_id; + tBTA_GATT_SRVC_ID incl_svc_id; }tBTA_GATTC_INCL_SVC_ID; #define BTA_GATT_TYPE_CHAR 0 @@ -204,11 +204,11 @@ typedef struct }tBTA_GATTC_MULTI; -#define BTA_GATT_AUTH_REQ_NONE GATT_AUTH_REQ_NONE +#define BTA_GATT_AUTH_REQ_NONE GATT_AUTH_REQ_NONE #define BTA_GATT_AUTH_REQ_NO_MITM GATT_AUTH_REQ_NO_MITM /* unauthenticated encryption */ #define BTA_GATT_AUTH_REQ_MITM GATT_AUTH_REQ_MITM /* authenticated encryption */ -#define BTA_GATT_AUTH_REQ_SIGNED_NO_MITM GATT_AUTH_REQ_SIGNED_NO_MITM -#define BTA_GATT_AUTH_REQ_SIGNED_MITM GATT_AUTH_REQ_SIGNED_MITM +#define BTA_GATT_AUTH_REQ_SIGNED_NO_MITM GATT_AUTH_REQ_SIGNED_NO_MITM +#define BTA_GATT_AUTH_REQ_SIGNED_MITM GATT_AUTH_REQ_SIGNED_MITM typedef tGATT_AUTH_REQ tBTA_GATT_AUTH_REQ; @@ -237,7 +237,7 @@ typedef struct typedef struct { tBTA_GATT_STATUS status; - tBTA_GATTC_IF client_if; + tBTA_GATTC_IF client_if; // btla-specific ++ tBT_UUID app_uuid; // btla-specific -- @@ -278,19 +278,19 @@ typedef struct typedef struct { UINT16 conn_id; - tBTA_GATT_STATUS status; + tBTA_GATT_STATUS status; }tBTA_GATTC_EXEC_CMPL; typedef struct { UINT16 conn_id; - tBTA_GATT_STATUS status; + tBTA_GATT_STATUS status; }tBTA_GATTC_SEARCH_CMPL; typedef struct { UINT16 conn_id; - tBTA_GATT_SRVC_ID service_uuid; + tBTA_GATT_SRVC_ID service_uuid; }tBTA_GATTC_SRVC_RES; @@ -298,16 +298,16 @@ typedef struct { tBTA_GATT_STATUS status; UINT16 conn_id; - tBTA_GATTC_IF client_if; - BD_ADDR remote_bda; + tBTA_GATTC_IF client_if; + BD_ADDR remote_bda; }tBTA_GATTC_OPEN; typedef struct { tBTA_GATT_STATUS status; UINT16 conn_id; - tBTA_GATTC_IF client_if; - BD_ADDR remote_bda; + tBTA_GATTC_IF client_if; + BD_ADDR remote_bda; tBTA_GATT_REASON reason; /* disconnect reason code, not useful when connect event is reported */ }tBTA_GATTC_CLOSE; @@ -326,16 +326,16 @@ typedef struct typedef struct { tBTA_GATT_STATUS status; - tBTA_GATTC_IF client_if; - UINT16 conn_id; - BD_ADDR remote_bda; + tBTA_GATTC_IF client_if; + UINT16 conn_id; + BD_ADDR remote_bda; }tBTA_GATTC_OPEN_CLOSE; // btla-specific -- typedef union { - tBTA_GATT_STATUS status; - + tBTA_GATT_STATUS status; + tBTA_GATTC_SEARCH_CMPL search_cmpl; /* discovery complete */ tBTA_GATTC_SRVC_RES srvc_res; /* discovery result */ tBTA_GATTC_REG reg_oper; /* registration data */ @@ -379,7 +379,7 @@ typedef tGATT_IF tBTA_GATTS_IF; /* Attribute permissions */ -#define BTA_GATT_PERM_READ GATT_PERM_READ /* bit 0 - 0x0001 */ +#define BTA_GATT_PERM_READ GATT_PERM_READ /* bit 0 - 0x0001 */ #define BTA_GATT_PERM_READ_ENCRYPTED GATT_PERM_READ_ENCRYPTED /* bit 1 - 0x0002 */ #define BTA_GATT_PERM_READ_ENC_MITM GATT_PERM_READ_ENC_MITM /* bit 2 - 0x0004 */ #define BTA_GATT_PERM_WRITE GATT_PERM_WRITE /* bit 4 - 0x0010 */ @@ -389,9 +389,9 @@ typedef tGATT_IF tBTA_GATTS_IF; #define BTA_GATT_PERM_WRITE_SIGNED_MITM GATT_PERM_WRITE_SIGNED_MITM /* bit 8 - 0x0100 */ typedef UINT16 tBTA_GATT_PERM; -#define BTA_GATTS_INVALID_APP 0xff +#define BTA_GATTS_INVALID_APP 0xff -#define BTA_GATTS_INVALID_IF 0 +#define BTA_GATTS_INVALID_IF 0 /* definition of characteristic properties */ #define BTA_GATT_CHAR_PROP_BIT_BROADCAST GATT_CHAR_PROP_BIT_BROADCAST /* 0x01 */ @@ -414,17 +414,17 @@ typedef struct { tBT_UUID app_uuid128; tBT_UUID svc_uuid; - UINT16 svc_inst; + UINT16 svc_inst; UINT16 s_handle; UINT16 e_handle; BOOLEAN is_primary; /* primary service or secondary */ } tBTA_GATTS_HNDL_RANGE; -#define BTA_GATTS_SRV_CHG_CMD_ADD_CLIENT GATTS_SRV_CHG_CMD_ADD_CLIENT -#define BTA_GATTS_SRV_CHG_CMD_UPDATE_CLIENT GATTS_SRV_CHG_CMD_UPDATE_CLIENT -#define BTA_GATTS_SRV_CHG_CMD_REMOVE_CLIENT GATTS_SRV_CHG_CMD_REMOVE_CLIENT -#define BTA_GATTS_SRV_CHG_CMD_READ_NUM_CLENTS GATTS_SRV_CHG_CMD_READ_NUM_CLENTS -#define BTA_GATTS_SRV_CHG_CMD_READ_CLENT GATTS_SRV_CHG_CMD_READ_CLENT +#define BTA_GATTS_SRV_CHG_CMD_ADD_CLIENT GATTS_SRV_CHG_CMD_ADD_CLIENT +#define BTA_GATTS_SRV_CHG_CMD_UPDATE_CLIENT GATTS_SRV_CHG_CMD_UPDATE_CLIENT +#define BTA_GATTS_SRV_CHG_CMD_REMOVE_CLIENT GATTS_SRV_CHG_CMD_REMOVE_CLIENT +#define BTA_GATTS_SRV_CHG_CMD_READ_NUM_CLENTS GATTS_SRV_CHG_CMD_READ_NUM_CLENTS +#define BTA_GATTS_SRV_CHG_CMD_READ_CLENT GATTS_SRV_CHG_CMD_READ_CLENT typedef tGATTS_SRV_CHG_CMD tBTA_GATTS_SRV_CHG_CMD; typedef tGATTS_SRV_CHG tBTA_GATTS_SRV_CHG; @@ -435,15 +435,15 @@ enum { BTA_GATT_TRANSPORT_LE, BTA_GATT_TRANSPORT_BR_EDR, - BTA_GATT_TRANSPORT_LE_BR_EDR + BTA_GATT_TRANSPORT_LE_BR_EDR }; typedef UINT8 tBTA_GATT_TRANSPORT; /* attribute value */ -typedef tGATT_VALUE tBTA_GATT_VALUE; +typedef tGATT_VALUE tBTA_GATT_VALUE; /* attribute response data */ -typedef tGATTS_RSP tBTA_GATTS_RSP; +typedef tGATTS_RSP tBTA_GATTS_RSP; /* attribute request data from the client */ #define BTA_GATT_PREP_WRITE_CANCEL 0x00 @@ -551,13 +551,13 @@ extern "C" ** ** Function BTA_GATTC_AppRegister ** -** Description This function is called to register application callbacks +** Description This function is called to register application callbacks ** with BTA GATTC module. ** ** Parameters p_app_uuid - applicaiton UUID ** p_client_cb - pointer to the application callback function. ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTC_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTC_CBACK *p_client_cb); @@ -566,12 +566,12 @@ BTA_API extern void BTA_GATTC_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTC_CBACK ** ** Function BTA_GATTC_AppDeregister ** -** Description This function is called to deregister an application +** Description This function is called to deregister an application ** from BTA GATTC module. ** ** Parameters client_if - client interface identifier. ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTC_AppDeregister (tBTA_GATTC_IF client_if); @@ -582,7 +582,7 @@ BTA_API extern void BTA_GATTC_AppDeregister (tBTA_GATTC_IF client_if); ** ** Description Open a direct connection or add a background auto connection ** bd address -** +** ** Parameters client_if: server interface. ** remote_bda: remote device BD address. ** is_direct: direct connection or background auto connection @@ -598,7 +598,7 @@ BTA_API extern void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, ** ** Description Open a direct connection or add a background auto connection ** bd address -** +** ** Parameters client_if: server interface. ** remote_bda: remote device BD address. ** is_direct: direct connection or background auto connection @@ -613,7 +613,7 @@ BTA_API extern void BTA_GATTC_CancelOpen(tBTA_GATTC_IF client_if, BD_ADDR remote ** Function BTA_GATTC_Close ** ** Description Close a connection to a GATT server. -** +** ** Parameters conn_id: connectino ID to be closed. ** ** Returns void @@ -625,16 +625,16 @@ BTA_API extern void BTA_GATTC_Close(UINT16 conn_id); ** ** Function BTA_GATTC_ServiceSearchRequest ** -** Description This function is called to request a GATT service discovery +** Description This function is called to request a GATT service discovery ** on a GATT server. This function report service search result ** by a callback event, and followed by a service search complete ** event. ** -** Parameters conn_id: connection ID. +** Parameters conn_id: connection ID. ** p_srvc_uuid: a UUID of the service application is interested in. ** If Null, discover for all services. ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTC_ServiceSearchRequest(UINT16 conn_id, tBT_UUID *p_srvc_uuid); @@ -646,20 +646,20 @@ BTA_API extern void BTA_GATTC_ServiceSearchRequest(UINT16 conn_id, tBT_UUID *p_s ** Description This function is called to find the first charatceristic of the ** service on the given server. ** -** Parameters conn_id: connection ID which identify the server. +** Parameters conn_id: connection ID which identify the server. ** p_srvc_id: the service ID of which the characteristic is belonged to. ** p_char_uuid_cond: Characteristic UUID, if NULL find the first available -** characteristic. -** p_char_result: output parameter which will store the GATT +** characteristic. +** p_char_result: output parameter which will store the GATT ** characteristic ID. ** p_property: output parameter to carry the characteristic property. ** -** Returns returns status. +** Returns returns status. ** *******************************************************************************/ -BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstChar (UINT16 conn_id, - tBTA_GATT_SRVC_ID *p_srvc_id, - tBT_UUID *p_char_uuid_cond, +BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstChar (UINT16 conn_id, + tBTA_GATT_SRVC_ID *p_srvc_id, + tBT_UUID *p_char_uuid_cond, tBTA_GATTC_CHAR_ID *p_char_result, tBTA_GATT_CHAR_PROP *p_property); @@ -670,21 +670,21 @@ BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstChar (UINT16 con ** Description This function is called to find the next charatceristic of the ** service on the given server. ** -** Parameters conn_id: connection ID which identify the server. -** p_start_char_id: start the characteristic search from the next record +** Parameters conn_id: connection ID which identify the server. +** p_start_char_id: start the characteristic search from the next record ** after the one identified by char_id. ** p_char_uuid_cond: Characteristic UUID, if NULL find the first available -** characteristic. -** p_char_result: output parameter which will store the GATT -** characteristic ID. +** characteristic. +** p_char_result: output parameter which will store the GATT +** characteristic ID. ** p_property: output parameter, characteristic property. ** -** Returns returns status. +** Returns returns status. ** *******************************************************************************/ -BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextChar (UINT16 conn_id, +BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextChar (UINT16 conn_id, tBTA_GATTC_CHAR_ID *p_start_char_id, - tBT_UUID *p_char_uuid_cond, + tBT_UUID *p_char_uuid_cond, tBTA_GATTC_CHAR_ID *p_char_result, tBTA_GATT_CHAR_PROP *p_property); @@ -695,18 +695,18 @@ BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextChar (UINT16 conn_id, ** Description This function is called to find the first charatceristic descriptor of the ** charatceristic on the given server. ** -** Parameters conn_id: connection ID which identify the server. +** Parameters conn_id: connection ID which identify the server. ** p_char_id: the characteristic ID of which the descriptor is belonged to. ** p_descr_uuid_cond: Characteristic Descr UUID, if NULL find the first available -** characteristic. -** p_descr_result: output parameter which will store the GATT +** characteristic. +** p_descr_result: output parameter which will store the GATT ** characteristic descriptor ID. ** -** Returns returns status. +** Returns returns status. ** *******************************************************************************/ -BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstCharDescr (UINT16 conn_id, tBTA_GATTC_CHAR_ID *p_char_id, - tBT_UUID *p_descr_uuid_cond, +BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstCharDescr (UINT16 conn_id, tBTA_GATTC_CHAR_ID *p_char_id, + tBT_UUID *p_descr_uuid_cond, tBTA_GATTC_CHAR_DESCR_ID *p_descr_result); /******************************************************************************* @@ -716,20 +716,20 @@ BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstCharDescr (UINT16 conn_id, tB ** Description This function is called to find the next charatceristic of the ** service on the given server. ** -** Parameters conn_id: connection ID which identify the server. -** p_start_descr_id: start the characteristic search from the next record +** Parameters conn_id: connection ID which identify the server. +** p_start_descr_id: start the characteristic search from the next record ** after the one identified by p_start_descr_id. -** p_descr_uuid_cond: Characteristic descriptor UUID, if NULL find -** the first available characteristic descriptor. -** p_descr_result: output parameter which will store the GATT -** characteristic descriptor ID. +** p_descr_uuid_cond: Characteristic descriptor UUID, if NULL find +** the first available characteristic descriptor. +** p_descr_result: output parameter which will store the GATT +** characteristic descriptor ID. ** -** Returns returns status. +** Returns returns status. ** *******************************************************************************/ -BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextCharDescr (UINT16 conn_id, +BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextCharDescr (UINT16 conn_id, tBTA_GATTC_CHAR_DESCR_ID *p_start_descr_id, - tBT_UUID *p_descr_uuid_cond, + tBT_UUID *p_descr_uuid_cond, tBTA_GATTC_CHAR_DESCR_ID *p_descr_result); @@ -740,19 +740,19 @@ BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextCharDescr (UINT16 conn_id, ** Description This function is called to find the first included service of the ** service on the given server. ** -** Parameters conn_id: connection ID which identify the server. -** p_srvc_id: the service ID of which the included service is belonged to. +** Parameters conn_id: connection ID which identify the server. +** p_srvc_id: the service ID of which the included service is belonged to. ** p_uuid_cond: include service UUID, if NULL find the first available -** included service. -** p_result: output parameter which will store the GATT ID +** included service. +** p_result: output parameter which will store the GATT ID ** of the included service found. ** -** Returns returns status. +** Returns returns status. ** *******************************************************************************/ -BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstIncludedService(UINT16 conn_id, - tBTA_GATT_SRVC_ID *p_srvc_id, - tBT_UUID *p_uuid_cond, +BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstIncludedService(UINT16 conn_id, + tBTA_GATT_SRVC_ID *p_srvc_id, + tBT_UUID *p_uuid_cond, tBTA_GATTC_INCL_SVC_ID *p_result); /******************************************************************************* @@ -762,20 +762,20 @@ BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetFirstIncludedService(UINT16 conn_i ** Description This function is called to find the next included service of the ** service on the given server. ** -** Parameters conn_id: connection ID which identify the server. -** p_start_id: start the search from the next record -** after the one identified by p_start_id. +** Parameters conn_id: connection ID which identify the server. +** p_start_id: start the search from the next record +** after the one identified by p_start_id. ** p_uuid_cond: Included service UUID, if NULL find the first available -** included service. -** p_result: output parameter which will store the GATT ID +** included service. +** p_result: output parameter which will store the GATT ID ** of the included service found. ** -** Returns returns status. +** Returns returns status. ** *******************************************************************************/ -BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextIncludedService(UINT16 conn_id, +BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextIncludedService(UINT16 conn_id, tBTA_GATTC_INCL_SVC_ID *p_start_id, - tBT_UUID *p_uuid_cond, + tBT_UUID *p_uuid_cond, tBTA_GATTC_INCL_SVC_ID *p_result); /******************************************************************************* @@ -788,10 +788,10 @@ BTA_API extern tBTA_GATT_STATUS BTA_GATTC_GetNextIncludedService(UINT16 conn_id ** Parameters conn_id - connectino ID. ** p_char_id - characteritic ID to read. ** -** Returns None +** Returns None ** *******************************************************************************/ -BTA_API extern void BTA_GATTC_ReadCharacteristic (UINT16 conn_id, +BTA_API extern void BTA_GATTC_ReadCharacteristic (UINT16 conn_id, tBTA_GATTC_CHAR_ID *p_char_id, tBTA_GATT_AUTH_REQ auth_req); @@ -804,10 +804,10 @@ BTA_API extern void BTA_GATTC_ReadCharacteristic (UINT16 conn_id, ** Parameters conn_id - connection ID. ** p_char_descr_id - characteritic descriptor ID to read. ** -** Returns None +** Returns None ** *******************************************************************************/ -BTA_API extern void BTA_GATTC_ReadCharDescr (UINT16 conn_id, +BTA_API extern void BTA_GATTC_ReadCharDescr (UINT16 conn_id, tBTA_GATTC_CHAR_DESCR_ID *p_char_descr_id, tBTA_GATT_AUTH_REQ auth_req); @@ -823,11 +823,11 @@ BTA_API extern void BTA_GATTC_ReadCharDescr (UINT16 conn_id, ** len: length of the data to be written. ** p_value - the value to be written. ** -** Returns None +** Returns None ** *******************************************************************************/ -BTA_API extern void BTA_GATTC_WriteCharValue (UINT16 conn_id, - tBTA_GATTC_CHAR_ID *p_char_id, +BTA_API extern void BTA_GATTC_WriteCharValue (UINT16 conn_id, + tBTA_GATTC_CHAR_ID *p_char_id, tBTA_GATTC_WRITE_TYPE write_type, UINT16 len, UINT8 *p_value, @@ -844,11 +844,11 @@ BTA_API extern void BTA_GATTC_WriteCharValue (UINT16 conn_id, ** write_type - type of write. ** p_value - the value to be written. ** -** Returns None +** Returns None ** *******************************************************************************/ -BTA_API extern void BTA_GATTC_WriteCharDescr (UINT16 conn_id, - tBTA_GATTC_CHAR_DESCR_ID *p_char_descr_id, +BTA_API extern void BTA_GATTC_WriteCharDescr (UINT16 conn_id, + tBTA_GATTC_CHAR_DESCR_ID *p_char_descr_id, tBTA_GATTC_WRITE_TYPE write_type, tBTA_GATT_UNFMT *p_data, tBTA_GATT_AUTH_REQ auth_req); @@ -862,7 +862,7 @@ BTA_API extern void BTA_GATTC_WriteCharDescr (UINT16 conn_id, ** Parameters conn_id - connection ID. ** p_char_id - characteristic ID to confrim. ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTC_SendIndConfirm (UINT16 conn_id, tBTA_GATTC_CHAR_ID *p_char_id); @@ -875,13 +875,13 @@ BTA_API extern void BTA_GATTC_SendIndConfirm (UINT16 conn_id, tBTA_GATTC_CHAR_ID ** ** Parameters client_if - client interface. ** remote_bda - target GATT server. -** p_char_id - pointer to GATT characteristic ID. +** p_char_id - pointer to GATT characteristic ID. ** -** Returns OK if registration succeed, otherwise failed. +** Returns OK if registration succeed, otherwise failed. ** *******************************************************************************/ -BTA_API extern tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications (tBTA_GATTC_IF client_if, - BD_ADDR remote_bda, +BTA_API extern tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications (tBTA_GATTC_IF client_if, + BD_ADDR remote_bda, tBTA_GATTC_CHAR_ID *p_char_id); @@ -895,11 +895,11 @@ BTA_API extern tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications (tBTA_GATTC_I ** remote_bda - target GATT server. ** p_char_id - pointer to a GATT characteristic ID. ** -** Returns OK if deregistration succeed, otherwise failed. +** Returns OK if deregistration succeed, otherwise failed. ** *******************************************************************************/ -BTA_API extern tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF client_if, - BD_ADDR remote_bda, +BTA_API extern tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF client_if, + BD_ADDR remote_bda, tBTA_GATTC_CHAR_ID *p_char_id); /******************************************************************************* @@ -914,11 +914,11 @@ BTA_API extern tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC ** len: length of the data to be written. ** p_value - the value to be written. ** -** Returns None +** Returns None ** *******************************************************************************/ -BTA_API extern void BTA_GATTC_PrepareWrite (UINT16 conn_id, - tBTA_GATTC_CHAR_ID *p_char_id, +BTA_API extern void BTA_GATTC_PrepareWrite (UINT16 conn_id, + tBTA_GATTC_CHAR_ID *p_char_id, UINT16 offset, UINT16 len, UINT8 *p_value, @@ -933,7 +933,7 @@ BTA_API extern void BTA_GATTC_PrepareWrite (UINT16 conn_id, ** Parameters conn_id - connection ID. ** is_execute - execute or cancel. ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTC_ExecuteWrite (UINT16 conn_id, BOOLEAN is_execute); @@ -948,7 +948,7 @@ BTA_API extern void BTA_GATTC_ExecuteWrite (UINT16 conn_id, BOOLEAN is_execute) ** Parameters conn_id - connectino ID. ** p_read_multi - read multiple parameters. ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_read_multi, @@ -964,13 +964,13 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** ** Function BTA_GATTS_AppRegister ** -** Description This function is called to register application callbacks +** Description This function is called to register application callbacks ** with BTA GATTS module. ** ** Parameters p_app_uuid - applicaiton UUID ** p_cback - pointer to the application callback function. ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTS_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTS_CBACK *p_cback); @@ -981,7 +981,7 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** Function BTA_GATTS_AppDeregister ** ** Description De-register with BTA GATT Server. -** +** ** Parameters server_if: server interface ** ** Returns void @@ -994,11 +994,11 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** Function BTA_GATTS_CreateService ** ** Description Create a service. When service creation is done, a callback -** event BTA_GATTS_CREATE_SRVC_EVT is called to report status +** event BTA_GATTS_CREATE_SRVC_EVT is called to report status ** and service ID to the profile. The service ID obtained in ** the callback function needs to be used when adding included ** service and characteristics/descriptors into the service. -** +** ** Parameters server_if: server interface. ** p_service_uuid: service UUID. ** inst: instance ID number of this service. @@ -1008,7 +1008,7 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** Returns void ** *******************************************************************************/ - BTA_API extern void BTA_GATTS_CreateService(tBTA_GATTS_IF server_if, tBT_UUID *p_service_uuid, + BTA_API extern void BTA_GATTS_CreateService(tBTA_GATTS_IF server_if, tBT_UUID *p_service_uuid, UINT8 inst, UINT16 num_handle, BOOLEAN is_primary); /******************************************************************************* @@ -1018,8 +1018,8 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** Description This function is called to add an included service. After included ** service is included, a callback event BTA_GATTS_ADD_INCL_SRVC_EVT ** is reported the included service ID. -** -** Parameters service_id: service ID to which this included service is to +** +** Parameters service_id: service ID to which this included service is to ** be added. ** included_service_id: the service ID to be included. ** @@ -1033,14 +1033,14 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** Function BTA_GATTS_AddCharacteristic ** ** Description This function is called to add a characteristic into a service. -** -** Parameters service_id: service ID to which this included service is to +** +** Parameters service_id: service ID to which this included service is to ** be added. ** p_char_uuid : Characteristic UUID. ** perm : Characteristic value declaration attribute permission. ** property : Characteristic Properties ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTS_AddCharacteristic (UINT16 service_id, tBT_UUID *p_char_uuid, @@ -1050,20 +1050,20 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** ** Function BTA_GATTS_AddCharDescriptor ** -** Description This function is called to add characteristic descriptor. When +** Description This function is called to add characteristic descriptor. When ** it's done, a callback event BTA_GATTS_ADD_DESCR_EVT is called ** to report the status and an ID number for this descriptor. ** -** Parameters service_id: service ID to which this charatceristic descriptor is to +** Parameters service_id: service ID to which this charatceristic descriptor is to ** be added. ** perm: descriptor access permission. -** p_descr_uuid: descriptor UUID. +** p_descr_uuid: descriptor UUID. ** p_descr_params: descriptor value if it's read only descriptor. ** -** Returns returns status. +** Returns returns status. ** *******************************************************************************/ - BTA_API extern void BTA_GATTS_AddCharDescriptor (UINT16 service_id, + BTA_API extern void BTA_GATTS_AddCharDescriptor (UINT16 service_id, tBTA_GATT_PERM perm, tBT_UUID * p_descr_uuid); @@ -1071,12 +1071,12 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** ** Function BTA_GATTS_DeleteService ** -** Description This function is called to delete a service. When this is done, +** Description This function is called to delete a service. When this is done, ** a callback event BTA_GATTS_DELETE_EVT is report with the status. ** -** Parameters service_id: service_id to be deleted. +** Parameters service_id: service_id to be deleted. ** -** Returns returns none. +** Returns returns none. ** *******************************************************************************/ BTA_API extern void BTA_GATTS_DeleteService(UINT16 service_id); @@ -1090,7 +1090,7 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** Parameters service_id: the service ID to be started. ** sup_transport: supported trasnport. ** -** Returns None. +** Returns None. ** *******************************************************************************/ BTA_API extern void BTA_GATTS_StartService(UINT16 service_id, tBTA_GATT_TRANSPORT sup_transport); @@ -1103,7 +1103,7 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** ** Parameters service_id - service to be topped. ** -** Returns None +** Returns None ** *******************************************************************************/ BTA_API extern void BTA_GATTS_StopService(UINT16 service_id); @@ -1120,12 +1120,12 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** p_data: data to indicate. ** need_confirm - if this indication expects a confirmation or not. ** -** Returns None +** Returns None ** *******************************************************************************/ - BTA_API extern void BTA_GATTS_HandleValueIndication (UINT16 conn_id, UINT16 attr_id, - UINT16 data_len, - UINT8 *p_data, + BTA_API extern void BTA_GATTS_HandleValueIndication (UINT16 conn_id, UINT16 attr_id, + UINT16 data_len, + UINT8 *p_data, BOOLEAN need_confirm); /******************************************************************************* @@ -1139,10 +1139,10 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** status - response status ** p_msg - response data. ** -** Returns None +** Returns None ** *******************************************************************************/ - BTA_API extern void BTA_GATTS_SendRsp (UINT16 conn_id, UINT32 trans_id, + BTA_API extern void BTA_GATTS_SendRsp (UINT16 conn_id, UINT32 trans_id, tBTA_GATT_STATUS status, tBTA_GATTS_RSP *p_msg); @@ -1154,7 +1154,7 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** ** Description Open a direct open connection or add a background auto connection ** bd address -** +** ** Parameters server_if: server interface. ** remote_bda: remote device BD address. ** is_direct: direct connection or background auto connection @@ -1171,7 +1171,7 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** ** Description Cancel a direct open connection or remove a background auto connection ** bd address -** +** ** Parameters server_if: server interface. ** remote_bda: remote device BD address. ** is_direct: direct connection or background auto connection @@ -1187,7 +1187,7 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r ** Function BTA_GATTS_Close ** ** Description Close a connection a remote device. -** +** ** Parameters conn_id: connectino ID to be closed. ** ** Returns void @@ -1197,7 +1197,7 @@ BTA_API extern void BTA_GATTC_ReadMultiple(UINT16 conn_id, tBTA_GATTC_MULTI *p_r #ifdef __cplusplus - + } #endif diff --git a/bta/include/bta_gattc_ci.h b/bta/include/bta_gattc_ci.h index 65941fc..cb97d19 100644 --- a/bta/include/bta_gattc_ci.h +++ b/bta/include/bta_gattc_ci.h @@ -56,10 +56,10 @@ extern "C" ** status - BTA_GATT_OK if full buffer of data, ** BTA_GATT_FAIL if an error has occurred. ** -** Returns void +** Returns void ** *******************************************************************************/ -BTA_API extern void bta_gattc_ci_cache_open(BD_ADDR server_bda, UINT16 evt, +BTA_API extern void bta_gattc_ci_cache_open(BD_ADDR server_bda, UINT16 evt, tBTA_GATT_STATUS status, UINT16 conn_id); /******************************************************************************* @@ -68,18 +68,18 @@ BTA_API extern void bta_gattc_ci_cache_open(BD_ADDR server_bda, UINT16 evt, ** ** Description This function sends an event to BTA indicating the phone has ** load the servere cache and ready to send it to the stack. -** +** ** Parameters server_bda - server BDA of this cache. ** num_bytes_read - number of bytes read into the buffer ** specified in the read callout-function. ** status - BTA_GATT_OK if full buffer of data, ** BTA_GATT_FAIL if an error has occurred. ** -** Returns void +** Returns void ** *******************************************************************************/ -BTA_API extern void bta_gattc_ci_cache_load(BD_ADDR server_bda, UINT16 evt, - UINT16 num_attr, tBTA_GATTC_NV_ATTR *p_atrr, +BTA_API extern void bta_gattc_ci_cache_load(BD_ADDR server_bda, UINT16 evt, + UINT16 num_attr, tBTA_GATTC_NV_ATTR *p_atrr, tBTA_GATT_STATUS status, UINT16 conn_id); /******************************************************************************* @@ -88,15 +88,15 @@ BTA_API extern void bta_gattc_ci_cache_load(BD_ADDR server_bda, UINT16 evt, ** ** Description This function sends an event to BTA indicating the phone has ** save the server cache. -** +** ** Parameters server_bda - server BDA of this cache. ** status - BTA_GATT_OK if full buffer of data, ** BTA_GATT_FAIL if an error has occurred. ** -** Returns void +** Returns void ** *******************************************************************************/ -BTA_API extern void bta_gattc_ci_cache_save(BD_ADDR server_bda, UINT16 evt, +BTA_API extern void bta_gattc_ci_cache_save(BD_ADDR server_bda, UINT16 evt, tBTA_GATT_STATUS status, UINT16 conn_id); diff --git a/bta/include/bta_gattc_co.h b/bta/include/bta_gattc_co.h index 0aedf9f..a56af42 100644 --- a/bta/include/bta_gattc_co.h +++ b/bta/include/bta_gattc_co.h @@ -29,7 +29,7 @@ ** Returns void. ** *******************************************************************************/ -BTA_API extern void bta_gattc_co_cache_open(BD_ADDR server_bda, UINT16 evt, +BTA_API extern void bta_gattc_co_cache_open(BD_ADDR server_bda, UINT16 evt, UINT16 conn_id, BOOLEAN to_save); /******************************************************************************* @@ -37,7 +37,7 @@ BTA_API extern void bta_gattc_co_cache_open(BD_ADDR server_bda, UINT16 evt, ** Function bta_gattc_co_cache_close ** ** Description This callout function is executed by GATTC when a GATT server -** cache is written completely. +** cache is written completely. ** ** Parameter server_bda: server bd address of this cache belongs to ** conn_id: connection ID of this cache operation attach to. @@ -53,18 +53,18 @@ BTA_API extern void bta_gattc_co_cache_close(BD_ADDR server_bda, UINT16 conn_id) ** ** Description This callout function is executed by GATT when a server cache ** is available to save. -** +** ** Parameter server_bda: server bd address of this cache belongs to ** evt: call in event to be passed in when cache save is done. ** num_attr: number of attribute to be save. ** p_attr: pointer to the list of attributes to save. ** attr_index: starting attribute index of the save operation. ** conn_id: connection ID of this cache operation attach to. -** Returns +** Returns ** *******************************************************************************/ -BTA_API extern void bta_gattc_co_cache_save(BD_ADDR server_bda, UINT16 evt, - UINT16 num_attr, tBTA_GATTC_NV_ATTR *p_attr, +BTA_API extern void bta_gattc_co_cache_save(BD_ADDR server_bda, UINT16 evt, + UINT16 num_attr, tBTA_GATTC_NV_ATTR *p_attr, UINT16 attr_index, UINT16 conn_id); /******************************************************************************* @@ -73,16 +73,16 @@ BTA_API extern void bta_gattc_co_cache_save(BD_ADDR server_bda, UINT16 evt, ** ** Description This callout function is executed by GATT when server cache ** is required to load. -** +** ** Parameter server_bda: server bd address of this cache belongs to ** evt: call in event to be passed in when cache save is done. ** num_attr: number of attribute to be save. ** attr_index: starting attribute index of the save operation. ** conn_id: connection ID of this cache operation attach to. -** Returns +** Returns ** *******************************************************************************/ -BTA_API extern void bta_gattc_co_cache_load(BD_ADDR server_bda, UINT16 evt, +BTA_API extern void bta_gattc_co_cache_load(BD_ADDR server_bda, UINT16 evt, UINT16 start_index, UINT16 conn_id); #endif /* BTA_GATT_CO_H */ diff --git a/bta/include/bta_gatts_co.h b/bta/include/bta_gatts_co.h index cb1ff76..084cc0e 100644 --- a/bta/include/bta_gatts_co.h +++ b/bta/include/bta_gatts_co.h @@ -40,14 +40,14 @@ BTA_API extern void bta_gatts_co_update_handle_range(BOOLEAN is_add, tBTA_GATTS_ ** Parameter cmd - request command ** p_req - request paramters ** p_rsp - response data for the request -** +** ** Returns TRUE - if the request is processed successfully and ** the response is returned in p_rsp. ** FASLE - if the request can not be processed ** *******************************************************************************/ -BTA_API extern BOOLEAN bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd, - tBTA_GATTS_SRV_CHG_REQ *p_req, +BTA_API extern BOOLEAN bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd, + tBTA_GATTS_SRV_CHG_REQ *p_req, tBTA_GATTS_SRV_CHG_RSP *p_rsp); /******************************************************************************* @@ -55,14 +55,14 @@ BTA_API extern BOOLEAN bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd, ** Function bta_gatts_co_load_handle_range ** ** Description This callout function is executed by GATTS when a GATT server -** handle range is requested to be loaded from NV. +** handle range is requested to be loaded from NV. ** -** Parameter +** Parameter ** ** Returns void. ** *******************************************************************************/ -BTA_API extern BOOLEAN bta_gatts_co_load_handle_range(UINT8 index, +BTA_API extern BOOLEAN bta_gatts_co_load_handle_range(UINT8 index, tBTA_GATTS_HNDL_RANGE *p_handle); diff --git a/bta/include/bta_hh_api.h b/bta/include/bta_hh_api.h index dd9a528..869c22b 100755..100644 --- a/bta/include/bta_hh_api.h +++ b/bta/include/bta_hh_api.h @@ -21,11 +21,11 @@ #define BTA_HH_DEBUG FALSE #endif -#ifndef BTA_HH_SSR_MAX_LATENCY_DEF +#ifndef BTA_HH_SSR_MAX_LATENCY_DEF #define BTA_HH_SSR_MAX_LATENCY_DEF 1600 #endif -#ifndef BTA_HH_SSR_MIN_TOUT_DEF +#ifndef BTA_HH_SSR_MIN_TOUT_DEF #define BTA_HH_SSR_MIN_TOUT_DEF 2 #endif @@ -52,7 +52,7 @@ typedef UINT16 tBTA_HH_EVT; /* defined the minimum offset */ #define BTA_HH_MIN_OFFSET L2CAP_MIN_OFFSET+1 -#define BTA_HH_MAX_KNOWN HID_HOST_MAX_DEVICES +#define BTA_HH_MAX_KNOWN HID_HOST_MAX_DEVICES /* invalid device handle */ #define BTA_HH_INVALID_HANDLE 0xff @@ -71,13 +71,13 @@ typedef UINT8 tBTA_HH_BOOT_RPT_ID; /* type of devices, bit mask */ #define BTA_HH_DEVT_UNKNOWN 0x00 -#define BTA_HH_DEVT_JOS 0x01 /* joy stick */ +#define BTA_HH_DEVT_JOS 0x01 /* joy stick */ #define BTA_HH_DEVT_GPD 0x02 /* game pad */ #define BTA_HH_DEVT_RMC 0x03 /* remote control */ #define BTA_HH_DEVT_SED 0x04 /* sensing device */ #define BTA_HH_DEVT_DGT 0x05 /* Digitizer tablet */ #define BTA_HH_DEVT_CDR 0x06 /* card reader */ -#define BTA_HH_DEVT_KBD 0x10 /* keyboard */ +#define BTA_HH_DEVT_KBD 0x10 /* keyboard */ #define BTA_HH_DEVT_MIC 0x20 /* pointing device */ #define BTA_HH_DEVT_COM 0x30 /* Combo keyboard/pointing */ #define BTA_HH_DEVT_OTHER 0x80 @@ -88,14 +88,14 @@ enum BTA_HH_OK, BTA_HH_HS_HID_NOT_READY, /* handshake error : device not ready */ BTA_HH_HS_INVALID_RPT_ID, /* handshake error : invalid report ID */ - BTA_HH_HS_TRANS_NOT_SPT, /* handshake error : transaction not spt */ - BTA_HH_HS_INVALID_PARAM, /* handshake error : invalid paremter */ + BTA_HH_HS_TRANS_NOT_SPT, /* handshake error : transaction not spt */ + BTA_HH_HS_INVALID_PARAM, /* handshake error : invalid paremter */ BTA_HH_HS_ERROR, /* handshake error : unspecified HS error */ BTA_HH_ERR, /* general BTA HH error */ BTA_HH_ERR_SDP, /* SDP error */ - BTA_HH_ERR_PROTO, /* SET_Protocol error, + BTA_HH_ERR_PROTO, /* SET_Protocol error, only used in BTA_HH_OPEN_EVT callback */ - BTA_HH_ERR_DB_FULL, /* device database full error, used in + BTA_HH_ERR_DB_FULL, /* device database full error, used in BTA_HH_OPEN_EVT/BTA_HH_ADD_DEV_EVT */ BTA_HH_ERR_TOD_UNSPT, /* type of device not supported */ BTA_HH_ERR_NO_RES, /* out of system resources */ @@ -105,14 +105,14 @@ enum typedef UINT8 tBTA_HH_STATUS; -#define BTA_HH_VIRTUAL_CABLE HID_VIRTUAL_CABLE -#define BTA_HH_NORMALLY_CONNECTABLE HID_NORMALLY_CONNECTABLE -#define BTA_HH_RECONN_INIT HID_RECONN_INIT -#define BTA_HH_SDP_DISABLE HID_SDP_DISABLE -#define BTA_HH_BATTERY_POWER HID_BATTERY_POWER -#define BTA_HH_REMOTE_WAKE HID_REMOTE_WAKE -#define BTA_HH_SUP_TOUT_AVLBL HID_SUP_TOUT_AVLBL -#define BTA_HH_SEC_REQUIRED HID_SEC_REQUIRED +#define BTA_HH_VIRTUAL_CABLE HID_VIRTUAL_CABLE +#define BTA_HH_NORMALLY_CONNECTABLE HID_NORMALLY_CONNECTABLE +#define BTA_HH_RECONN_INIT HID_RECONN_INIT +#define BTA_HH_SDP_DISABLE HID_SDP_DISABLE +#define BTA_HH_BATTERY_POWER HID_BATTERY_POWER +#define BTA_HH_REMOTE_WAKE HID_REMOTE_WAKE +#define BTA_HH_SUP_TOUT_AVLBL HID_SUP_TOUT_AVLBL +#define BTA_HH_SEC_REQUIRED HID_SEC_REQUIRED typedef UINT16 tBTA_HH_ATTR_MASK; @@ -124,7 +124,7 @@ typedef struct }tBTA_HH_SPT_TOD; /* configuration struct */ -typedef struct +typedef struct { UINT8 max_devt_spt; /* max number of types of devices spt */ tBTA_HH_SPT_TOD *p_devt_list; /* supported types of device list */ @@ -164,7 +164,7 @@ typedef struct UINT16 ssr_max_latency; /* SSR max latency */ UINT16 ssr_min_tout; /* SSR min timeout */ UINT8 ctry_code; /*Country Code.*/ - tBTA_HH_DEV_DESCR descriptor; + tBTA_HH_DEV_DESCR descriptor; }tBTA_HH_DEV_DSCP_INFO; /* callback event data for BTA_HH_OPEN_EVT */ @@ -185,7 +185,7 @@ typedef struct } tBTA_HH_CBDATA; enum -{ +{ BTA_HH_MOD_CTRL_KEY, BTA_HH_MOD_SHFT_KEY, BTA_HH_MOD_ALT_KEY, @@ -197,7 +197,7 @@ enum typedef struct { UINT8 this_char[6]; /* virtual key code */ - BOOLEAN mod_key[BTA_HH_MOD_MAX_KEY]; + BOOLEAN mod_key[BTA_HH_MOD_MAX_KEY]; /* ctrl, shift, Alt, GUI */ /* modifier key: is Shift key pressed */ /* modifier key: is Ctrl key pressed */ @@ -223,7 +223,7 @@ typedef struct { tBTA_HH_KEYBD_RPT keybd_rpt; /* keyboard report */ tBTA_HH_MICE_RPT mice_rpt; /* mouse report */ - } data_rpt; + } data_rpt; } tBTA_HH_BOOT_RPT; /* handshake data */ @@ -245,7 +245,7 @@ typedef union { tBTA_HH_DEV_INFO dev_info; /* BTA_HH_ADD_DEV_EVT, BTA_HH_RMV_DEV_EVT */ tBTA_HH_CONN conn; /* BTA_HH_OPEN_EVT */ - tBTA_HH_CBDATA dev_status; /* BTA_HH_CLOSE_EVT, + tBTA_HH_CBDATA dev_status; /* BTA_HH_CLOSE_EVT, BTA_HH_SET_PROTO_EVT BTA_HH_SET_RPT_EVT BTA_HH_SET_IDLE_EVT */ @@ -253,13 +253,13 @@ typedef union tBTA_HH_STATUS status; /* BTA_HH_ENABLE_EVT */ tBTA_HH_DEV_DSCP_INFO dscp_info; /* BTA_HH_GET_DSCP_EVT */ tBTA_HH_HSDATA hs_data; /* GET_ transaction callback - BTA_HH_GET_RPT_EVT - BTA_HH_GET_PROTO_EVT + BTA_HH_GET_RPT_EVT + BTA_HH_GET_PROTO_EVT BTA_HH_GET_IDLE_EVT */ } tBTA_HH; /* BTA HH callback function */ -typedef void (tBTA_HH_CBACK) (tBTA_HH_EVT event, tBTA_HH *p_data); +typedef void (tBTA_HH_CBACK) (tBTA_HH_EVT event, tBTA_HH *p_data); /***************************************************************************** @@ -274,7 +274,7 @@ extern "C" ** ** Function BTA_HhRegister ** -** Description This function enable HID host and registers HID-Host with +** Description This function enable HID host and registers HID-Host with ** lower layers. ** ** Returns void @@ -297,14 +297,14 @@ BTA_API extern void BTA_HhDisable(void); ** ** Function BTA_HhOpen ** -** Description This function is called to start an inquiry and read SDP -** record of responding devices; connect to a device if only +** Description This function is called to start an inquiry and read SDP +** record of responding devices; connect to a device if only ** one active HID device is found. ** ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_HhOpen (BD_ADDR dev_bda, tBTA_HH_PROTO_MODE mode, +BTA_API extern void BTA_HhOpen (BD_ADDR dev_bda, tBTA_HH_PROTO_MODE mode, tBTA_SEC sec_mask); /******************************************************************************* @@ -348,19 +348,19 @@ BTA_API extern void BTA_HhGetProtoMode(UINT8 dev_handle); ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_HhSetReport(UINT8 dev_handle, tBTA_HH_RPT_TYPE r_type, +BTA_API extern void BTA_HhSetReport(UINT8 dev_handle, tBTA_HH_RPT_TYPE r_type, BT_HDR *p_data); /******************************************************************************* ** ** Function BTA_HhGetReport ** -** Description Send a GET_REPORT to HID device. +** Description Send a GET_REPORT to HID device. ** ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_HhGetReport(UINT8 dev_handle, tBTA_HH_RPT_TYPE r_type, +BTA_API extern void BTA_HhGetReport(UINT8 dev_handle, tBTA_HH_RPT_TYPE r_type, UINT8 rpt_id, UINT16 buf_size); /******************************************************************************* ** @@ -371,7 +371,7 @@ BTA_API extern void BTA_HhGetReport(UINT8 dev_handle, tBTA_HH_RPT_TYPE r_type, ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_HhSendCtrl(UINT8 dev_handle, +BTA_API extern void BTA_HhSendCtrl(UINT8 dev_handle, tBTA_HH_TRANS_CTRL_TYPE c_type); /******************************************************************************* @@ -423,22 +423,22 @@ BTA_API extern void BTA_HhGetDscpInfo(UINT8 dev_handle); ** ** Function BTA_HhAddDev ** -** Description Add a virtually cabled device into HID-Host device list -** to manage and assign a device handle for future API call, -** host applciation call this API at start-up to initialize its -** virtually cabled devices. +** Description Add a virtually cabled device into HID-Host device list +** to manage and assign a device handle for future API call, +** host applciation call this API at start-up to initialize its +** virtually cabled devices. ** ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_HhAddDev(BD_ADDR bda, tBTA_HH_ATTR_MASK attr_mask, - UINT8 sub_class, UINT8 app_id, +BTA_API extern void BTA_HhAddDev(BD_ADDR bda, tBTA_HH_ATTR_MASK attr_mask, + UINT8 sub_class, UINT8 app_id, tBTA_HH_DEV_DSCP_INFO dscp_info); /******************************************************************************* ** ** Function BTA_HhRemoveDev ** -** Description Remove a device from the HID host devices list. +** Description Remove a device from the HID host devices list. ** ** Returns void ** @@ -446,7 +446,7 @@ BTA_API extern void BTA_HhAddDev(BD_ADDR bda, tBTA_HH_ATTR_MASK attr_mask, BTA_API extern void BTA_HhRemoveDev(UINT8 dev_handle ); /******************************************************************************* ** -** Parsing Utility Functions +** Parsing Utility Functions ** *******************************************************************************/ /******************************************************************************* @@ -458,7 +458,7 @@ BTA_API extern void BTA_HhRemoveDev(UINT8 dev_handle ); ** Returns void ** *******************************************************************************/ -BTA_API extern void BTA_HhParseBootRpt(tBTA_HH_BOOT_RPT *p_data, UINT8 *p_report, +BTA_API extern void BTA_HhParseBootRpt(tBTA_HH_BOOT_RPT *p_data, UINT8 *p_report, UINT16 report_len); #ifdef __cplusplus diff --git a/bta/include/bta_hh_co.h b/bta/include/bta_hh_co.h index 37d27ea..4123b82 100644 --- a/bta/include/bta_hh_co.h +++ b/bta/include/bta_hh_co.h @@ -20,14 +20,14 @@ ** Function bta_hh_co_data ** ** Description This callout function is executed by HH when data is received -** in interupt channel. -** +** in interupt channel. +** ** ** Returns void. ** *******************************************************************************/ -BTA_API extern void bta_hh_co_data(UINT8 dev_handle, UINT8 *p_rpt, UINT16 len, - tBTA_HH_PROTO_MODE mode, UINT8 sub_class, +BTA_API extern void bta_hh_co_data(UINT8 dev_handle, UINT8 *p_rpt, UINT16 len, + tBTA_HH_PROTO_MODE mode, UINT8 sub_class, UINT8 ctry_code, BD_ADDR peer_addr, UINT8 app_id); /******************************************************************************* @@ -35,21 +35,21 @@ BTA_API extern void bta_hh_co_data(UINT8 dev_handle, UINT8 *p_rpt, UINT16 len, ** Function bta_hh_co_open ** ** Description This callout function is executed by HH when connection is -** opened, and application may do some device specific +** opened, and application may do some device specific ** initialization. ** ** Returns void. ** *******************************************************************************/ -BTA_API extern void bta_hh_co_open(UINT8 dev_handle, UINT8 sub_class, +BTA_API extern void bta_hh_co_open(UINT8 dev_handle, UINT8 sub_class, UINT16 attr_mask, UINT8 app_id); /******************************************************************************* ** ** Function bta_hh_co_close ** -** Description This callout function is executed by HH when connection is -** closed, and device specific finalizatio nmay be needed. +** Description This callout function is executed by HH when connection is +** closed, and device specific finalizatio nmay be needed. ** ** Returns void. ** diff --git a/bta/include/bta_hl_ci.h b/bta/include/bta_hl_ci.h index 6cb1451..90af11a 100644 --- a/bta/include/bta_hl_ci.h +++ b/bta/include/bta_hl_ci.h @@ -34,18 +34,18 @@ ** Function bta_hl_ci_get_tx_data ** ** Description This function is called in response to the -** bta_hl_co_get_tx_data call-out function. +** bta_hl_co_get_tx_data call-out function. ** ** Parameters mdl_handle -MDL handle ** status - BTA_MA_STATUS_OK if operation is successful ** BTA_MA_STATUS_FAIL if any errors have occurred. ** evt - evt from the call-out function ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_hl_ci_get_tx_data( tBTA_HL_MDL_HANDLE mdl_handle, - tBTA_HL_STATUS status, + tBTA_HL_STATUS status, UINT16 evt ); /******************************************************************************* @@ -53,18 +53,18 @@ BTA_API extern void bta_hl_ci_get_tx_data( tBTA_HL_MDL_HANDLE mdl_handle, ** Function bta_hl_ci_put_rx_data ** ** Description This function is called in response to the -** bta_hl_co_put_rx_data call-out function. +** bta_hl_co_put_rx_data call-out function. ** ** Parameters mdl_handle -MDL handle ** status - BTA_MA_STATUS_OK if operation is successful ** BTA_MA_STATUS_FAIL if any errors have occurred. ** evt - evt from the call-out function ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_hl_ci_put_rx_data( tBTA_HL_MDL_HANDLE mdl_handle, - tBTA_HL_STATUS status, + tBTA_HL_STATUS status, UINT16 evt ); @@ -74,18 +74,18 @@ BTA_API extern void bta_hl_ci_put_rx_data( tBTA_HL_MDL_HANDLE mdl_handle, ** Function bta_hl_ci_get_echo_data ** ** Description This function is called in response to the -** bta_hl_co_get_echo_data call-out function. +** bta_hl_co_get_echo_data call-out function. ** ** Parameters mcl_handle -MCL handle ** status - BTA_MA_STATUS_OK if operation is successful ** BTA_MA_STATUS_FAIL if any errors have occurred. ** evt - evt from the call-out function ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_hl_ci_get_echo_data( tBTA_HL_MCL_HANDLE mcl_handle, - tBTA_HL_STATUS status, + tBTA_HL_STATUS status, UINT16 evt ); @@ -94,18 +94,18 @@ BTA_API extern void bta_hl_ci_get_echo_data( tBTA_HL_MCL_HANDLE mcl_handle, ** Function bta_hl_ci_put_echo_data ** ** Description This function is called in response to the -** bta_hl_co_put_echo_data call-out function. +** bta_hl_co_put_echo_data call-out function. ** ** Parameters mcl_handle -MCL handle ** status - BTA_MA_STATUS_OK if operation is successful ** BTA_MA_STATUS_FAIL if any errors have occurred. ** evt - evt from the call-out function ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_hl_ci_put_echo_data( tBTA_HL_MCL_HANDLE mcl_handle, - tBTA_HL_STATUS status, + tBTA_HL_STATUS status, UINT16 evt ); #endif /* BTA_HL_CI_H */ diff --git a/bta/include/bta_hl_co.h b/bta/include/bta_hl_co.h index 464e99a..720308b 100644 --- a/bta/include/bta_hl_co.h +++ b/bta/include/bta_hl_co.h @@ -27,11 +27,11 @@ ** ** Function bta_hl_co_get_num_of_mdep ** -** Description This function is called to get the number of MDEPs for this +** Description This function is called to get the number of MDEPs for this ** application ID ** -** Parameters app_id - application ID -** p_num_of_mdep (output) - number of MDEP configurations supported +** Parameters app_id - application ID +** p_num_of_mdep (output) - number of MDEP configurations supported ** by the application ** ** Returns Bloolean - TRUE success @@ -45,9 +45,9 @@ BTA_API extern BOOLEAN bta_hl_co_get_num_of_mdep(UINT8 app_id, UINT8 *p_num_of_m ** Description This function is called to find out whether the SOURCE MDEP ** configuration information should be advertize in the SDP or nopt ** -** Parameters app_id - application ID +** Parameters app_id - application ID ** -** Returns Bloolean - TRUE advertise the SOURCE MDEP configuration +** Returns Bloolean - TRUE advertise the SOURCE MDEP configuration ** information ** *******************************************************************************/ @@ -56,21 +56,21 @@ BTA_API extern BOOLEAN bta_hl_co_advrtise_source_sdp(UINT8 app_id); ** ** Function bta_hl_co_get_mdep_config ** -** Description This function is called to get the supported feature +** Description This function is called to get the supported feature ** configuration for the specified mdep index and it also assigns ** the MDEP ID for the specified mdep index ** -** Parameters app_id - HDP application ID -** mdep_idx - the mdep index -** mdep_id - the assigned MDEP ID for the specified medp_idx -** p_mdl_cfg (output) - pointer to the MDEP configuration +** Parameters app_id - HDP application ID +** mdep_idx - the mdep index +** mdep_id - the assigned MDEP ID for the specified medp_idx +** p_mdl_cfg (output) - pointer to the MDEP configuration ** ** ** Returns Bloolean - TRUE success *******************************************************************************/ -BTA_API extern BOOLEAN bta_hl_co_get_mdep_config(UINT8 app_id, - UINT8 mdep_idx, - tBTA_HL_MDEP_ID mdep_id, +BTA_API extern BOOLEAN bta_hl_co_get_mdep_config(UINT8 app_id, + UINT8 mdep_idx, + tBTA_HL_MDEP_ID mdep_id, tBTA_HL_MDEP_CFG *p_mdep_cfg); @@ -78,16 +78,16 @@ BTA_API extern BOOLEAN bta_hl_co_get_mdep_config(UINT8 app_id, ** ** Function bta_hl_co_get_echo_config ** -** Description This function is called to get the echo test -** maximum APDU size configuration +** Description This function is called to get the echo test +** maximum APDU size configuration ** -** Parameters app_id - HDP application ID -** p_echo_cfg (output) - pointer to the Echo test maximum APDU size -** configuration +** Parameters app_id - HDP application ID +** p_echo_cfg (output) - pointer to the Echo test maximum APDU size +** configuration ** ** Returns Bloolean - TRUE success *******************************************************************************/ -BTA_API extern BOOLEAN bta_hl_co_get_echo_config(UINT8 app_id, +BTA_API extern BOOLEAN bta_hl_co_get_echo_config(UINT8 app_id, tBTA_HL_ECHO_CFG *p_echo_cfg); @@ -95,10 +95,10 @@ BTA_API extern BOOLEAN bta_hl_co_get_echo_config(UINT8 app_id, ** ** Function bta_hl_co_save_mdl ** -** Description This function is called to save a MDL configuration item in persistent +** Description This function is called to save a MDL configuration item in persistent ** storage ** -** Parameters app_id - HDP application ID +** Parameters app_id - HDP application ID ** item_idx - the MDL configuration storage index ** p_mdl_cfg - pointer to the MDL configuration data ** @@ -110,10 +110,10 @@ BTA_API extern void bta_hl_co_save_mdl(UINT8 app_id, UINT8 item_idx, tBTA_HL_MDL ** ** Function bta_hl_co_delete_mdl ** -** Description This function is called to delete a MDL configuration item in persistent +** Description This function is called to delete a MDL configuration item in persistent ** storage ** -** Parameters app_id - HDP application ID +** Parameters app_id - HDP application ID ** item_idx - the MDL configuration storage index ** ** Returns void @@ -124,19 +124,19 @@ BTA_API extern void bta_hl_co_delete_mdl(UINT8 app_id, UINT8 item_idx); ** ** Function bta_hl_co_get_mdl_config ** -** Description This function is called to get the MDL configuration +** Description This function is called to get the MDL configuration ** from teh persistent memory. This function shall only be called *8 once after the device is powered up ** -** Parameters app_id - HDP application ID +** Parameters app_id - HDP application ID ** buffer_size - the unit of the buffer size is sizeof(tBTA_HL_MDL_CFG) -** p_mdl_buf - Point to the starting location of the buffer +** p_mdl_buf - Point to the starting location of the buffer ** ** Returns BOOLEAN -** -** +** +** *******************************************************************************/ -BTA_API extern BOOLEAN bta_hl_co_load_mdl_config (UINT8 app_id, UINT8 buffer_size, +BTA_API extern BOOLEAN bta_hl_co_load_mdl_config (UINT8 app_id, UINT8 buffer_size, tBTA_HL_MDL_CFG *p_mdl_buf ); @@ -144,17 +144,17 @@ BTA_API extern BOOLEAN bta_hl_co_load_mdl_config (UINT8 app_id, UINT8 buffer_siz ** ** Function bta_hl_co_get_tx_data ** -** Description Get the data to be sent +** Description Get the data to be sent ** -** Parameters app_id - HDP application ID +** Parameters app_id - HDP application ID ** mdl_handle - MDL handle -** buf_size - the size of the buffer +** buf_size - the size of the buffer ** p_buf - the buffer pointer -** evt - the evt to be passed back to the HL in the +** evt - the evt to be passed back to the HL in the ** bta_hl_ci_get_tx_data call-in function ** ** Returns Void -** +** *******************************************************************************/ BTA_API extern void bta_hl_co_get_tx_data (UINT8 app_id, tBTA_HL_MDL_HANDLE mdl_handle, UINT16 buf_size, UINT8 *p_buf, UINT16 evt); @@ -164,17 +164,17 @@ BTA_API extern void bta_hl_co_get_tx_data (UINT8 app_id, tBTA_HL_MDL_HANDLE mdl_ ** ** Function bta_hl_co_put_rx_data ** -** Description Put the received data +** Description Put the received data ** -** Parameters app_id - HDP application ID +** Parameters app_id - HDP application ID ** mdl_handle - MDL handle -** data_size - the size of the data +** data_size - the size of the data ** p_data - the data pointer -** evt - the evt to be passed back to the HL in the +** evt - the evt to be passed back to the HL in the ** bta_hl_ci_put_rx_data call-in function ** ** Returns Void -** +** *******************************************************************************/ BTA_API extern void bta_hl_co_put_rx_data (UINT8 app_id, tBTA_HL_MDL_HANDLE mdl_handle, UINT16 data_size, UINT8 *p_data, UINT16 evt); @@ -182,17 +182,17 @@ BTA_API extern void bta_hl_co_put_rx_data (UINT8 app_id, tBTA_HL_MDL_HANDLE mdl_ ** ** Function bta_hl_co_get_tx_data ** -** Description Get the Echo data to be sent +** Description Get the Echo data to be sent ** -** Parameters app_id - HDP application ID +** Parameters app_id - HDP application ID ** mcl_handle - MCL handle -** buf_size - the size of the buffer +** buf_size - the size of the buffer ** p_buf - the buffer pointer -** evt - the evt to be passed back to the HL in the +** evt - the evt to be passed back to the HL in the ** bta_hl_ci_get_tx_data call-in function ** ** Returns Void -** +** *******************************************************************************/ BTA_API extern void bta_hl_co_get_echo_data (UINT8 app_id, tBTA_HL_MCL_HANDLE mcl_handle, UINT16 buf_size, UINT8 *p_buf, UINT16 evt); @@ -201,17 +201,17 @@ BTA_API extern void bta_hl_co_get_echo_data (UINT8 app_id, tBTA_HL_MCL_HANDLE mc ** ** Function bta_hl_co_put_echo_data ** -** Description Put the received loopback echo data +** Description Put the received loopback echo data ** -** Parameters app_id - HDP application ID +** Parameters app_id - HDP application ID ** mcl_handle - MCL handle -** data_size - the size of the data +** data_size - the size of the data ** p_data - the data pointer -** evt - the evt to be passed back to the HL in the +** evt - the evt to be passed back to the HL in the ** bta_hl_ci_put_echo_data call-in function ** ** Returns Void -** +** *******************************************************************************/ BTA_API extern void bta_hl_co_put_echo_data (UINT8 app_id, tBTA_HL_MCL_HANDLE mcl_handle, UINT16 data_size, UINT8 *p_data, UINT16 evt); diff --git a/bta/include/bta_pan_api.h b/bta/include/bta_pan_api.h index 2b72d6a..9b98627 100644 --- a/bta/include/bta_pan_api.h +++ b/bta/include/bta_pan_api.h @@ -3,7 +3,7 @@ ** Name: bta_pan_api.h ** ** Description: This is the public interface file for the Personal -** Area Networking (PAN) subsystem of BTA, Widcomm's +** Area Networking (PAN) subsystem of BTA, Widcomm's ** Bluetooth application layer for mobile phones. ** ** Copyright (c) 2004, Widcomm Inc., All Rights Reserved. @@ -118,7 +118,7 @@ extern "C" ** Description Enable PAN service. This function must be ** called before any other functions in the PAN API are called. ** When the enable operation is complete the callback function -** will be called with a BTA_PAN_ENABLE_EVT. +** will be called with a BTA_PAN_ENABLE_EVT. ** ** Returns void ** @@ -129,7 +129,7 @@ BTA_API extern void BTA_PanEnable(tBTA_PAN_CBACK p_cback); ** ** Function BTA_PanDisable ** -** Description Disable PAN service. +** Description Disable PAN service. ** ** Returns void ** @@ -142,8 +142,8 @@ BTA_API extern void BTA_PanDisable(void); ** Function BTA_PanSetRole ** ** Description Sets PAN roles. When the enable operation is complete -** the callback function will be called with a BTA_PAN_SET_ROLE_EVT. -** +** the callback function will be called with a BTA_PAN_SET_ROLE_EVT. +** ** Returns void ** *******************************************************************************/ @@ -157,8 +157,8 @@ BTA_API void BTA_PanSetRole(tBTA_PAN_ROLE role, tBTA_PAN_ROLE_INFO *p_user_info, ** ** Description Opens a connection to a peer device. ** When connection is open callback function is called -** with a BTA_PAN_OPEN_EVT. -** +** with a BTA_PAN_OPEN_EVT. +** ** ** Returns void ** @@ -171,8 +171,8 @@ BTA_API void BTA_PanOpen(BD_ADDR bd_addr, tBTA_PAN_ROLE local_role, tBTA_PAN_ ** ** Function BTA_PanClose ** -** Description Close a PAN connection to a peer device. -** +** Description Close a PAN connection to a peer device. +** ** ** Returns void ** diff --git a/bta/include/bta_pan_ci.h b/bta/include/bta_pan_ci.h index cd759d9..11751e8 100644 --- a/bta/include/bta_pan_ci.h +++ b/bta/include/bta_pan_ci.h @@ -30,9 +30,9 @@ extern "C" ** ready for more data and PAN should call bta_pan_co_tx_path(). ** This function is used when the TX data path is configured ** to use a pull interface. -** ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API extern void bta_pan_ci_tx_ready(UINT16 handle); @@ -45,9 +45,9 @@ BTA_API extern void bta_pan_ci_tx_ready(UINT16 handle); ** has data available to send to PAN and PAN should call ** bta_pan_co_rx_path(). This function is used when the RX ** data path is configured to use a pull interface. -** ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API extern void bta_pan_ci_rx_ready(UINT16 handle); @@ -62,9 +62,9 @@ BTA_API extern void bta_pan_ci_rx_ready(UINT16 handle); ** any more data sent by bta_pan_co_tx_write() or ** bta_pan_co_tx_writebuf(). This function is used when the ** TX data path is configured to use a push interface. -** ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API extern void bta_pan_ci_tx_flow(UINT16 handle, BOOLEAN enable); @@ -79,9 +79,9 @@ BTA_API extern void bta_pan_ci_tx_flow(UINT16 handle, BOOLEAN enable); ** the data buffer. The buffer must be allocated using ** functions GKI_getbuf() or GKI_getpoolbuf(). The buffer ** will be freed by BTA; the phone must not free the buffer. -** ** -** Returns TRUE if flow enabled +** +** Returns TRUE if flow enabled ** *******************************************************************************/ BTA_API extern void bta_pan_ci_rx_writebuf(UINT16 handle, BD_ADDR src, BD_ADDR dst, UINT16 protocol, BT_HDR *p_buf, BOOLEAN ext); @@ -92,24 +92,24 @@ BTA_API extern void bta_pan_ci_rx_writebuf(UINT16 handle, BD_ADDR src, BD_ADDR d ** ** Description This function is called by the phone to read data from PAN ** when the TX path is configured to use a pull interface. -** The phone must free the buffer using function GKI_freebuf() when +** The phone must free the buffer using function GKI_freebuf() when ** it is through processing the buffer. -** ** -** Returns void +** +** Returns void ** *******************************************************************************/ -BTA_API extern BT_HDR * bta_pan_ci_readbuf(UINT16 handle, BD_ADDR src, BD_ADDR dst, UINT16 *p_protocol, +BTA_API extern BT_HDR * bta_pan_ci_readbuf(UINT16 handle, BD_ADDR src, BD_ADDR dst, UINT16 *p_protocol, BOOLEAN* p_ext, BOOLEAN* p_forward); /******************************************************************************* ** ** Function bta_pan_ci_set_pfilters ** -** Description This function is called to set protocol filters -** +** Description This function is called to set protocol filters +** ** -** Returns void +** Returns void ** *******************************************************************************/ BTA_API extern void bta_pan_ci_set_pfilters(UINT16 handle, UINT16 num_filters, UINT16 *p_start_array, UINT16 *p_end_array); @@ -119,15 +119,15 @@ BTA_API extern void bta_pan_ci_set_pfilters(UINT16 handle, UINT16 num_filters, U ** ** Function bta_pan_ci_set_mfilters ** -** Description This function is called to set multicast filters -** +** Description This function is called to set multicast filters ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API extern void bta_pan_ci_set_mfilters(UINT16 handle, UINT16 num_mcast_filters, UINT8 *p_start_array, UINT8 *p_end_array); - + diff --git a/bta/include/bta_pan_co.h b/bta/include/bta_pan_co.h index c8769f4..ea9f3b0 100644 --- a/bta/include/bta_pan_co.h +++ b/bta/include/bta_pan_co.h @@ -47,7 +47,7 @@ ** used by the phone to initialize data paths or for other ** initialization purposes. The function must return the ** data flow mask as described below. -** +** ** ** Returns Data flow mask. ** @@ -58,10 +58,10 @@ BTA_API extern UINT8 bta_pan_co_init(UINT8 *q_level); ** ** Function bta_pan_co_open ** -** Description This function is executed by PAN when a connection +** Description This function is executed by PAN when a connection ** is opened. The phone can use this function to set ** up data paths or perform any required initialization. -** +** ** ** Returns void ** @@ -74,7 +74,7 @@ BTA_API extern void bta_pan_co_open(UINT16 handle, UINT8 app_id, tBTA_PAN_ROLE l ** ** Description This function is called by PAN when a connection to a ** server is closed. -** +** ** ** Returns void ** @@ -88,8 +88,8 @@ BTA_API extern void bta_pan_co_close(UINT16 handle, UINT8 app_id); ** Description This function is called by PAN to transfer data on the ** TX path; that is, data being sent from BTA to the phone. ** This function is used when the TX data path is configured -** to use the pull interface. -** +** to use the pull interface. +** ** ** Returns void ** @@ -103,8 +103,8 @@ BTA_API extern void bta_pan_co_tx_path(UINT16 handle, UINT8 app_id); ** Description This function is called by PAN to transfer data on the ** RX path; that is, data being sent from the phone to BTA. ** This function is used when the RX data path is configured -** to use the pull interface. -** +** to use the pull interface. +** ** ** Returns void ** @@ -119,12 +119,12 @@ BTA_API extern void bta_pan_co_rx_path(UINT16 handle, UINT8 app_id); ** when the TX path is configured to use a push interface. ** The implementation of this function must copy the data to ** the phone's memory. -** +** ** ** Returns void ** *******************************************************************************/ -BTA_API extern void bta_pan_co_tx_write(UINT16 handle, UINT8 app_id, BD_ADDR src, BD_ADDR dst, UINT16 protocol, UINT8 *p_data, +BTA_API extern void bta_pan_co_tx_write(UINT16 handle, UINT8 app_id, BD_ADDR src, BD_ADDR dst, UINT16 protocol, UINT8 *p_data, UINT16 len, BOOLEAN ext, BOOLEAN forward); /******************************************************************************* @@ -135,7 +135,7 @@ BTA_API extern void bta_pan_co_tx_write(UINT16 handle, UINT8 app_id, BD_ADDR src ** when the TX path is configured to use a push interface with ** zero copy. The phone must free the buffer using function ** GKI_freebuf() when it is through processing the buffer. -** +** ** ** Returns void ** @@ -152,8 +152,8 @@ BTA_API extern void bta_pan_co_tx_writebuf(UINT16 handle, UINT8 app_id, BD_ADDR ** data flow on the RX path when it is configured to use ** a push interface. If data flow is disabled the phone must ** not call bta_pan_ci_rx_write() or bta_pan_ci_rx_writebuf() -** until data flow is enabled again. -** +** until data flow is enabled again. +** ** ** Returns void ** @@ -184,6 +184,6 @@ BTA_API extern void bta_pan_co_pfilt_ind(UINT16 handle, BOOLEAN indication, tBTA *******************************************************************************/ BTA_API extern void bta_pan_co_mfilt_ind(UINT16 handle, BOOLEAN indication, tBTA_PAN_STATUS result, UINT16 len, UINT8 *p_filters); - + #endif /* BTA_PAN_CO_H */ diff --git a/bta/include/bta_sys_ci.h b/bta/include/bta_sys_ci.h index 48cfab1..98998ae 100644 --- a/bta/include/bta_sys_ci.h +++ b/bta/include/bta_sys_ci.h @@ -28,9 +28,9 @@ extern "C" ** ** Description This function must be called in response to function ** bta_sys_hw_co_enable(), when HW is indeed enabled -** ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API void bta_sys_hw_ci_enabled(tBTA_SYS_HW_MODULE module ); @@ -42,9 +42,9 @@ BTA_API void bta_sys_hw_ci_enabled(tBTA_SYS_HW_MODULE module ); ** ** Description This function must be called in response to function ** bta_sys_hw_co_disable() when HW is really OFF -** ** -** Returns void +** +** Returns void ** *******************************************************************************/ BTA_API void bta_sys_hw_ci_disabled( tBTA_SYS_HW_MODULE module ); diff --git a/bta/include/bta_sys_co.h b/bta/include/bta_sys_co.h index 2b82153..a4fd0fb 100644 --- a/bta/include/bta_sys_co.h +++ b/bta/include/bta_sys_co.h @@ -25,7 +25,7 @@ ** ** Function bta_sys_hw_co_enable ** -** Description This function is called by the stack to power up the HW +** Description This function is called by the stack to power up the HW ** ** Returns void ** @@ -36,7 +36,7 @@ BTA_API void bta_sys_hw_co_enable( tBTA_SYS_HW_MODULE module ); ** ** Function bta_sys_hw_co_disable ** -** Description This function is called by the stack to power down the HW +** Description This function is called by the stack to power down the HW ** ** Returns void ** diff --git a/bta/include/utl.h b/bta/include/utl.h index 392d239..543794b 100644 --- a/bta/include/utl.h +++ b/bta/include/utl.h @@ -52,7 +52,7 @@ extern "C" ** Description This utility function converts a character string to an ** integer. Acceptable values in string are 0-9. If invalid ** string or string value too large, -1 is returned. -** +** ** ** Returns Integer value or -1 on error. ** @@ -67,7 +67,7 @@ extern INT16 utl_str2int(const char *p_s); ** String p_s must be uppercase. String p_t is converted to ** uppercase if lowercase. If p_s ends first, the substring ** match is counted as a match. -** +** ** ** Returns 0 if strings match, nonzero otherwise. ** @@ -81,7 +81,7 @@ extern int utl_strucmp(const char *p_s, const char *p_t); ** Description This utility function converts a UINT16 to a string. The ** string is NULL-terminated. The length of the string is ** returned. -** +** ** ** Returns Length of string. ** @@ -95,7 +95,7 @@ extern UINT8 utl_itoa(UINT16 i, char *p_s); ** Description This function calls GKI_freebuf to free the buffer passed ** in, if buffer pointer is not NULL, and also initializes ** buffer pointer to NULL. -** +** ** ** Returns Nothing. ** @@ -108,7 +108,7 @@ extern void utl_freebuf(void **p); ** ** Description This function updates the local Device Class. ** -** Parameters: +** Parameters: ** p_cod - Pointer to the device class to set to ** ** cmd - the fields of the device class to update. @@ -127,9 +127,9 @@ extern BOOLEAN utl_set_device_class(tBTA_UTL_COD *p_cod, UINT8 cmd); ** ** Function utl_isintstr ** -** Description This utility function checks if the given string is an +** Description This utility function checks if the given string is an ** integer string or not -** +** ** ** Returns TRUE if successful, Otherwise FALSE ** @@ -140,9 +140,9 @@ extern BOOLEAN utl_isintstr(const char *p_s); ** ** Function utl_isdialstr ** -** Description This utility function checks if the given string contains +** Description This utility function checks if the given string contains ** only dial digits or not -** +** ** ** Returns TRUE if successful, Otherwise FALSE ** |