Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

intel_edision_fab_c: renamed from fab_b

Browse Source 
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-07-16 17:24:08 +01:00
committed by Brendan Le Foll
parent 854585ef49
commit 5766b03068
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/mraa/types.h
View File

@@ -39,7 +39,7 @@ extern "C" {
typedef enum { typedef enum {
MRAA_INTEL_GALILEO_GEN1 = 0, /**< The Generation 1 Galileo platform (RevD) */ MRAA_INTEL_GALILEO_GEN1 = 0, /**< The Generation 1 Galileo platform (RevD) */
MRAA_INTEL_GALILEO_GEN2 = 1, /**< The Generation 2 Galileo platform (RevG/H) */ MRAA_INTEL_GALILEO_GEN2 = 1, /**< The Generation 2 Galileo platform (RevG/H) */
MRAA_INTEL_EDISON_FAB_B = 2, /**< The Intel Edison (FAB B) */ MRAA_INTEL_EDISON_FAB_C = 2, /**< The Intel Edison (FAB C) */
MRAA_UNKNOWN_PLATFORM = 99 /**< An unknown platform type, typically will load INTEL_GALILEO_GEN1 */ MRAA_UNKNOWN_PLATFORM = 99 /**< An unknown platform type, typically will load INTEL_GALILEO_GEN1 */
} mraa_platform_t; } mraa_platform_t;

2
include/intel_edison_fab_b.h → include/intel_edison_fab_c.h
View File

@@ -33,7 +33,7 @@ extern "C" {
#define MRAA_INTEL_EDISON_PINCOUNT 25 #define MRAA_INTEL_EDISON_PINCOUNT 25
mraa_board_t* mraa_board_t*
mraa_intel_edison_fab_b(); mraa_intel_edison_fab_c();
#ifdef __cplusplus #ifdef __cplusplus
} }

2
src/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ set (mraa_LIB_SRCS
${PROJECT_SOURCE_DIR}/src/uart/uart.c ${PROJECT_SOURCE_DIR}/src/uart/uart.c
${PROJECT_SOURCE_DIR}/src/intel_galileo_rev_d.c ${PROJECT_SOURCE_DIR}/src/intel_galileo_rev_d.c
${PROJECT_SOURCE_DIR}/src/intel_galileo_rev_g.c ${PROJECT_SOURCE_DIR}/src/intel_galileo_rev_g.c
${PROJECT_SOURCE_DIR}/src/intel_edison_fab_b.c ${PROJECT_SOURCE_DIR}/src/intel_edison_fab_c.c
# autogenerated version file # autogenerated version file
${CMAKE_CURRENT_BINARY_DIR}/version.c ${CMAKE_CURRENT_BINARY_DIR}/version.c
) )

4
src/intel_edison_fab_b.c → src/intel_edison_fab_c.c
View File

@@ -26,10 +26,10 @@
#include <string.h> #include <string.h>
#include "common.h" #include "common.h"
#include "intel_edison_fab_b.h" #include "intel_edison_fab_c.h"
mraa_board_t* mraa_board_t*
mraa_intel_edison_fab_b() mraa_intel_edison_fab_c()
{ {
mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t)); mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t));
if (b == NULL) if (b == NULL)

10
src/mraa.c
View File

@@ -31,7 +31,7 @@
#include "mraa_internal.h" #include "mraa_internal.h"
#include "intel_galileo_rev_d.h" #include "intel_galileo_rev_d.h"
#include "intel_galileo_rev_g.h" #include "intel_galileo_rev_g.h"
#include "intel_edison_fab_b.h" #include "intel_edison_fab_c.h"
#include "gpio.h" #include "gpio.h"
#include "version.h" #include "version.h"
@@ -70,9 +70,9 @@ mraa_init()
if (strncmp(line, "GalileoGen2", 10) == 0) { if (strncmp(line, "GalileoGen2", 10) == 0) {
platform_type = MRAA_INTEL_GALILEO_GEN2; platform_type = MRAA_INTEL_GALILEO_GEN2;
} else if (strncmp(line, "BODEGA BAY", 10) == 0) { } else if (strncmp(line, "BODEGA BAY", 10) == 0) {
platform_type = MRAA_INTEL_EDISON_FAB_B; platform_type = MRAA_INTEL_EDISON_FAB_C;
} else if (strncmp(line, "SALT BAY", 7) == 0) { } else if (strncmp(line, "SALT BAY", 7) == 0) {
platform_type = MRAA_INTEL_EDISON_FAB_B; platform_type = MRAA_INTEL_EDISON_FAB_C;
} else { } else {
platform_type = MRAA_INTEL_GALILEO_GEN1; platform_type = MRAA_INTEL_GALILEO_GEN1;
} }
@@ -91,8 +91,8 @@ mraa_init()
case MRAA_INTEL_GALILEO_GEN1: case MRAA_INTEL_GALILEO_GEN1:
plat = mraa_intel_galileo_rev_d(); plat = mraa_intel_galileo_rev_d();
break; break;
case MRAA_INTEL_EDISON_FAB_B: case MRAA_INTEL_EDISON_FAB_C:
plat = mraa_intel_edison_fab_b(&advance_func); plat = mraa_intel_edison_fab_c();
break; break;
default: default:
plat = mraa_intel_galileo_rev_d(); plat = mraa_intel_galileo_rev_d();