Private
Public Access
2
0

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

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

View File

@@ -27,16 +27,15 @@ typedef struct {
int pinMap;
char path[64];
FILE *value_fp;
} gpio_t;
} maa_gpio_context;
typedef char gpio_mode_t[16];
typedef char gpio_dir_t[16];
maa_result_t maa_gpio_init(gpio_t *gpio, int pin);
int maa_gpio_set(int pin);
void maa_gpio_mode(gpio_t *gpio, gpio_mode_t mode);
void maa_gpio_dir(gpio_t *gpio, gpio_dir_t dir);
maa_gpio_context* maa_gpio_init(int pin);
void maa_gpio_mode(maa_gpio_context *dev, gpio_mode_t mode);
void maa_gpio_dir(maa_gpio_context *dev, gpio_dir_t dir);
void maa_gpio_close(gpio_t *gpio);
int maa_gpio_read(gpio_t *gpio);
void maa_gpio_write(gpio_t *gpio, int value);
void maa_gpio_close(maa_gpio_context *dev);
int maa_gpio_read(maa_gpio_context *dev);
void maa_gpio_write(maa_gpio_context *dev, int value);

View File

@@ -29,16 +29,16 @@ typedef struct {
int hz;
int fh;
int addr;
gpio_t gpio;
} i2c_t;
maa_gpio_context gpio;
} maa_i2c_context;
maa_result_t maa_i2c_init(i2c_t* dev);
maa_i2c_context* maa_i2c_init();
/** Set the frequency of the I2C interface
*
* @param hz The bus frequency in hertz
*/
void maa_i2c_frequency(i2c_t* dev, int hz);
void maa_i2c_frequency(maa_i2c_context* dev, int hz);
/** Checks to see if this I2C Slave has been addressed.
*
@@ -49,7 +49,7 @@ void maa_i2c_frequency(i2c_t* dev, int hz);
* - WriteAddressed - the master is writing to this slave
* - WriteGeneral - the master is writing to all slave
*/
int maa_i2c_receive(i2c_t* dev);
int maa_i2c_receive(maa_i2c_context* dev);
/** Read from an I2C master.
*
@@ -60,14 +60,14 @@ int maa_i2c_receive(i2c_t* dev);
* 0 on success,
* non-0 otherwise
*/
int maa_i2c_read(i2c_t* dev, char *data, int length);
int maa_i2c_read(maa_i2c_context* dev, char *data, int length);
/** Read a single byte from an I2C master.
*
* @returns
* the byte read
*/
int maa_i2c_read_byte(i2c_t* dev);
int maa_i2c_read_byte(maa_i2c_context* dev);
/** Write to an I2C master.
*
@@ -78,7 +78,7 @@ int maa_i2c_read_byte(i2c_t* dev);
* 0 on success,
* non-0 otherwise
*/
int maa_i2c_write(i2c_t* dev, const char *data, int length);
int maa_i2c_write(maa_i2c_context* dev, const char *data, int length);
/** Write a single byte to an I2C master.
*
@@ -88,7 +88,7 @@ int maa_i2c_write(i2c_t* dev, const char *data, int length);
* '1' if an ACK was received,
* '0' otherwise
*/
int maa_i2c_write_byte(i2c_t* dev, int data);
int maa_i2c_write_byte(maa_i2c_context* dev, int data);
/** Sets the I2C slave address.
*
@@ -96,8 +96,8 @@ int maa_i2c_write_byte(i2c_t* dev, int data);
* signifcant bit). If set to 0, the slave will only respond to the
* general call address.
*/
void maa_i2c_address(i2c_t* dev, int address);
void maa_i2c_address(maa_i2c_context* dev, int address);
/** De-inits an i2c_t device
/** De-inits an maa_i2c_context device
*/
void maa_i2c_stop(i2c_t* dev);
void maa_i2c_stop(maa_i2c_context* dev);

View File

@@ -26,9 +26,9 @@
typedef struct {
int chipid, pin;
FILE *duty_fp;
} pwm_t;
} maa_pwm_context;
maa_result_t maa_pwm_init(pwm_t* pwm, int chipin, int pin);
maa_pwm_context* maa_pwm_init(int chipin, int pin);
/** Set the ouput duty-cycle percentage, as a float
*
@@ -36,7 +36,7 @@ maa_result_t maa_pwm_init(pwm_t* pwm, int chipin, int pin);
* The value should lie between 0.0f (representing on 0%) and 1.0f
* Values above or below this range will be set at either 0.0f or 1.0f.
*/
void maa_pwm_write(pwm_t* pwm, float percentage);
void maa_pwm_write(maa_pwm_context* pwm, float percentage);
/** Read the ouput duty-cycle percentage, as a float
*
@@ -44,45 +44,45 @@ void maa_pwm_write(pwm_t* pwm, float percentage);
* The value should lie between 0.0f (representing on 0%) and 1.0f
* Values above or below this range will be set at either 0.0f or 1.0f.
*/
float maa_pwm_read(pwm_t* pwm);
float maa_pwm_read(maa_pwm_context* pwm);
/** Set the PWM period as seconds represented in a float
*
* @param seconds Peroid represented as a float in seconds.
*/
void maa_pwm_period(pwm_t* pwm, float seconds);
void maa_pwm_period(maa_pwm_context* pwm, float seconds);
/** Set period. milli-oseconds.
* @param ms milli-seconds for period.
*/
void maa_pwm_period_ms(pwm_t* pwm, int ms);
void maa_pwm_period_ms(maa_pwm_context* pwm, int ms);
/** Set period. microseconds
* @param ns microseconds as period.
*/
void maa_pwm_period_us(pwm_t* pwm, int us);
void maa_pwm_period_us(maa_pwm_context* pwm, int us);
/** Set pulsewidth, As represnted by seconds in a (float).
* @param seconds The duration of a pulse
*/
void maa_pwm_pulsewidth(pwm_t* pwm, float seconds);
void maa_pwm_pulsewidth(maa_pwm_context* pwm, float seconds);
/** Set pulsewidth. Milliseconds
* @param ms milliseconds for pulsewidth.
*/
void maa_pwm_pulsewidth_ms(pwm_t* pwm, int ms);
void maa_pwm_pulsewidth_ms(maa_pwm_context* pwm, int ms);
/** Set pulsewidth, microseconds.
* @param us microseconds for pulsewidth.
*/
void maa_pwm_pulsewidth_us(pwm_t* pwm, int us);
void maa_pwm_pulsewidth_us(maa_pwm_context* pwm, int us);
/** Set the enable status of the PWM pin. None zero will assume on with output being driven.
* and 0 will disable the output.
* @param enable enable status of pin
*/
void maa_pwm_enable(pwm_t* pwm, int enable);
void maa_pwm_enable(maa_pwm_context* pwm, int enable);
/** Close and unexport the PWM pin.
*/
void maa_pwm_close(pwm_t* pwm);
void maa_pwm_close(maa_pwm_context* pwm);