FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

constify efi_gpio, use size_t (#4695)

This commit is contained in:
Matthew Kennedy 2022-10-23 05:25:47 -07:00 committed by GitHub
parent 38a90f1ee4
commit 1e0144efaa
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
firmware/controllers/system/efi_gpio.cpp
View File

@ -64,27 +64,28 @@ static const char* const auxValveShortNames[] = { "a1", "a2"};
static RegisteredOutputPin * registeredOutputHead = nullptr;
RegisteredNamedOutputPin::RegisteredNamedOutputPin(const char *name, short pinOffset,
short pinModeOffset) : RegisteredOutputPin(name, pinOffset, pinModeOffset) {
RegisteredNamedOutputPin::RegisteredNamedOutputPin(const char *name, size_t pinOffset,
size_t pinModeOffset) : RegisteredOutputPin(name, pinOffset, pinModeOffset) {
}
RegisteredOutputPin::RegisteredOutputPin(const char *registrationName, short pinOffset,
short pinModeOffset) {
this->registrationName = registrationName;
this->pinOffset = pinOffset;
this->pinModeOffset = pinModeOffset;
RegisteredOutputPin::RegisteredOutputPin(const char *registrationName, size_t pinOffset,
size_t pinModeOffset)
: next(registeredOutputHead)
, registrationName(registrationName)
, m_pinOffset(static_cast<uint16_t>(pinOffset))
, m_pinModeOffset(static_cast<uint16_t>(pinModeOffset))
{
// adding into head of the list is so easy and since we do not care about order that's what we shall do
this->next = registeredOutputHead;
registeredOutputHead = this;
}
bool RegisteredOutputPin::isPinConfigurationChanged() {
#if EFI_PROD_CODE
brain_pin_e curPin = *(brain_pin_e *) ((void *) (&((char*)&activeConfiguration)[pinOffset]));
brain_pin_e newPin = *(brain_pin_e *) ((void *) (&((char*) engineConfiguration)[pinOffset]));
brain_pin_e curPin = *(brain_pin_e *) ((void *) (&((char*)&activeConfiguration)[m_pinOffset]));
brain_pin_e newPin = *(brain_pin_e *) ((void *) (&((char*) engineConfiguration)[m_pinOffset]));
pin_output_mode_e curMode = *(pin_output_mode_e *) ((void *) (&((char*)&activeConfiguration)[pinModeOffset]));
pin_output_mode_e newMode = *(pin_output_mode_e *) ((void *) (&((char*) engineConfiguration)[pinModeOffset]));
pin_output_mode_e curMode = *(pin_output_mode_e *) ((void *) (&((char*)&activeConfiguration)[m_pinModeOffset]));
pin_output_mode_e newMode = *(pin_output_mode_e *) ((void *) (&((char*) engineConfiguration)[m_pinModeOffset]));
return curPin != newPin || curMode != newMode;
#else
return true;
@ -92,8 +93,8 @@ bool RegisteredOutputPin::isPinConfigurationChanged() {
}
void RegisteredOutputPin::init() {
brain_pin_e newPin = *(brain_pin_e *) ((void *) (&((char*) engineConfiguration)[pinOffset]));
pin_output_mode_e *newMode = (pin_output_mode_e *) ((void *) (&((char*) engineConfiguration)[pinModeOffset]));
brain_pin_e newPin = *(brain_pin_e *) ((void *) (&((char*) engineConfiguration)[m_pinOffset]));
pin_output_mode_e *newMode = (pin_output_mode_e *) ((void *) (&((char*) engineConfiguration)[m_pinModeOffset]));
if (isPinConfigurationChanged()) {
this->initPin(registrationName, newPin, newMode);

10
firmware/controllers/system/efi_gpio.h
View File

@ -43,20 +43,20 @@ public:
*/
class RegisteredOutputPin : public virtual OutputPin {
public:
RegisteredOutputPin(const char *registrationName, short pinOffset, short pinModeOffset);
RegisteredOutputPin(const char *registrationName, size_t pinOffset, size_t pinModeOffset);
void init();
void unregister();
RegisteredOutputPin *next;
RegisteredOutputPin* const next;
const char *registrationName;
private:
short pinOffset;
short pinModeOffset;
const uint16_t m_pinOffset;
const uint16_t m_pinModeOffset;
bool isPinConfigurationChanged();
};
class RegisteredNamedOutputPin : public RegisteredOutputPin, public NamedOutputPin {
public:
RegisteredNamedOutputPin(const char *name, short pinOffset, short pinModeOffset);
RegisteredNamedOutputPin(const char *name, size_t pinOffset, size_t pinModeOffset);
};
class EnginePins {