]> rtime.felk.cvut.cz Git - tiny-bt.git/blobdiff - src2/tiny_bt_hci_core.c
Better coding style and evt_array is setted on zeros in init function
[tiny-bt.git] / src2 / tiny_bt_hci_core.c
index be0916a713229c257325631bf29a89d1c62017ce..31abb0be4a93b0566cfeb4a8bfe70a2d1dfe181b 100644 (file)
 #include "tiny_bt_hci_cmd.h"
 #include "bt_hw.h"
 
-
 static expect_evt evt_array[MAX_CMD_STATE_REQUEST];
 static int evt_id;
 static int global_index;
 extern connection_hci connection;
 /******************************HCI callback functions*********************/
 
-static void callback_hci_all_commands(void *p_arg, void *p_recbuf){
+static void callback_hci_all_commands(void *p_arg, void *p_recbuf) 
+{
        evt_cmd_status *p_rp;
        p_rp = (void *) p_recbuf;
 
-       if(p_rp->status){
+       if (p_rp->status) {
                perror("command status error\n");
                //return -1;
                exit(-1); // !!!!!!!!!!!!!!!!
@@ -39,42 +39,46 @@ static void callback_hci_all_commands(void *p_arg, void *p_recbuf){
        //return 0;
 }
 
-static void callback_hci_read_bd_addr(void *p_arg, void *p_recbuf){
-       read_bd_addr_data *p_data=p_arg;
+static void callback_hci_read_bd_addr(void *p_arg, void *p_recbuf)
+{
+       read_bd_addr_data *p_data = p_arg;
        read_bd_addr_rp *p_rp;
                
-       p_rp = (void *) (p_recbuf+3);   
-       memcpy(p_data->p_address,&p_rp->bdaddr,6);
+       p_rp = (void *) (p_recbuf + 3); 
+       memcpy(p_data->p_address, &p_rp->bdaddr, 6);
        p_data->callback_app_read_bd_addr(p_data->p_address);
        free(p_data);
 }
 
-static void callback_hci_read_local_name(void *p_arg, void *p_recbuf){
-       read_local_name_data *p_data=p_arg;
+static void callback_hci_read_local_name(void *p_arg, void *p_recbuf)
+{
+       read_local_name_data *p_data = p_arg;
        read_local_name_rp *p_rp;
 
-       p_rp = (void *) (p_recbuf+3);
-       memcpy(p_data->p_name,&p_rp->name,248);
+       p_rp = (void *) (p_recbuf + 3);
+       memcpy(p_data->p_name, &p_rp->name, 248);
        p_data->callback_app_read_local_name(p_data->p_name);
        free(p_data);
 }
 
-static void callback_hci_inquiry_RSSI(void *p_arg, void *p_recbuf){
-       inquiry_RSSI_data *p_data=p_arg;
+static void callback_hci_inquiry_RSSI(void *p_arg, void *p_recbuf)
+{
+       inquiry_RSSI_data *p_data = p_arg;
        inquiry_info_with_rssi *p_rp;
 
-       p_rp = (void *) (p_recbuf+1);
-       memcpy(p_data->p_address,&p_rp->bdaddr,6);
+       p_rp = (void *) (p_recbuf + 1);
+       memcpy(p_data->p_address, &p_rp->bdaddr, 6);
        p_data->callback_app_inquiry_RSSI(p_data->p_address);
        free(p_data);
 }
 
-static void callback_hci_inquiry_comple(void *p_arg, void *p_recbuf){
-       inquiry_complete_data *p_data=p_arg;
+static void callback_hci_inquiry_comple(void *p_arg, void *p_recbuf)
+{
+       inquiry_complete_data *p_data = p_arg;
        __u8 *p_byte;
 
        p_byte = (void *) p_recbuf;
-       if(*p_byte){
+       if (*p_byte) {
                perror("inquiry complete status error\n");
                exit(-1); // !!!!!!!!
        }
@@ -83,80 +87,94 @@ static void callback_hci_inquiry_comple(void *p_arg, void *p_recbuf){
        free(p_data);
 }
 
-static void callback_hci_create_connection(void *p_arg, void *p_recbuf){
-       connection_complete_data *p_data=p_arg;
+static void callback_hci_create_connection(void *p_arg, void *p_recbuf)
+{
+       connection_complete_data *p_data = p_arg;
        evt_conn_complete *p_rp;
 
-       p_rp = (void *) (p_recbuf+3);
-       memcpy(p_data->p_handle,&p_rp->handle,2);
+       p_rp = (void *) (p_recbuf + 3);
+       memcpy(p_data->p_handle, &p_rp->handle, 2);
        //memcpy(p_data->p_address,&p_rp->bdaddr,6);
        p_data->callback_app_connection_complete(p_data->p_handle);
        free(p_data);
 }
 
+static void callback_hci_connection_request(void *p_arg, void *p_recbuf)
+{
+       connection_request_data *p_data = p_arg;
+       evt_conn_request *p_rp;
+       
+       p_rp = (void *) (p_recbuf);
+       memcpy(p_data->p_address, &p_rp->bdaddr, 6);
+       p_data->callback_app_connection_request(p_data->p_address);
+       free(p_data);
+}
 
-void add_evt_toarray(expect_evt *p_evt)   //fcn add the request at the end of array or replace the oldest request
+static void callback_hci_disconnect(void *p_arg, void *p_recbuf)
 {
-       int i,sig=0,index=0;
-       expect_evt the_oldest=evt_array[0];
-
-       for ( i=0;i<MAX_EVT_COUNT;i++ )
-       {
-               if ( ( evt_array[i].actual_status ) ==0 || evt_array[i].actual_status==3 )
-               {
-                       evt_array[i]=*p_evt;
+       disconnect_data *p_data = p_arg;
+       evt_disconn_complete *p_rp;
+
+       p_rp = (void *) (p_recbuf);
+       p_data->callback_app_disconnect(&p_rp->handle, &p_rp->reason);
+       free(p_data);   
+}
+
+/******************************array functions*********************/
+/*fcn add the request at the end of array or replace the oldest request*/
+void add_evt_toarray(expect_evt *p_evt)   
+{
+       int i;
+       int sig = 0,index = 0;
+       expect_evt the_oldest = evt_array[0];
+
+       for (i = 0; i < MAX_EVT_COUNT; i++) {/*todo use constatns will be better*/
+               if (evt_array[i].actual_status == 0 || evt_array[i].actual_status == 3) {
+                       evt_array[i] = *p_evt;
                        sig=1;
                        global_index=i;
                        break;
                }
-               if ( ( evt_array[i].id ) < the_oldest.id )   //the smallest id (oldest request) will stay here
-               {
+               /*the smallest id (oldest request) will stay here*/
+               if (evt_array[i].id < the_oldest.id) {
                        the_oldest = evt_array[i];
                        index=i;
 
                }
        }
-       if ( !sig )
-       {
-
-               evt_array[index]=*p_evt;
-               global_index=index;
+       if (!sig) {
+               evt_array[index] = *p_evt;
+               global_index = index;
        }
 }
 
-int look_up_inarray(__u8 evt_type, __u16 opcode){
-       
-       int i,index=-1,oldestid=65535;
-
+int look_up_inarray(__u8 evt_type, __u16 opcode)
+{
+       int i;
+       int index = -1, oldestid = 65535;
 
-       if(evt_array[global_index].evt_type == evt_type && evt_array[global_index].actual_status != DONE){
-               if(opcode!=0){
+       if (evt_array[global_index].evt_type == evt_type && evt_array[global_index].actual_status != DONE) {
+               if (opcode != 0) {
                        if(evt_array[global_index].req_opcode == opcode)
                                return global_index;    
-               }
-               else{
+               } else {
                        return global_index;
                }
                
-       }
-       else
-       {
-               for ( i=0;i<MAX_CMD_STATE_REQUEST;i++ )
-               {
-                       if ( evt_array[i].evt_type == evt_type && evt_array[i].actual_status != DONE )
-                       {       
-                               if(opcode!=0){
-                                       if(evt_array[i].req_opcode == opcode){
-                                               if(evt_array[i].id<oldestid){
-                                                       oldestid=evt_array[i].id;
-                                                       index=i;
+       } else {
+               for (i = 0; i < MAX_CMD_STATE_REQUEST; i++) {
+                       if (evt_array[i].evt_type == evt_type && evt_array[i].actual_status != DONE ) { 
+                               if (opcode != 0) {
+                                       if (evt_array[i].req_opcode == opcode) {
+                                               if (evt_array[i].id < oldestid) {
+                                                       oldestid = evt_array[i].id;
+                                                       index = i;
                                                }
                                        }
-                               }
-                               else{
-                                       if(evt_array[i].id<oldestid){
-                                               oldestid=evt_array[i].id;
-                                               index=i;
+                               } else {
+                                       if (evt_array[i].id < oldestid) {
+                                               oldestid = evt_array[i].id;
+                                               index = i;
                                        }
                                }
                        }
@@ -166,290 +184,392 @@ int look_up_inarray(__u8 evt_type, __u16 opcode){
        return -1;
 }
 
-
-
-
-int tiny_bt_init(__u8 dev_id){
+/******************************tiny_bt_functions functions*********************/
+int tiny_bt_init(__u8 dev_id)
+{
        struct hci_filter nf;
        int dd;
-       expect_evt evt,*p_evt=&evt;
-       connection_hci *p_conn=&connection;
+       expect_evt evt, *p_evt = &evt;
+       connection_hci *p_conn = &connection;
        req_state status = PERMANENT;
        connection_state con_state = DISCONNECT;
-       evt_id=0;
-       global_index=0;
-       p_conn->con_id=0;
-       p_conn->con_state=con_state;
-
-       memset(p_evt,0,sizeof(evt));
-       p_evt->actual_status=status;
-       p_evt->id=evt_id++;
-       p_evt->evt_type=EVT_CMD_STATUS;
-       p_evt->p_callback=callback_hci_all_commands;
-       p_evt->p_data=NULL;
-
+       
+       memset(evt_array, 0, MAX_CMD_STATE_REQUEST * sizeof(expect_evt));
+       evt_id = 0;
+       global_index = 0;
+       p_conn->con_id = 0;
+       p_conn->con_state = con_state;
+
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_CMD_STATUS;
+       p_evt->p_callback = callback_hci_all_commands;
+       p_evt->p_data = NULL;
        add_evt_toarray(p_evt);
        
-       dd=hw_bt_open_device(dev_id);
+       if ((dd = hw_bt_open_device(dev_id)) < 0) {
+               perror("device impossible to open\n");
+               return -1;
+       }
        
        hci_filter_clear(&nf);
        hci_filter_all_ptypes(&nf);
        hci_filter_all_events(&nf);
 //     hci_filter_set_opcode(swap_2_bytes(READ_BD_ADDR_CMD_OP),&nf);
                
-       if(setsockopt(dd, SOL_HCI, HCI_FILTER, &nf, sizeof(nf))<0){
-               perror("some problem with setsockopt");
+       if (setsockopt(dd, SOL_HCI, HCI_FILTER, &nf, sizeof(nf)) < 0) {
+               perror("some problem with setsockopt\n");
                return -1;
        }
        printf("init was succesful dd:%d\n",dd);
-
        return 0;
-
 }
 
-int tiny_bt_process(){
-       
-       int len,j,index;
-       static int inqRSSI_index=-1;
+int tiny_bt_process()
+{
+       int len, j, index;
+       int err;
+       static int inqRSSI_index = -1;
        hci_event_hdr *p_hdr;
-       __u8 recbuf[HCI_MAX_EVENT_SIZE],*p_recbuf;
+       __u8 recbuf[HCI_MAX_EVENT_SIZE], *p_recbuf;
 
-       len=hw_bt_read(recbuf);
+       len = hw_bt_read(recbuf);
 
-       if ( len )
-       {
-               printf ( "Count of received bytes %d \n ",len );
-               for ( j=0;j<len;j++ )
-               {
-                       printf ( "%2.2X ",recbuf[j] );
+       if (len) {
+               printf("Count of received bytes %d\n ", len);
+               for (j = 0; j < len; j++) {
+                       printf(" %2.2X ",recbuf[j]);
                }
-               printf ( "\n" );
-               if ( recbuf[0]==HCI_EVENT_PKT )
-               {
-                       p_hdr = ( void * ) ( recbuf + 1 );
-                       p_recbuf = ( void * ) ( recbuf + ( 1 + HCI_EVENT_HDR_SIZE ) );
-                       if(p_hdr->evt==EVT_CMD_COMPLETE ){
+               printf("\n");
+               if (recbuf[0] == HCI_EVENT_PKT) {
+                       p_hdr = (void *) (recbuf + 1);
+                       p_recbuf = (void *) (recbuf + (1 + HCI_EVENT_HDR_SIZE));
+                       if (p_hdr->evt == EVT_CMD_COMPLETE) {
                                evt_cmd_complete *p_ccevt;
                                p_ccevt = (void *) p_recbuf;
-                               if((index=look_up_inarray(p_hdr->evt,swap_2_bytes(p_ccevt->opcode)))<0){
-                                       printf ( "There is no awaiting evt like this\n" );
-                                       return -1;
-                               }
-                               else{
+                               if ((index = look_up_inarray(p_hdr->evt, swap_2_bytes(p_ccevt->opcode))) < 0) {
+                                       err = -1;
+                                       goto no_evt_exit;
+                               } else {
                                        evt_array[index].p_callback(evt_array[index].p_data, p_recbuf);
-                                       if(evt_array[index].actual_status != PERMANENT){
+                                       if (evt_array[index].actual_status != PERMANENT)
                                                evt_array[index].actual_status = DONE;
-                                       }
+                                       
                                }
-                       }
-                       /*else if(p_hdr->evt==EVT_INQUIRY_RESULT_WITH_RSSI){
-                               if((index=look_up_inarray(p_hdr->evt,0))<0){
-                                       printf("There is no awaiting evt like this\n");
-                                       return -1;
-                               }
-                               else{
-                                       inqRSSI_index=index; //I will save a inq evt index
+                       } else if (p_hdr->evt == EVT_INQUIRY_RESULT_WITH_RSSI || p_hdr->evt == EVT_INQUIRY_RESULT) {
+                               if ((index = look_up_inarray(EVT_INQUIRY_RESULT_WITH_RSSI, 0)) < 0) {
+                                       err = -1;
+                                       goto no_evt_exit;
+                               } else {
                                        evt_array[index].p_callback(evt_array[index].p_data, p_recbuf);
+                                       if (evt_array[index].actual_status != PERMANENT)
+                                               evt_array[index].actual_status = DONE;
+                                       
                                }
 
-                       }  */
-                       else if(p_hdr->evt==EVT_INQUIRY_COMPLETE){
-                               if((index=look_up_inarray(p_hdr->evt,0))<0){
-                                       printf("There is no awaiting evt like this\n");
-                                       return -1;
-                               }
-                               if((inqRSSI_index=look_up_inarray(EVT_INQUIRY_RESULT_WITH_RSSI,0))<0){
-                                       printf("There is no awaiting evt like this\n");
-                                       return -1;
+                       } else if (p_hdr->evt == EVT_MAX_SLOTS_CHANGE || p_hdr->evt == EVT_NUM_COMP_PKTS) {
+                               /*TODO*/
+                               return 0;
+                       } else if (p_hdr->evt == EVT_INQUIRY_COMPLETE) {
+                               if ((index = look_up_inarray(p_hdr->evt, 0)) < 0) {
+                                       err = -1;
+                                       goto no_evt_exit;
                                }
-                               
-                               else{
+                               if ((inqRSSI_index = look_up_inarray(EVT_INQUIRY_RESULT_WITH_RSSI, 0)) < 0) {
+                                       err = -1;
+                                       goto no_evt_exit;
+                               } else {
                                        evt_array[index].p_callback(evt_array[index].p_data, p_recbuf);
-                                       if(evt_array[index].actual_status != PERMANENT){
+                                       if (evt_array[index].actual_status != PERMANENT) {
                                                evt_array[index].actual_status = DONE;
                                        }// mark inq result evt like a DONE
-                                       if(evt_array[inqRSSI_index].actual_status != PERMANENT){
+                                       if (evt_array[inqRSSI_index].actual_status != PERMANENT) {
                                                free(evt_array[inqRSSI_index].p_data);
                                                evt_array[inqRSSI_index].actual_status = DONE;
                                        }
                                }
-
-                       }
-                       else{
-                               if((index=look_up_inarray(p_hdr->evt,0))<0){
-                                       printf("There is no awaiting evt like this\n");
-                                       return -1;
-                               }
-                               else{
+                       } else {
+                               if ((index = look_up_inarray(p_hdr->evt, 0)) < 0) {
+                                       err = -1;
+                                       goto no_evt_exit;
+                               } else {
                                        evt_array[index].p_callback(evt_array[index].p_data, p_recbuf);
-                                       if(evt_array[index].actual_status != PERMANENT){
+                                       if (evt_array[index].actual_status != PERMANENT) 
                                                evt_array[index].actual_status = DONE;
-                                       }
                                }
                        }
-                       return 1;
-               }
-               else if ( recbuf[0]==2 )
-               {
-
-               }
-               else return 0; // 0 or -1
+                       goto evt_found_exit;
+               } else if (recbuf[0] == HCI_ACLDATA_PKT) {
+                       printf("Incoming data:\n");
+                       printf("Count of received bytes %d\n ", len);
+                       for(j = 0; j < len; j++) {
+                               printf("%2.2X ", recbuf[j]);
+                       }
+                       printf("\n");
+               } else 
+                       goto packet_wrong; 
+       } else 
+               goto no_data;
+       
+       
+no_evt_exit:
+       printf("There is no awaiting evt like this\n");
+       return err;
+       
+evt_found_exit:
+       return 1;
 
-       }
-       else
-       {
-               //printf ( "There is nothing on socket \n");
-               return 0;
-       }
+packet_wrong:
+       printf("Packet have bad format\n");
+       return 0;
 
+no_data:
+       printf("There is no data on socket");
        return 0;
 }
 
-int tiny_bt_read_bd_addr(bt_address *p_dest, void(*callback_app_read_bd_addr)(bt_address *p_address)){
-       expect_evt evt,*p_evt=&evt;
+int tiny_bt_read_bd_addr(bt_address *p_dest, void(*callback_app_read_bd_addr)(bt_address *p_address))
+{
+       expect_evt evt, *p_evt = &evt;
        req_state status = ESTABLISHED;
        read_bd_addr_data *p_data;
 
-       memset(p_evt,0,sizeof(evt));
-       p_evt->actual_status=status;
-       p_evt->id=evt_id++;
-       p_evt->evt_type=EVT_CMD_COMPLETE;
-       p_evt->req_opcode=READ_BD_ADDR_CMD_OP;
-       p_evt->p_callback=&callback_hci_read_bd_addr;
-
-       p_data=malloc(sizeof(read_bd_addr_data));
-       p_data->p_address=p_dest;
-       p_data->callback_app_read_bd_addr=callback_app_read_bd_addr;
-       p_evt->p_data=(void *) p_data;
-
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_CMD_COMPLETE;
+       p_evt->req_opcode = READ_BD_ADDR_CMD_OP;
+       p_evt->p_callback = &callback_hci_read_bd_addr;
+
+       p_data = malloc(sizeof(read_bd_addr_data));
+       p_data->p_address = p_dest;
+       p_data->callback_app_read_bd_addr = callback_app_read_bd_addr;
+       p_evt->p_data = (void *) p_data;
        add_evt_toarray(p_evt);
-       if(send_hci_read_bd_addr_cmd()<0)
-       {
-               perror("send_hci_cmd error");
+
+       if (send_hci_read_bd_addr_cmd() < 0) {
+               perror("send_hci_cmd error\n");
                return -1;
        }
        return 0;
 }
 
-int tiny_bt_read_local_name(char *p_name, void(*callback_app_read_local_name)(char *p_name)){
-       expect_evt evt,*p_evt=&evt;
+int tiny_bt_read_local_name(char *p_name, void(*callback_app_read_local_name)(char *p_name)) 
+{
+       expect_evt evt, *p_evt = &evt;
        req_state status = ESTABLISHED;
        read_local_name_data *p_data;
 
-       memset (p_evt,0,sizeof(evt));
-       p_evt->actual_status=status;
-       p_evt->id=evt_id++;
-       p_evt->evt_type=EVT_CMD_COMPLETE;
-       p_evt->req_opcode=READ_LOCAL_NAME_CMD_OP;
-       p_evt->p_callback=callback_hci_read_local_name;
+       memset (p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_CMD_COMPLETE;
+       p_evt->req_opcode = READ_LOCAL_NAME_CMD_OP;
+       p_evt->p_callback = callback_hci_read_local_name;
 
-       p_data=malloc (sizeof(read_local_name_data));
-       p_data->p_name=p_name;
-       p_data->callback_app_read_local_name=callback_app_read_local_name;
-       p_evt->p_data=(void *) p_data;
+       p_data = malloc(sizeof(read_local_name_data));
+       p_data->p_name = p_name;
+       p_data->callback_app_read_local_name = callback_app_read_local_name;
+       p_evt->p_data = (void *) p_data;
 
        add_evt_toarray(p_evt);
-       if(send_hci_read_local_name_cmd()<0)
-       {
-               perror("send_hci_cmd error");
+       if(send_hci_read_local_name_cmd() < 0) {
+               perror("send_hci_cmd error\n");
                return -1;
        }
        return 0;
 }
 
-int tiny_bt_inquiry(bt_address *p_dest_addr, void(*callback_app_inquiry_RSSI)(bt_address *p_address), void(*callback_app_inquiry_complete)(void)){
-       
-       expect_evt evt,*p_evt=&evt;
+int tiny_bt_inquiry(bt_address *p_dest_addr, void(*callback_app_inquiry_RSSI)(bt_address *p_address), void(*callback_app_inquiry_complete)(void))
+{
+       expect_evt evt,*p_evt = &evt;
        req_state status = ESTABLISHED;
        req_state istatus = ESTABLISHED;
        inquiry_RSSI_data *p_data;
        inquiry_complete_data *p_idata;
        
-       memset (p_evt,0,sizeof(evt));
-       p_evt->actual_status=status;
-       p_evt->id=evt_id++;
-       p_evt->evt_type=EVT_INQUIRY_RESULT_WITH_RSSI;
-       p_evt->req_opcode=INQUIRY_CMD_OP;
-       p_evt->p_callback=callback_hci_inquiry_RSSI;
-
-       p_data=malloc(sizeof(inquiry_RSSI_data));
-       p_data->p_address=p_dest_addr;
-       p_data->callback_app_inquiry_RSSI=callback_app_inquiry_RSSI;
-       p_evt->p_data=(void *) p_data;
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_INQUIRY_RESULT_WITH_RSSI;
+       p_evt->req_opcode = INQUIRY_CMD_OP;
+       p_evt->p_callback = callback_hci_inquiry_RSSI;
+
+       p_data = malloc(sizeof(inquiry_RSSI_data));
+       p_data->p_address = p_dest_addr;
+       p_data->callback_app_inquiry_RSSI = callback_app_inquiry_RSSI;
+       p_evt->p_data = (void *) p_data;
        
        add_evt_toarray(p_evt);
 
-       memset (p_evt,0,sizeof(evt));
-       p_evt->actual_status=istatus;
-       p_evt->id=evt_id++;
-       p_evt->evt_type=EVT_INQUIRY_COMPLETE;
-       p_evt->req_opcode=INQUIRY_CMD_OP;
-       p_evt->p_callback=callback_hci_inquiry_comple;
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = istatus;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_INQUIRY_COMPLETE;
+       p_evt->req_opcode = INQUIRY_CMD_OP;
+       p_evt->p_callback = callback_hci_inquiry_comple;
 
-       p_idata=malloc(sizeof(inquiry_complete_data));
-       p_idata->callback_app_inquiry_complete=callback_app_inquiry_complete;
+       p_idata = malloc(sizeof(inquiry_complete_data));
+       p_idata->callback_app_inquiry_complete = callback_app_inquiry_complete;
        p_evt->p_data = (void *)p_idata;
        
        add_evt_toarray(p_evt);
        
-       if(send_hci_inquiry_cmd()<0)
-       {
+       if(send_hci_inquiry_cmd()<0) {
                perror("send_hci_cmd error");
                return -1;
        }
        return 0;
 }
 
-void tiny_bt_inquiry_register_again(bt_address *p_dest_addr, void(*callback_app_inquiry_RSSI)(bt_address *p_address)){
-       expect_evt evt,*p_evt=&evt;
+void tiny_bt_inquiry_register_again(bt_address *p_dest_addr, void(*callback_app_inquiry_RSSI)(bt_address *p_address))
+{
+       expect_evt evt, *p_evt = &evt;
        req_state status = ESTABLISHED;
        inquiry_RSSI_data *p_data;
        
-       memset (p_evt,0,sizeof(evt));
-       p_evt->actual_status=status;
-       p_evt->id=evt_id++;
-       p_evt->evt_type=EVT_INQUIRY_RESULT_WITH_RSSI;
-       p_evt->req_opcode=INQUIRY_CMD_OP;
-       p_evt->p_callback=callback_hci_inquiry_RSSI;
-
-       p_data=malloc(sizeof(inquiry_RSSI_data));
-       p_data->p_address=p_dest_addr;
-       p_data->callback_app_inquiry_RSSI=callback_app_inquiry_RSSI;
-       p_evt->p_data=(void *) p_data;
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_INQUIRY_RESULT_WITH_RSSI;
+       p_evt->req_opcode = INQUIRY_CMD_OP;
+       p_evt->p_callback = callback_hci_inquiry_RSSI;
+
+       p_data = malloc(sizeof(inquiry_RSSI_data));
+       p_data->p_address = p_dest_addr;
+       p_data->callback_app_inquiry_RSSI = callback_app_inquiry_RSSI;
+       p_evt->p_data = (void *) p_data;
        
        add_evt_toarray(p_evt);
 }
 
 int tiny_bt_connect(bt_address *p_dest_addr, __u16 *p_handle, void( *callback_app_connection_complete)(__u16 *p_handle))
 {
-       expect_evt evt,*p_evt=&evt;
+       expect_evt evt, *p_evt = &evt;
        req_state status = ESTABLISHED;
        connection_complete_data *p_data;
 
-       memset ( p_evt,0,sizeof ( evt ) );
-       p_evt->actual_status=status;
-       p_evt->id=evt_id++;
-       p_evt->evt_type=EVT_CONN_COMPLETE;
-       p_evt->req_opcode=CREATE_CONNECTION_CMD_OP;
-       p_evt->p_callback=callback_hci_create_connection;
-
-       p_data=malloc ( sizeof ( connection_complete_data ) );
-       p_data->p_handle=p_handle;
-       p_data->callback_app_connection_complete=callback_app_connection_complete;
-       p_evt->p_data= ( void * ) p_data;
-
-       add_evt_toarray ( p_evt );
-       if ( send_hci_create_connection_cmd ( p_dest_addr ) <0 )
-       {
-               perror ( "send_hci_cmd error" );
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_CONN_COMPLETE;
+       p_evt->req_opcode = CREATE_CONNECTION_CMD_OP;
+       p_evt->p_callback = callback_hci_create_connection;
+
+       p_data = malloc(sizeof(connection_complete_data));
+       p_data->p_handle = p_handle;
+       p_data->callback_app_connection_complete = callback_app_connection_complete;
+       p_evt->p_data = (void *) p_data;
+
+       add_evt_toarray (p_evt);
+       if (send_hci_create_connection_cmd(p_dest_addr) < 0) {
+               perror("send_hci_cmd error\n");
                return -1;
        }
        return 0;
 
 }
 
-int tiny_bt_wait_for_connection()
+void tiny_bt_wait_for_connection(bt_address *p_dest_addr, void(*callback_app_conection_request)(bt_address *p_address)) 
 {
+       expect_evt evt, *p_evt = &evt;
+       req_state status = ESTABLISHED;
+       connection_request_data *p_data;
+       
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_CONN_REQUEST;
+       p_evt->p_callback = callback_hci_connection_request;
+       
+       p_data = malloc(sizeof(connection_request_data));
+       p_data->p_address = p_dest_addr;
+       p_data->callback_app_connection_request = callback_app_conection_request;
+       p_evt->p_data = (void*) p_data;
+
+       add_evt_toarray(p_evt);
+}
+
+int tiny_bt_accept_connection(bt_address *p_dest_addr, __u16 *p_handle, void(*callback_app_connection_complete)(__u16 *p_handle))
+{
+       expect_evt evt, *p_evt = &evt;
+       req_state status = ESTABLISHED;
+       connection_complete_data *p_data;
+
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_CONN_COMPLETE;
+       p_evt->req_opcode = ACCEPT_CONNECTION_REQ_OP;
+       p_evt->p_callback = callback_hci_create_connection;
+
+       p_data = malloc(sizeof(connection_complete_data));
+       p_data->p_handle = p_handle;
+       p_data->callback_app_connection_complete = callback_app_connection_complete;
+       p_evt->p_data = (void *) p_data;
+       
+       add_evt_toarray(p_evt);
+       // and register disconnect event
+       if (send_hci_accept_conn_req_cmd(p_dest_addr) < 0) {
+               perror("send_hci_cmd error\n");
+               return -1;
+       }
        return 0;
 }
 
+void tiny_bt_disconnect_register(void(*callback_app_disconnect)(__u16 *p_handle, __u8 *p_reason))
+{
+       expect_evt evt, *p_evt = &evt;
+       req_state status = ESTABLISHED;
+       disconnect_data *p_data;
+
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_DISCONN_COMPLETE;
+       p_evt->p_callback = callback_hci_disconnect;
+
+       p_data = malloc(sizeof(disconnect_data));
+       p_data->callback_app_disconnect = callback_app_disconnect;
+       p_evt->p_data = (void *) p_data;
+       
+       add_evt_toarray(p_evt);
+}
+
+int tiny_bt_disconnect(__u16 *p_handle, void(*callback_app_disconnect)(__u16 *p_handle, __u8 *p_reason))
+{
+       expect_evt evt, *p_evt = &evt;
+       req_state status = ESTABLISHED;
+       disconnect_data *p_data;
+
+       memset(p_evt, 0, sizeof(evt));
+       p_evt->actual_status = status;
+       p_evt->id = evt_id++;
+       p_evt->evt_type = EVT_DISCONN_COMPLETE;
+       p_evt->p_callback = callback_hci_disconnect;
+
+       p_data = malloc(sizeof(disconnect_data));
+       p_data->callback_app_disconnect = callback_app_disconnect;
+       p_evt->p_data = (void *) p_data;
+       
+       add_evt_toarray(p_evt);
+       
+       if (send_hci_disconnect_cmd(*p_handle) < 0) {
+               perror ("send_hci_cmd error\n");
+               return -1;
+       }
+       return 0;
+
+}
+
+int tiny_bt_send_data(char *p_data, __u16 lenght, __u16 *p_chandle)
+{      
+       if (send_hci_data(p_data, lenght, p_chandle) < 0) {
+               perror ("send_hci_cmd error\n");
+               return -1;
+       }
+       return 0;
+}
+
+