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

internal/platform_name: move to const char*

Browse Source 
Instead of plain char* to avoid need to malloc and do all the needed
error checking needed that goes along with that.

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2015-01-21 15:35:54 +00:00
parent 067487f9ec
commit 53a9a7dce4
7 changed files with 7 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/mraa/common.h
View File

@@ -175,8 +175,7 @@ typedef struct {
int pwm_default_period; /**< The default PWM period is US */
int pwm_max_period; /**< Maximum period in us */
int pwm_min_period; /**< Minimum period in us */
unsigned int platform_name_length; /**< Platform Name length */
char* platform_name; /**< Platform Name pointer */
const char* platform_name; /**< Platform Name pointer */
mraa_pininfo_t* pins; /**< Pointer to pin array */
/*@}*/
} mraa_board_t;

2
src/mraa.c
View File

@@ -305,7 +305,7 @@ mraa_get_platform_name()
{
if (plat == NULL)
return "Unknown";
return plat->platform_name;
return (char*) plat->platform_name;
}
unsigned int

8
src/x86/intel_de3815.c
View File

@@ -40,13 +40,7 @@ mraa_intel_de3815()
return NULL;
}
b->platform_name_length = strlen(PLATFORM_NAME) + 1;
b->platform_name = (char*) malloc(sizeof(char) * b->platform_name_length);
if (b->platform_name == NULL) {
goto error;
}
strncpy(b->platform_name, PLATFORM_NAME, b->platform_name_length);
b->platform_name = PLATFORM_NAME;
b->phy_pin_count = 18;
//b->gpio_count = 14;
b->aio_count = 0;

8
src/x86/intel_edison_fab_c.c
View File

@@ -1080,13 +1080,7 @@ mraa_intel_edison_fab_c()
return NULL;
}
b->platform_name_length = strlen(PLATFORM_NAME) + 1;
b->platform_name = (char*) malloc(sizeof(char) * b->platform_name_length);
if (b->platform_name == NULL) {
goto error;
}
strncpy(b->platform_name, PLATFORM_NAME, b->platform_name_length);
b->platform_name = PLATFORM_NAME;
// This seciton will also check if the arduino board is there
tristate = mraa_gpio_init_raw(214);
if (tristate == NULL) {

8
src/x86/intel_galileo_rev_d.c
View File

@@ -125,13 +125,7 @@ mraa_intel_galileo_rev_d()
return NULL;
}
b->platform_name_length = strlen(PLATFORM_NAME) + 1;
b->platform_name = (char*) malloc(sizeof(char) * b->platform_name_length);
if (b->platform_name == NULL) {
goto error;
}
strncpy(b->platform_name, PLATFORM_NAME, b->platform_name_length);
b->platform_name = PLATFORM_NAME;
b->phy_pin_count = 20;
b->gpio_count = 14;
b->aio_count = 6;

8
src/x86/intel_galileo_rev_g.c
View File

@@ -326,13 +326,7 @@ mraa_intel_galileo_gen2()
return NULL;
}
b->platform_name_length = strlen(PLATFORM_NAME) + 1;
b->platform_name = (char*) malloc(sizeof(char) * b->platform_name_length);
if (b->platform_name == NULL) {
goto error;
}
strncpy(b->platform_name, PLATFORM_NAME, b->platform_name_length);
b->platform_name = PLATFORM_NAME;
b->phy_pin_count = 20;
b->gpio_count = 14;
b->aio_count = 6;

8
src/x86/intel_minnow_max.c
View File

@@ -87,13 +87,7 @@ mraa_intel_minnow_max()
return NULL;
}
b->platform_name_length = strlen(PLATFORM_NAME) + 1;
b->platform_name = (char*) malloc(sizeof(char) * b->platform_name_length);
if (b->platform_name == NULL) {
goto error;
}
strncpy(b->platform_name, PLATFORM_NAME, b->platform_name_length);
b->platform_name = PLATFORM_NAME;
b->phy_pin_count = MRAA_INTEL_MINNOW_MAX_PINCOUNT;
b->gpio_count = MRAA_INTEL_MINNOW_MAX_PINCOUNT;
b->aio_count = 0;