Diff: dialog_fota/gapm_task.h

Revision:

5:e11b23f9aacc

Parent:

4:60be78a172c2

Child:

9:fcf91f563147

diff -r 60be78a172c2 -r e11b23f9aacc dialog_fota/gapm_task.h
--- a/dialog_fota/gapm_task.h	Wed Jun 24 08:50:07 2015 +0000
+++ b/dialog_fota/gapm_task.h	Mon Jul 13 06:32:05 2015 +0000
@@ -2,6 +2,7 @@
 #define GAPM_TASK_H
 
 #include "dialog_fota_config.h"
+#include "gap.h"
 
 namespace sevencore_fota{
 
@@ -87,56 +88,7 @@
 };
 
 
-//////////////GAP
-#define KEY_LEN     0x10
-/// Generic Security key structure
-struct gap_sec_key
-{
-    /// Key value MSB -> LSB
-    uint8_t key[KEY_LEN];
-};
 
-/// Address information about a device address
-struct gap_bdaddr
-{
-    /// BD Address of device
-    struct bd_addr addr;
-    /// Address type of the device 0=public/1=private random
-    uint8_t addr_type;
-};
-
-/// Advertising mode
-enum gap_adv_mode
-{
-    /// Mode in non-discoverable
-    GAP_NON_DISCOVERABLE,
-    /// Mode in general discoverable
-    GAP_GEN_DISCOVERABLE,
-    /// Mode in limited discoverable
-    GAP_LIM_DISCOVERABLE,
-    /// Broadcaster mode which is a non discoverable and non connectable mode.
-    GAP_BROADCASTER_MODE,
-};
-/****************** GAP Role **********************/
-enum gap_role
-{
-    /// No role set yet
-    GAP_NO_ROLE    = 0x00,
-
-    /// Observer role
-    GAP_OBSERVER_SCA    = 0x01,
-
-    /// Broadcaster role
-    GAP_BROADCASTER_ADV = 0x02,
-
-    /// Master/Central role
-    GAP_CENTRAL_MST     = (0x04 | GAP_OBSERVER_SCA),
-
-    /// Peripheral/Slave role
-    GAP_PERIPHERAL_SLV  = (0x08 | GAP_BROADCASTER_ADV),
-};
-
-//////////////GAP
 
 /// Set advertising mode Command
 struct gapm_start_advertise_cmd