Vincent (pan-) Coubard / X_NUCLEO_IDB0XA1

My fork of X_NUCLEO_IDB0XA1

Fork of X_NUCLEO_IDB0XA1 by ST

Files at this revision

API Documentation at this revision

Revision 294:fd19310b086d, committed 2016-09-15

Comitter:
Vincent Coubard
Date:
Thu Sep 15 10:52:02 2016 +0100
Branch:
32241492098bb4d0cd62a16975725a4374ad7ecc
Parent:
293:5a1f577bf92f
Child:
295:480f017cd04d
Commit message:
Sync with 32241492098bb4d0cd62a16975725a4374ad7ecc

2016-07-28 16:04:43+02:00: Andrea Palmieri
Update include

Signed-off-by: Andrea Palmieri <andrea.palmieri@st.com>

Changed in this revision

source/bluenrg-hci/hci/ble_hci.c Show annotated file Show diff for this revision Revisions of this file
source/bluenrg-hci/hci/controller/bluenrg_gap_aci.c Show annotated file Show diff for this revision Revisions of this file
source/bluenrg-hci/hci/controller/bluenrg_hal_aci.c Show annotated file Show diff for this revision Revisions of this file
source/bluenrg-hci/hci/controller/bluenrg_updater_aci.c Show annotated file Show diff for this revision Revisions of this file
source/bluenrg-hci/hci/controller/bluenrg_utils.c Show annotated file Show diff for this revision Revisions of this file
source/bluenrg-hci/utils/ble_list.c Show annotated file Show diff for this revision Revisions of this file
x-nucleo-idb0xa1/bluenrg-hci/ble_hal_types.h Show annotated file Show diff for this revision Revisions of this file
x-nucleo-idb0xa1/bluenrg-hci/ble_osal.h Show annotated file Show diff for this revision Revisions of this file
x-nucleo-idb0xa1/bluenrg-hci/bluenrg_utils.h Show annotated file Show diff for this revision Revisions of this file
x-nucleo-idb0xa1/utils/ble_utils.h Show annotated file Show diff for this revision Revisions of this file 
--- a/source/bluenrg-hci/hci/ble_hci.c	Thu Sep 15 10:52:00 2016 +0100
+++ b/source/bluenrg-hci/hci/ble_hci.c	Thu Sep 15 10:52:02 2016 +0100
@@ -1,6 +1,6 @@
 /**
   ******************************************************************************
-  * @file    hci.c 
+  * @file    ble_hci.c 
   * @author  AMS/HESA Application Team
   * @brief   Function for managing HCI interface.
   ******************************************************************************
@@ -16,13 +16,13 @@
   * <h2><center>&copy; COPYRIGHT 2013 STMicroelectronics</center></h2>
   */ 
 
-#include "hal_types.h"
-#include "osal.h"
+#include "ble_hal_types.h"
+#include "ble_osal.h"
 #include "ble_status.h"
-#include "hal.h"
-#include "hci_const.h"
-#include "gp_timer.h"
-#include "debug.h"
+#include "ble_hal.h"
+#include "ble_hci_const.h"
+#include "ble_gp_timer.h"
+#include "ble_debug.h"
 
 #include "stm32_bluenrg_ble.h"
 

--- a/source/bluenrg-hci/hci/controller/bluenrg_gap_aci.c	Thu Sep 15 10:52:00 2016 +0100
+++ b/source/bluenrg-hci/hci/controller/bluenrg_gap_aci.c	Thu Sep 15 10:52:02 2016 +0100
@@ -14,11 +14,11 @@
 *******************************************************************************/
 
 #include "hal_types.h"
-#include "osal.h"
+#include "ble_osal.h"
 #include "ble_status.h"
-#include "hal.h"
-#include "osal.h"
-#include "hci_const.h"
+#include "ble_hal.h"
+#include "ble_osal.h"
+#include "ble_hci_const.h"
 #include "bluenrg_aci_const.h"
 #include "bluenrg_gap_aci.h"
 #include "bluenrg_gatt_server.h"
@@ -1304,4 +1304,4 @@
     Osal_MemCpy(device_list, rp.dev_list, MIN(device_list_size,rp.num_addr*7));
   
   return 0;
-}
+}
\ No newline at end of file

--- a/source/bluenrg-hci/hci/controller/bluenrg_hal_aci.c	Thu Sep 15 10:52:00 2016 +0100
+++ b/source/bluenrg-hci/hci/controller/bluenrg_hal_aci.c	Thu Sep 15 10:52:02 2016 +0100
@@ -13,12 +13,12 @@
 * INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
 *******************************************************************************/
 
-#include "hal_types.h"
-#include "osal.h"
+#include "ble_hal_types.h"
+#include "ble_osal.h"
 #include "ble_status.h"
-#include "hal.h"
-#include "osal.h"
-#include "hci_const.h"
+#include "ble_hal.h"
+#include "ble_osal.h"
+#include "ble_hci_const.h"
 #include "bluenrg_aci_const.h"
 #include "bluenrg_hal_aci.h"
 #include "bluenrg_gatt_server.h"
@@ -180,4 +180,3 @@
 }
 
 
-

--- a/source/bluenrg-hci/hci/controller/bluenrg_updater_aci.c	Thu Sep 15 10:52:00 2016 +0100
+++ b/source/bluenrg-hci/hci/controller/bluenrg_updater_aci.c	Thu Sep 15 10:52:02 2016 +0100
@@ -13,12 +13,12 @@
 * INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
 *******************************************************************************/
 
-#include "hal_types.h"
-#include "osal.h"
+#include "ble_hal_types.h"
+#include "ble_osal.h"
 #include "ble_status.h"
-#include "hal.h"
-#include "osal.h"
-#include "hci_const.h"
+#include "ble_hal.h"
+#include "ble_osal.h"
+#include "ble_hci_const.h"
 #include "bluenrg_aci_const.h"
 #include "bluenrg_updater_aci.h"
 
@@ -267,4 +267,3 @@
 
 
 
-

--- a/source/bluenrg-hci/hci/controller/bluenrg_utils.c	Thu Sep 15 10:52:00 2016 +0100
+++ b/source/bluenrg-hci/hci/controller/bluenrg_utils.c	Thu Sep 15 10:52:02 2016 +0100
@@ -1,11 +1,11 @@
 
-#include "hal.h"
-#include "hal_types.h"
+#include "ble_hal.h"
+#include "ble_hal_types.h"
 #include "ble_status.h"
 #include "bluenrg_aci.h"
 #include "bluenrg_utils.h"
-#include "hci.h"
-#include "osal.h"
+#include "ble_hci.h"
+#include "ble_osal.h"
 #include "string.h"
 #include "stm32_bluenrg_ble.h"
 
@@ -427,4 +427,4 @@
     return 0;
 
   return 1;
-}
+}
\ No newline at end of file

--- a/source/bluenrg-hci/utils/ble_list.c	Thu Sep 15 10:52:00 2016 +0100
+++ b/source/bluenrg-hci/utils/ble_list.c	Thu Sep 15 10:52:02 2016 +0100
@@ -1,5 +1,5 @@
 /******************** (C) COPYRIGHT 2012 STMicroelectronics ********************
-* File Name          : list.c
+* File Name          : ble_list.c
 * Author             : AMS - HEA&RF BU
 * Version            : V1.0.0
 * Date               : 19-July-2012
@@ -16,8 +16,8 @@
 /******************************************************************************
  * Include Files
 ******************************************************************************/
-#include <hal_types.h>
-#include "list.h"
+#include <ble_hal_types.h>
+#include "ble_list.h"
 
 /******************************************************************************
  * Function Definitions 
@@ -116,4 +116,3 @@
 {
     *node = ref_node->prev;
 }
-

--- a/x-nucleo-idb0xa1/bluenrg-hci/ble_hal_types.h	Thu Sep 15 10:52:00 2016 +0100
+++ b/x-nucleo-idb0xa1/bluenrg-hci/ble_hal_types.h	Thu Sep 15 10:52:02 2016 +0100
@@ -1,5 +1,5 @@
 /******************** (C) COPYRIGHT 2012 STMicroelectronics ********************
-* File Name          : hal_types.h
+* File Name          : ble_hal_types.h
 * Author             : AMS - HEA&RF BU
 * Version            : V1.0.0
 * Date               : 19-July-2012
@@ -55,4 +55,3 @@
 
 
 #endif /* __HAL_TYPES_H__ */ 
-

--- a/x-nucleo-idb0xa1/bluenrg-hci/ble_osal.h	Thu Sep 15 10:52:00 2016 +0100
+++ b/x-nucleo-idb0xa1/bluenrg-hci/ble_osal.h	Thu Sep 15 10:52:02 2016 +0100
@@ -22,7 +22,7 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
-#include <hal_types.h>
+#include <ble_hal_types.h>
 #ifdef __ICCARM__
 #include <intrinsics.h>
 #endif
@@ -78,4 +78,4 @@
 uint32_t Osal_Get_Cur_Time(void);
 
 
-#endif /* __OSAL_H__ */
+#endif /* __OSAL_H__ */
\ No newline at end of file

--- a/x-nucleo-idb0xa1/bluenrg-hci/bluenrg_utils.h	Thu Sep 15 10:52:00 2016 +0100
+++ b/x-nucleo-idb0xa1/bluenrg-hci/bluenrg_utils.h	Thu Sep 15 10:52:02 2016 +0100
@@ -27,8 +27,8 @@
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "hal_types.h" 
-#include "compiler.h"
+#include "ble_hal_types.h" 
+#include "ble_compiler.h"
 
 /* Exported types ------------------------------------------------------------*/
 typedef struct{
@@ -201,4 +201,4 @@
 
 #endif /*__BLUENRG_UTILS_H */
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
\ No newline at end of file

--- a/x-nucleo-idb0xa1/utils/ble_utils.h	Thu Sep 15 10:52:00 2016 +0100
+++ b/x-nucleo-idb0xa1/utils/ble_utils.h	Thu Sep 15 10:52:02 2016 +0100
@@ -21,7 +21,7 @@
 #define __UTIL_H__
 
 #include "ble_status.h"
-#include "hal_types.h"
+#include "ble_hal_types.h"
 #ifdef YOTTA_CFG_MBED_OS
     #include "mbed-drivers/mbed.h"
 #else