Skip to content

Rename some function parameters to solve -Wshadow issue in SPI and EEPROM libraries #2880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpistm merged 3 commits into from
Dec 16, 2025
+15 −15
Merged

Rename some function parameters to solve -Wshadow issue in SPI and EEPROM libraries #2880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2271cae
fix: rename constructor parameter to solve shadow issue
marshfolx Dec 16, 2025
234c71f
fix: SPISettings constructor parameter names to solve shadow issue
marshfolx Dec 16, 2025
11aa107
fix: array name shadowing some HAL declaration
fpistm Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libraries/EEPROM/src/EEPROM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ extern "C" {

struct EERef {

EERef(const int index)
: index(index) {}
EERef(const int idx)
: index(idx) {}

//Access/read members.
uint8_t operator*() const
Expand Down Expand Up @@ -140,8 +140,8 @@ struct EERef {

struct EEPtr {

EEPtr(const int index)
: index(index) {}
EEPtr(const int idx)
: index(idx) {}

operator int() const
{
Expand Down
16 changes: 8 additions & 8 deletions libraries/SPI/src/SPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ extern "C" {

class SPISettings {
public:
constexpr SPISettings(uint32_t clock, BitOrder bitOrder, uint8_t dataMode, SPIDeviceMode deviceMode = SPI_MASTER)
constexpr SPISettings(uint32_t clock, BitOrder order, uint8_t mode, SPIDeviceMode devMode = SPI_MASTER)
: clockFreq(clock),
bitOrder(bitOrder),
dataMode((SPIMode)dataMode),
deviceMode(deviceMode)
bitOrder(order),
dataMode((SPIMode)mode),
deviceMode(devMode)
{ }
constexpr SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIDeviceMode deviceMode = SPI_MASTER)
constexpr SPISettings(uint32_t clock, BitOrder order, SPIMode mode, SPIDeviceMode devMode = SPI_MASTER)
: clockFreq(clock),
bitOrder(bitOrder),
dataMode(dataMode),
deviceMode(deviceMode)
bitOrder(order),
dataMode(mode),
deviceMode(devMode)
{ }
constexpr SPISettings()
: clockFreq(SPI_SPEED_CLOCK_DEFAULT),
Expand Down
4 changes: 2 additions & 2 deletions libraries/SrcWrapper/inc/PortNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
extern "C" {
#endif

extern GPIO_TypeDef *GPIOPort[];
extern GPIO_TypeDef *GPIOPort_list[];

typedef enum {
FirstPort = 0x00,
Expand Down Expand Up @@ -79,7 +79,7 @@ typedef enum {
#define MAX_NB_PORT (LastPort-FirstPort+1)

/* Return GPIO base address */
#define get_GPIO_Port(p) ((p < MAX_NB_PORT) ? GPIOPort[p] : (GPIO_TypeDef *)NULL)
#define get_GPIO_Port(p) ((p < MAX_NB_PORT) ? GPIOPort_list[p] : (GPIO_TypeDef *)NULL)
/* Enable GPIO clock and return GPIO base address */
GPIO_TypeDef *set_GPIO_Port_Clock(uint32_t port_idx);

Expand Down
2 changes: 1 addition & 1 deletion libraries/SrcWrapper/src/stm32/PortNames.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/
#include "PortNames.h"

GPIO_TypeDef *GPIOPort[MAX_NB_PORT] = {
GPIO_TypeDef *GPIOPort_list[MAX_NB_PORT] = {
(GPIO_TypeDef *)GPIOA_BASE,
(GPIO_TypeDef *)GPIOB_BASE
#if defined GPIOC_BASE
Expand Down