FIND_PACKAGE (Threads)
-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fno-omit-frame-pointer")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
# Appends the cmake/modules path to MAKE_MODULE_PATH variable.
#pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mraa_internal.h"
+
#define MRAA_INTEL_GALILEO_REV_D_PINCOUNT 25
mraa_board_t*
-mraa_intel_galileo_rev_d();
+mraa_intel_galileo_rev_d(mraa_adv_func* adv);
+
+#ifdef __cplusplus
+}
+#endif
#pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "mraa_internal.h"
+
#define MRAA_INTEL_GALILEO_GEN_2_PINCOUNT 25
mraa_board_t*
-mraa_intel_galileo_gen2();
+mraa_intel_galileo_gen2(mraa_adv_func* adv);
+
+#ifdef __cplusplus
+}
+#endif
--- /dev/null
+/*
+ * Author: Thomas Ingleby <thomas.c.ingleby@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 "common.h"
+#include "mraa.h"
+#include "types.h"
+
+typedef struct {
+ mraa_result_t (*gpio_init_pre) (int pin);
+ mraa_result_t (*gpio_init_post) (mraa_gpio_context dev);
+
+ mraa_result_t (*gpio_mode_replace) (mraa_gpio_context dev, gpio_mode_t mode);
+ mraa_result_t (*gpio_mode_pre) (mraa_gpio_context dev, gpio_mode_t mode);
+ mraa_result_t (*gpio_mode_post) (mraa_gpio_context dev, gpio_mode_t mode);
+
+ mraa_result_t (*gpio_dir_replace) (mraa_gpio_context dev, gpio_dir_t dir);
+ mraa_result_t (*gpio_dir_pre) (mraa_gpio_context dev, gpio_dir_t dir);
+ mraa_result_t (*gpio_dir_post) (mraa_gpio_context dev, gpio_dir_t dir);
+
+ mraa_result_t (*gpio_write_pre) (mraa_gpio_context dev, int value);
+ mraa_result_t (*gpio_write_post) (mraa_gpio_context dev, int value);
+
+ mraa_result_t (*gpio_mmaped_write_replace) (mraa_gpio_context dev, int value);
+ mraa_result_t (*gpio_mmaped_write_pre) (mraa_gpio_context dev, int value);
+ mraa_result_t (*gpio_mmaped_write_post) (mraa_gpio_context dev, int value);
+} mraa_adv_func;
#pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "common.h"
#include "mraa_internal_types.h"
+extern mraa_adv_func advance_func;
+
/** Setup gpio
*
* Will check input is valid for gpio and will also setup required multiplexers.
* @return mraa_result_t of operation
*/
mraa_result_t mraa_setup_uart(int index);
+
+#ifdef __cplusplus
+}
+#endif
#pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
extern int i2c_smbus_block_process_call(int fd, uint8_t command, uint8_t length,
uint8_t *values);
+
+#ifdef __cplusplus
+}
+#endif
#pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
const char* gVERSION;
const char* gVERSION_SHORT;
+
+#ifdef __cplusplus
+}
+#endif
mraa_gpio_context
mraa_gpio_init_raw(int pin)
{
+ if (advance_func.gpio_init_pre != NULL) {
+ printf("Actually entering\n");
+ if (advance_func.gpio_init_pre(pin) != MRAA_SUCCESS)
+ return NULL;
+ }
+
if (pin < 0)
return NULL;
close(export);
}
+ if (advance_func.gpio_init_post != NULL) {
+ free(dev);
+ return NULL;
+ }
return dev;
}
static mraa_result_t
mraa_gpio_write_register(mraa_gpio_context dev,int value)
{
- if (value == 1) {
+ if (advance_func.gpio_mmaped_write_replace != NULL)
+ return advance_func.gpio_mmaped_write_replace(dev,value);
+ if (advance_func.gpio_mmaped_write_pre != NULL) {
+ mraa_result_t pre_ret = (advance_func.gpio_mmaped_write_pre(dev,value));
+ if(pre_ret != MRAA_SUCCESS)
+ return pre_ret;
+ }
+ if (value == 1) {
*((unsigned *)dev->reg) |= (1<<dev->reg_bit_pos);
return MRAA_SUCCESS;
}
*((unsigned *)dev->reg) &= ~(1<<dev->reg_bit_pos);
+ if (advance_func.gpio_mmaped_write_post != NULL)
+ return advance_func.gpio_mmaped_write_post(dev,value);
return MRAA_SUCCESS;
}
// assume our thread will exit either way we just lost it's handle
dev->thread_id = 0;
dev->isr_value_fp = -1;
-
return ret;
}
mraa_result_t
mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
{
+ if (advance_func.gpio_mode_replace != NULL)
+ return advance_func.gpio_mode_replace(dev,mode);
+
+ if (advance_func.gpio_mode_pre != NULL) {
+ mraa_result_t pre_ret = (advance_func.gpio_mode_pre(dev,mode));
+ if(pre_ret != MRAA_SUCCESS)
+ return pre_ret;
+ }
+
if (dev->value_fp != -1) {
close(dev->value_fp);
dev->value_fp = -1;
}
close(drive);
+ if (advance_func.gpio_mode_post != NULL)
+ return advance_func.gpio_mode_post(dev,mode);
return MRAA_SUCCESS;
}
mraa_result_t
mraa_gpio_dir(mraa_gpio_context dev, gpio_dir_t dir)
{
+ if (advance_func.gpio_dir_replace != NULL)
+ return advance_func.gpio_dir_replace(dev,dir);
+ if (advance_func.gpio_dir_pre != NULL) {
+ mraa_result_t pre_ret = (advance_func.gpio_dir_pre(dev,dir));
+ if(pre_ret != MRAA_SUCCESS)
+ return pre_ret;
+ }
+
if (dev == NULL) {
return MRAA_ERROR_INVALID_HANDLE;
}
}
close(direction);
+ if (advance_func.gpio_dir_post != NULL)
+ return advance_func.gpio_dir_post(dev,dir);
return MRAA_SUCCESS;
}
int ret = strtol(bu, NULL, 10);
return ret;
+ return 0;
}
mraa_result_t
if (dev->mmap == 1)
return mraa_gpio_write_register(dev,value);
+ if (advance_func.gpio_write_pre != NULL) {
+ mraa_result_t pre_ret = (advance_func.gpio_write_pre(dev,value));
+ if(pre_ret != MRAA_SUCCESS)
+ return pre_ret;
+ }
+
if (dev->value_fp == -1) {
mraa_gpio_get_valfp(dev);
}
return MRAA_ERROR_INVALID_HANDLE;
}
+ if (advance_func.gpio_write_post != NULL)
+ return advance_func.gpio_write_post(dev,value);
return MRAA_SUCCESS;
}
//static mraa_pininfo_t* pindata;
static mraa_board_t* plat = NULL;
static mraa_platform_t platform_type = MRAA_UNKNOWN_PLATFORM;
+mraa_adv_func advance_func;
const char *
mraa_get_version()
return gVERSION;
}
-#if 0
-const mraa_adv_func*
-mraa_get_advance()
-{
- return (const mraa_adv_func*) advance;
-}
-#endif
-
-mraa_result_t
+mraa_result_t __attribute__((constructor))
mraa_init()
{
/** Once more board definitions have been added,
free(line);
fclose(fh);
+ memset(&advance_func, 0, sizeof(mraa_adv_func));
switch(platform_type) {
case MRAA_INTEL_GALILEO_GEN2:
- plat = mraa_intel_galileo_gen2();
+ plat = mraa_intel_galileo_gen2(&advance_func);
break;
case MRAA_INTEL_GALILEO_GEN1:
- plat = mraa_intel_galileo_rev_d();
+ plat = mraa_intel_galileo_rev_d(&advance_func);
break;
default:
- plat = mraa_intel_galileo_rev_d();
+ plat = mraa_intel_galileo_rev_d(&advance_func);
fprintf(stderr, "Platform not found, initialising MRAA_INTEL_GALILEO_GEN1\n");
}
projects / contrib / mraa.git / commitdiff