Backport auf gcc 4.6

[hackover2013-badge-firmware.git] / core / gpio / gpio.c

diff --git a/core/gpio/gpio.c b/core/gpio/gpio.c
index e13f72e..2f03e9a 100644 (file)
--- a/core/gpio/gpio.c
+++ b/core/gpio/gpio.c
@@ -227,67 +227,6 @@ void gpioSetDir (uint32_t portNum, uint32_t bitPos, gpioDirection_t dir)
   dir == gpioDirection_Output ? (*gpiodir |= (1 << bitPos)) : (*gpiodir &= ~(1 << bitPos));
 }
 
   dir == gpioDirection_Output ? (*gpiodir |= (1 << bitPos)) : (*gpiodir &= ~(1 << bitPos));
 }
 

-/**************************************************************************/
-/*! 
-    @brief Gets the value for a specific port pin
-
-    @param[in]  portNum
-                The port number (0..3)
-    @param[in]  bitPos
-                The bit position (0..31)
-
-    @return     The current value for the specified port pin (0..1)
-*/
-/**************************************************************************/
-uint32_t gpioGetValue (uint32_t portNum, uint32_t bitPos)
-{
-  if (!_gpioInitialised) gpioInit();
-
-  uint32_t value = 0;
-
-  switch (portNum)
-  {
-    case 0:
-      value = (GPIO_GPIO0DATA & (1 << bitPos)) ? 1 : 0;
-      break;
-    case 1:
-      value = (GPIO_GPIO1DATA & (1 << bitPos)) ? 1 : 0;
-      break;
-    case 2:
-      value = (GPIO_GPIO2DATA & (1 << bitPos)) ? 1 : 0;
-      break;
-    case 3:
-      value = (GPIO_GPIO3DATA & (1 << bitPos)) ? 1 : 0;
-      break;
-    default:
-      break;
-  }
-
-  return value;
-}
-
-/**************************************************************************/
-/*! 
-    @brief Sets the value for a specific port pin (only relevant when a
-           pin is configured as output).
-
-    @param[in]  portNum
-                The port number (0..3)
-    @param[in]  bitPos
-                The bit position (0..31)
-    @param[in]  bitValue
-                The value to set for the specified bit (0..1).  0 will set
-                the pin low and 1 will set the pin high.
-*/
-/**************************************************************************/
-inline void gpioSetValue (const uint32_t portNum, const uint32_t bitPos, const uint32_t bitVal)
-{
-  if (!_gpioInitialised) gpioInit();
-
-  // Take advantage of the fact the GPIO registers are bit-banded
-  (*(pREG32 ((GPIO_GPIO0_BASE + (portNum << 16)) + ((1 << bitPos) << 2)))) = bitVal ? 0xFFF : 0;
-}
-

 /**************************************************************************/
 /*! 
     @brief Sets the interrupt sense, event, etc.
 /**************************************************************************/
 /*! 
     @brief Sets the interrupt sense, event, etc.


@@ -367,7 +306,7 @@ void gpioSetInterrupt (uint32_t portNum, uint32_t bitPos, gpioInterruptSense_t s
     *gpiois |= (0x1<<bitPos);
   }
 
     *gpiois |= (0x1<<bitPos);
   }
 

-  event == gpioInterruptEvent_ActiveHigh ? (*gpioiev &= ~(0x1<<bitPos)) : (*gpioiev |= (0x1<<bitPos));
+  event == gpioInterruptEvent_ActiveLow ? (*gpioiev &= ~(0x1<<bitPos)) : (*gpioiev |= (0x1<<bitPos));

 
   return;
 }
 
   return;
 }