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

i2c.hpp: Add C++ wrapper around I2c

Browse Source 
* maa_i2c_context bcomes an opaque pointer
* C++ wrapper class I2c created
* swig now uses C++ wrapper I2c to generate API

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2014-05-16 10:28:26 +01:00
parent 9e823b7f1d
commit e491f99228
7 changed files with 104 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@@ -7,6 +7,7 @@ set (maa_LIB_HEADERS
${PROJECT_SOURCE_DIR}/api/maa.h
${PROJECT_SOURCE_DIR}/api/gpio.h
${PROJECT_SOURCE_DIR}/api/i2c.h
${PROJECT_SOURCE_DIR}/api/i2c.pp
${PROJECT_SOURCE_DIR}/api/pwm.h
${PROJECT_SOURCE_DIR}/api/spi.h
${PROJECT_SOURCE_DIR}/api/aio.h

28
src/i2c/i2c.c
View File

@@ -25,7 +25,15 @@
#include "i2c.h"
#include "smbus.h"
maa_i2c_context*
struct _i2c {
/*@{*/
int hz; /**< frequency of communication */
int fh; /**< the file handle to the /dev/i2c-* device */
int addr; /**< the address of the i2c slave */
/*@}*/
};
maa_i2c_context
maa_i2c_init(int bus)
{
int checked_pin = maa_check_i2c(bus);
@@ -46,10 +54,10 @@ maa_i2c_init(int bus)
return maa_i2c_init_raw((unsigned int) checked_pin);
}
maa_i2c_context*
maa_i2c_context
maa_i2c_init_raw(unsigned int bus)
{
maa_i2c_context* dev = (maa_i2c_context*) malloc(sizeof(maa_i2c_context));
maa_i2c_context dev = (maa_i2c_context) malloc(sizeof(struct _i2c));
if (dev == NULL)
return NULL;
@@ -62,7 +70,7 @@ maa_i2c_init_raw(unsigned int bus)
}
maa_result_t
maa_i2c_frequency(maa_i2c_context* dev, int hz)
maa_i2c_frequency(maa_i2c_context dev, int hz)
{
dev->hz = hz;
@@ -70,7 +78,7 @@ maa_i2c_frequency(maa_i2c_context* dev, int hz)
}
maa_result_t
maa_i2c_read(maa_i2c_context* dev, char *data, int length)
maa_i2c_read(maa_i2c_context dev, const char *data, int length)
{
// this is the read(3) syscall not maa_i2c_read()
if (read(dev->fh, data, length) == length) {
@@ -80,7 +88,7 @@ maa_i2c_read(maa_i2c_context* dev, char *data, int length)
}
int
maa_i2c_read_byte(maa_i2c_context* dev)
maa_i2c_read_byte(maa_i2c_context dev)
{
int byte;
byte = i2c_smbus_read_byte(dev->fh);
@@ -91,7 +99,7 @@ maa_i2c_read_byte(maa_i2c_context* dev)
}
maa_result_t
maa_i2c_write(maa_i2c_context* dev, const char* data, int length)
maa_i2c_write(maa_i2c_context dev, 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 i2c\n");
@@ -101,7 +109,7 @@ maa_i2c_write(maa_i2c_context* dev, const char* data, int length)
}
maa_result_t
maa_i2c_write_byte(maa_i2c_context* 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 i2c\n");
@@ -111,7 +119,7 @@ maa_i2c_write_byte(maa_i2c_context* dev, int data)
}
maa_result_t
maa_i2c_address(maa_i2c_context* dev, int addr)
maa_i2c_address(maa_i2c_context dev, int addr)
{
dev->addr = addr;
if (ioctl(dev->fh, I2C_SLAVE_FORCE, addr) < 0) {
@@ -122,7 +130,7 @@ maa_i2c_address(maa_i2c_context* dev, int addr)
}
maa_result_t
maa_i2c_stop(maa_i2c_context* dev)
maa_i2c_stop(maa_i2c_context dev)
{
free(dev);
return MAA_SUCCESS;

45
src/maa.i
View File

@@ -2,7 +2,7 @@
#include "maa.h"
#include "gpio.h"
#include "pwm.h"
#include "i2c.h"
#include "i2c.hpp"
#include "spi.h"
#include "aio.hpp"
%}
@@ -126,48 +126,7 @@ typedef struct {
#### i2c ####
%nodefault maa_i2c_context;
%rename(I2c) maa_i2c_context;
%ignore fh;
typedef struct {
/*@{*/
int hz; /**< frequency of communication */
int fh; /**< the file handle to the /dev/i2c-* device */
int addr; /**< the address of the i2c slave */
/*@}*/
} maa_i2c_context;
%nodefault maa_i2c_context;
%extend maa_i2c_context {
maa_i2c_context()
{
return maa_i2c_init(0);
}
~maa_i2c_context()
{
}
int frequency(int hz)
{
return maa_i2c_frequency($self, hz);
}
int read(char *data, int length)
{
return maa_i2c_read($self, data, length);
}
int read()
{
return maa_i2c_read_byte($self);
}
int write(char *data, int length)
{
return maa_i2c_write($self, data, length);
}
int write(int data)
{
return maa_i2c_write_byte($self, data);
}
}
%include "i2c.hpp"
#### PWM ####