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

Joule: Update references to the Intel Joule

Browse Source 
GT/GrosseTete -> Joule. This commit deprecates the MRAA_INTEL_GT_TUCHUCK
mraa_platform_t value and links the grossetete.md page to joule.md.

Signed-off-by: Wai Lun Poon <wai.lun.poon@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Wai Lun
2017-02-24 16:37:45 -05:00
committed by Brendan Le Foll
parent 2c529689ed
commit 0092e13f57
13 changed files with 171 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@@ -41,7 +41,7 @@ set (mraa_LIB_X86_SRCS_NOAUTO
${PROJECT_SOURCE_DIR}/src/x86/intel_sofia_3gr.c
${PROJECT_SOURCE_DIR}/src/x86/intel_cherryhills.c
${PROJECT_SOURCE_DIR}/src/x86/up.c
${PROJECT_SOURCE_DIR}/src/x86/intel_gt_tuchuck.c
${PROJECT_SOURCE_DIR}/src/x86/intel_joule_expansion.c
)
message (STATUS "INFO - Adding support for platform ${MRAAPLATFORMFORCE}")
@@ -67,8 +67,8 @@ if (NOT ${MRAAPLATFORMFORCE} STREQUAL "ALL")
set (mraa_LIB_X86_SRCS_NOAUTO ${PROJECT_SOURCE_DIR}/src/x86/x86.c ${PROJECT_SOURCE_DIR}/src/x86/intel_cherryhills.c)
elseif (${MRAAPLATFORMFORCE} STREQUAL "MRAA_UP")
set (mraa_LIB_X86_SRCS_NOAUTO ${PROJECT_SOURCE_DIR}/src/x86/x86.c ${PROJECT_SOURCE_DIR}/src/x86/up.c)
elseif( ${MRAAPLATFORMFORCE} STREQUAL "MRAA_INTEL_GT_TUCHUCK")
set (mraa_LIB_X86_SRCS_NOAUTO ${PROJECT_SOURCE_DIR}/src/x86/x86.c ${PROJECT_SOURCE_DIR}/src/x86/intel_gt_tuchuck.c)
elseif( ${MRAAPLATFORMFORCE} STREQUAL "MRAA_INTEL_JOULE_EXPANSION")
set (mraa_LIB_X86_SRCS_NOAUTO ${PROJECT_SOURCE_DIR}/src/x86/x86.c ${PROJECT_SOURCE_DIR}/src/x86/intel_joule_expansion.c)
else ()
message (FATAL_ERROR "Unknown x86 platform enabled!")
endif ()

12
src/x86/intel_gt_tuchuck.c → src/x86/intel_joule_expansion.c
View File

@@ -29,12 +29,12 @@
#include <fcntl.h>
#include "common.h"
#include "x86/intel_gt_tuchuck.h"
#include "x86/intel_joule_expansion.h"
#define PLATFORM_NAME "Intel GT Tuchuck"
#define PLATFORM_NAME "INTEL JOULE EXPANSION"
mraa_board_t*
mraa_gt_tuchuck_board()
mraa_joule_expansion_board()
{
mraa_board_t* b = (mraa_board_t*) calloc(1, sizeof(mraa_board_t));
if (b == NULL) {
@@ -42,12 +42,12 @@ mraa_gt_tuchuck_board()
}
b->platform_name = PLATFORM_NAME;
b->phy_pin_count = MRAA_INTEL_GT_TUCHUCK_PINCOUNT;
b->phy_pin_count = MRAA_INTEL_JOULE_EXPANSION_PINCOUNT;
b->aio_count = 0;
b->adc_raw = 0;
b->adc_supported = 0;
b->pins = (mraa_pininfo_t*) calloc(MRAA_INTEL_GT_TUCHUCK_PINCOUNT, sizeof(mraa_pininfo_t));
b->pins = (mraa_pininfo_t*) calloc(MRAA_INTEL_JOULE_EXPANSION_PINCOUNT, sizeof(mraa_pininfo_t));
if (b->pins == NULL) {
goto error;
}
@@ -705,7 +705,7 @@ mraa_gt_tuchuck_board()
return b;
error:
syslog(LOG_CRIT, "GT Tuchuck: Platform failed to initialise");
syslog(LOG_CRIT, "Intel Joule Expansion: Platform failed to initialise");
free(b);
return NULL;
}

14
src/x86/x86.c
View File

@@ -37,7 +37,7 @@
#include "x86/intel_sofia_3gr.h"
#include "x86/intel_cherryhills.h"
#include "x86/up.h"
#include "x86/intel_gt_tuchuck.h"
#include "x86/intel_joule_expansion.h"
mraa_platform_t
mraa_x86_platform()
@@ -88,11 +88,11 @@ mraa_x86_platform()
platform_type = MRAA_UP;
plat = mraa_up_board();
} else if (strncasecmp(line, "RVP", 3) == 0) {
platform_type = MRAA_INTEL_GT_TUCHUCK;
plat = mraa_gt_tuchuck_board();
platform_type = MRAA_INTEL_JOULE_EXPANSION;
plat = mraa_joule_expansion_board();
} else if (strncasecmp(line, "SDS", 3) == 0) {
platform_type = MRAA_INTEL_GT_TUCHUCK;
plat = mraa_gt_tuchuck_board();
platform_type = MRAA_INTEL_JOULE_EXPANSION;
plat = mraa_joule_expansion_board();
} else {
syslog(LOG_ERR, "Platform not supported, not initialising");
platform_type = MRAA_UNKNOWN_PLATFORM;
@@ -133,8 +133,8 @@ mraa_x86_platform()
plat = mraa_intel_cherryhills();
#elif defined(xMRAA_UP)
plat = mraa_up_board();
#elif defined(xMRAA_INTEL_GT_TUCHUCK)
plat = mraa_gt_tuchuck_board();
#elif defined(xMRAA_INTEL_JOULE_EXPANSION)
plat = mraa_joule_expansion_board();
#else
#error "Not using a valid platform value from mraa_platform_t - cannot compile"
#endif