Switch to using calloc on all calls to malloc where the memory isn't initialized. For things like the mraa_board_t, not allocating all to zero causes issues such as with the sub_platform member, where if that's not zero mraa_get_platform_type will try to dereference a random memory location for the sub_platform->platform_name, which can result in segmentation faults and other issues. Note that in some places where immediately after the malloc call is a copy operation, there is no need for calloc, as all the memory gets overwritten anyways, but in cases where there may or may not be memory written to (such as in mraa_file_contains, with reading from a file), even though in most cases the memory is overwritten, it could be the case that the read operation does nothing, but the memory still has non-zero values, by virtue of the fact it wasn't overwritten. Signed-off-by: Ian Johnson <ijohnson@wolfram.com> Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
104 lines
3.5 KiB
C
104 lines
3.5 KiB
C
/*
|
|
* Author: Lay, Kuan Loon <kuan.loon.lay@intel.com>
|
|
* Copyright (c) 2015 Intel Corporation.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "common.h"
|
|
#include "x86/intel_sofia_3gr.h"
|
|
|
|
#define PLATFORM_NAME "SoFIA 3GR"
|
|
|
|
mraa_board_t*
|
|
mraa_intel_sofia_3gr()
|
|
{
|
|
mraa_board_t* b = (mraa_board_t*) calloc(1, sizeof(mraa_board_t));
|
|
if (b == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
b->platform_name = PLATFORM_NAME;
|
|
b->phy_pin_count = MRAA_INTEL_SOFIA_3GR_PINCOUNT;
|
|
|
|
b->adv_func = (mraa_adv_func_t*) calloc(1, sizeof(mraa_adv_func_t));
|
|
if (b->adv_func == NULL) {
|
|
goto error;
|
|
}
|
|
|
|
b->pins = (mraa_pininfo_t*) calloc(MRAA_INTEL_SOFIA_3GR_PINCOUNT, sizeof(mraa_pininfo_t));
|
|
if (b->pins == NULL) {
|
|
free(b->adv_func);
|
|
goto error;
|
|
}
|
|
|
|
strncpy(b->pins[0].name, "I2C1SCL", 8);
|
|
b->pins[0].capabilites = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
|
|
b->pins[0].i2c.pinmap = 1;
|
|
b->pins[0].i2c.mux_total = 0;
|
|
|
|
strncpy(b->pins[1].name, "I2C1SDA", 8);
|
|
b->pins[1].capabilites = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
|
|
b->pins[1].i2c.pinmap = 1;
|
|
b->pins[1].i2c.mux_total = 0;
|
|
|
|
strncpy(b->pins[2].name, "I2C2SCL", 8);
|
|
b->pins[2].capabilites = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
|
|
b->pins[2].i2c.pinmap = 1;
|
|
b->pins[2].i2c.mux_total = 0;
|
|
|
|
strncpy(b->pins[3].name, "I2C2SDA", 8);
|
|
b->pins[3].capabilites = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
|
|
b->pins[3].i2c.pinmap = 1;
|
|
b->pins[3].i2c.mux_total = 0;
|
|
|
|
strncpy(b->pins[4].name, "I2C3SCL", 8);
|
|
b->pins[4].capabilites = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
|
|
b->pins[4].i2c.pinmap = 1;
|
|
b->pins[4].i2c.mux_total = 0;
|
|
|
|
strncpy(b->pins[5].name, "I2C3SDA", 8);
|
|
b->pins[5].capabilites = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
|
|
b->pins[5].i2c.pinmap = 1;
|
|
b->pins[5].i2c.mux_total = 0;
|
|
|
|
strncpy(b->pins[6].name, "I2C4SCL", 8);
|
|
b->pins[6].capabilites = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
|
|
b->pins[6].i2c.pinmap = 1;
|
|
b->pins[6].i2c.mux_total = 0;
|
|
|
|
strncpy(b->pins[7].name, "I2C4SDA", 8);
|
|
b->pins[7].capabilites = (mraa_pincapabilities_t){ 1, 0, 0, 0, 0, 1, 0, 0 };
|
|
b->pins[7].i2c.pinmap = 1;
|
|
b->pins[7].i2c.mux_total = 0;
|
|
|
|
return b;
|
|
error:
|
|
syslog(LOG_CRIT, "SoFIA 3GR: Platform failed to initialise");
|
|
free(b);
|
|
return NULL;
|
|
}
|