From e2aaa349ff42038dc56b7a4e0407b08e45e816c6 Mon Sep 17 00:00:00 2001 From: Evan Steele Date: Tue, 15 Sep 2015 15:35:26 +0100 Subject: [PATCH] minnowboardmax: Add support for compatible boards Signed-off-by: Evan Steele Signed-off-by: Brendan Le Foll --- ...tel_minnow_max.h => intel_minnow_byt_compatible.h} | 2 +- src/CMakeLists.txt | 2 +- ...tel_minnow_max.c => intel_minnow_byt_compatible.c} | 5 +++-- src/x86/x86.c | 11 +++++++---- 4 files changed, 12 insertions(+), 8 deletions(-) rename include/x86/{intel_minnow_max.h => intel_minnow_byt_compatible.h} (97%) rename src/x86/{intel_minnow_max.c => intel_minnow_byt_compatible.c} (98%) diff --git a/include/x86/intel_minnow_max.h b/include/x86/intel_minnow_byt_compatible.h similarity index 97% rename from include/x86/intel_minnow_max.h rename to include/x86/intel_minnow_byt_compatible.h index 96c604d..0f22f14 100644 --- a/include/x86/intel_minnow_max.h +++ b/include/x86/intel_minnow_byt_compatible.h @@ -34,7 +34,7 @@ extern "C" { #define MRAA_INTEL_MINNOW_MAX_PINCOUNT (26 + 1) mraa_board_t* -mraa_intel_minnow_max(); +mraa_intel_minnowboard_byt_compatible(); #ifdef __cplusplus } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dbfe9e4..5e1f413 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,7 +25,7 @@ set (mraa_LIB_X86_SRCS_NOAUTO ${PROJECT_SOURCE_DIR}/src/x86/intel_edison_fab_c.c ${PROJECT_SOURCE_DIR}/src/x86/intel_de3815.c ${PROJECT_SOURCE_DIR}/src/x86/intel_nuc5.c - ${PROJECT_SOURCE_DIR}/src/x86/intel_minnow_max.c + ${PROJECT_SOURCE_DIR}/src/x86/intel_minnow_byt_compatible.c ) set (mraa_LIB_ARM_SRCS_NOAUTO diff --git a/src/x86/intel_minnow_max.c b/src/x86/intel_minnow_byt_compatible.c similarity index 98% rename from src/x86/intel_minnow_max.c rename to src/x86/intel_minnow_byt_compatible.c index 8891a22..0c2ab27 100644 --- a/src/x86/intel_minnow_max.c +++ b/src/x86/intel_minnow_byt_compatible.c @@ -1,5 +1,6 @@ /* * Author: Henry Bruce + * Evan Steele * Copyright (c) 2014 Intel Corporation. * * Permission is hereby granted, free of charge, to any person obtaining @@ -28,7 +29,7 @@ #include #include "common.h" -#include "x86/intel_minnow_max.h" +#include "x86/intel_minnow_byt_compatible.h" #define PLATFORM_NAME "MinnowBoard MAX" #define I2C_BUS_DEFAULT 7 @@ -83,7 +84,7 @@ mraa_get_pin_index(mraa_board_t* board, char* name, int* pin_index) } mraa_board_t* -mraa_intel_minnow_max() +mraa_intel_minnowboard_byt_compatible() { mraa_board_t* b = (mraa_board_t*) calloc(1, sizeof(mraa_board_t)); diff --git a/src/x86/x86.c b/src/x86/x86.c index 7c524c1..40a4ec3 100644 --- a/src/x86/x86.c +++ b/src/x86/x86.c @@ -30,8 +30,8 @@ #include "x86/intel_galileo_rev_g.h" #include "x86/intel_edison_fab_c.h" #include "x86/intel_de3815.h" -#include "x86/intel_minnow_max.h" #include "x86/intel_nuc5.h" +#include "x86/intel_minnow_byt_compatible.h" mraa_platform_t mraa_x86_platform() @@ -60,14 +60,17 @@ mraa_x86_platform() plat = mraa_intel_nuc5(); } else if (strncmp(line, "NOTEBOOK", 8) == 0) { platform_type = MRAA_INTEL_MINNOWBOARD_MAX; - plat = mraa_intel_minnow_max(); + plat = mraa_intel_minnowboard_byt_compatible(); } else if (strncasecmp(line, "MinnowBoard MAX", 15) == 0) { platform_type = MRAA_INTEL_MINNOWBOARD_MAX; - plat = mraa_intel_minnow_max(); + plat = mraa_intel_minnowboard_byt_compatible(); } else if (strncasecmp(line, "Galileo", 7) == 0) { platform_type = MRAA_INTEL_GALILEO_GEN1; plat = mraa_intel_galileo_rev_d(); - } else { + } else if (strncasecmp(line, "MinnowBoard Compatible", 22) == 0) { + platform_type = MRAA_INTEL_MINNOWBOARD_MAX; + plat = mraa_intel_minnowboard_byt_compatible(); + } else { syslog(LOG_ERR, "Platform not supported, not initialising"); platform_type = MRAA_UNKNOWN_PLATFORM; }