Commit b8f135ba authored by Guillaume Gautier's avatar Guillaume Gautier Committed by Erwan Gouriou
Browse files

lib: stm32wb: hci: fix gcc warnings 

Patches lib WB HCI to avoid GCC warnings due to wrong buffer size.

Signed-off-by: default avatarGuillaume Gautier <guillaume.gautier-ext@st.com>
parent d013bdfb

lib/stm32wb/hci/README

+14 −0
Changes for lib/stm32wb/hci/README: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -86,5 +86,19 @@ Patch List: 
            used as, in Zephyr context, it is  running on C-M4 side.

          Impacted file: app_conf.h



         *  (Z-WB-4) Change payload size of several structure defined in tl.h

             from 255 to 2 (TL_CcEvt_t, TL_AsynchEvt_t and TL_Evt_t).

             Rename TL_BLEEVT_CS_BUFFER_SIZE to TL_BLEEVT_CC_BUFFER_SIZE and

             TL_BLEEVT_CS_PACKET_SIZE to TL_BLEEVT_CC_PACKET_SIZE and changing

             its value to use sizeof(TL_CcEvt_t) instead of sizeof(TL_CsEvt_t).

             In shci.c, for all declaration of local_buffer, change the size

             from TL_BLEEVT_CS_BUFFER_SIZE to TL_BLEEVT_CC_BUFFER_SIZE.

             The goal of all that is to prevent a GCC warning in most function

             returns of shci.c: warning: array subscript 'TL_CcEvt_t[0]' is

             partly outside array bounds of 'uint8_t[15]' {aka 'unsigned

             char[15]'} [-Warray-bounds].

             This is expected to be fixed in release 1.17.0

             Internal reference: 142283

          Impacted files: tl.h, shci.c



	* Remove trailing whitespaces
 
 No newline at end of file

lib/stm32wb/hci/shci.c

+36 −36
Changes for lib/stm32wb/hci/shci.c: 36 added lines, 36 removed lines.
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ 
uint8_t SHCI_C2_FUS_GetState( SHCI_FUS_GetState_ErrorCode_t *p_error_code )

{

  /**

   * A command status event + payload has the same size than the expected command complete

   * Buffer is large enough to hold command complete with payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE + 1];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE + 1];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -63,10 +63,10 @@ uint8_t SHCI_C2_FUS_GetState( SHCI_FUS_GetState_ErrorCode_t *p_error_code ) 
SHCI_CmdStatus_t SHCI_C2_FUS_FwUpgrade( uint32_t fw_src_add,  uint32_t fw_dest_add )

{

  /**

   * TL_BLEEVT_CS_BUFFER_SIZE is 15 bytes so it is large enough to hold the 8 bytes of command parameters

   * TL_BLEEVT_CC_BUFFER_SIZE is 16 bytes so it is large enough to hold the 8 bytes of command parameters

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;

  uint32_t *p_cmd;

  uint8_t cmd_length;
@@ -101,7 +101,7 @@ SHCI_CmdStatus_t SHCI_C2_FUS_FwDelete( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -119,7 +119,7 @@ SHCI_CmdStatus_t SHCI_C2_FUS_UpdateAuthKey( SHCI_C2_FUS_UpdateAuthKey_Cmd_Param_ 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -137,7 +137,7 @@ SHCI_CmdStatus_t SHCI_C2_FUS_LockAuthKey( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -153,9 +153,9 @@ SHCI_CmdStatus_t SHCI_C2_FUS_LockAuthKey( void ) 
SHCI_CmdStatus_t SHCI_C2_FUS_StoreUsrKey( SHCI_C2_FUS_StoreUsrKey_Cmd_Param_t *pParam, uint8_t *p_key_index )

{

  /**

   * Buffer is large enough to hold command complete without payload

   * Buffer is large enough to hold command complete with payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE + 1];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE + 1];

  TL_EvtPacket_t * p_rsp;

  uint8_t local_payload_len;
@@ -189,7 +189,7 @@ SHCI_CmdStatus_t SHCI_C2_FUS_LoadUsrKey( uint8_t key_index ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -209,7 +209,7 @@ SHCI_CmdStatus_t SHCI_C2_FUS_StartWs( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -227,7 +227,7 @@ SHCI_CmdStatus_t SHCI_C2_FUS_LockUsrKey( uint8_t key_index ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -247,7 +247,7 @@ SHCI_CmdStatus_t SHCI_C2_FUS_UnloadUsrKey( uint8_t key_index ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -267,7 +267,7 @@ SHCI_CmdStatus_t SHCI_C2_FUS_ActivateAntiRollback( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -285,7 +285,7 @@ SHCI_CmdStatus_t SHCI_C2_BLE_Init( SHCI_C2_Ble_Init_Cmd_Packet_t *pCmdPacket ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -303,7 +303,7 @@ SHCI_CmdStatus_t SHCI_C2_THREAD_Init( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -321,7 +321,7 @@ SHCI_CmdStatus_t SHCI_C2_LLDTESTS_Init( uint8_t param_size, uint8_t * p_param ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -339,7 +339,7 @@ SHCI_CmdStatus_t SHCI_C2_BLE_LLD_Init( uint8_t param_size, uint8_t * p_param ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -357,7 +357,7 @@ SHCI_CmdStatus_t SHCI_C2_ZIGBEE_Init( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -375,7 +375,7 @@ SHCI_CmdStatus_t SHCI_C2_DEBUG_Init( SHCI_C2_DEBUG_Init_Cmd_Packet_t *pCmdPacket 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -393,7 +393,7 @@ SHCI_CmdStatus_t SHCI_C2_FLASH_EraseActivity( SHCI_EraseActivity_t erase_activit 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -413,7 +413,7 @@ SHCI_CmdStatus_t SHCI_C2_CONCURRENT_SetMode( SHCI_C2_CONCURRENT_Mode_Param_t Mod 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -431,9 +431,9 @@ SHCI_CmdStatus_t SHCI_C2_CONCURRENT_SetMode( SHCI_C2_CONCURRENT_Mode_Param_t Mod 
SHCI_CmdStatus_t SHCI_C2_CONCURRENT_GetNextBleEvtTime( SHCI_C2_CONCURRENT_GetNextBleEvtTime_Param_t *pParam )

{

  /**

   * Buffer is large enough to hold command complete without payload

   * Buffer is large enough to hold command complete with payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE+4];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE+4];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -453,7 +453,7 @@ SHCI_CmdStatus_t SHCI_C2_CONCURRENT_EnableNext_802154_EvtNotification( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -471,7 +471,7 @@ SHCI_CmdStatus_t SHCI_C2_FLASH_StoreData( SHCI_C2_FLASH_Ip_t Ip ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -491,7 +491,7 @@ SHCI_CmdStatus_t SHCI_C2_FLASH_EraseData( SHCI_C2_FLASH_Ip_t Ip ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -511,7 +511,7 @@ SHCI_CmdStatus_t SHCI_C2_RADIO_AllowLowPower( SHCI_C2_FLASH_Ip_t Ip,uint8_t Fla 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -532,7 +532,7 @@ SHCI_CmdStatus_t SHCI_C2_MAC_802_15_4_Init( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -550,7 +550,7 @@ SHCI_CmdStatus_t SHCI_C2_Reinit( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -566,10 +566,10 @@ SHCI_CmdStatus_t SHCI_C2_Reinit( void ) 
SHCI_CmdStatus_t SHCI_C2_ExtpaConfig(uint32_t gpio_port, uint16_t gpio_pin_number, uint8_t gpio_polarity, uint8_t gpio_status)

{

  /**

   * TL_BLEEVT_CS_BUFFER_SIZE is 15 bytes so it is large enough to hold the 8 bytes of command parameters

   * TL_BLEEVT_CC_BUFFER_SIZE is 16 bytes so it is large enough to hold the 8 bytes of command parameters

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -590,10 +590,10 @@ SHCI_CmdStatus_t SHCI_C2_ExtpaConfig(uint32_t gpio_port, uint16_t gpio_pin_numbe 
SHCI_CmdStatus_t SHCI_C2_SetFlashActivityControl(SHCI_C2_SET_FLASH_ACTIVITY_CONTROL_Source_t Source)

{

  /**

   * TL_BLEEVT_CS_BUFFER_SIZE is 15 bytes so it is large enough to hold the 1 byte of command parameter

   * TL_BLEEVT_CC_BUFFER_SIZE is 16 bytes so it is large enough to hold the 1 byte of command parameter

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -613,7 +613,7 @@ SHCI_CmdStatus_t SHCI_C2_Config(SHCI_C2_CONFIG_Cmd_Param_t *pCmdPacket) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;
@@ -631,7 +631,7 @@ SHCI_CmdStatus_t SHCI_C2_802_15_4_DeInit( void ) 
  /**

   * Buffer is large enough to hold command complete without payload

   */

  uint8_t local_buffer[TL_BLEEVT_CS_BUFFER_SIZE];

  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];

  TL_EvtPacket_t * p_rsp;



  p_rsp = (TL_EvtPacket_t *)local_buffer;

lib/stm32wb/hci/tl.h

+5 −6
Changes for lib/stm32wb/hci/tl.h: 5 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -58,9 +58,8 @@ extern "C" { 
#define TL_BLEEVT_CS_OPCODE            (0x0F)

#define TL_BLEEVT_VS_OPCODE            (0xFF)



#define TL_BLEEVT_CS_PACKET_SIZE       (TL_EVT_HDR_SIZE + sizeof(TL_CsEvt_t))

#define TL_BLEEVT_CS_BUFFER_SIZE       (sizeof(TL_PacketHeader_t) + TL_BLEEVT_CS_PACKET_SIZE)



#define TL_BLEEVT_CC_PACKET_SIZE       (TL_EVT_HDR_SIZE + sizeof(TL_CcEvt_t))

#define TL_BLEEVT_CC_BUFFER_SIZE       (sizeof(TL_PacketHeader_t) + TL_BLEEVT_CC_PACKET_SIZE)

/* Exported types ------------------------------------------------------------*/

/**< Packet header */

typedef PACKED_STRUCT
@@ -90,7 +89,7 @@ typedef PACKED_STRUCT 
{

  uint8_t   numcmd;

  uint16_t  cmdcode;

  uint8_t   payload[255];

  uint8_t   payload[2];

} TL_CcEvt_t;



/**
@@ -99,7 +98,7 @@ typedef PACKED_STRUCT 
typedef PACKED_STRUCT

{

  uint16_t  subevtcode;

  uint8_t   payload[255];

  uint8_t   payload[2];

} TL_AsynchEvt_t;



/**
@@ -109,7 +108,7 @@ typedef PACKED_STRUCT 
{

  uint8_t   evtcode;

  uint8_t   plen;

  uint8_t   payload[255];

  uint8_t   payload[2];

} TL_Evt_t;



typedef PACKED_STRUCT

CRA Git | Maintained and supported by SUSTech CRA and CCSE