Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a8a500b

Browse files
committedNov 19, 2020
Fix [-Waddress-of-packed-member] warning
Signed-off-by: Francois Ramu <[email protected]>
1 parent 998a42f commit a8a500b

File tree

5 files changed

+659
-733
lines changed

5 files changed

+659
-733
lines changed
 

‎src/utility/HCISharedMemTransport.cpp

Lines changed: 491 additions & 490 deletions
Large diffs are not rendered by default.

‎src/utility/HCISharedMemTransport.h

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "STM32Cube_FW/tl.h"
3131
#include "STM32Cube_FW/shci.h"
3232
#include "STM32Cube_FW/shci_tl.h"
33-
#include "STM32Cube_FW/stm_list.h"
3433
#include "STM32Cube_FW/app_conf.h"
3534

3635
/* this one is for printing info content when HW serial enabled */
@@ -64,32 +63,32 @@ void evt_received(TL_EvtPacket_t *hcievt);
6463
uint16_t mbox_write(uint8_t type, uint16_t len, const uint8_t *pData);
6564

6665
class HCISharedMemTransportClass : public HCITransportInterface {
67-
public:
68-
HCISharedMemTransportClass();
69-
virtual ~HCISharedMemTransportClass();
66+
public:
67+
HCISharedMemTransportClass();
68+
virtual ~HCISharedMemTransportClass();
7069

71-
virtual int begin();
72-
virtual void end();
70+
virtual int begin();
71+
virtual void end();
7372

74-
virtual void wait(unsigned long timeout);
73+
virtual void wait(unsigned long timeout);
7574

76-
virtual int available();
77-
virtual int peek();
78-
virtual int read();
75+
virtual int available();
76+
virtual int peek();
77+
virtual int read();
7978

80-
virtual size_t write(const uint8_t* data, size_t length);
79+
virtual size_t write(const uint8_t *data, size_t length);
8180

82-
private:
81+
private:
8382

84-
/* method to initialize the BLE device */
85-
void transport_init(void);
86-
void start_ble_rf(void);
87-
void stm32wb_reset(void);
88-
int stm32wb_start_ble(void);
89-
int bt_ipm_ble_init(void);
90-
int bt_ipm_set_addr(void);
91-
int bt_ipm_set_power(void);
83+
/* method to initialize the BLE device */
84+
void transport_init(void);
85+
void start_ble_rf(void);
86+
void stm32wb_reset(void);
87+
int stm32wb_start_ble(void);
88+
int bt_ipm_ble_init(void);
89+
int bt_ipm_set_addr(void);
90+
int bt_ipm_set_power(void);
9291

93-
};
92+
};
9493

9594
#endif /* _HCI_SHARED_MEM_TRANSPORT_H_ */

‎src/utility/HCISpiTransport.cpp

Lines changed: 112 additions & 194 deletions
Large diffs are not rendered by default.

‎src/utility/HCISpiTransport.h

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,41 @@ typedef enum BLEChip_s {
3131
} BLEChip_t;
3232

3333
#ifndef BLE_SPI_BYTE_ORDER
34-
#define BLE_SPI_BYTE_ORDER MSBFIRST
34+
#define BLE_SPI_BYTE_ORDER MSBFIRST
3535
#endif
3636
#define BLE_MODULE_SPI_BUFFER_SIZE 128
3737

3838
class HCISpiTransportClass : public HCITransportInterface {
39-
public:
40-
HCISpiTransportClass(SPIClass& spi, BLEChip_t ble_chip, uint8_t cs_pin, uint8_t spi_irq, uint8_t ble_rst, uint32_t frequency, uint8_t spi_mode);
41-
virtual ~HCISpiTransportClass();
39+
public:
40+
HCISpiTransportClass(SPIClass &spi, BLEChip_t ble_chip, uint8_t cs_pin, uint8_t spi_irq, uint8_t ble_rst, uint32_t frequency, uint8_t spi_mode);
41+
virtual ~HCISpiTransportClass();
4242

43-
virtual int begin();
44-
virtual void end();
43+
virtual int begin();
44+
virtual void end();
4545

46-
virtual void wait(unsigned long timeout);
46+
virtual void wait(unsigned long timeout);
4747

48-
virtual int available();
49-
virtual int peek();
50-
virtual int read();
48+
virtual int available();
49+
virtual int peek();
50+
virtual int read();
5151

52-
virtual size_t write(const uint8_t* data, size_t length);
52+
virtual size_t write(const uint8_t *data, size_t length);
5353

54-
private:
55-
void wait_for_blue_initialize();
56-
void wait_for_enable_ll_only();
57-
void enable_ll_only();
58-
SPIClass* _spi;
59-
SPISettings _spiSettings;
60-
BLEChip_t _ble_chip;
61-
uint8_t _cs_pin;
62-
uint8_t _spi_irq;
63-
uint8_t _ble_rst;
64-
uint8_t _rxbuff[BLE_MODULE_SPI_BUFFER_SIZE];
65-
uint16_t _read_index;
66-
uint16_t _write_index;
67-
uint16_t _write_index_initial;
68-
uint8_t _initial_phase;
54+
private:
55+
void wait_for_blue_initialize();
56+
void wait_for_enable_ll_only();
57+
void enable_ll_only();
58+
SPIClass *_spi;
59+
SPISettings _spiSettings;
60+
BLEChip_t _ble_chip;
61+
uint8_t _cs_pin;
62+
uint8_t _spi_irq;
63+
uint8_t _ble_rst;
64+
uint8_t _rxbuff[BLE_MODULE_SPI_BUFFER_SIZE];
65+
uint16_t _read_index;
66+
uint16_t _write_index;
67+
uint16_t _write_index_initial;
68+
uint8_t _initial_phase;
6969
};
7070

7171
#endif /* _HCI_SPI_TRANSPORT_H_ */

‎src/utility/STM32Cube_FW/stm_list.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@
2323

2424
/* Includes ------------------------------------------------------------------*/
2525

26-
#include "stdint.h"
2726
#include "stdbool.h"
27+
#include "stm32_wpan_common.h"
2828

29-
typedef struct _tListNode {
29+
#ifdef __cplusplus
30+
extern "C" {
31+
#endif
32+
33+
typedef PACKED_STRUCT _tListNode {
3034
struct _tListNode *next;
3135
struct _tListNode *prev;
3236
} tListNode;
@@ -55,4 +59,8 @@ void LST_get_next_node(tListNode *ref_node, tListNode **node);
5559

5660
void LST_get_prev_node(tListNode *ref_node, tListNode **node);
5761

62+
#ifdef __cplusplus
63+
}
64+
#endif
65+
5866
#endif /* _STM_LIST_H_ */

0 commit comments

Comments
 (0)
Please sign in to comment.