maa: add global maa.h and maa.hpp and stop using /usr/include/maa/

* pkg-config now only sees maa.h & maa.hpp
* usage of maa/*.{h,hpp} is still allowed
* examples updated to use maa.{h,hpp}

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

api/maa/gpio.hpp

@@ -0,0 +1,168 @@
+/*
+ * Author: Brendan Le Foll <brendan.le.foll@intel.com>
+ * Copyright (c) 2014 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "gpio.h"
+
+namespace maa {
+
+// These enums must match the enums in gpio.h
+
+/**
+ * Gpio Output modes
+ */
+typedef enum {
+    MODE_STRONG   = 0, /**< No interrupt on Gpio */
+    MODE_PULLUP   = 1, /**< Interupt on rising & falling */
+    MODE_PULLDOWN = 2, /**< Interupt on rising only */
+    MODE_HIZ      = 3  /**< Interupt on falling only */
+} Mode;
+
+/**
+ * Gpio Direction options
+ */
+typedef enum {
+    DIR_OUT = 0, /**< Output. A Mode can also be set */
+    DIR_IN  = 1  /**< Input */
+} Dir;
+
+/**
+ * Gpio Edge types for interupts
+ */
+typedef enum {
+    EDGE_NONE    = 0, /**< No interrupt on Gpio */
+    EDGE_BOTH    = 1, /**< Interupt on rising & falling */
+    EDGE_RISING  = 2, /**< Interupt on rising only */
+    EDGE_FALLING = 3  /**< Interupt on falling only */
+} Edge;
+
+/**
+ * @brief C++ API to General Purpose IO
+ *
+ * This file defines the gpio C++ interface for libmaa
+ *
+ * @snippet Blink-IO.cpp Interesting
+ */
+class Gpio {
+    public:
+        /**
+         * Instanciates a Gpio object
+         *
+         * @param pin pin number to use
+         * @param owner (optional) Set pin owner, default behaviour is to 'own'
+         * the pin if we exported it. This means we will close it on destruct.
+         * Otherwise it will get left open. This is only valid in sysfs use
+         * cases
+         * @param raw (optional) Raw pins will use gpiolibs pin numbering from
+         * the kernel module. Note that you will not get any muxers set up for
+         * you so this may not always work as expected.
+         */
+        Gpio(int pin, bool owner=true, bool raw=false) {
+            if (raw)
+                m_gpio = maa_gpio_init_raw(pin);
+            else
+                m_gpio = maa_gpio_init(pin);
+            if (!owner)
+                maa_gpio_owner(m_gpio, 0);
+        }
+        /**
+         * Gpio object destructor, this will only unexport the gpio if we where
+         * the owner
+         */
+        ~Gpio() {
+            maa_gpio_close(m_gpio);
+        }
+        /**
+         * Set the edge mode for ISR
+         *
+         * @param mode The edge mode to set
+         * @return Result of operation
+         */
+        maa_result_t edge(Edge mode) {
+            return maa_gpio_edge_mode(m_gpio, (gpio_edge_t) mode);
+        }
+#if defined(SWIGPYTHON)
+        maa_result_t isr(Edge mode, PyObject *pyfunc) {
+            return maa_gpio_isr(m_gpio, (gpio_edge_t) mode, (void (*) ()) pyfunc);
+        }
+#else
+        /**
+         * Sets a callback to be called when pin value changes
+         *
+         * @return Result of operation
+         */
+        maa_result_t isr(Edge mode, void (*fptr)(void)) {
+            return maa_gpio_isr(m_gpio, (gpio_edge_t) mode, fptr);
+        }
+#endif
+        /**
+         * Exits callback - this call will not kill the isr thread imediatlu
+         * but only when it is out of it's critical section
+         *
+         * @return Result of operation
+         */
+        maa_result_t isr_exit() {
+            return maa_gpio_isr_exit(m_gpio);
+        }
+        /**
+         * Change Gpio mode
+         *
+         * @param mode The mode to change the gpio into
+         * @return Result of operation
+         */
+        maa_result_t mode(Mode mode) {
+            return maa_gpio_mode(m_gpio, (gpio_mode_t) mode);
+        }
+        /**
+         * Change Gpio direction
+         *
+         * @param dir The direction to change the gpio into
+         * @return Result of operation
+         */
+        maa_result_t dir(Dir dir) {
+            return maa_gpio_dir(m_gpio, (gpio_dir_t) dir);
+        }
+        /**
+         * Read value from Gpio
+         *
+         * @return Gpio value
+         */
+        int read() {
+            return maa_gpio_read(m_gpio);
+        }
+        /**
+         * Write value to Gpio
+         *
+         * @param value Value to write to Gpio
+         * @return Result of operation
+         */
+        maa_result_t write(int value) {
+            return maa_gpio_write(m_gpio, value);
+        }
+    private:
+        maa_gpio_context m_gpio;
+};
+
+}