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

syslog: unify error msg style

Browse Source 
syslog messages should be written as <module>: Message in order to increase
readability and usefulness

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2014-10-22 21:06:45 +01:00
parent a67d71ed90
commit a6b3d384b2
8 changed files with 69 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/aio/aio.c
View File

@@ -47,8 +47,8 @@ aio_get_valid_fp(mraa_aio_context dev)
dev->adc_in_fp = open(file_path, O_RDONLY); dev->adc_in_fp = open(file_path, O_RDONLY);
if (dev->adc_in_fp == -1) { if (dev->adc_in_fp == -1) {
syslog(LOG_ERR, "Failed to open Analog input raw file %s for " syslog(LOG_ERR, "aio: Failed to open input raw file %s for reading!",
"reading!", file_path); file_path);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -68,15 +68,15 @@ mraa_aio_init(unsigned int aio_channel)
if (checked_pin < 0) { if (checked_pin < 0) {
switch (checked_pin) { switch (checked_pin) {
case MRAA_NO_SUCH_IO: case MRAA_NO_SUCH_IO:
syslog(LOG_ERR, "Invalid analog input channel %d specified", syslog(LOG_ERR, "aio: Invalid input channel %d specified",
aio_channel); aio_channel);
return NULL; return NULL;
case MRAA_IO_SETUP_FAILURE: case MRAA_IO_SETUP_FAILURE:
syslog(LOG_ERR, "Failed to set-up analog input channel %d " syslog(LOG_ERR, "aio: Failed to set-up input channel %d "
"multiplexer", aio_channel); "multiplexer", aio_channel);
return NULL; return NULL;
case MRAA_PLATFORM_NO_INIT: case MRAA_PLATFORM_NO_INIT:
syslog(LOG_ERR, "Platform not initialised"); syslog(LOG_ERR, "aio: Platform not initialised");
return NULL; return NULL;
default: default:
return NULL; return NULL;
@@ -86,7 +86,7 @@ mraa_aio_init(unsigned int aio_channel)
//Create ADC device connected to specified channel //Create ADC device connected to specified channel
mraa_aio_context dev = malloc(sizeof(struct _aio)); mraa_aio_context dev = malloc(sizeof(struct _aio));
if (dev == NULL) { if (dev == NULL) {
syslog(LOG_ERR, "Insufficient memory for specified Analog input channel " syslog(LOG_ERR, "aio: Insufficient memory for specified input channel "
"%d\n", aio_channel); "%d\n", aio_channel);
return NULL; return NULL;
} }
@@ -123,7 +123,7 @@ mraa_aio_read(mraa_aio_context dev)
lseek(dev->adc_in_fp, 0, SEEK_SET); lseek(dev->adc_in_fp, 0, SEEK_SET);
if (read(dev->adc_in_fp, buffer, sizeof(buffer)) < 1) { if (read(dev->adc_in_fp, buffer, sizeof(buffer)) < 1) {
syslog(LOG_ERR, "Failed to read a sensible value"); syslog(LOG_ERR, "aio: Failed to read a sensible value");
} }
// force NULL termination of string // force NULL termination of string
buffer[16] = '\0'; buffer[16] = '\0';
@@ -133,10 +133,10 @@ mraa_aio_read(mraa_aio_context dev)
char *end; char *end;
unsigned int analog_value = (unsigned int) strtoul(buffer, &end, 10); unsigned int analog_value = (unsigned int) strtoul(buffer, &end, 10);
if (end == &buffer[0]) { if (end == &buffer[0]) {
syslog(LOG_ERR, "value is not a decimal number"); syslog(LOG_ERR, "aio: Value is not a decimal number");
} }
else if (errno != 0) { else if (errno != 0) {
syslog(LOG_ERR, "errno was set"); syslog(LOG_ERR, "aio: Errno was set");
} }
if (dev->value_bit != raw_bits) { if (dev->value_bit != raw_bits) {
@@ -165,14 +165,10 @@ mraa_aio_close(mraa_aio_context dev)
mraa_result_t mraa_result_t
mraa_aio_set_bit(mraa_aio_context dev, int bits) mraa_aio_set_bit(mraa_aio_context dev, int bits)
{ {
if (dev == NULL) { if (dev == NULL || bits < 1) {
syslog(LOG_ERR, "AIO Device not valid"); syslog(LOG_ERR, "aio: Device not valid");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
if (bits < 1) {
syslog(LOG_ERR, "AIO Device not valid");
return MRAA_ERROR_INVALID_PARAMETER;
}
dev->value_bit = bits; dev->value_bit = bits;
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }
@@ -181,7 +177,7 @@ int
mraa_aio_get_bit(mraa_aio_context dev) mraa_aio_get_bit(mraa_aio_context dev)
{ {
if (dev == NULL) { if (dev == NULL) {
syslog(LOG_ERR, "AIO Device not valid"); syslog(LOG_ERR, "aio: Device not valid");
return 0; return 0;
} }
return dev->value_bit; return dev->value_bit;

28
src/gpio/gpio.c
View File

@@ -88,7 +88,7 @@ mraa_gpio_init_raw(int pin)
mraa_gpio_context dev = (mraa_gpio_context) malloc(sizeof(struct _gpio)); mraa_gpio_context dev = (mraa_gpio_context) malloc(sizeof(struct _gpio));
if (dev == NULL) { if (dev == NULL) {
syslog(LOG_CRIT, "Failed to allocate memory for context"); syslog(LOG_CRIT, "gpio: Failed to allocate memory for context");
return NULL; return NULL;
} }
@@ -106,13 +106,13 @@ mraa_gpio_init_raw(int pin)
} else { } else {
int export = open(SYSFS_CLASS_GPIO "/export", O_WRONLY); int export = open(SYSFS_CLASS_GPIO "/export", O_WRONLY);
if (export == -1) { if (export == -1) {
syslog(LOG_ERR, "Failed to open export for writing"); syslog(LOG_ERR, "gpio: Failed to open export for writing");
free(dev); free(dev);
return NULL; return NULL;
} }
length = snprintf(bu, sizeof(bu), "%d", dev->pin); length = snprintf(bu, sizeof(bu), "%d", dev->pin);
if (write(export, bu, length*sizeof(char)) == -1) { if (write(export, bu, length*sizeof(char)) == -1) {
syslog(LOG_ERR, "Failed to write to export"); syslog(LOG_ERR, "gpio: Failed to write to export");
close(export); close(export);
return NULL; return NULL;
} }
@@ -196,11 +196,11 @@ mraa_gpio_interrupt_handler(void* arg)
PyObject *ret; PyObject *ret;
arglist = Py_BuildValue("(i)", dev->isr_args); arglist = Py_BuildValue("(i)", dev->isr_args);
if (arglist == NULL) { if (arglist == NULL) {
syslog(LOG_ERR, "Py_BuildValue NULL"); syslog(LOG_ERR, "gpio: Py_BuildValue NULL");
} else { } else {
ret = PyEval_CallObject((PyObject*)dev->isr, arglist); ret = PyEval_CallObject((PyObject*)dev->isr, arglist);
if (ret == NULL) { if (ret == NULL) {
syslog(LOG_ERR, "PyEval_CallObject failed"); syslog(LOG_ERR, "gpio: PyEval_CallObject failed");
} else { } else {
Py_DECREF(ret); Py_DECREF(ret);
} }
@@ -235,7 +235,7 @@ mraa_gpio_edge_mode(mraa_gpio_context dev, gpio_edge_t mode)
int edge = open(filepath, O_RDWR); int edge = open(filepath, O_RDWR);
if (edge == -1) { if (edge == -1) {
syslog(LOG_ERR, "Failed to open edge for writing"); syslog(LOG_ERR, "gpio: Failed to open edge for writing");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -259,7 +259,7 @@ mraa_gpio_edge_mode(mraa_gpio_context dev, gpio_edge_t mode)
return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED; return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED;
} }
if (write(edge, bu, length*sizeof(char)) == -1) { if (write(edge, bu, length*sizeof(char)) == -1) {
syslog(LOG_ERR, "Failed to write to edge"); syslog(LOG_ERR, "gpio: Failed to write to edge");
close(edge); close(edge);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -345,7 +345,7 @@ mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
int drive = open(filepath, O_WRONLY); int drive = open(filepath, O_WRONLY);
if (drive == -1) { if (drive == -1) {
syslog(LOG_ERR, "Failed to open drive for writing"); syslog(LOG_ERR, "gpio: Failed to open drive for writing");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -369,7 +369,7 @@ mraa_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED; return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED;
} }
if (write(drive, bu, length*sizeof(char)) == -1) { if (write(drive, bu, length*sizeof(char)) == -1) {
syslog(LOG_ERR, "Failed to write to drive mode"); syslog(LOG_ERR, "gpio: Failed to write to drive mode");
close(drive); close(drive);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
@@ -441,7 +441,7 @@ mraa_gpio_read(mraa_gpio_context dev)
if (dev->value_fp == -1) { if (dev->value_fp == -1) {
if (mraa_gpio_get_valfp(dev) != MRAA_SUCCESS) { if (mraa_gpio_get_valfp(dev) != MRAA_SUCCESS) {
syslog(LOG_ERR, "Failed to get value file pointer"); syslog(LOG_ERR, "gpio: Failed to get value file pointer");
} }
} }
else { else {
@@ -450,7 +450,7 @@ mraa_gpio_read(mraa_gpio_context dev)
} }
char bu[2]; char bu[2];
if (read(dev->value_fp, bu, 2*sizeof(char)) != 2) { if (read(dev->value_fp, bu, 2*sizeof(char)) != 2) {
syslog(LOG_ERR, "Failed to read a sensible value from sysfs"); syslog(LOG_ERR, "gpio: Failed to read a sensible value from sysfs");
return -1; return -1;
} }
lseek(dev->value_fp, 0, SEEK_SET); lseek(dev->value_fp, 0, SEEK_SET);
@@ -496,14 +496,14 @@ mraa_gpio_unexport_force(mraa_gpio_context dev)
{ {
int unexport = open(SYSFS_CLASS_GPIO "/unexport", O_WRONLY); int unexport = open(SYSFS_CLASS_GPIO "/unexport", O_WRONLY);
if (unexport == -1) { if (unexport == -1) {
syslog(LOG_ERR, "Failed to open unexport for writing"); syslog(LOG_ERR, "gpio: Failed to open unexport for writing");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
char bu[MAX_SIZE]; char bu[MAX_SIZE];
int length = snprintf(bu, sizeof(bu), "%d", dev->pin); int length = snprintf(bu, sizeof(bu), "%d", dev->pin);
if (write(unexport, bu, length*sizeof(char)) == -1) { if (write(unexport, bu, length*sizeof(char)) == -1) {
syslog(LOG_ERR, "Failed to write to unexport"); syslog(LOG_ERR, "gpio: Failed to write to unexport");
close(unexport); close(unexport);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -561,7 +561,7 @@ mraa_gpio_use_mmaped(mraa_gpio_context dev, mraa_boolean_t mmap_en)
int fd; int fd;
fd = open(mmp->mem_dev, O_RDWR); fd = open(mmp->mem_dev, O_RDWR);
if (fd < 1) { if (fd < 1) {
syslog(LOG_ERR, "Unable to open memory device"); syslog(LOG_ERR, "gpio: Unable to open memory device");
close(fd); close(fd);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }

16
src/i2c/i2c.c
View File

@@ -33,13 +33,13 @@ mraa_i2c_init(int bus)
if (checked_pin < 0) { if (checked_pin < 0) {
switch(checked_pin) { switch(checked_pin) {
case MRAA_NO_SUCH_IO: case MRAA_NO_SUCH_IO:
syslog(LOG_ERR, "No i2c on board"); syslog(LOG_ERR, "i2c: No i2c on board");
return NULL; return NULL;
case MRAA_IO_SETUP_FAILURE: case MRAA_IO_SETUP_FAILURE:
syslog(LOG_ERR, "Failed to set-up i2c multiplexer"); syslog(LOG_ERR, "i2c: Failed to set-up i2c multiplexer");
return NULL; return NULL;
case MRAA_PLATFORM_NO_INIT: case MRAA_PLATFORM_NO_INIT:
syslog(LOG_ERR, "Platform Not Initialised"); syslog(LOG_ERR, "i2c: Platform Not Initialised");
return NULL; return NULL;
default: return NULL; default: return NULL;
} }
@@ -56,14 +56,14 @@ mraa_i2c_init_raw(unsigned int bus)
} }
mraa_i2c_context dev = (mraa_i2c_context) malloc(sizeof(struct _i2c)); mraa_i2c_context dev = (mraa_i2c_context) malloc(sizeof(struct _i2c));
if (dev == NULL) { if (dev == NULL) {
syslog(LOG_CRIT, "Failed to allocate memory for context"); syslog(LOG_CRIT, "i2c: Failed to allocate memory for context");
return NULL; return NULL;
} }
char filepath[32]; char filepath[32];
snprintf(filepath, 32, "/dev/i2c-%u", bus); snprintf(filepath, 32, "/dev/i2c-%u", bus);
if ((dev->fh = open(filepath, O_RDWR)) < 1) { if ((dev->fh = open(filepath, O_RDWR)) < 1) {
syslog(LOG_ERR, "Failed to open requested i2c port %s", filepath); syslog(LOG_ERR, "i2c: Failed to open requested i2c port %s", filepath);
} }
if (advance_func->i2c_init_post != NULL) { if (advance_func->i2c_init_post != NULL) {
@@ -105,7 +105,7 @@ mraa_result_t
mraa_i2c_write(mraa_i2c_context dev, const uint8_t* data, int length) mraa_i2c_write(mraa_i2c_context dev, const uint8_t* data, int length)
{ {
if (i2c_smbus_write_i2c_block_data(dev->fh, data[0], length-1, (uint8_t*) data+1) < 0) { if (i2c_smbus_write_i2c_block_data(dev->fh, data[0], length-1, (uint8_t*) data+1) < 0) {
syslog(LOG_ERR, "Failed to write to i2c"); syslog(LOG_ERR, "i2c: Failed to write");
return MRAA_ERROR_INVALID_HANDLE; return MRAA_ERROR_INVALID_HANDLE;
} }
return MRAA_SUCCESS; return MRAA_SUCCESS;
@@ -115,7 +115,7 @@ mraa_result_t
mraa_i2c_write_byte(mraa_i2c_context dev, const uint8_t data) mraa_i2c_write_byte(mraa_i2c_context dev, const uint8_t data)
{ {
if (i2c_smbus_write_byte(dev->fh, data) < 0) { if (i2c_smbus_write_byte(dev->fh, data) < 0) {
syslog(LOG_ERR, "Failed to write to i2c"); syslog(LOG_ERR, "i2c: Failed to write");
return MRAA_ERROR_INVALID_HANDLE; return MRAA_ERROR_INVALID_HANDLE;
} }
return MRAA_SUCCESS; return MRAA_SUCCESS;
@@ -126,7 +126,7 @@ mraa_i2c_address(mraa_i2c_context dev, int addr)
{ {
dev->addr = addr; dev->addr = addr;
if (ioctl(dev->fh, I2C_SLAVE_FORCE, addr) < 0) { if (ioctl(dev->fh, I2C_SLAVE_FORCE, addr) < 0) {
syslog(LOG_ERR, "Failed to set slave address %d", addr); syslog(LOG_ERR, "i2c: Failed to set slave address %d", addr);
return MRAA_ERROR_INVALID_HANDLE; return MRAA_ERROR_INVALID_HANDLE;
} }
return MRAA_SUCCESS; return MRAA_SUCCESS;

20
src/intel_edison_fab_c.c
View File

@@ -63,7 +63,7 @@ mraa_intel_edison_pinmode_change(int sysfs, int mode)
snprintf(buffer, MAX_SIZE, SYSFS_PINMODE_PATH "%i/current_pinmux",sysfs); snprintf(buffer, MAX_SIZE, SYSFS_PINMODE_PATH "%i/current_pinmux",sysfs);
int modef = open(buffer, O_WRONLY); int modef = open(buffer, O_WRONLY);
if (modef == -1) { if (modef == -1) {
syslog(LOG_ERR, "Failed to open SoC pinmode for opening"); syslog(LOG_ERR, "edison: Failed to open SoC pinmode for opening");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -129,7 +129,7 @@ mraa_intel_edison_i2c_init_pre(unsigned int bus)
{ {
if (miniboard == 0) { if (miniboard == 0) {
if(bus != 6) { if(bus != 6) {
syslog(LOG_ERR, "Edison: You can't use that bus, switching to bus 6"); syslog(LOG_ERR, "edison: You can't use that bus, switching to bus 6");
bus = 6; bus = 6;
} }
mraa_gpio_write(tristate, 0); mraa_gpio_write(tristate, 0);
@@ -162,7 +162,7 @@ mraa_intel_edison_i2c_init_pre(unsigned int bus)
mraa_gpio_write(tristate, 1); mraa_gpio_write(tristate, 1);
} else { } else {
if(bus != 6 && bus != 1) { if(bus != 6 && bus != 1) {
syslog(LOG_ERR, "Edison: You can't use that bus, switching to bus 6"); syslog(LOG_ERR, "edison: You can't use that bus, switching to bus 6");
bus = 6; bus = 6;
} }
int scl = plat->pins[plat->i2c_bus[bus].scl].gpio.pinmap; int scl = plat->pins[plat->i2c_bus[bus].scl].gpio.pinmap;
@@ -225,7 +225,7 @@ mraa_intel_edison_aio_get_fp(mraa_aio_context dev)
dev->adc_in_fp = open(file_path, O_RDONLY); dev->adc_in_fp = open(file_path, O_RDONLY);
if (dev->adc_in_fp == -1) { if (dev->adc_in_fp == -1) {
syslog(LOG_ERR, "Failed to open Analog input raw file %s for " syslog(LOG_ERR, "edison: Failed to open Analog input raw file %s for "
"reading!", file_path); "reading!", file_path);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -237,7 +237,7 @@ mraa_result_t
mraa_intel_edison_aio_init_pre(unsigned int aio) mraa_intel_edison_aio_init_pre(unsigned int aio)
{ {
if (aio > plat->aio_count) { if (aio > plat->aio_count) {
syslog(LOG_ERR, "Invalid analog input channel"); syslog(LOG_ERR, "edison: Invalid analog input channel");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -371,7 +371,7 @@ mraa_intel_edison_gpio_mode_replace(mraa_gpio_context dev, gpio_mode_t mode)
pullup_e = mraa_gpio_init_raw(pullup_map[dev->phy_pin]); pullup_e = mraa_gpio_init_raw(pullup_map[dev->phy_pin]);
mraa_result_t sta = mraa_gpio_dir(pullup_e, MRAA_GPIO_IN); mraa_result_t sta = mraa_gpio_dir(pullup_e, MRAA_GPIO_IN);
if(sta != MRAA_SUCCESS) { if(sta != MRAA_SUCCESS) {
syslog(LOG_ERR, "Edison: Failed to set gpio mode-pullup"); syslog(LOG_ERR, "edison: Failed to set gpio mode-pullup");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -395,7 +395,7 @@ mraa_intel_edison_gpio_mode_replace(mraa_gpio_context dev, gpio_mode_t mode)
sta = mraa_gpio_dir(pullup_e, MRAA_GPIO_OUT); sta = mraa_gpio_dir(pullup_e, MRAA_GPIO_OUT);
sta = mraa_gpio_write(pullup_e, value); sta = mraa_gpio_write(pullup_e, value);
if (sta != MRAA_SUCCESS) { if (sta != MRAA_SUCCESS) {
syslog(LOG_ERR, "Edison: Error Setting pullup"); syslog(LOG_ERR, "edison: Error setting pullup");
return sta; return sta;
} }
} }
@@ -417,7 +417,7 @@ mraa_intel_edsion_mb_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
int drive = open(filepath, O_WRONLY); int drive = open(filepath, O_WRONLY);
if (drive == -1) { if (drive == -1) {
syslog(LOG_ERR, "Edison: Failed to open drive for writing"); syslog(LOG_ERR, "edison: Failed to open drive for writing");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -441,7 +441,7 @@ mraa_intel_edsion_mb_gpio_mode(mraa_gpio_context dev, gpio_mode_t mode)
return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED; return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED;
} }
if (write(drive, bu, length*sizeof(char)) == -1) { if (write(drive, bu, length*sizeof(char)) == -1) {
syslog(LOG_ERR, "Failed to write to drive mode"); syslog(LOG_ERR, "edison: Failed to write to drive mode");
close(drive); close(drive);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
@@ -855,7 +855,7 @@ mraa_intel_edison_fab_c()
// This seciton will also check if the arduino board is there // This seciton will also check if the arduino board is there
tristate = mraa_gpio_init_raw(214); tristate = mraa_gpio_init_raw(214);
if (tristate == NULL) { if (tristate == NULL) {
syslog(LOG_INFO, "Intel Edison Failed to initialise Arduino board TriState,\ syslog(LOG_INFO, "edison: Failed to initialise Arduino board TriState,\
assuming Intel Edison Miniboard\n"); assuming Intel Edison Miniboard\n");
if (mraa_intel_edsion_miniboard(b) != MRAA_SUCCESS) { if (mraa_intel_edsion_miniboard(b) != MRAA_SUCCESS) {
free(b); free(b);

10
src/intel_galileo_rev_g.c
View File

@@ -84,7 +84,7 @@ mraa_intel_galileo_gen2_pwm_period_replace(mraa_pwm_context dev, int period)
int period_f = open(bu, O_RDWR); int period_f = open(bu, O_RDWR);
if (period_f == -1) { if (period_f == -1) {
syslog(LOG_ERR, "Failed to open period for writing!"); syslog(LOG_ERR, "galileo2: Failed to open period for writing!");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
char out[MAX_SIZE]; char out[MAX_SIZE];
@@ -110,7 +110,7 @@ mraa_intel_galileo_gen2_gpio_mode_replace(mraa_gpio_context dev, gpio_mode_t mod
pullup_e = mraa_gpio_init_raw(pullup_map[dev->phy_pin]); pullup_e = mraa_gpio_init_raw(pullup_map[dev->phy_pin]);
mraa_result_t sta = mraa_gpio_dir(pullup_e, MRAA_GPIO_IN); mraa_result_t sta = mraa_gpio_dir(pullup_e, MRAA_GPIO_IN);
if (sta != MRAA_SUCCESS) { if (sta != MRAA_SUCCESS) {
syslog(LOG_ERR, "Galileo Gen 2: Failed to set gpio pullup"); syslog(LOG_ERR, "galileo2: Failed to set gpio pullup");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -119,7 +119,7 @@ mraa_intel_galileo_gen2_gpio_mode_replace(mraa_gpio_context dev, gpio_mode_t mod
int drive = open(filepath, O_WRONLY); int drive = open(filepath, O_WRONLY);
if (drive == -1) { if (drive == -1) {
syslog(LOG_ERR, "Failed to open drive for writing"); syslog(LOG_ERR, "galileo2: Failed to open drive for writing");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -147,7 +147,7 @@ mraa_intel_galileo_gen2_gpio_mode_replace(mraa_gpio_context dev, gpio_mode_t mod
return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED; return MRAA_ERROR_FEATURE_NOT_IMPLEMENTED;
} }
if (write(drive, bu, length*sizeof(char)) == -1) { if (write(drive, bu, length*sizeof(char)) == -1) {
syslog(LOG_ERR, "Failed to write to drive mode"); syslog(LOG_ERR, "galileo2: Failed to write to drive mode");
close(drive); close(drive);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -155,7 +155,7 @@ mraa_intel_galileo_gen2_gpio_mode_replace(mraa_gpio_context dev, gpio_mode_t mod
sta = mraa_gpio_dir(pullup_e, MRAA_GPIO_OUT); sta = mraa_gpio_dir(pullup_e, MRAA_GPIO_OUT);
sta += mraa_gpio_write(pullup_e, value); sta += mraa_gpio_write(pullup_e, value);
if (sta != MRAA_SUCCESS) { if (sta != MRAA_SUCCESS) {
syslog(LOG_ERR, "Galileo Gen 2: Error Setting pullup"); syslog(LOG_ERR, "galileo2: Error Setting pullup");
close(drive); close(drive);
return sta; return sta;
} }

26
src/pwm/pwm.c
View File

@@ -57,7 +57,7 @@ mraa_pwm_write_period(mraa_pwm_context dev, int period)
int period_f = open(bu, O_RDWR); int period_f = open(bu, O_RDWR);
if (period_f == -1) { if (period_f == -1) {
syslog(LOG_ERR, "Failed to open period for writing"); syslog(LOG_ERR, "pwm: Failed to open period for writing");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
char out[MAX_SIZE]; char out[MAX_SIZE];
@@ -93,7 +93,7 @@ mraa_pwm_read_period(mraa_pwm_context dev)
int period_f = open(bu, O_RDWR); int period_f = open(bu, O_RDWR);
if (period_f == -1) { if (period_f == -1) {
syslog(LOG_ERR, "Failed to open period for reading"); syslog(LOG_ERR, "pwm: Failed to open period for reading");
return 0; return 0;
} }
off_t size = lseek(period_f, 0, SEEK_END); off_t size = lseek(period_f, 0, SEEK_END);
@@ -105,11 +105,11 @@ mraa_pwm_read_period(mraa_pwm_context dev)
char *endptr; char *endptr;
long int ret = strtol(output, &endptr, 10); long int ret = strtol(output, &endptr, 10);
if ('\0' != *endptr) { if ('\0' != *endptr) {
syslog(LOG_ERR, "error in string converstion"); syslog(LOG_ERR, "pwm: Error in string converstion");
return -1; return -1;
} }
else if (ret > INT_MAX || ret < INT_MIN) { else if (ret > INT_MAX || ret < INT_MIN) {
syslog(LOG_ERR, "number is invalid"); syslog(LOG_ERR, "pwm: Number is invalid");
return -1; return -1;
} }
return (int) ret; return (int) ret;
@@ -131,11 +131,11 @@ mraa_pwm_read_duty(mraa_pwm_context dev)
char *endptr; char *endptr;
long int ret = strtol(output, &endptr, 10); long int ret = strtol(output, &endptr, 10);
if ('\0' != *endptr) { if ('\0' != *endptr) {
syslog(LOG_ERR, "error in string converstion"); syslog(LOG_ERR, "pwm: Error in string converstion");
return -1; return -1;
} }
else if (ret > INT_MAX || ret < INT_MIN) { else if (ret > INT_MAX || ret < INT_MIN) {
syslog(LOG_ERR, "number is invalid"); syslog(LOG_ERR, "pwm: Number is invalid");
return -1; return -1;
} }
return (int) ret; return (int) ret;
@@ -180,14 +180,14 @@ mraa_pwm_init_raw(int chipin, int pin)
snprintf(directory, MAX_SIZE, SYSFS_PWM "/pwmchip%d/pwm%d", dev->chipid, dev->pin); snprintf(directory, MAX_SIZE, SYSFS_PWM "/pwmchip%d/pwm%d", dev->chipid, dev->pin);
struct stat dir; struct stat dir;
if (stat(directory, &dir) == 0 && S_ISDIR(dir.st_mode)) { if (stat(directory, &dir) == 0 && S_ISDIR(dir.st_mode)) {
syslog(LOG_NOTICE, "PWM Pin already exporting, continuing"); syslog(LOG_NOTICE, "pwm: Pin already exported, continuing");
dev->owner = 0; // Not Owner dev->owner = 0; // Not Owner
} else { } else {
char buffer[MAX_SIZE]; char buffer[MAX_SIZE];
snprintf(buffer, MAX_SIZE, "/sys/class/pwm/pwmchip%d/export", dev->chipid); snprintf(buffer, MAX_SIZE, "/sys/class/pwm/pwmchip%d/export", dev->chipid);
int export_f = open(buffer, O_WRONLY); int export_f = open(buffer, O_WRONLY);
if (export_f == -1) { if (export_f == -1) {
syslog(LOG_ERR, "Failed to open export for writing"); syslog(LOG_ERR, "pwm: Failed to open export for writing");
free(dev); free(dev);
return NULL; return NULL;
} }
@@ -195,7 +195,7 @@ mraa_pwm_init_raw(int chipin, int pin)
char out[MAX_SIZE]; char out[MAX_SIZE];
int size = snprintf(out, MAX_SIZE, "%d", dev->pin); int size = snprintf(out, MAX_SIZE, "%d", dev->pin);
if (write(export_f, out, size*sizeof(char)) == -1) { if (write(export_f, out, size*sizeof(char)) == -1) {
syslog(LOG_WARNING, "Failed to write to export! Potentially already enabled"); syslog(LOG_WARNING, "pwm: Failed to write to export! Potentially already enabled");
close(export_f); close(export_f);
free(dev); free(dev);
return NULL; return NULL;
@@ -271,13 +271,13 @@ mraa_pwm_enable(mraa_pwm_context dev, int enable)
int enable_f = open(bu, O_RDWR); int enable_f = open(bu, O_RDWR);
if (enable_f == -1) { if (enable_f == -1) {
syslog(LOG_ERR, "Failed to open enable for writing"); syslog(LOG_ERR, "pwm: Failed to open enable for writing");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
char out[2]; char out[2];
int size = snprintf(out, sizeof(out), "%d", enable); int size = snprintf(out, sizeof(out), "%d", enable);
if (write(enable_f, out, size * sizeof(char)) == -1) { if (write(enable_f, out, size * sizeof(char)) == -1) {
syslog(LOG_ERR, "Failed to write to enable"); syslog(LOG_ERR, "pwm: Failed to write to enable");
close(enable_f); close(enable_f);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -293,14 +293,14 @@ mraa_pwm_unexport_force(mraa_pwm_context dev)
int unexport_f = open(filepath, O_WRONLY); int unexport_f = open(filepath, O_WRONLY);
if (unexport_f == -1) { if (unexport_f == -1) {
syslog(LOG_ERR, "Failed to open unexport for writing"); syslog(LOG_ERR, "pwm: Failed to open unexport for writing");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
char out[MAX_SIZE]; char out[MAX_SIZE];
int size = snprintf(out, MAX_SIZE, "%d", dev->pin); int size = snprintf(out, MAX_SIZE, "%d", dev->pin);
if (write(unexport_f, out, size*sizeof(char)) == -1) { if (write(unexport_f, out, size*sizeof(char)) == -1) {
syslog(LOG_ERR, "Failed to write to unexport"); syslog(LOG_ERR, "pwm: Failed to write to unexport");
close(unexport_f); close(unexport_f);
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }

12
src/spi/spi.c
View File

@@ -59,7 +59,7 @@ mraa_spi_init(int bus)
mraa_spi_bus_t *spi = mraa_setup_spi(bus); mraa_spi_bus_t *spi = mraa_setup_spi(bus);
if (bus < 0) { if (bus < 0) {
syslog(LOG_ERR, "Failed. SPI platform Error"); syslog(LOG_ERR, "spi: Failed. SPI platform Error");
return NULL; return NULL;
} }
mraa_spi_context dev = (mraa_spi_context) malloc(sizeof(struct _spi)); mraa_spi_context dev = (mraa_spi_context) malloc(sizeof(struct _spi));
@@ -70,7 +70,7 @@ mraa_spi_init(int bus)
dev->devfd = open(path, O_RDWR); dev->devfd = open(path, O_RDWR);
if (dev->devfd < 0) { if (dev->devfd < 0) {
syslog(LOG_ERR, "Failed opening SPI Device. bus:%s", path); syslog(LOG_ERR, "spi: Failed opening SPI Device. bus:%s", path);
free(dev); free(dev);
return NULL; return NULL;
} }
@@ -113,7 +113,7 @@ mraa_spi_mode(mraa_spi_context dev, mraa_spi_mode_t mode)
} }
if (ioctl (dev->devfd, SPI_IOC_WR_MODE, &spi_mode) < 0) { if (ioctl (dev->devfd, SPI_IOC_WR_MODE, &spi_mode) < 0) {
syslog(LOG_ERR, "Failed to set spi mode"); syslog(LOG_ERR, "spi: Failed to set spi mode");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
@@ -136,7 +136,7 @@ mraa_spi_lsbmode(mraa_spi_context dev, mraa_boolean_t lsb)
lsb_mode = 1; lsb_mode = 1;
} }
if (ioctl (dev->devfd, SPI_IOC_WR_LSB_FIRST, &lsb_mode) < 0) { if (ioctl (dev->devfd, SPI_IOC_WR_LSB_FIRST, &lsb_mode) < 0) {
syslog(LOG_ERR, "Failed to set bit order"); syslog(LOG_ERR, "spi: Failed to set bit order");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
dev->lsb = lsb; dev->lsb = lsb;
@@ -170,7 +170,7 @@ mraa_spi_write(mraa_spi_context dev, uint8_t data)
msg.delay_usecs = 0; msg.delay_usecs = 0;
msg.len = length; msg.len = length;
if (ioctl(dev->devfd, SPI_IOC_MESSAGE(1), &msg) < 0) { if (ioctl(dev->devfd, SPI_IOC_MESSAGE(1), &msg) < 0) {
syslog(LOG_ERR, "Failed to perform dev transfer"); syslog(LOG_ERR, "spi: Failed to perform dev transfer");
return -1; return -1;
} }
return recv; return recv;
@@ -189,7 +189,7 @@ mraa_spi_transfer_buf(mraa_spi_context dev, uint8_t* data, uint8_t* rxbuf, int l
msg.delay_usecs = 0; msg.delay_usecs = 0;
msg.len = length; msg.len = length;
if (ioctl(dev->devfd, SPI_IOC_MESSAGE(1), &msg) < 0) { if (ioctl(dev->devfd, SPI_IOC_MESSAGE(1), &msg) < 0) {
syslog(LOG_ERR, "Failed to perform dev transfer"); syslog(LOG_ERR, "spi: Failed to perform dev transfer");
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
return MRAA_SUCCESS; return MRAA_SUCCESS;