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

maa: change struct names to be more unique and fix allocs

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2014-04-28 11:31:53 +01:00
parent 00fd42b186
commit f280b3c0f6
9 changed files with 125 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/gpio/gpio.c
View File

@@ -30,21 +30,22 @@
#include "gpio.h"
static int
maa_gpio_get_valfp(gpio_t *gpio)
maa_gpio_get_valfp(maa_gpio_context *dev)
{
char bu[64];
sprintf(bu, "/sys/class/gpio/gpio%d/value", gpio->pin);
sprintf(bu, "/sys/class/gpio/gpio%d/value", dev->pin);
if ((gpio->value_fp = fopen(bu, "r+b")) == NULL) {
if ((dev->value_fp = fopen(bu, "r+b")) == NULL) {
return 1;
}
return 0;
}
maa_result_t
maa_gpio_init(gpio_t *gpio, int pin)
maa_gpio_context*
maa_gpio_init(int pin)
{
FILE *export_f;
maa_gpio_context* dev = (maa_gpio_context*) malloc(sizeof(maa_gpio_context));
if ((export_f = fopen("/sys/class/gpio/export", "w")) == NULL) {
fprintf(stderr, "Failed to open export for writing!\n");
@@ -52,31 +53,24 @@ maa_gpio_init(gpio_t *gpio, int pin)
fprintf(export_f, "%d", pin);
fclose(export_f);
}
gpio->pin = pin;
return MAA_SUCCESS;
}
int
maa_gpio_set(int pin)
{
//Stuff
return 0;
dev->pin = pin;
return dev;
}
void
maa_gpio_mode(gpio_t *gpio, gpio_mode_t mode)
maa_gpio_mode(maa_gpio_context *dev, gpio_mode_t mode)
{
//gpio->pin
}
void
maa_gpio_dir(gpio_t *gpio, gpio_dir_t dir)
maa_gpio_dir(maa_gpio_context *dev, gpio_dir_t dir)
{
if (gpio->value_fp != NULL) {
gpio->value_fp = NULL;
if (dev->value_fp != NULL) {
dev->value_fp = NULL;
}
char filepath[64];
snprintf(filepath, 64, "/sys/class/gpio/gpio%d/direction", gpio->pin);
snprintf(filepath, 64, "/sys/class/gpio/gpio%d/direction", dev->pin);
FILE *direction;
if ((direction = fopen(filepath, "w")) == NULL) {
@@ -84,44 +78,44 @@ maa_gpio_dir(gpio_t *gpio, gpio_dir_t dir)
} else {
fprintf(direction, dir);
fclose(direction);
gpio->value_fp = NULL;
dev->value_fp = NULL;
}
}
int
maa_gpio_read(gpio_t *gpio)
maa_gpio_read(maa_gpio_context *dev)
{
if (gpio->value_fp == NULL) {
maa_gpio_get_valfp(gpio);
if (dev->value_fp == NULL) {
maa_gpio_get_valfp(dev);
}
fseek(gpio->value_fp, SEEK_SET, 0);
fseek(dev->value_fp, SEEK_SET, 0);
char buffer[2];
fread(buffer, 2, 1, gpio->value_fp);
fseek(gpio->value_fp, SEEK_SET, 0);
fread(buffer, 2, 1, dev->value_fp);
fseek(dev->value_fp, SEEK_SET, 0);
return atoi(buffer);
}
void
maa_gpio_write(gpio_t *gpio, int value)
maa_gpio_write(maa_gpio_context *dev, int value)
{
if (gpio->value_fp == NULL) {
maa_gpio_get_valfp(gpio);
if (dev->value_fp == NULL) {
maa_gpio_get_valfp(dev);
}
fseek(gpio->value_fp, SEEK_SET, 0);
fprintf(gpio->value_fp, "%d", value);
fseek(gpio->value_fp, SEEK_SET, 0);
fseek(dev->value_fp, SEEK_SET, 0);
fprintf(dev->value_fp, "%d", value);
fseek(dev->value_fp, SEEK_SET, 0);
}
void
maa_gpio_close(gpio_t *gpio)
maa_gpio_close(maa_gpio_context *dev)
{
FILE *unexport_f;
if ((unexport_f = fopen("/sys/class/gpio/unexport", "w")) == NULL) {
fprintf(stderr, "Failed to open unexport for writing!\n");
} else {
fprintf(unexport_f, "%d", gpio->pin);
fprintf(unexport_f, "%d", dev->pin);
fclose(unexport_f);
}
}

27
src/i2c/i2c.c
View File

@@ -25,13 +25,12 @@
#include "i2c.h"
#include "smbus.h"
maa_result_t
maa_i2c_init(i2c_t* dev)
maa_i2c_context*
maa_i2c_init()
{
// maa allocates the memory for *dev
dev = malloc(sizeof *dev);
if (!dev)
return MAA_ERROR_NO_RESOURCES;
maa_i2c_context* dev = (maa_i2c_context*) malloc(sizeof(maa_i2c_context));
if (dev == NULL)
return NULL;
// Galileo only has one I2C master which should be /dev/i2c-0
// reliability is a fickle friend!
@@ -42,19 +41,19 @@ maa_i2c_init(i2c_t* dev)
}
void
maa_i2c_frequency(i2c_t* dev, int hz)
maa_i2c_frequency(maa_i2c_context* dev, int hz)
{
dev->hz = hz;
}
int
maa_i2c_receive(i2c_t* dev)
maa_i2c_receive(maa_i2c_context* dev)
{
return -1;
}
int
maa_i2c_read(i2c_t* dev, char *data, int length)
maa_i2c_read(maa_i2c_context* dev, char *data, int length)
{
// this is the read(3) syscall not maa_i2c_read()
if (read(dev->fh, data, length) == length) {
@@ -64,7 +63,7 @@ maa_i2c_read(i2c_t* dev, char *data, int length)
}
int
maa_i2c_read_byte(i2c_t* dev)
maa_i2c_read_byte(maa_i2c_context* dev)
{
int byte;
byte = i2c_smbus_read_byte(dev->fh);
@@ -75,7 +74,7 @@ maa_i2c_read_byte(i2c_t* dev)
}
int
maa_i2c_write(i2c_t* dev, const char* data, int length)
maa_i2c_write(maa_i2c_context* dev, const char* data, int length)
{
if (i2c_smbus_write_i2c_block_data(dev->fh, data[0], length-1, (uint8_t*) data+1) < 0) {
fprintf(stderr, "Failed to write to I2CSlave slave\n");
@@ -85,7 +84,7 @@ maa_i2c_write(i2c_t* dev, const char* data, int length)
}
int
maa_i2c_write_byte(i2c_t* dev, int data)
maa_i2c_write_byte(maa_i2c_context* dev, int data)
{
if (i2c_smbus_write_byte(dev->fh, data) < 0) {
fprintf(stderr, "Failed to write to I2CSlave slave\n");
@@ -95,7 +94,7 @@ maa_i2c_write_byte(i2c_t* dev, int data)
}
void
maa_i2c_address(i2c_t* dev, int addr)
maa_i2c_address(maa_i2c_context* dev, int addr)
{
dev->addr = addr;
if (ioctl(dev->fh, I2C_SLAVE_FORCE, addr) < 0) {
@@ -104,7 +103,7 @@ maa_i2c_address(i2c_t* dev, int addr)
}
void
maa_i2c_stop(i2c_t* dev)
maa_i2c_stop(maa_i2c_context* dev)
{
free(dev);
}

47
src/pwm/pwm.c
View File

@@ -27,7 +27,7 @@
#include "pwm.h"
static int
maa_pwm_setup_duty_fp(pwm_t* dev)
maa_pwm_setup_duty_fp(maa_pwm_context* dev)
{
char bu[64];
sprintf(bu, "/sys/class/pwm/pwmchip%d/pwm%d/duty_cycle", dev->chipid, dev->pin);
@@ -39,7 +39,7 @@ maa_pwm_setup_duty_fp(pwm_t* dev)
}
static void
maa_pwm_write_period(pwm_t* dev, int period)
maa_pwm_write_period(maa_pwm_context* dev, int period)
{
FILE *period_f;
char bu[64];
@@ -53,7 +53,7 @@ maa_pwm_write_period(pwm_t* dev, int period)
}
static void
maa_pwm_write_duty(pwm_t* dev, int duty)
maa_pwm_write_duty(maa_pwm_context* dev, int duty)
{
if (dev->duty_fp == NULL) {
maa_pwm_setup_duty_fp(dev);
@@ -64,7 +64,7 @@ maa_pwm_write_duty(pwm_t* dev, int duty)
}
static int
maa_pwm_get_period(pwm_t* dev)
maa_pwm_get_period(maa_pwm_context* dev)
{
FILE *period_f;
char bu[64];
@@ -81,7 +81,7 @@ maa_pwm_get_period(pwm_t* dev)
}
static int
maa_pwm_get_duty(pwm_t* dev)
maa_pwm_get_duty(maa_pwm_context* dev)
{
if (dev->duty_fp == NULL) {
maa_pwm_setup_duty_fp(dev);
@@ -92,12 +92,13 @@ maa_pwm_get_duty(pwm_t* dev)
return atoi(output);
}
maa_result_t
maa_pwm_init(pwm_t* dev, int chipin, int pin)
maa_pwm_context*
maa_pwm_init(int chipin, int pin)
{
dev = malloc(sizeof *dev);
if (!dev)
return MAA_ERROR_NO_RESOURCES;
maa_pwm_context* dev = (maa_pwm_context*) malloc(sizeof(maa_pwm_context));
if (dev == NULL)
return NULL;
dev->chipid = chipin;
dev->pin = pin;
@@ -107,67 +108,67 @@ maa_pwm_init(pwm_t* dev, int chipin, int pin)
if ((export_f = fopen(buffer, "w")) == NULL) {
fprintf(stderr, "Failed to open export for writing!\n");
return MAA_ERROR_INVALID_HANDLE;
free(dev);
return NULL;
} else {
fprintf(export_f, "%d", dev->pin);
fclose(export_f);
maa_pwm_setup_duty_fp(dev);
}
return MAA_SUCCESS;
return dev;
}
void
maa_pwm_write(pwm_t* dev, float percentage)
maa_pwm_write(maa_pwm_context* dev, float percentage)
{
maa_pwm_write_duty(dev, percentage * maa_pwm_get_period(dev));
}
float
maa_pwm_read(pwm_t* dev)
maa_pwm_read(maa_pwm_context* dev)
{
float output = maa_pwm_get_duty(dev) / (float) maa_pwm_get_period(dev);
return output;
}
void
maa_pwm_period(pwm_t* dev, float seconds)
maa_pwm_period(maa_pwm_context* dev, float seconds)
{
maa_pwm_period_ms(dev, seconds*1000);
}
void
maa_pwm_period_ms(pwm_t* dev, int ms)
maa_pwm_period_ms(maa_pwm_context* dev, int ms)
{
maa_pwm_period_us(dev, ms*1000);
}
void
maa_pwm_period_us(pwm_t* dev, int us)
maa_pwm_period_us(maa_pwm_context* dev, int us)
{
maa_pwm_write_period(dev, us*1000);
}
void
maa_pwm_pulsewidth(pwm_t* dev, float seconds)
maa_pwm_pulsewidth(maa_pwm_context* dev, float seconds)
{
maa_pwm_pulsewidth_ms(dev, seconds*1000);
}
void
maa_pwm_pulsewidth_ms(pwm_t* dev, int ms)
maa_pwm_pulsewidth_ms(maa_pwm_context* dev, int ms)
{
maa_pwm_pulsewidth_us(dev, ms*1000);
}
void
maa_pwm_pulsewidth_us(pwm_t* dev, int us)
maa_pwm_pulsewidth_us(maa_pwm_context* dev, int us)
{
maa_pwm_write_duty(dev, us*1000);
}
void
maa_pwm_enable(pwm_t* dev, int enable)
maa_pwm_enable(maa_pwm_context* dev, int enable)
{
int status;
if (enable != 0) {
@@ -189,7 +190,7 @@ maa_pwm_enable(pwm_t* dev, int enable)
}
void
maa_pwm_close(pwm_t* dev)
maa_pwm_close(maa_pwm_context* dev)
{
maa_pwm_enable(dev, 0);
FILE *unexport_f;