]> rtime.felk.cvut.cz Git - tiny-bt.git/commitdiff
Better coding style and evt_array is setted on zeros in init function
authorDavid Plotek <ploted1@fel.cvut.cz>
Tue, 2 Dec 2008 11:09:53 +0000 (12:09 +0100)
committerDavid Plotek <ploted1@fel.cvut.cz>
Tue, 2 Dec 2008 11:09:53 +0000 (12:09 +0100)
src2/Makefile.omk
src2/bt_hw.c
src2/bt_hw.h
src2/testapp.c
src2/testapp.h
src2/tiny_bt_hci_cmd.c
src2/tiny_bt_hci_cmd.h
src2/tiny_bt_hci_core.c
src2/tiny_bt_hci_core.h

index a3831adcf162691529b9f88c19e52a7b1f946263..160ee0d3e3f90041f7ecffc55da73a56493a59d9 100644 (file)
@@ -2,9 +2,12 @@ lib_LIBRARIES = tinybt
 tinybt_SOURCES = tiny_bt_hci_cmd.c tiny_bt_hci_core.c bt_hw.c
 
 
-bin_PROGRAMS = tiny_bt tiny_bt_sl
+bin_PROGRAMS = tiny_bt tiny_bt_sl tiny_bt_con
 tiny_bt_SOURCES = testapp.c 
 tiny_bt_LIBS = tinybt
 
 tiny_bt_sl_SOURCES = testslave.c
-tiny_bt_sl_LIBS = tinybt
\ No newline at end of file
+tiny_bt_sl_LIBS = tinybt
+
+tiny_bt_con_SOURCES = testcon.c
+tiny_bt_con_LIBS = tinybt
\ No newline at end of file
index 00d18f6bae02f74f8957a2bd2063f6edcd177241..ca59dfdf80d348ae84b4941fd92bb9b76837d0de 100644 (file)
@@ -9,7 +9,8 @@
 * Copyright: See COPYING file that comes with this distribution
 *
 */
-#include<sys/socket.h>
+
+#include <sys/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include "bt_hw.h"
 #include "hciembeded.h"
 
-static int hw_dd;
+static int hw_dd; /*TODO: this is only for one socket connection */
 
-int hw_bt_open_device(__u8 dev_id){
+int hw_bt_open_device(__u8 dev_id)
+{
        struct sockaddr_hci address;
        int dd;
        int oldflag;
-       if((dd=socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI))<0){
+       int err;
+       
+       if ((dd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI)) < 0) {
                perror("socket no created");
-               return dd; //it return -1 when socket isn't created
+               return dd; /*it return -1 when socket isn't created*/
        }
        
-       oldflag=fcntl(dd, F_GETFL, 0);
-       if(fcntl(dd, F_SETFL, oldflag | O_NONBLOCK) < 0){
+       oldflag = fcntl(dd, F_GETFL, 0);
+       if (fcntl(dd, F_SETFL, oldflag | O_NONBLOCK) < 0) {
                perror("problem with socket flag setting");
-               return -1;
+               err = -1;
+               goto close_socket;
        }
        
-       memset(&address,0,sizeof(address));
-       address.hci_family=AF_BLUETOOTH;
-       address.hci_dev=dev_id;
-       if(bind(dd,(struct sockaddr *) &address, sizeof(address))<0){
+       memset(&address, 0, sizeof(address));
+       address.hci_family = AF_BLUETOOTH;
+       address.hci_dev = dev_id;
+       if (bind(dd, (struct sockaddr *) &address, sizeof(address)) < 0) {
                perror("Socket not binded to hci device");
-               close(dd);
-               return -1;
+               err = -1;
+               goto close_socket;
        }
        
-       if(ioctl(dd, HCISETRAW,1)<0){
+       if(ioctl(dd, HCISETRAW, 1) < 0) {
                perror("error in ioctl HCISETRAW");
-               return -1;
-                       
+               err = -1;
+               goto close_socket;
        }
-       hw_dd=dd;
+       
+       hw_dd = dd;
        return dd;
+close_socket:
+       close(dd);
+       return err;
 }
 
-int hw_bt_close_dev(){
+int hw_bt_close_dev()
+{
        return close(hw_dd);
 }
 
-int hw_bt_write(__u8 *p_array, __u16 length){
-       while(write(hw_dd, p_array, length)<0){
+int hw_bt_write(__u8 *p_array, __u16 length)
+{
+       while (write(hw_dd, p_array, length) < 0) {
                perror("write interrupted");
-               if(errno == EAGAIN || errno == EINTR)
+               if (errno == EAGAIN || errno == EINTR)
                        continue;
                return -1;
                
@@ -71,14 +82,17 @@ int hw_bt_write(__u8 *p_array, __u16 length){
        return 0;
 }
 
-int hw_bt_read(__u8 *p_recbuf){
+int hw_bt_read(__u8 *p_recbuf)
+{
        int len;
-       while((len=read(hw_dd, p_recbuf, sizeof(p_recbuf)*HCI_MAX_EVENT_SIZE))<0){
-               if(errno == EINTR)
+       
+       while ((len = read(hw_dd, p_recbuf,
+                        sizeof(p_recbuf) * HCI_MAX_EVENT_SIZE)) < 0) {
+               if (errno == EINTR)
                        continue;
-               if(errno == EAGAIN)
+               if (errno == EAGAIN)
                        return 0;
-               perror("Problem with reading \n");
+               perror("Problem with reading\n");
                        return -1;
        }
        return len;
index 7e9b258129484536924adb20020cb34f1a710c18..f5c54b06ed7818215e780b37baaa01da17694d75 100644 (file)
@@ -1,18 +1,18 @@
-//
-// C++ Interface: bt_hw
-//
-// Description: 
-//
-//
-// Author: root <root@ubuntu>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/*
+ *C++ Interface: bt_hw
+ *
+ *Description: 
+ *
+ *
+ *Author: root <root@ubuntu>, (C) 2008
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ */
+
 #ifndef __BT_HW
 #define __BT_HW
 
-#include<asm/types.h>
+#include <asm/types.h>
 
 /* BT protocols(from bluetooth.h)*/
 #define BTPROTO_L2CAP  0
index 453ab8a596410dc18476b3a82f2fd04efda30ef5..2d44ade465acfd56b0603e322e752c49e2c1dd75 100644 (file)
 
 bt_address rem_bd_addr_array[HCI_MAX_DEV];
 bt_address rem_addr;
-int glob_count;
+int glob_count = 0;
+int stop = 0;
 connection_hci connection,*p_connection=&connection;
 
-
-void callback_app_read_bd_addr(bt_address *p_address){
+void callback_app_read_bd_addr(bt_address *p_address)
+{
        printf("Read address is :");
        printba(p_address);
        tiny_bt_read_local_name(&(p_connection->master.name), callback_app_read_local_name);
 }
 
-void callback_app_read_local_name(char *p_name){
+void callback_app_read_local_name(char *p_name)
+{
        int i;
+       
        printf("read name is:");
-       for(i=0;i<8;i++){
-               printf("%c",*(p_name+i));
+       
+       for (i = 0; i < 8; i++) {
+               printf("%c", *(p_name+i));
        }
        printf("\n");
        tiny_bt_inquiry(&rem_addr, callback_app_inquiry_RSSI, callback_app_inquiry_complete);
 }
 
-void callback_app_inquiry_RSSI(bt_address *p_address){
-       static int count=0;
-       int i,sign=0;
+void callback_app_inquiry_RSSI(bt_address *p_address)
+{
+       static int count = 0;
+       int i, sign = 0;
        
-       if(count==0){
-               rem_bd_addr_array[0]=*p_address;
+       if (count == 0) {
+               rem_bd_addr_array[0] = *p_address;
                count++;
-       }
-       else{
-               for(i=0;i<count;i++){
-                       if(compare_bda(p_address,&rem_bd_addr_array[i])){
-                               sign=1;
+       } else {
+               for (i = 0; i < count; i++) {
+                       if (compare_bda(p_address, &rem_bd_addr_array[i])) {
+                               sign = 1;
                                break;
                        }
-                       
                }
-               if(sign==0){
-                       if(count < HCI_MAX_DEV){        
-                               rem_bd_addr_array[count]=*p_address;
+               if (sign == 0) {
+                       if (count < HCI_MAX_DEV) {      
+                               rem_bd_addr_array[count] = *p_address;
                                printf("There is device:");
                                printba(p_address);
                                count++;
-                       }
-                       else{
+                       } else {
                                printf("Array full, there is more than 16 devices in surroundig area\n");
                        }
                }
        }
-       
-       glob_count=count;
+       glob_count = count;
        tiny_bt_inquiry_register_again(&rem_addr, callback_app_inquiry_RSSI);
-
 }
 
-void callback_app_inquiry_complete(void){
+void callback_app_inquiry_complete(void)
+{
        int i;
        
        printf("inquiry complete\n");
-       for(i=0;i<glob_count;i++){
-               printf("remote dev ");
+       
+       for (i = 0; i < glob_count; i++) {
+               printf("remote dev");
                printba(&rem_bd_addr_array[i]);
        }
-       p_connection->slave.bdaddr=rem_bd_addr_array[0];
-       tiny_bt_connect(&rem_bd_addr_array[0],&p_connection->handle, callback_app_connection_complete);
        
+       if (glob_count > 0) {
+               p_connection->slave.bdaddr = rem_bd_addr_array[0];
+               tiny_bt_connect(&rem_bd_addr_array[0], 
+                       &p_connection->handle, callback_app_connection_complete);
+       } else {
+               printf("There is no remote device suitable for connect\n");
+               stop=1;
+       }
 }
 
-void callback_app_connection_complete(__u16 *p_handle){
+void callback_app_connection_complete(__u16 *p_handle)
+{
+       char ar[6] = {"hallo "};
+
        connection_state state = CONNECT;
-       p_connection->con_state=state;
-       printf("Connection complete handle:%d\n",*p_handle);
+       p_connection->con_state = state;
+       printf("Connection complete handle:%d\n", *p_handle);
+
+       if (tiny_bt_send_data(ar, 6, p_handle) < 0) {
+               printf("unable to send data\n");
+       }
        
+       tiny_bt_disconnect(p_handle, callback_app_disconnect);
+}
 
+void callback_app_disconnect(__u16 *p_handle, __u8 *p_reason) 
+{
+       printf("disconnection handle %d was completed\n", *p_handle);
+       stop = 1;
 }
 
 
-int main(void){
-       int ii=30000;
-       tiny_bt_init(0);
+int main(void)
+{
+       int ii = 30000;
+       
+       if (tiny_bt_init(0) < 0) {
+               perror("device impossible to ititialize\n");
+               return -1;
+       }
        printf("begin of main\n");
-       if(tiny_bt_read_bd_addr(&p_connection->master.bdaddr, callback_app_read_bd_addr)<0){
-               perror("tiny_bt_read_bd_addr error");
+       
+       if (tiny_bt_read_bd_addr(&p_connection->master.bdaddr, callback_app_read_bd_addr) < 0) {
+               perror("tiny_bt_read_bd_addr error\n");
                return -1;
        }
-       while(1){
-               
-               ii--;
-               if(tiny_bt_process()<0){
+       
+       while (1) {
+               if (stop) 
+                       return -1;
+               //ii--;
+               if (tiny_bt_process() < 0) {
                        perror("process error");
                        return -1;
                }
index 77e219e452a3a718b140d7bfae26bdff0906541d..d8edb407b280b59060a0797ca537d5f0e31a76ec 100644 (file)
@@ -1,24 +1,23 @@
-//
-// C++ Interface: testapp
-//
-// Description: 
-//
-//
-// Author: root <root@ubuntu>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/*
+ * C++ Interface: testapp
+ *
+ * Description: 
+ *
+ *
+ * Author: root <root@ubuntu>, (C) 2008
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ */
+
 #ifndef __TEST
 #define __TEST
+
 extern void callback_app_read_bd_addr(bt_address *p_address);
 extern void callback_app_read_local_name(char *p_name);
 extern void callback_app_inquiry_RSSI(bt_address *p_address);
 extern void callback_app_connection_complete(__u16 *p_handle);
 extern void callback_app_inquiry_complete(void);
-
-
-
+extern void callback_app_disconnect(__u16 *p_handle, __u8 *p_reason);
 
 #endif
 
index 2e7f5e62d04342bf760138c9d95878798f7ce972..ef11b3dc5ee11cebd8fdb4e7c356e68e43590ff5 100644 (file)
 #include "tiny_bt_hci_cmd.h"
 #include "bt_hw.h"
 
-
-
-
-
 /************************** hci command functions**************************/
-int send_hci_inquiry_cmd(void){
-       inquiry_cp cmdp,*p_cmdp=&cmdp;
-       hci_cmd_request creq,*p_creq=&creq;
-       inq_time time=T14s40;
-       responce_num num=NUM_RSP_20; 
-       
-       memset(p_cmdp,0,sizeof(cmdp));
-       p_cmdp->lap[0]=0x33;
-       p_cmdp->lap[1]=0x8b;
-       p_cmdp->lap[2]=0x9e;
-       p_cmdp->length=time;
-       p_cmdp->num_rsp=num;
-       memset(p_creq,0,sizeof(creq));
-       p_creq->OCF_OGF=INQUIRY_CMD_OP;
-       p_creq->p_cmdp=p_cmdp;
-       p_creq->cmdp_len=INQUIRY_CP_SIZE;
-       
-       if(send_cmd(p_creq)<0){
-               perror("hci_inquiry_cmd wasn't sent");
+int send_hci_inquiry_cmd(void)
+{
+       inquiry_cp cmdp, *p_cmdp = &cmdp;
+       hci_cmd_request creq, *p_creq = &creq;
+       inq_time time = T14s40;
+       responce_num num = NUM_RSP_20; 
+       
+       memset(p_cmdp, 0, sizeof(cmdp));
+       p_cmdp->lap[0] = 0x33;
+       p_cmdp->lap[1] = 0x8b;
+       p_cmdp->lap[2] = 0x9e;
+       p_cmdp->length = time;
+       p_cmdp->num_rsp = num;
+       memset(p_creq, 0, sizeof(creq));
+       p_creq->OCF_OGF = INQUIRY_CMD_OP;
+       p_creq->p_cmdp = p_cmdp;
+       p_creq->cmdp_len = INQUIRY_CP_SIZE;
+       
+       if (send_cmd(p_creq) < 0) {
+               perror("hci_inquiry_cmd wasn't sent\n");
                return -1;
        }
        return 0;
 }
-// fill up the input parameter address pointer by one address
-int send_hci_read_bd_addr_cmd(void){
-       hci_cmd_request creq,*p_creq=&creq;
+/* fill up the input parameter address pointer by one address*/
+int send_hci_read_bd_addr_cmd(void)
+{
+       hci_cmd_request creq, *p_creq = &creq;
                
-       memset(p_creq,0,sizeof(creq));
-       p_creq->OCF_OGF=READ_BD_ADDR_CMD_OP;
-       p_creq->cmdp_len=0;
+       memset(p_creq, 0, sizeof(creq));
+       p_creq->OCF_OGF = READ_BD_ADDR_CMD_OP;
+       p_creq->cmdp_len = 0;
        
-       if(send_cmd(p_creq)<0){
-               perror("hci_read_bd_addr wasn't sent");
+       if (send_cmd(p_creq) < 0) {
+               perror("hci_read_bd_addr wasn't sent\n");
                return -1;
        }
        return 0;
 }
 
-int send_hci_read_local_name_cmd(void){
-       hci_cmd_request creq,*p_creq=&creq;
+int send_hci_read_local_name_cmd(void)
+{
+       hci_cmd_request creq, *p_creq = &creq;
                
-       memset(p_creq,0,sizeof(creq));
-       p_creq->OCF_OGF=READ_LOCAL_NAME_CMD_OP;
-       p_creq->cmdp_len=0;
+       memset(p_creq, 0, sizeof(creq));
+       p_creq->OCF_OGF = READ_LOCAL_NAME_CMD_OP;
+       p_creq->cmdp_len = 0;
        
-       if(send_cmd(p_creq)<0){
-               perror("hci_read_local_name_cmd wasn't sent");
+       if (send_cmd(p_creq) < 0) {
+               perror("hci_read_local_name_cmd wasn't sent\n");
                return -1;
        }
        return 0;
 }
 
-int send_hci_create_connection_cmd(bt_address *p_dest_addr){
-       create_conn_cp cmdp,*p_cmdp=&cmdp;
-       hci_cmd_request creq,*p_creq=&creq;
-       
-       memset(p_cmdp,0,sizeof(cmdp));  
-       p_cmdp->bdaddr=*p_dest_addr;
-       p_cmdp->pkt_type=0x0010;
-       p_cmdp->pscan_rep_mode=0x01;
-       p_cmdp->pscan_mode=0x00;
-       p_cmdp->clock_offset=0xf000;
-       p_cmdp->role_switch=0x00;
-       memset(p_creq,0,sizeof(creq));
-       p_creq->OCF_OGF=CREATE_CONNECTION_CMD_OP;
-       p_creq->p_cmdp=p_cmdp;
-       p_creq->cmdp_len=CREATE_CONN_CP_SIZE;
-       
-       if(send_cmd(p_creq)<0){
-               perror("hci_create_connection_cmd wasn't sent");
+int send_hci_create_connection_cmd(bt_address *p_dest_addr)
+{
+       create_conn_cp cmdp, *p_cmdp = &cmdp;
+       hci_cmd_request creq, *p_creq = &creq;
+       
+       memset(p_cmdp, 0, sizeof(cmdp));        
+       p_cmdp->bdaddr= *p_dest_addr;
+       p_cmdp->pkt_type = 0x0010;
+       p_cmdp->pscan_rep_mode = 0x01;
+       p_cmdp->pscan_mode = 0x00;
+       p_cmdp->clock_offset = 0xf000;
+       p_cmdp->role_switch = 0x00;
+       
+       memset(p_creq, 0, sizeof(creq));
+       p_creq->OCF_OGF = CREATE_CONNECTION_CMD_OP;
+       p_creq->p_cmdp = p_cmdp;
+       p_creq->cmdp_len = CREATE_CONN_CP_SIZE;
+       
+       if (send_cmd(p_creq) < 0) {
+               perror("hci_create_connection_cmd wasn't sent\n");
                return -1;
        }
        return 0;       
 }
 
-int send_hci_accept_conn_req_cmd(bt_address *p_address){
-       accept_conn_req_cp cmdp, *p_cmdp=&cmdp;
-       hci_cmd_request creq,*p_creq=&creq;
+int send_hci_accept_conn_req_cmd(bt_address *p_address)
+{
+       accept_conn_req_cp cmdp, *p_cmdp = &cmdp;
+       hci_cmd_request creq, *p_creq = &creq;
+       
+       memset(p_cmdp, 0, sizeof(cmdp));
+       p_cmdp->bdaddr = *p_address;
+       p_cmdp->role = 0x01;
+       memset(p_creq, 0, sizeof(creq));
+       p_creq->OCF_OGF = ACCEPT_CONNECTION_REQ_OP;
+       p_creq->p_cmdp = p_cmdp;
+       p_creq->cmdp_len = ACCEPT_CONN_REQ_CP_SIZE;
+       
+       if (send_cmd(p_creq) < 0) {
+               perror("hci_accept_conn_req_cmd wasn't sent\n");
+               return -1;
+       }
+       return 0;
+}
+
+int send_hci_disconnect_cmd(__u16 handle)
+{
+       disconnect_cp cmdp, *p_cmdp = &cmdp;
+       hci_cmd_request creq, *p_creq = &creq;
+
+       memset(p_cmdp, 0, sizeof(cmdp));
+       p_cmdp->handle = handle;
+       p_cmdp->reason = 0x13;
        
-       memset(p_cmdp,0,sizeof(cmdp));
-       p_cmdp->bdaddr=*p_address;
-       p_cmdp->role=0x01;
-       memset(p_creq,0,sizeof(creq));
-       p_creq->OCF_OGF=ACCEPT_CONNECTION_REQ_OP;
-       p_creq->p_cmdp=p_cmdp;
-       p_creq->cmdp_len=ACCEPT_CONN_REQ_CP_SIZE;
+       memset(p_creq, 0, sizeof(creq));
+       p_creq->OCF_OGF = DISCONNECT_CMD_OP;
+       p_creq->p_cmdp = p_cmdp;
+       p_creq->cmdp_len = DISCONNECT_CP_SIZE;
+
+       if (send_cmd(p_creq) < 0) {
+               perror("hci_disconnect_cmd wasn't sent\n");
+               return -1;
+       }
+       return 0;
+}
+
+int send_hci_data(char *p_data, __u16 lenght, __u16 *p_chandle)
+{
+       hci_data_request dreq, *p_dreq = &dreq;
+
+       p_dreq->p_data = p_data;
+       p_dreq->lenght = lenght;
+       p_dreq->p_chandle = p_chandle;
        
-       if(send_cmd(p_creq)<0){
-               perror("hci_accept_conn_req_cmd wasn't sent");
+       if (send_data(p_dreq) < 0) {
+               perror("hci_accept_conn_req_cmd wasn't sent\n");
                return -1;
        }
        return 0;
 }
 
 /*********************************main functions****************************/
-int send_cmd(hci_cmd_request *p_creq){
-       __u8 array[p_creq->cmdp_len+4];
+int send_cmd(hci_cmd_request *p_creq)
+{
+       __u8 array[p_creq->cmdp_len + 4];
        __u16 sw_opcode;
        int ii;
-       sw_opcode=swap_2_bytes(p_creq->OCF_OGF);
-       array[0]=0x01;
-       memcpy(&array[1],&sw_opcode,2);
-       array[3]= p_creq->cmdp_len;
-       if(p_creq->cmdp_len > 0){
-               memcpy(&array[4],p_creq->p_cmdp,p_creq->cmdp_len); // !!!!!!!!! segmentation fault
+       
+       sw_opcode = swap_2_bytes(p_creq->OCF_OGF);
+       array[0]= HCI_COMMAND_PKT;
+       memcpy(&array[1], &sw_opcode,2);
+       array[3] = p_creq->cmdp_len;
+       if (p_creq->cmdp_len > 0) {
+               memcpy(&array[4], p_creq->p_cmdp, p_creq->cmdp_len); // !!!!!!!!! segmentation fault
        }
 
-       for(ii=0;ii<sizeof(array);ii++){
+       for (ii = 0; ii < sizeof(array); ii++) {
                printf(" %x",array[ii]);
        }
        printf("\n");
 
-       if(hw_bt_write(array,sizeof(array))<0){
-               perror("hw_bt_write problem");
+       if (hw_bt_write(array, sizeof(array)) < 0) {
+               perror("hw_bt_write problem\n");
                return -1;
        }
        return 0;
 }
 
-/*****************************HCI support functions*****************************/
+int send_data(hci_data_request *p_dreq)
+{
+       int ii;
+       __u8 array[p_dreq->lenght + 4];
+       
+       array[0] = HCI_ACLDATA_PKT;
+       memcpy(&array[1], p_dreq->p_chandle, 2);
+       memcpy(&array[3], &p_dreq->lenght, 2);
+       memcpy(&array[5], p_dreq->p_data, p_dreq->lenght);
+       
+       for (ii = 0; ii < sizeof(array); ii++) {
+               printf(" %x",array[ii]);
+       }
+       printf("\n");
+       
+       if (hw_bt_write(array,sizeof(array))<0) {
+               perror("hw_bt_write problem\n");
+               return -1;
+       }
+       return 0;
+}
 
+/*****************************HCI support functions*****************************/
 
-void assemble_ocf_ogf(__u8 ocf,__u8 ogf,__u16 *p_ocf_ogf){
+void assemble_ocf_ogf(__u8 ocf,__u8 ogf,__u16 *p_ocf_ogf)
+{
        __u16 var1;
        __u16 result;
        
-       var1=(ogf<<10);
-       result=ocf;
-       *p_ocf_ogf=(result|var1);
+       var1 = (ogf << 10);
+       result = ocf;
+       *p_ocf_ogf = (result | var1);
 }
 
-void printba(bt_address *ba){
-       printf("address: %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X: \n",ba->byte[0],ba->byte[1],ba->byte[2],ba->byte[3],ba->byte[4],ba->byte[5]);
+void printba(bt_address *ba)
+{
+       printf("address: %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X: \n", ba->byte[0], 
+                       ba->byte[1], ba->byte[2], ba->byte[3], ba->byte[4], ba->byte[5]);
 }
 
-int compare_bda(bt_address *p_first, bt_address *p_second){
-       __u8 i,k=0;
-       for(i=0;i<sizeof(bt_address);i++){
-               if(p_first->byte[i]==p_second->byte[i])
+int compare_bda(bt_address *p_first, bt_address *p_second)
+{
+       __u8 i, k = 0;
+       
+       for (i = 0; i < sizeof(bt_address); i++) {
+               if (p_first->byte[i] == p_second->byte[i])
                        k++;
        }
-       if(k==sizeof(bt_address)) return 1; //all bytes are similar
+       
+       if (k == sizeof(bt_address)) 
+               return 1; //all bytes are similar
        
        return 0; //addreses are different in one byte at least  
 }
 
-void fill_zero(bt_address *p_addr){
+void fill_zero(bt_address *p_addr)
+{
        __u8 i;
-       for(i=0;i<sizeof(bt_address);i++){
-               p_addr->byte[i]=0x00;
+       
+       for (i = 0; i < sizeof(bt_address); i++) {
+               p_addr->byte[i] = 0x00;
        }
 }
-void swap_addrbytes(bt_address *p_addr){
-       bt_address help,*p_help=&help;
+
+void swap_addrbytes(bt_address *p_addr)
+{
+       bt_address help, *p_help = &help;
        __u8 i;
-       for(i=0;i<sizeof(bt_address);i++){
-               p_help->byte[i]=p_addr->byte[5-i];
+       
+       for (i = 0; i < sizeof(bt_address); i++) {
+               p_help->byte[i] = p_addr->byte[5-i];
        }
-       *p_addr=*p_help;
+       *p_addr = *p_help;
 }
-__u16 swap_2_bytes(__u16 twobytes){
-       __u16 first,second,result=0;
-       first=twobytes&255;
-       second=twobytes&65280;
-       result=result|(first<<8);
-       result=result|(second>>8);
+
+__u16 swap_2_bytes(__u16 twobytes)
+{
+       __u16 first, second, result=0;
+
+       first = twobytes & 255;
+       second = twobytes & 65280;
+       result = result | (first << 8);
+       result = result | (second >> 8);
        return result;
 }
 
-__u8 swap8(__u8 byte1){
-       __u8 i,mask=0,hvar1=0,resvar=0;
-       for(i=0;i<8;i++){
-               mask=1<<i; // 1,2,4,8,16,32,64,128
-               hvar1=byte1 & mask;
-               if(hvar1>0)
-               resvar=resvar + (128>>i);
+__u8 swap8(__u8 byte1)
+{
+       __u8 i, mask = 0, hvar1 = 0, resvar = 0;
+       
+       for (i = 0; i < 8; i++) { 
+               mask = 1 << i; // 1,2,4,8,16,32,64,128
+               hvar1 = byte1 & mask;
+               if (hvar1 > 0)
+                       resvar = resvar + (128 >> i);
        }
        return resvar;          
 }
 
-__u16 swap16(__u16 byte2){
+__u16 swap16(__u16 byte2)
+{
        __u8 i;
-       __u16 mask=0,hvar1=0,resvar=0;
-       for(i=0;i<16;i++){
-       mask=1<<i;
-       hvar1=byte2 & mask;
-       if(hvar1>0)
-       resvar=resvar + (32768>>i);
+       __u16 mask = 0, hvar1 = 0, resvar = 0;
+       
+       for (i = 0; i < 16; i++) {
+               mask = 1 << i;
+               hvar1 = byte2 & mask;
+               if (hvar1 > 0)
+                       resvar = resvar + (32768 >> i);
        }
        return resvar;
 }
 
-void fill_add(bt_address *addr,__u8 first, __u8 sec, __u8 third, __u8 forth, __u8 fifth, __u8 sixth){  
-       addr->byte[0]=first;
-       addr->byte[1]=sec;
-       addr->byte[2]=third;
-       addr->byte[3]=forth;
-       addr->byte[4]=fifth;
-       addr->byte[5]=sixth;
+void fill_add(bt_address *addr,__u8 first, __u8 sec,
+                        __u8 third, __u8 forth, __u8 fifth, __u8 sixth)
+{      
+       addr->byte[0] = first;
+       addr->byte[1] = sec;
+       addr->byte[2] = third;
+       addr->byte[3] = forth;
+       addr->byte[4] = fifth;
+       addr->byte[5] = sixth;
 }
 
index 6824a54330c1c093019ff8ef15d3012f0b57c18a..95a3880cfca2c6629c926730b470b5fa17cb515d 100644 (file)
@@ -1,19 +1,19 @@
-//
-// C++ Interface: hcidriver
-//
-// Description: my idea , embeded system will be in waiting state. For this role it will be slave. Master it is a main computer or phone. 
-//
-//
-// Author: root <root@ubuntu>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/*
+ * C++ Interface: hcidriver
+ *
+ * Description: my idea , embeded system will be in waiting state. For this role it will be slave. Master it is a main computer or phone. 
+ *
+ *
+ * Author: root <root@ubuntu>, (C) 2008
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ */
+
 #ifndef __TINI_BT_HCI_CMD
 #define __TINI_BT_HCI_CMD
 
-#include<asm/types.h>
-#include<string.h>
+#include <asm/types.h>
+#include <string.h>
 #include "hciembeded.h"
 
 
@@ -41,49 +41,52 @@ typedef enum{
        T5s52 = 4,
        T7s20 = 5,
        T14s40 = 10
-}inq_time;
+} inq_time;
 
 typedef enum{
        NUM_RSP_5 = 5,
        NUM_RSP_10 = 10,
        NUM_RSP_20 = 20
-}responce_num;
-
+} responce_num;
 
 /* BD_ADDR  (bluetooth.h)*/
 
-
 typedef struct{
        __u8 byte[3];
 } __attribute__((packed)) dev_lap;
 
 
-
 /* Class of device*/
 
 typedef struct{
        __u8 byte[3];
-}cl_device;
+} cl_device;
+
+typedef struct{
+       char *p_data;
+       __u16 lenght;
+       __u16 *p_chandle;
+} hci_data_request;
 
 
 typedef struct{
        __u16 OCF_OGF;
        void *p_cmdp;
        __u16 cmdp_len;
-}hci_cmd_request;
-
-
+} hci_cmd_request;
 
 /* next function structures*/
 
-
 extern int send_hci_inquiry_cmd(void);
 extern int send_hci_read_bd_addr_cmd(void);
 extern int send_hci_read_local_name_cmd(void);
 extern int send_hci_create_connection_cmd(bt_address *p_dest_addr);
 extern int send_hci_accept_conn_req_cmd(bt_address *p_address);
+extern int send_hci_disconnect_cmd(__u16 handle);
+extern int send_hci_data(char *p_data, __u16 lenght, __u16 *p_chandle);
 
 extern int send_cmd(hci_cmd_request *p_creq);
+extern int send_data(hci_data_request *p_dreq);
 
 extern void assemble_ocf_ogf(__u8 ogf,__u8 ocf,__u16 *p_ocf_ogf);
 extern void printba(bt_address *ba);
@@ -94,7 +97,8 @@ extern __u16 swap_2_bytes(__u16 twobytes);
 extern __u8 swap8(__u8 byte1);
 extern __u16 swap16(__u16 byte2);
 extern __u16 swap_2_bytes(__u16 twobytes);
-extern void fill_add(bt_address *addr,__u8 first, __u8 sec, __u8 third, __u8 forth, __u8 fifth, __u8 sixth);
+extern void fill_add(bt_address *addr,__u8 first, 
+               __u8 sec, __u8 third, __u8 forth, __u8 fifth, __u8 sixth);
 
 static inline void hci_set_bit(int nr, void *addr)
 {
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;
+}
+
+
index 7203fff09a18200fe9b10997f3986f1b9e4fff1e..b724c530f818683fdaa2cedf089ba6c5ac5860bd 100644 (file)
@@ -1,45 +1,43 @@
-//
-// C++ Interface: hil2cap
-//
-// Description: 
-//
-//
-// Author: root <root@ubuntu>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/*
+ *C++ Interface: hil2cap
+ *
+ * Description: 
+ *
+ *
+ * Author: root <root@ubuntu>, (C) 2008
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ */
+
 #ifndef __TINI_BT_HCI_CORE
 #define __TINI_BT_HCI_CORE
 
-#include"tiny_bt_hci_cmd.h"
-#include<asm/types.h>
-#include<sys/socket.h>
-#include<errno.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <errno.h>
+#include "tiny_bt_hci_cmd.h"
 
+#define MAX_CMD_STATE_REQUEST 0x0F
+#define MAX_EVT_COUNT  128
 
 typedef enum{
        DISCONNECT = 0,
        CONNECT= 1
-}connection_state;
+} connection_state;
 
 typedef enum{
        FREE = 0,
        ESTABLISHED = 1,
        PERMANENT = 2,
        DONE = 3
-}req_state;
-
-#define MAX_CMD_STATE_REQUEST 0x0F
-#define MAX_EVT_COUNT  128
+} req_state;
 
 typedef struct{
        __u8 actual_status;
        __u8 id;
        __u16 req_opcode;
-       __u8 evt_code;//codes of expected ansver event,command status event will be accepted everytime
+       __u8 evt_code; /*codes of expected ansver event,command status event will be accepted everytime*/
        void (*p_serv_rutine)(void); 
-
 } __attribute__((packed)) cmd_state_request;
 
 typedef struct{
@@ -58,33 +56,43 @@ typedef struct{
        struct hci_dev_info slave;
        uint16_t handle;
        int socket_fd;
-}connection_hci;
-
+} connection_hci;
 
 typedef struct{
        bt_address *p_address;
        void (*callback_app_read_bd_addr)(bt_address *p_address);
-}read_bd_addr_data;
+} read_bd_addr_data;
 
 typedef struct{
        char    *p_name;
        void (*callback_app_read_local_name)(char *p_name);
-}read_local_name_data;
+} read_local_name_data;
 
 typedef struct{
        bt_address *p_address;
        void (*callback_app_inquiry_RSSI)(bt_address *p_address);
-}inquiry_RSSI_data;
+} inquiry_RSSI_data;
 
 typedef struct{
        void (*callback_app_inquiry_complete)(void);
-}inquiry_complete_data;
+} inquiry_complete_data;
+
+typedef struct{
+       bt_address *p_address;
+       void (*callback_app_connection_request)(bt_address *p_address);
+} connection_request_data;
 
 typedef struct{
        __u16   *p_handle;
        //bt_address    *p_address; // address of device whoo iniciated this connection
        void (*callback_app_connection_complete)(__u16 *p_handle);
-}connection_complete_data;
+} connection_complete_data;
+
+typedef struct{
+       __u16 *p_handle;
+       __u8 *p_reason;
+       void (*callback_app_disconnect)(__u16 *p_handle, __u8 *p_reason);
+} disconnect_data;
 
 extern void add_evt_toarray(expect_evt *p_evt);
 extern int look_up_inarray(__u8 evt_type, __u16 opcode);
@@ -95,6 +103,10 @@ extern int tiny_bt_read_local_name(char *p_name, void(*callback_app_read_local_n
 extern int tiny_bt_inquiry(bt_address *p_dest_addr, void(*callback_app_inquiry_RSSI)(bt_address *p_address), void(*callback_app_inquiry_complete)(void));
 extern void tiny_bt_inquiry_register_again(bt_address *p_dest_addr, void(*callback_app_inquiry_RSSI)(bt_address *p_address));
 extern int tiny_bt_connect(bt_address *p_dest_addr, __u16 *p_handle, void( *callback_app_connection_complete)(__u16 *p_handle));
-extern int tiny_bt_wait_for_connection();
+extern void tiny_bt_wait_for_connection(bt_address *p_dest_addr, void(*callback_app_conection_request)(bt_address *p_address));
+extern int tiny_bt_accept_connection(bt_address *p_dest_addr,__u16 *p_handle, void(*callback_app_connection_complete)(__u16 *p_handle));
+extern void tiny_bt_disconnect_register(void(*callback_app_disconnect)(__u16 *p_handle, __u8 *p_reason));
+extern int tiny_bt_disconnect(__u16 *p_handle, void(*callback_app_disconnect)(__u16 *p_handle, __u8 *p_reason));
+extern int tiny_bt_send_data(char *p_data, __u16 lenght, __u16 *p_chandle);
 
 #endif