From bda02b464a2ad00b1a8e373d4c6b80b0a7c8de95 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 9 Dec 2021 13:42:54 +0100
Subject: [PATCH] linux HAL fixes

---
 hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.cpp b/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.cpp
index 020ba9644..e2e4e46d3 100644
--- a/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.cpp
+++ b/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.cpp
@@ -75,7 +75,7 @@ ReturnValue_t LinuxLibgpioIF::configureGpios(GpioMap& mapToAdd) {
             configureGpioByLineName(gpioConfig.first, *regularGpio);
             break;
         }
-        case(gpio::GpioTypes::CALLBACK): {
+        case(gpio::GpioTypes::TYPE_CALLBACK): {
             auto gpioCallback = dynamic_cast<GpioCallback*>(gpioConfig.second);
             if(gpioCallback->callback == nullptr) {
                 return GPIO_INVALID_INSTANCE;
@@ -163,12 +163,12 @@ ReturnValue_t LinuxLibgpioIF::configureRegularGpio(gpioId_t gpioId, struct gpiod
     consumer = regularGpio.consumer;
     /* Configure direction and add a description to the GPIO */
     switch (direction) {
-    case(gpio::OUT): {
+    case(gpio::DIR_OUT): {
         result = gpiod_line_request_output(lineHandle, consumer.c_str(),
                 regularGpio.initValue);
         break;
     }
-    case(gpio::IN): {
+    case(gpio::DIR_IN): {
         result = gpiod_line_request_input(lineHandle, consumer.c_str());
         break;
     }
@@ -330,7 +330,7 @@ ReturnValue_t LinuxLibgpioIF::checkForConflicts(GpioMap& mapToAdd){
             }
             break;
         }
-        case(gpio::GpioTypes::CALLBACK): {
+        case(gpio::GpioTypes::TYPE_CALLBACK): {
             auto callbackGpio = dynamic_cast<GpioCallback*>(gpioConfig.second);
             if(callbackGpio == nullptr)  {
                 return GPIO_TYPE_FAILURE;
@@ -371,13 +371,13 @@ ReturnValue_t LinuxLibgpioIF::checkForConflictsById(gpioId_t gpioIdToCheck,
         case(gpio::GpioTypes::GPIO_REGULAR_BY_CHIP):
         case(gpio::GpioTypes::GPIO_REGULAR_BY_LABEL):
         case(gpio::GpioTypes::GPIO_REGULAR_BY_LINE_NAME): {
-            if(gpioType == gpio::GpioTypes::NONE or gpioType == gpio::GpioTypes::CALLBACK) {
+            if(gpioType == gpio::GpioTypes::NONE or gpioType == gpio::GpioTypes::TYPE_CALLBACK) {
                 eraseDuplicateDifferentType = true;
             }
             break;
         }
-        case(gpio::GpioTypes::CALLBACK): {
-            if(gpioType != gpio::GpioTypes::CALLBACK) {
+        case(gpio::GpioTypes::TYPE_CALLBACK): {
+            if(gpioType != gpio::GpioTypes::TYPE_CALLBACK) {
                 eraseDuplicateDifferentType = true;
             }
         }