From 1fbd72c5775d2546d5c10fae37b24db0769f26dc Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Wed, 29 Nov 2017 16:57:07 +0100
Subject: [PATCH] sm: move sm_pairing_packet getters into sm.c

---
 src/ble/sm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/ble/sm.h | 44 --------------------------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/ble/sm.c b/src/ble/sm.c
index 53cf44298..95e162cd9 100644
--- a/src/ble/sm.c
+++ b/src/ble/sm.c
@@ -414,6 +414,50 @@ static void log_info_hex16(const char * name, uint16_t value){
     log_info("%-6s 0x%04x", name, value);
 }
 
+// static inline uint8_t sm_pairing_packet_get_code(sm_pairing_packet_t packet){
+//     return packet[0];
+// }
+static inline uint8_t sm_pairing_packet_get_io_capability(sm_pairing_packet_t packet){
+    return packet[1];
+}
+static inline uint8_t sm_pairing_packet_get_oob_data_flag(sm_pairing_packet_t packet){
+    return packet[2];
+}
+static inline uint8_t sm_pairing_packet_get_auth_req(sm_pairing_packet_t packet){
+    return packet[3];
+}
+static inline uint8_t sm_pairing_packet_get_max_encryption_key_size(sm_pairing_packet_t packet){
+    return packet[4];
+}
+static inline uint8_t sm_pairing_packet_get_initiator_key_distribution(sm_pairing_packet_t packet){
+    return packet[5];
+}
+static inline uint8_t sm_pairing_packet_get_responder_key_distribution(sm_pairing_packet_t packet){
+    return packet[6];
+}
+
+static inline void sm_pairing_packet_set_code(sm_pairing_packet_t packet, uint8_t code){
+    packet[0] = code;
+}
+static inline void sm_pairing_packet_set_io_capability(sm_pairing_packet_t packet, uint8_t io_capability){
+    packet[1] = io_capability;
+}
+static inline void sm_pairing_packet_set_oob_data_flag(sm_pairing_packet_t packet, uint8_t oob_data_flag){
+    packet[2] = oob_data_flag;
+}
+static inline void sm_pairing_packet_set_auth_req(sm_pairing_packet_t packet, uint8_t auth_req){
+    packet[3] = auth_req;
+}
+static inline void sm_pairing_packet_set_max_encryption_key_size(sm_pairing_packet_t packet, uint8_t max_encryption_key_size){
+    packet[4] = max_encryption_key_size;
+}
+static inline void sm_pairing_packet_set_initiator_key_distribution(sm_pairing_packet_t packet, uint8_t initiator_key_distribution){
+    packet[5] = initiator_key_distribution;
+}
+static inline void sm_pairing_packet_set_responder_key_distribution(sm_pairing_packet_t packet, uint8_t responder_key_distribution){
+    packet[6] = responder_key_distribution;
+}
+
 // @returns 1 if all bytes are 0
 static int sm_is_null(uint8_t * data, int size){
     int i;
diff --git a/src/ble/sm.h b/src/ble/sm.h
index 5eb72f370..eca5fd3fd 100644
--- a/src/ble/sm.h
+++ b/src/ble/sm.h
@@ -53,50 +53,6 @@ typedef struct {
     bd_addr_type_t address_type;
 } sm_lookup_entry_t;
 
-static inline uint8_t sm_pairing_packet_get_code(sm_pairing_packet_t packet){
-    return packet[0];
-}
-static inline uint8_t sm_pairing_packet_get_io_capability(sm_pairing_packet_t packet){
-    return packet[1];
-}
-static inline uint8_t sm_pairing_packet_get_oob_data_flag(sm_pairing_packet_t packet){
-    return packet[2];
-}
-static inline uint8_t sm_pairing_packet_get_auth_req(sm_pairing_packet_t packet){
-    return packet[3];
-}
-static inline uint8_t sm_pairing_packet_get_max_encryption_key_size(sm_pairing_packet_t packet){
-    return packet[4];
-}
-static inline uint8_t sm_pairing_packet_get_initiator_key_distribution(sm_pairing_packet_t packet){
-    return packet[5];
-}
-static inline uint8_t sm_pairing_packet_get_responder_key_distribution(sm_pairing_packet_t packet){
-    return packet[6];
-}
-
-static inline void sm_pairing_packet_set_code(sm_pairing_packet_t packet, uint8_t code){
-    packet[0] = code;
-}
-static inline void sm_pairing_packet_set_io_capability(sm_pairing_packet_t packet, uint8_t io_capability){
-    packet[1] = io_capability;
-}
-static inline void sm_pairing_packet_set_oob_data_flag(sm_pairing_packet_t packet, uint8_t oob_data_flag){
-    packet[2] = oob_data_flag;
-}
-static inline void sm_pairing_packet_set_auth_req(sm_pairing_packet_t packet, uint8_t auth_req){
-    packet[3] = auth_req;
-}
-static inline void sm_pairing_packet_set_max_encryption_key_size(sm_pairing_packet_t packet, uint8_t max_encryption_key_size){
-    packet[4] = max_encryption_key_size;
-}
-static inline void sm_pairing_packet_set_initiator_key_distribution(sm_pairing_packet_t packet, uint8_t initiator_key_distribution){
-    packet[5] = initiator_key_distribution;
-}
-static inline void sm_pairing_packet_set_responder_key_distribution(sm_pairing_packet_t packet, uint8_t responder_key_distribution){
-    packet[6] = responder_key_distribution;
-}
-
 /* API_START */
 
 /**