From 123c6b8ba269b2d57cefac275c4e6ef2c2893206 Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Mon, 15 Feb 2016 11:15:42 +0200
Subject: [PATCH] drivers/nble: Update headers following new 0215 fw release

These are mostly cosmetic changes, shall work with firmwares
niko-0214 and niko-0215.

Change-Id: Id39c6b9cee6e759f77a05259632e453492ffe498
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
 drivers/nble/gatt.c                      |  4 ++--
 drivers/nble/gatt_internal.h             | 14 +++++++-------
 drivers/nble/rpc_functions_to_ble_core.h |  3 ++-
 drivers/nble/rpc_functions_to_quark.h    |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/nble/gatt.c b/drivers/nble/gatt.c
index 96da6f2c31a..9c7927b447f 100644
--- a/drivers/nble/gatt.c
+++ b/drivers/nble/gatt.c
@@ -460,7 +460,7 @@ void on_nble_gatts_write_evt(const struct nble_gatt_wr_evt *evt,
 	}
 }
 
-void on_nble_gatts_get_attribute_value_rsp(const struct nble_gatts_attribute_response *par,
+void on_nble_gatts_get_attribute_value_rsp(const struct nble_gatts_attribute_rsp *rsp,
 					   uint8_t *data, uint8_t length)
 {
 	BT_DBG("");
@@ -477,7 +477,7 @@ void on_nble_gatts_send_svc_changed_rsp(const struct nble_core_response *par)
 	BT_DBG("");
 }
 
-void on_nble_gatts_set_attribute_value_rsp(const struct nble_gatts_attribute_response *par)
+void on_nble_gatts_set_attribute_value_rsp(const struct nble_gatts_attribute_rsp *rsp)
 {
 	BT_DBG("");
 }
diff --git a/drivers/nble/gatt_internal.h b/drivers/nble/gatt_internal.h
index a6965d7fd9f..e3f116a3589 100644
--- a/drivers/nble/gatt_internal.h
+++ b/drivers/nble/gatt_internal.h
@@ -228,7 +228,7 @@ struct nble_gatts_get_attribute_params {
 	uint16_t value_handle;		/* mandatory */
 };
 
-struct nble_gatts_attribute_response {
+struct nble_gatts_attribute_rsp {
 	int status;			/**< Status of the operation. */
 	uint16_t value_handle;		/* mandatory */
 	void *priv;
@@ -251,9 +251,9 @@ void nble_gatts_set_attribute_value_req(const struct nble_gatts_set_attribute_pa
 /**
  * Response to @ref nble_gatts_send_svc_changed_req.
  *
- * @param par Response
+ * @param rsp Response
  */
-void on_ble_gatts_set_attribute_value_rsp(const struct nble_gatts_attribute_response *par);
+void on_ble_gatts_set_attribute_value_rsp(const struct nble_gatts_attribute_rsp *rsp);
 
 /**
  * Get an attribute value.
@@ -270,11 +270,11 @@ void nble_gatts_get_attribute_value_req(const struct nble_gatts_get_attribute_pa
 /**
  * Response to @ref nble_gatts_get_attribute_value_req.
  *
- * @param par Response
+ * @param rsp Response
  * @param data Attribute value
  * @param length Length of attribute value
  */
-void on_ble_gatts_get_attribute_value_rsp(const struct nble_gatts_attribute_response *par,
+void on_ble_gatts_get_attribute_value_rsp(const struct nble_gatts_attribute_rsp *rsp,
 					  uint8_t *data, uint8_t length);
 
 struct nble_gatts_svc_changed_params {
@@ -483,7 +483,7 @@ struct nble_gattc_write_rsp {
  * @param priv Pointer to private data.
  */
 void nble_gattc_read_req(const struct nble_gattc_read_params *params,
-			void *priv);
+			 void *priv);
 
 /**
  * Response to @ref nble_gattc_read_req.
@@ -506,7 +506,7 @@ void on_ble_gattc_read_rsp(const struct nble_gattc_read_rsp *ev,
  * @param priv Pointer to private data.
  */
 void nble_gattc_write_req(const struct nble_gattc_write_params *params,
-			 const uint8_t *buf, uint8_t len, void *priv);
+			  const uint8_t *buf, uint8_t len, void *priv);
 
 /**
  * Response to @ref nble_gattc_write_req.
diff --git a/drivers/nble/rpc_functions_to_ble_core.h b/drivers/nble/rpc_functions_to_ble_core.h
index 7d447e829ce..4a9608bbc79 100644
--- a/drivers/nble/rpc_functions_to_ble_core.h
+++ b/drivers/nble/rpc_functions_to_ble_core.h
@@ -63,7 +63,8 @@
 
 #define LIST_FN_SIG_S_P							\
 	FN_SIG_S_P(nble_gap_disconnect_req,				\
-		   const struct nble_gap_disconnect_req_params *, void *)\
+		   const struct nble_gap_disconnect_req_params *,	\
+		   void *)						\
 	FN_SIG_S_P(nble_gap_connect_req,				\
 		   const struct nble_gap_connect_req_params *, void *)	\
 	FN_SIG_S_P(nble_gap_generic_cmd_req,				\
diff --git a/drivers/nble/rpc_functions_to_quark.h b/drivers/nble/rpc_functions_to_quark.h
index 032ef985448..4f60a902fe2 100644
--- a/drivers/nble/rpc_functions_to_quark.h
+++ b/drivers/nble/rpc_functions_to_quark.h
@@ -89,7 +89,7 @@
 		   const struct nble_gatt_wr_evt *,		\
 		   const uint8_t *, uint8_t)			\
 	FN_SIG_S_B(on_nble_gatts_get_attribute_value_rsp,	\
-		   const struct nble_gatts_attribute_response *,\
+		   const struct nble_gatts_attribute_rsp *,	\
 		   uint8_t *, uint8_t)				\
 	FN_SIG_S_B(on_nble_gatt_register_rsp,			\
 		   const struct nble_gatt_register_rsp *,	\