An unsucesfull attempt to clean bluetooth library and make it working.

[mirosot.git] / bluetooth / bth_event_acc.c

diff --git a/bluetooth/bth_event_acc.c b/bluetooth/bth_event_acc.c
index e4966a5bf11c4781ac966173407e8bf6017638cf..fd1450639b68ee45946067c89c624119e810e5f8 100644 (file)
--- a/bluetooth/bth_event_acc.c
+++ b/bluetooth/bth_event_acc.c
@@ -13,7 +13,7 @@
 \r
 #include <string.h>\r
 #include <stdlib.h>\r
-#include "types.h"\r
+#include <types.h>\r
 #include "hci.h"\r
 #include "l2cap.h"\r
 #include "hci_event.h"\r
@@ -76,9 +76,9 @@ int bth_del_event(uint16_t opcode)
   uint16_t opcode_pkt;\r
   for(i=0;i<LENCOMMAND;i++)\r
   {\r
-    if(bth_pole_adrr_check_packet[i]!=NULL)\r
+    if(bth_array_adrr_check_packet[i]!=NULL)\r
     {\r
-      __bthtomc16(&opcode_pkt,((uint8_t*)bth_pole_adrr_check_packet[i]+HCI_PKT_SIZE));\r
+      __bthtomc16(&opcode_pkt,((uint8_t*)bth_array_adrr_check_packet[i]+HCI_PKT_SIZE));\r
       if(opcode_pkt==opcode)\r
       {return i;};\r
     };\r
@@ -135,8 +135,8 @@ int bth_evt_conn_complete(uint8_t *bth_p, uint8_t size)   //0x03
   VypisHexa((void*)&(((bths_connect_bluet*)bth_connected[j])->handle),2);\r
   sci_rs232_sendch('c',sci_rs232_chan_default); //do PC*/\r
   \r
-  store16(bth_q->link_type,*((uint8_t*)bth_p+EVT_CONN_COMPLETE____link_type));\r
-  store16(bth_q->encr_mode,*((uint8_t*)bth_p+EVT_CONN_COMPLETE____encr_mode));\r
+  store8(bth_q->link_type,*((uint8_t*)bth_p+EVT_CONN_COMPLETE____link_type));\r
+  store8(bth_q->encr_mode,*((uint8_t*)bth_p+EVT_CONN_COMPLETE____encr_mode));\r
 \r
   bth_cmd_write_link_policy_settings(bth_q->handle,htobs(0x000f)); //reply\r
   return (*((uint8_t*)bth_p+EVT_CONN_COMPLETE____status));\r
@@ -216,7 +216,7 @@ int bth_evt_cmd_complete(uint8_t *bth_p, uint8_t size)  //0x0E
   uint16_t opcode,ogf,ocf;\r
   int index=-1;\r
   \r
-  store16(bth_q.ncmd,*((uint8_t*)bth_p+EVT_CMD_COMPLETE____ncmd));\r
+  store8(bth_q.ncmd,*((uint8_t*)bth_p+EVT_CMD_COMPLETE____ncmd));\r
 //  store_le16(&bth_q.opcode,*((uint16_t*)((uint8_t*)bth_p+EVT_CMD_COMPLETE____opcode)));\r
   __bthtomc16(&bth_q.opcode,(((uint8_t*)bth_p+EVT_CMD_COMPLETE____opcode)));\r
   index=bth_del_event(bth_q.opcode);\r
@@ -230,16 +230,16 @@ int bth_evt_cmd_complete(uint8_t *bth_p, uint8_t size)  //0x0E
     {\r
       if(*((uint8_t*)bth_p+3)==0)\r
       {\r
-        free(bth_pole_adrr_check_packet[index]);\r
-        bth_pole_adrr_check_packet[index]=NULL;\r
+        free(bth_array_adrr_check_packet[index]);\r
+        bth_array_adrr_check_packet[index]=NULL;\r
         bth_local_info.busy=0;\r
         return 0; //no complications was encountered during command execution\r
       }\r
       else\r
       {\r
         /*status is not OK - an error occured - the sent command is still in the confirmation queue */\r
-        free(bth_pole_adrr_check_packet[index]);\r
-        bth_pole_adrr_check_packet[index]=NULL;\r
+        free(bth_array_adrr_check_packet[index]);\r
+        bth_array_adrr_check_packet[index]=NULL;\r
         bth_local_info.busy=0;\r
         return((int)*((uint8_t*)bth_p+EVT_CMD_COMPLETE_SIZE));\r
       };\r
@@ -287,10 +287,10 @@ int bth_evt_cmd_complete(uint8_t *bth_p, uint8_t size)  //0x0E
 int bth_evt_cmd_status(uint8_t *bth_p, uint8_t size) //0x0F\r
 {\r
   evt_cmd_status bth_q;\r
-  store16(bth_q.status,*((uint8_t*)bth_p+EVT_CMD_STATUS____status));\r
-  store16(bth_q.ncmd,*((uint8_t*)bth_p+EVT_CMD_STATUS____ncmd));\r
+  store8(bth_q.status,*((uint8_t*)bth_p+EVT_CMD_STATUS____status));\r
+  store8(bth_q.ncmd,*((uint8_t*)bth_p+EVT_CMD_STATUS____ncmd));\r
 //  store_le16(&bth_q.opcode,*((uint16_t*)((uint8_t*)bth_p+EVT_CMD_STATUS____opcode)));\r
-  __bthtomc16(&bth_q.opcode,(((uint8_t*)bth_p+EVT_CMD_STATUS____opcode)));\r
+  __bthtomc8(&bth_q.opcode,(((uint8_t*)bth_p+EVT_CMD_STATUS____opcode)));\r
 //  memcpy(&bth_q.opcode,(((uint8_t*)bth_p+EVT_CMD_STATUS____opcode)),2);\r
   uint8_t ogf, ocf;\r
   int index;\r
@@ -307,14 +307,14 @@ int bth_evt_cmd_status(uint8_t *bth_p, uint8_t size) //0x0F
     {\r
       if(bth_q.status==0)\r
       {\r
-        free(bth_pole_adrr_check_packet[index]);\r
-        bth_pole_adrr_check_packet[index]=NULL;\r
+        free(bth_array_adrr_check_packet[index]);\r
+        bth_array_adrr_check_packet[index]=NULL;\r
       }\r
       else\r
       {\r
         /*status is not OK - an error occured - the sent command is still in the confirmation queue */\r
-        free(bth_pole_adrr_check_packet[index]);\r
-        bth_pole_adrr_check_packet[index]=NULL;\r
+        free(bth_array_adrr_check_packet[index]);\r
+        bth_array_adrr_check_packet[index]=NULL;\r
       };\r
     }\r
     else\r