Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

component bt:Change the HIDD profile function to the new api function

Browse source
This commit is contained in:
Yulong 2016-11-02 03:45:00 -04:00
parent 2cea783ca1
commit a0007ceb79
3 changed files with 128 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
components/bt/bluedroid/profiles/std/hid_le/hid_le_prf.c
View file

@ -16,14 +16,14 @@
#include "prf_defs.h" #include "prf_defs.h"
#if (HIDD_LE_PROFILE_CFG) #if (HIDD_LE_PROFILE_CFG)
tHIDD_LE_ENV hidd_le_env; hidd_le_env_t hidd_le_env;
#define HI_UINT16(a) (((a) >> 8) & 0xFF) #define HI_UINT16(a) (((a) >> 8) & 0xFF)
#define LO_UINT16(a) ((a) & 0xFF) #define LO_UINT16(a) ((a) & 0xFF)
// HID Information characteristic value // HID Information characteristic value
static const UINT8 hidInfo[HID_INFORMATION_LEN] = static const uint8_t hidInfo[HID_INFORMATION_LEN] =
{ {
LO_UINT16(0x0111), HI_UINT16(0x0111), // bcdHID (USB HID version) LO_UINT16(0x0111), HI_UINT16(0x0111), // bcdHID (USB HID version)
0x00, // bCountryCode 0x00, // bCountryCode
@ -32,7 +32,7 @@ static const UINT8 hidInfo[HID_INFORMATION_LEN] =
// HID Report Map characteristic value // HID Report Map characteristic value
// Keyboard report descriptor (using format for Boot interface descriptor) // Keyboard report descriptor (using format for Boot interface descriptor)
static const UINT8 hidReportMap[] = static const uint8_t hidReportMap[] =
{ {
0x05, 0x01, // Usage Page (Generic Desktop) 0x05, 0x01, // Usage Page (Generic Desktop)
0x09, 0x02, // Usage (Mouse) 0x09, 0x02, // Usage (Mouse)
@ -169,27 +169,27 @@ static const UINT8 hidReportMap[] =
}; };
// HID report map length // HID report map length
UINT8 hidReportMapLen = sizeof(hidReportMap); uint8_t hidReportMapLen = sizeof(hidReportMap);
UINT8 hidProtocolMode = HID_PROTOCOL_MODE_REPORT; uint8_t hidProtocolMode = HID_PROTOCOL_MODE_REPORT;
// HID report mapping table // HID report mapping table
static hidRptMap_t hidRptMap[HID_NUM_REPORTS]; static hidRptMap_t hidRptMap[HID_NUM_REPORTS];
tBT_UUID char_info_uuid = {LEN_UUID_16, {CHAR_HID_INFO_UUID}}; esp_bt_uuid_t char_info_uuid = {LEN_UUID_16, {CHAR_HID_INFO_UUID}};
tBT_UUID char_ctnl_pt_uuid = {LEN_UUID_16, {CHAR_HID_CTNL_PT_UUID}}; esp_bt_uuid_t char_ctnl_pt_uuid = {LEN_UUID_16, {CHAR_HID_CTNL_PT_UUID}};
tBT_UUID char_report_map_uuid = {LEN_UUID_16, {CHAR_REPORT_MAP_UUID}}; esp_bt_uuid_t char_report_map_uuid = {LEN_UUID_16, {CHAR_REPORT_MAP_UUID}};
tBT_UUID char_report_uuid = {LEN_UUID_16, {CHAR_REPORT_UUID}}; esp_bt_uuid_t char_report_uuid = {LEN_UUID_16, {CHAR_REPORT_UUID}};
tBT_UUID char_proto_mode_uuid = {LEN_UUID_16, {CHAR_PROTOCOL_MODE_UUID}}; esp_bt_uuid_t char_proto_mode_uuid = {LEN_UUID_16, {CHAR_PROTOCOL_MODE_UUID}};
tBT_UUID char_kb_in_report_uuid = {LEN_UUID_16, {CHAR_BOOT_KB_IN_REPORT_UUID}}; esp_bt_uuid_t char_kb_in_report_uuid = {LEN_UUID_16, {CHAR_BOOT_KB_IN_REPORT_UUID}};
tBT_UUID char_kb_out_report_uuid = {LEN_UUID_16,{CHAR_BOOT_KB_OUT_REPORT_UUID}}; esp_bt_uuid_t char_kb_out_report_uuid = {LEN_UUID_16,{CHAR_BOOT_KB_OUT_REPORT_UUID}};
tBT_UUID char_mouse_in_report_uuid = {LEN_UUID_16,{CHAR_BOOT_MOUSE_IN_REPORT_UUID}}; esp_bt_uuid_t char_mouse_in_report_uuid = {LEN_UUID_16,{CHAR_BOOT_MOUSE_IN_REPORT_UUID}};
/// Full HID device Database Description - Used to add attributes into the database /// Full HID device Database Description - Used to add attributes into the database
const tCHAR_DESC hids_char_db[HIDD_LE_CHAR_MAX] = const char_desc_t hids_char_db[HIDD_LE_CHAR_MAX] =
{ {
// HID Information Characteristic Value // HID Information Characteristic Value
[HIDD_LE_INFO_CHAR] = { [HIDD_LE_INFO_CHAR] = {
@ -247,25 +247,25 @@ const tCHAR_DESC hids_char_db[HIDD_LE_CHAR_MAX] =
}, },
}; };
static void HID_AddCharacteristic(const tCHAR_DESC *char_desc); static void hidd_add_characterisitc(const char_desc_t *char_desc);
/***************************************************************************** /*****************************************************************************
** Constants ** Constants
*****************************************************************************/ *****************************************************************************/
static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data); static void hidd_le_profile_cb(esp_gatts_evt_t event, esp_gatts_t *p_data);
/******************************************************************************* /*******************************************************************************
** **
** Function hidd_le_profile_cb ** Function hidd_add_characterisitc
** **
** Description the callback function after the hid device profile has been register to the BTA manager module ** Description the callback function after the hid device profile has been register to the BTA manager module
** **
** Returns NULL ** Returns NULL
** **
*******************************************************************************/ *******************************************************************************/
static void HID_AddCharacteristic(const tCHAR_DESC *char_desc) static void hidd_add_characterisitc(const char_desc_t *char_desc)
{ {
UINT16 service_id; uint16_t service_id;
if(char_desc == NULL) if(char_desc == NULL)
{ {
LOG_ERROR("Invalid hid characteristic\n"); LOG_ERROR("Invalid hid characteristic\n");
@ -282,7 +282,7 @@ static void HID_AddCharacteristic(const tCHAR_DESC *char_desc)
if(char_desc->char_uuid != 0x00) if(char_desc->char_uuid != 0x00)
{ {
// start added the charact to the data base // start added the charact to the data base
BTA_GATTS_AddCharacteristic(service_id, esp_ble_gatts_add_char (service_id,
char_desc->char_uuid, char_desc->char_uuid,
char_desc->perm, char_desc->perm,
char_desc->prop); char_desc->prop);
@ -299,19 +299,19 @@ static void HID_AddCharacteristic(const tCHAR_DESC *char_desc)
** Returns NULL ** Returns NULL
** **
*******************************************************************************/ *******************************************************************************/
static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data) static void hidd_le_profile_cb(esp_gatts_evt_t event, esp_gatts_t *p_data)
{ {
tBTA_GATTS_RSP rsp; esp_gatts_rsp_t rsp;
tBT_UUID uuid = {LEN_UUID_16, {ATT_SVC_HID}}; esp_bt_uuid_t uuid = {LEN_UUID_16, {ATT_SVC_HID}};
static UINT8 hid_char_idx; static uint8_t hid_char_idx;
tHIDD_CLCB *p_clcb = NULL; hidd_clcb_t *p_clcb = NULL;
UINT8 app_id = 0xff; uint8_t app_id = 0xff;
switch(event) switch(event)
{ {
case BTA_GATTS_REG_EVT: case ESP_GATTS_REG_EVT:
//check the register of the hid device profile has been succeess or not //check the register of the hid device profile has been succeess or not
if(p_data->reg_oper.status != BTA_GATT_OK) if(p_data->reg_oper.status != ESP_GATT_OK)
{ {
LOG_ERROR("hidd profile register failed\n"); LOG_ERROR("hidd profile register failed\n");
} }
@ -323,27 +323,27 @@ static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
//create the hid device service to the service data base. //create the hid device service to the service data base.
if(p_data->reg_oper.uuid.uu.uuid16 == ATT_SVC_HID) if(p_data->reg_oper.uuid.uu.uuid16 == ATT_SVC_HID)
{ {
hidd_le_CreateService(true); hidd_le_create_service(true);
} }
break; break;
case BTA_GATTS_CREATE_EVT: case ESP_GATTS_CREATE_EVT:
if(p_data->create.uuid.uu.uuid16 == ATT_SVC_HID) if(p_data->create.uuid.uu.uuid16 == ATT_SVC_HID)
{ {
///store the service id to the env ///store the service id to the env
hidd_le_env.hidd_clcb.cur_srvc_id = p_data->create.service_id; hidd_le_env.hidd_clcb.cur_srvc_id = p_data->create.service_id;
//start the button service after created //start the button service after created
BTA_GATTS_StartService(p_data->create.service_id,BTA_GATT_TRANSPORT_LE); esp_ble_gatts_start_srvc(p_data->create.service_id);
hid_char_idx = HIDD_LE_INFO_CHAR; hid_char_idx = HIDD_LE_INFO_CHAR;
//added the info character to the data base. //added the info character to the data base.
HID_AddCharacteristic(&hids_char_db[hid_char_idx]); hidd_add_characterisitc(&hids_char_db[hid_char_idx]);
hid_char_idx++; hid_char_idx++;
} }
break; break;
case BTA_GATTS_ADD_INCL_SRVC_EVT: case ESP_GATTS_ADD_INCL_SRVC_EVT:
break; break;
case BTA_GATTS_ADD_CHAR_EVT: case ESP_GATTS_ADD_CHAR_EVT:
//save the charateristic handle to the env //save the charateristic handle to the env
hidd_le_env.hidd_inst.att_tbl[hid_char_idx-1] = p_data->add_result.attr_id; hidd_le_env.hidd_inst.att_tbl[hid_char_idx-1] = p_data->add_result.attr_id;
LOG_ERROR("hanlder = %x, p_data->add_result.char_uuid.uu.uuid16 = %x\n",p_data->add_result.attr_id, LOG_ERROR("hanlder = %x, p_data->add_result.char_uuid.uu.uuid16 = %x\n",p_data->add_result.attr_id,
@ -360,18 +360,18 @@ static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
uuid.uu.uuid16 = GATT_UUID_CHAR_CLIENT_CONFIG; uuid.uu.uuid16 = GATT_UUID_CHAR_CLIENT_CONFIG;
LOG_ERROR("p_data->add_result.char_uuid.uu.uuid16 = %x\n", LOG_ERROR("p_data->add_result.char_uuid.uu.uuid16 = %x\n",
p_data->add_result.char_uuid.uu.uuid16); p_data->add_result.char_uuid.uu.uuid16);
BTA_GATTS_AddCharDescriptor (hidd_le_env.hidd_clcb.cur_srvc_id, esp_ble_gatts_add_char_descr (hidd_le_env.hidd_clcb.cur_srvc_id,
GATT_PERM_WRITE, GATT_PERM_WRITE,
&uuid); &uuid);
break; break;
} }
HID_AddCharacteristic(&hids_char_db[hid_char_idx]); hidd_add_characterisitc(&hids_char_db[hid_char_idx]);
} }
hid_char_idx++; hid_char_idx++;
break; break;
case BTA_GATTS_ADD_CHAR_DESCR_EVT: case ESP_GATTS_ADD_CHAR_DESCR_EVT:
if(p_data->add_result.char_uuid.uu.uuid16 == GATT_UUID_CHAR_CLIENT_CONFIG) if(p_data->add_result.char_uuid.uu.uuid16 == GATT_UUID_CHAR_CLIENT_CONFIG)
{ {
uuid.uu.uuid16 = GATT_UUID_RPT_REF_DESCR; uuid.uu.uuid16 = GATT_UUID_RPT_REF_DESCR;
@ -385,12 +385,12 @@ static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
{ {
if(hid_char_idx < HIDD_LE_CHAR_MAX) if(hid_char_idx < HIDD_LE_CHAR_MAX)
{ {
HID_AddCharacteristic(&hids_char_db[hid_char_idx]); hidd_add_characterisitc(&hids_char_db[hid_char_idx]);
hid_char_idx++; hid_char_idx++;
} }
} }
break; break;
case BTA_GATTS_READ_EVT: case ESP_GATTS_READ_EVT:
{ {
LOG_ERROR("Hidd profile BTA_GATTS_READ_EVT\n"); LOG_ERROR("Hidd profile BTA_GATTS_READ_EVT\n");
UINT32 trans_id = p_data->req_data.trans_id; UINT32 trans_id = p_data->req_data.trans_id;
@ -403,11 +403,11 @@ static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
hidd_read_attr_value(p_data->req_data.p_data,trans_id); hidd_read_attr_value(p_data->req_data.p_data,trans_id);
} }
break; break;
case BTA_GATTS_WRITE_EVT: case ESP_GATTS_WRITE_EVT:
BTA_GATTS_SendRsp(p_data->req_data.conn_id,p_data->req_data.trans_id, esp_ble_gatts_send_rsp (p_data->req_data.conn_id,p_data->req_data.trans_id,
p_data->req_data.status,NULL); p_data->req_data.status,NULL);
break; break;
case BTA_GATTS_CONNECT_EVT: case ESP_GATTS_CONNECT_EVT:
p_clcb = &hidd_le_env.hidd_clcb; p_clcb = &hidd_le_env.hidd_clcb;
if(!p_clcb->in_use) if(!p_clcb->in_use)
@ -419,16 +419,16 @@ static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
memcpy(p_clcb->remote_bda, p_data->conn.remote_bda,BD_ADDR_LEN); memcpy(p_clcb->remote_bda, p_data->conn.remote_bda,BD_ADDR_LEN);
} }
break; break;
case BTA_GATTS_DISCONNECT_EVT: case ESP_GATTS_DISCONNECT_EVT:
p_clcb = &hidd_le_env.hidd_clcb; p_clcb = &hidd_le_env.hidd_clcb;
//set the connection flag to true //set the connection flag to true
p_clcb->connected = false; p_clcb->connected = false;
p_clcb->in_use = TRUE; p_clcb->in_use = TRUE;
memset(p_clcb->remote_bda,0,BD_ADDR_LEN); memset(p_clcb->remote_bda, 0, BD_ADDR_LEN);
break; break;
case BTA_GATTS_START_EVT: case ESP_GATTS_START_EVT:
break; break;
case BTA_GATTS_CONGEST_EVT: case ESP_GATTS_CONGEST_EVT:
if(hidd_le_env.hidd_clcb.connected && (hidd_le_env.hidd_clcb.conn_id == p_data->conn.conn_id)) if(hidd_le_env.hidd_clcb.connected && (hidd_le_env.hidd_clcb.conn_id == p_data->conn.conn_id))
{ {
//set the connection channal congested flag to true //set the connection channal congested flag to true
@ -442,7 +442,7 @@ static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
/******************************************************************************* /*******************************************************************************
** **
** Function hidd_le_CreateService ** Function hidd_le_create_service
** **
** Description Create a Service for the hid device profile ** Description Create a Service for the hid device profile
** **
@ -453,17 +453,17 @@ static void hidd_le_profile_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
** Returns NULL ** Returns NULL
** **
*******************************************************************************/ *******************************************************************************/
void hidd_le_CreateService(BOOLEAN is_primary) void hidd_le_create_service(BOOLEAN is_primary)
{ {
tBTA_GATTS_IF server_if ; esp_gatts_if_t server_if ;
tBT_UUID uuid = {LEN_UUID_16, {ATT_SVC_HID}}; esp_bt_uuid_t uuid = {LEN_UUID_16, {ATT_SVC_HID}};
//the number of the hid device attributes in the hid service. //the number of the hid device attributes in the hid service.
UINT16 num_handle = HIDD_LE_IDX_NB; UINT16 num_handle = HIDD_LE_IDX_NB;
UINT8 inst = 0x00; UINT8 inst = 0x00;
server_if = hidd_le_env.gatt_if; server_if = hidd_le_env.gatt_if;
hidd_le_env.inst_id = inst; hidd_le_env.inst_id = inst;
//start create the hid device service //start create the hid device service
BTA_GATTS_CreateService(server_if,&uuid,inst,num_handle,is_primary); esp_ble_gatts_create_srvc (server_if,&uuid,inst,num_handle,is_primary);
} }
@ -472,16 +472,16 @@ void hidd_le_CreateService(BOOLEAN is_primary)
** **
** Description it will be called when client sends a read request ** Description it will be called when client sends a read request
******************************************************************************/ ******************************************************************************/
void hidd_read_attr_value(tGATTS_DATA *p_data, UINT32 trans_id) void hidd_read_attr_value(tGATTS_DATA *p_data, uint32_t trans_id)
{ {
tHIDD_INST *p_inst = &hidd_le_env.hidd_inst; hidd_inst_t *p_inst = &hidd_le_env.hidd_inst;
UINT8 i; uint8_t i;
UINT8 status = GATT_SUCCESS; uint8_t status = ESP_GATT_OK;
UINT8 app_id = hidd_le_env.hidd_inst.app_id; uint8_t app_id = hidd_le_env.hidd_inst.app_id;
tGATT_STATUS st = GATT_NOT_FOUND; esp_gatt_status_t st = ESP_GATT_NOT_FOUND;
UINT16 handle = p_data->read_req.handle; uint16_t handle = p_data->read_req.handle;
UINT16 conn_id = hidd_le_env.hidd_clcb.conn_id; uint16_t conn_id = hidd_le_env.hidd_clcb.conn_id;
if (handle == p_inst->att_tbl[HIDD_LE_INFO_CHAR]) if (handle == p_inst->att_tbl[HIDD_LE_INFO_CHAR])
{ {
@ -512,22 +512,22 @@ void hidd_read_attr_value(tGATTS_DATA *p_data, UINT32 trans_id)
} }
//start build the rsp message //start build the rsp message
Hidd_Rsp(trans_id,conn_id,app_id,status, p_inst->pending_evt,p_data); hidd_rsp(trans_id, conn_id, app_id, status, p_inst->pending_evt, p_data);
} }
/******************************************************************************* /*******************************************************************************
** **
** Function Hidd_Rsp ** Function hidd_rsp
** **
** Description Respond to a hid device service request ** Description Respond to a hid device service request
** **
*******************************************************************************/ *******************************************************************************/
void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id, void hidd_rsp (uint32_t trans_id, uint16_t conn_id, uint8_t app_id,
tGATT_STATUS status, UINT8 event, tGATTS_DATA *p_rsp) esp_gatt_status_t status, uint8_t event, tGATTS_DATA *p_rsp)
{ {
tHIDD_INST *p_inst = &hidd_le_env.hidd_inst; hidd_inst_t *p_inst = &hidd_le_env.hidd_inst;
tGATTS_RSP rsp; tGATTS_RSP rsp;
UINT8 *pp; uint8_t *pp;
LOG_ERROR("conn_id = %x, trans_id = %x, event = %x\n", LOG_ERROR("conn_id = %x, trans_id = %x, event = %x\n",
conn_id,trans_id,event); conn_id,trans_id,event);
@ -548,7 +548,7 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
//copy the infomation value to the att value to sent to the peer device //copy the infomation value to the att value to sent to the peer device
memcpy(rsp.attr_value.value,hidInfo,HID_INFORMATION_LEN); memcpy(rsp.attr_value.value,hidInfo,HID_INFORMATION_LEN);
//start send the rsp to the peer device //start send the rsp to the peer device
BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp); esp_ble_gatts_send_rsp(conn_id, trans_id, status, &rsp);
break; break;
case HIDD_LE_READ_CTNL_PT_EVT: case HIDD_LE_READ_CTNL_PT_EVT:
@ -557,7 +557,7 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_CTNL_PT_CHAR]; rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_CTNL_PT_CHAR];
rsp.attr_value.len = 0; rsp.attr_value.len = 0;
//start send the rsp to the peer device //start send the rsp to the peer device
BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp); esp_ble_gatts_send_rsp(conn_id, trans_id, status, &rsp);
break; break;
case HIDD_LE_READ_REPORT_MAP_EVT: case HIDD_LE_READ_REPORT_MAP_EVT:
@ -568,7 +568,7 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
//copy the infomation value to the att value to sent to the peer device //copy the infomation value to the att value to sent to the peer device
memcpy(rsp.attr_value.value,hidReportMap,hidReportMapLen); memcpy(rsp.attr_value.value,hidReportMap,hidReportMapLen);
//start send the rsp to the peer device //start send the rsp to the peer device
BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp); esp_ble_gatts_send_rsp(conn_id, trans_id, status, &rsp);
break; break;
case HIDD_LE_READ_REPORT_EVT: case HIDD_LE_READ_REPORT_EVT:
LOG_ERROR("p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR] = %x\n", LOG_ERROR("p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR] = %x\n",
@ -576,7 +576,7 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR]; rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR];
rsp.attr_value.len = 0; rsp.attr_value.len = 0;
BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp); esp_ble_gatts_send_rsp(conn_id, trans_id, status, &rsp);
break; break;
case HIDD_LE_READ_PROTO_MODE_EVT: case HIDD_LE_READ_PROTO_MODE_EVT:
LOG_ERROR("p_inst->att_tbl[HIDD_LE_PROTO_MODE_CHAR] = %x\n", LOG_ERROR("p_inst->att_tbl[HIDD_LE_PROTO_MODE_CHAR] = %x\n",
@ -586,7 +586,7 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
pp = rsp.attr_value.value; pp = rsp.attr_value.value;
//copy the infomation value to the att value to sent to the peer device //copy the infomation value to the att value to sent to the peer device
memcpy(rsp.attr_value.value,&hidProtocolMode,rsp.attr_value.len); memcpy(rsp.attr_value.value,&hidProtocolMode,rsp.attr_value.len);
BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp); esp_ble_gatts_send_rsp(conn_id, trans_id, status, &rsp);
break; break;
case HIDD_LE_BOOT_KB_IN_REPORT_EVT: case HIDD_LE_BOOT_KB_IN_REPORT_EVT:
LOG_ERROR("p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR] = %x\n", LOG_ERROR("p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR] = %x\n",
@ -594,7 +594,7 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR]; rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR];
rsp.attr_value.len = 0; rsp.attr_value.len = 0;
BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp); esp_ble_gatts_send_rsp(conn_id, trans_id, status, &rsp);
break; break;
case HIDD_LE_BOOT_KB_OUT_REPORT_EVT: case HIDD_LE_BOOT_KB_OUT_REPORT_EVT:
LOG_ERROR("p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR] = %x\n", LOG_ERROR("p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR] = %x\n",
@ -602,7 +602,7 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR]; rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR];
rsp.attr_value.len = 0; rsp.attr_value.len = 0;
BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp); esp_ble_gatts_send_rsp(conn_id, trans_id, status, &rsp);
break; break;
case HIDD_LE_BOOT_MOUSE_IN_REPORT_EVT: case HIDD_LE_BOOT_MOUSE_IN_REPORT_EVT:
LOG_ERROR("p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR] = %x\n", LOG_ERROR("p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR] = %x\n",
@ -610,7 +610,7 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR]; rsp.attr_value.handle = p_inst->att_tbl[HIDD_LE_BOOT_KB_IN_REPORT_CHAR];
rsp.attr_value.len = 0; rsp.attr_value.len = 0;
BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp); esp_ble_gatts_send_rsp(conn_id, trans_id, status, &rsp);
break; break;
default: default:
break; break;
@ -630,28 +630,28 @@ void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id,
** Description Initializa the GATT Service for button profiles. ** Description Initializa the GATT Service for button profiles.
** Returns NULL ** Returns NULL
*******************************************************************************/ *******************************************************************************/
tGATT_STATUS hidd_le_init (void) esp_gatt_status_t hidd_le_init (void)
{ {
tBT_UUID app_uuid = {LEN_UUID_16,{ATT_SVC_HID}}; tBT_UUID app_uuid = {LEN_UUID_16,{ATT_SVC_HID}};
if(hidd_le_env.enabled) if(hidd_le_env.enabled)
{ {
LOG_ERROR("hid device svc already initaliezd"); LOG_ERROR("hid device svc already initaliezd\n");
return GATT_ERROR; return ESP_GATT_ERROR;
} }
else else
{ {
memset(&hidd_le_env,0,sizeof(tHIDD_LE_ENV)); memset(&hidd_le_env,0,sizeof(hidd_le_env_t));
} }
/* /*
register the hid deivce profile to the BTA_GATTS module*/ register the hid deivce profile to the BTA_GATTS module*/
BTA_GATTS_AppRegister(&app_uuid,hidd_le_profile_cb); esp_ble_gatts_app_register(&app_uuid, hidd_le_profile_cb);
hidd_le_env.enabled = TRUE; hidd_le_env.enabled = TRUE;
return GATT_SUCCESS; return ESP_GATT_OK;
} }

64
components/bt/bluedroid/profiles/std/include/hid_le_prf.h
View file

@ -195,76 +195,76 @@ enum
typedef struct typedef struct
{ {
/// Service Features /// Service Features
UINT8 svc_features; uint8_t svc_features;
/// Number of Report Char. instances to add in the database /// Number of Report Char. instances to add in the database
UINT8 report_nb; uint8_t report_nb;
/// Report Char. Configuration /// Report Char. Configuration
UINT8 report_char_cfg[HIDD_LE_NB_REPORT_INST_MAX]; uint8_t report_char_cfg[HIDD_LE_NB_REPORT_INST_MAX];
}tHIDD_FEATURE; }hidd_feature_t;
typedef struct typedef struct
{ {
BOOLEAN in_use; BOOLEAN in_use;
BOOLEAN congest; BOOLEAN congest;
UINT16 conn_id; uint16_t conn_id;
BOOLEAN connected; BOOLEAN connected;
BD_ADDR remote_bda; BD_ADDR remote_bda;
UINT32 trans_id; uint32_t trans_id;
UINT8 cur_srvc_id; uint8_t cur_srvc_id;
}tHIDD_CLCB; }hidd_clcb_t;
// HID report mapping table // HID report mapping table
typedef struct typedef struct
{ {
UINT16 handle; // Handle of report characteristic uint16_t handle; // Handle of report characteristic
UINT16 cccdHandle; // Handle of CCCD for report characteristic uint16_t cccdHandle; // Handle of CCCD for report characteristic
UINT8 id; // Report ID uint8_t id; // Report ID
UINT8 type; // Report type uint8_t type; // Report type
UINT8 mode; // Protocol mode (report or boot) uint8_t mode; // Protocol mode (report or boot)
} hidRptMap_t; } hidRptMap_t;
typedef struct typedef struct
{ {
/// hidd profile id /// hidd profile id
UINT8 app_id; uint8_t app_id;
/// Notified handle /// Notified handle
UINT16 ntf_handle; uint16_t ntf_handle;
///Attribute handle Table ///Attribute handle Table
UINT16 att_tbl[HIDD_LE_CHAR_MAX]; uint16_t att_tbl[HIDD_LE_CHAR_MAX];
/// Supported Features /// Supported Features
tHIDD_FEATURE hidd_feature[HIDD_LE_NB_HIDS_INST_MAX]; hidd_feature_t hidd_feature[HIDD_LE_NB_HIDS_INST_MAX];
/// Current Protocol Mode /// Current Protocol Mode
UINT8 proto_mode[HIDD_LE_NB_HIDS_INST_MAX]; uint8_t proto_mode[HIDD_LE_NB_HIDS_INST_MAX];
/// Number of HIDS added in the database /// Number of HIDS added in the database
UINT8 hids_nb; uint8_t hids_nb;
UINT8 pending_evt; uint8_t pending_evt;
UINT16 pending_hal; uint16_t pending_hal;
}tHIDD_INST; }hidd_inst_t;
/* service engine control block */ /* service engine control block */
typedef struct typedef struct
{ {
tHIDD_CLCB hidd_clcb; /* connection link*/ hidd_clcb_t hidd_clcb; /* connection link*/
tGATT_IF gatt_if; esp_gatt_if_t gatt_if;
BOOLEAN enabled; BOOLEAN enabled;
BOOLEAN is_primery; BOOLEAN is_primery;
tHIDD_INST hidd_inst; hidd_inst_t hidd_inst;
UINT8 inst_id; uint8_t inst_id;
}tHIDD_LE_ENV; }hidd_le_env_t;
extern tHIDD_LE_ENV hidd_le_env; extern hidd_le_env_t hidd_le_env;
void hidd_le_CreateService(BOOLEAN is_primary); void hidd_le_create_service(BOOLEAN is_primary);
void Hidd_Rsp (UINT32 trans_id, UINT16 conn_id, UINT8 app_id, void hidd_rsp (uint32_t trans_id, uint16_t conn_id, uint8_t app_id,
tGATT_STATUS status, UINT8 event, tGATTS_DATA *p_rsp); esp_gatt_status_t status, uint8_t event, tGATTS_DATA *p_rsp);
void hidd_read_attr_value(tGATTS_DATA *p_data, UINT32 trans_id); void hidd_read_attr_value(tGATTS_DATA *p_data, uint32_t trans_id);
tGATT_STATUS hidd_le_init (void); tGATT_STATUS hidd_le_init (void);

31
components/bt/bluedroid/profiles/std/include/prf_defs.h
View file

@ -19,6 +19,7 @@
#include "bta_gatts_int.h" #include "bta_gatts_int.h"
#include "bta_gatt_api.h" #include "bta_gatt_api.h"
#include "bt_types.h" #include "bt_types.h"
#include "bt_app_defs.h"
#define ATT_HANDLE_LEN 0x0002 #define ATT_HANDLE_LEN 0x0002
@ -39,46 +40,46 @@
typedef struct typedef struct
{ {
///characteristic uuid ///characteristic uuid
tBT_UUID *char_uuid; esp_bt_uuid_t *char_uuid;
///the permition of the characteristic ///the permition of the characteristic
tBTA_GATT_PERM perm; esp_gatt_perm_t perm;
/// the properties of the characteristic /// the properties of the characteristic
tBTA_GATT_CHAR_PROP prop; esp_gatt_char_prop_t prop;
}tCHAR_DESC; }char_desc_t;
/// UUID - 128-bit type /// UUID - 128-bit type
typedef struct typedef struct
{ {
/// 128-bit UUID /// 128-bit UUID
UINT8 uuid[ATT_UUID_128_LEN]; uint8_t uuid[ATT_UUID_128_LEN];
}tUUID_128; }uuid_128_t;
/// UUID - 32-bit type /// UUID - 32-bit type
typedef struct typedef struct
{ {
/// 32-bit UUID /// 32-bit UUID
UINT8 uuid[ATT_UUID_32_LEN]; uint8_t uuid[ATT_UUID_32_LEN];
}tUUID_32; }uuid_32_t;
/// include service entry element /// include service entry element
typedef struct typedef struct
{ {
/// start handle value of included service /// start handle value of included service
UINT16 start_hdl; uint16_t start_hdl;
/// end handle value of included service /// end handle value of included service
UINT16 end_hdl; uint16_t end_hdl;
/// attribute value UUID /// attribute value UUID
UINT16 uuid; uint16_t uuid;
}tSVC_INCL_DESC; }incl_svc_desc;
/// Service Changed type definition /// Service Changed type definition
typedef struct typedef struct
{ {
/// Service start handle which changed /// Service start handle which changed
UINT16 start_hdl; uint16_t start_hdl;
/// Service end handle which changed /// Service end handle which changed
UINT16 end_hdl; uint16_t end_hdl;
}tSVC_CHANG; }svc_chang_type_t;