From b74759e973ac9e70567f52822e90e8ae118f5397 Mon Sep 17 00:00:00 2001
From: Thomas Ingleby <thomas.c.ingleby@intel.com>
Date: Mon, 14 Jul 2014 15:12:08 +0100
Subject: [PATCH] mraa: rename internal adv func mraa_adv_func_t

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
---
 include/intel_galileo_rev_d.h | 2 +-
 include/intel_galileo_rev_g.h | 2 +-
 include/mraa_adv_func.h       | 2 +-
 include/mraa_internal.h       | 2 +-
 src/intel_galileo_rev_d.c     | 2 +-
 src/intel_galileo_rev_g.c     | 2 +-
 src/mraa.c                    | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/intel_galileo_rev_d.h b/include/intel_galileo_rev_d.h
index 72f27bf..2dccef4 100644
--- a/include/intel_galileo_rev_d.h
+++ b/include/intel_galileo_rev_d.h
@@ -33,7 +33,7 @@ extern "C" {
 #define MRAA_INTEL_GALILEO_REV_D_PINCOUNT 25
 
 mraa_board_t*
-mraa_intel_galileo_rev_d(mraa_adv_func* adv);
+mraa_intel_galileo_rev_d(mraa_adv_func_t* adv);
 
 #ifdef __cplusplus
 }
diff --git a/include/intel_galileo_rev_g.h b/include/intel_galileo_rev_g.h
index d439010..c90e3c3 100644
--- a/include/intel_galileo_rev_g.h
+++ b/include/intel_galileo_rev_g.h
@@ -33,7 +33,7 @@ extern "C" {
 #define MRAA_INTEL_GALILEO_GEN_2_PINCOUNT 25
 
 mraa_board_t*
-mraa_intel_galileo_gen2(mraa_adv_func* adv);
+mraa_intel_galileo_gen2(mraa_adv_func_t* adv);
 
 #ifdef __cplusplus
 }
diff --git a/include/mraa_adv_func.h b/include/mraa_adv_func.h
index 6dd45ce..02c2352 100644
--- a/include/mraa_adv_func.h
+++ b/include/mraa_adv_func.h
@@ -46,4 +46,4 @@ typedef struct {
     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;
+} mraa_adv_func_t;
diff --git a/include/mraa_internal.h b/include/mraa_internal.h
index 528193c..6db9770 100644
--- a/include/mraa_internal.h
+++ b/include/mraa_internal.h
@@ -32,7 +32,7 @@ extern "C" {
 #include "mraa_internal_types.h"
 #include "mraa_adv_func.h"
 
-extern mraa_adv_func advance_func;
+extern mraa_adv_func_t advance_func;
 
 /** Setup gpio
  *
diff --git a/src/intel_galileo_rev_d.c b/src/intel_galileo_rev_d.c
index c4a5020..867df81 100644
--- a/src/intel_galileo_rev_d.c
+++ b/src/intel_galileo_rev_d.c
@@ -29,7 +29,7 @@
 #include "intel_galileo_rev_d.h"
 
 mraa_board_t*
-mraa_intel_galileo_rev_d(mraa_adv_func* adv)
+mraa_intel_galileo_rev_d(mraa_adv_func_t* adv)
 {
     mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t));
     if (b == NULL)
diff --git a/src/intel_galileo_rev_g.c b/src/intel_galileo_rev_g.c
index d1f0b53..d50c72c 100644
--- a/src/intel_galileo_rev_g.c
+++ b/src/intel_galileo_rev_g.c
@@ -30,7 +30,7 @@
 #include "intel_galileo_rev_g.h"
 
 mraa_board_t*
-mraa_intel_galileo_gen2(mraa_adv_func* adv)
+mraa_intel_galileo_gen2(mraa_adv_func_t* adv)
 {
     mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t));
     if (b == NULL)
diff --git a/src/mraa.c b/src/mraa.c
index 27f1bbf..ccc2eae 100644
--- a/src/mraa.c
+++ b/src/mraa.c
@@ -37,7 +37,7 @@
 //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;
+mraa_adv_func_t advance_func;
 
 const char *
 mraa_get_version()
@@ -77,7 +77,7 @@ mraa_init()
     free(line);
     fclose(fh);
 
-    memset(&advance_func, 0, sizeof(mraa_adv_func));
+    memset(&advance_func, 0, sizeof(mraa_adv_func_t));
     switch(platform_type) {
         case MRAA_INTEL_GALILEO_GEN2:
             plat = mraa_intel_galileo_gen2(&advance_func);
-- 
2.7.4