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

MAA version 0.2.0 moves to a standard C API

Browse Source 
* Removed all C++ code and renamed all .cxx extensions to .c
* All functions are renamed to maa_ and modules are for example called maa_pwm
* Cmake can now 'make doc' using a Doxyfile.in to create documentation
* examples/ have been updated but swig generated API is untested

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2014-04-27 21:17:54 +01:00
parent 5a270191b5
commit a5a407e4b5
23 changed files with 389 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/i2c/i2cslave.cxx → src/i2c/i2c.c
View File

@@ -22,55 +22,57 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "i2cslave.h"
#include "i2c.h"
#include "smbus.h"
using namespace maa;
I2CSlave::I2CSlave(unsigned int sda, unsigned int scl)
int
maa_i2c_init(i2c_t* dev)
{
// maa allocates the memory for *dev
dev = malloc(sizeof *dev);
// Galileo only has one I2C master which should be /dev/i2c-0
// reliability is a fickle friend!
if ((i2c_handle = open("/dev/i2c-0", O_RDWR)) < 1) {
if ((dev->fh = open("/dev/i2c-0", O_RDWR)) < 1) {
fprintf(stderr, "Failed to open requested i2c port");
}
}
void
I2CSlave::frequency(int hz)
maa_i2c_frequency(i2c_t* dev, int hz)
{
_hz = hz;
dev->hz = hz;
}
int
I2CSlave::receive(void)
maa_i2c_receive(i2c_t* dev)
{
return -1;
}
int
I2CSlave::read(char *data, int length)
maa_i2c_read(i2c_t* dev, char *data, int length)
{
// this is the read(3) syscall not I2CSlave::read()
if (::read(i2c_handle, data, length) == length) {
// this is the read(3) syscall not maa_i2c_read()
if (read(dev->fh, data, length) == length) {
return length;
}
return -1;
}
int
I2CSlave::read(void)
maa_i2c_read_byte(i2c_t* dev)
{
int byte;
if (byte = i2c_smbus_read_byte(i2c_handle) < 0) {
if (byte = i2c_smbus_read_byte(dev->fh) < 0) {
return -1;
}
return byte;
}
int
I2CSlave::write(const char *data, int length)
maa_i2c_write(i2c_t* dev, const char* data, int length)
{
if (i2c_smbus_write_i2c_block_data(i2c_handle, 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) {
fprintf(stderr, "Failed to write to I2CSlave slave\n");
return -1;
}
@@ -78,9 +80,9 @@ I2CSlave::write(const char *data, int length)
}
int
I2CSlave::write(int data)
maa_i2c_write_byte(i2c_t* dev, int data)
{
if (i2c_smbus_write_byte(i2c_handle, data) < 0) {
if (i2c_smbus_write_byte(dev->fh, data) < 0) {
fprintf(stderr, "Failed to write to I2CSlave slave\n");
return -1;
}
@@ -88,15 +90,16 @@ I2CSlave::write(int data)
}
void
I2CSlave::address(int addr)
maa_i2c_address(i2c_t* dev, int addr)
{
_addr = addr;
if (ioctl(i2c_handle, I2C_SLAVE_FORCE, addr) < 0) {
dev->addr = addr;
if (ioctl(dev->fh, I2C_SLAVE_FORCE, addr) < 0) {
fprintf(stderr, "Failed to set slave address %d\n", addr);
}
}
void
I2CSlave::stop()
maa_i2c_stop(i2c_t* dev)
{
free(dev);
}

93
src/i2c/i2c.cxx
View File

@@ -1,93 +0,0 @@
/*
* Author: Brendan Le Foll
* Copyright (c) 2014 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 "i2c.h"
using namespace maa;
I2C::I2C(unsigned int sda, unsigned int scl)
{
// Galileo only has one I2C device which is always /dev/i2c-0
// reliability is a fickle friend!
if (i2c_handle = open("/dev/i2c-0", O_RDWR) < 1) {
fprintf(stderr, "Failed to open requested i2c port");
}
}
void
I2C::frequency(int hz)
{
_hz = hz;
}
int
I2C::read(int address, char *data, int length, bool repeated)
{
return 0;
}
int
I2C::read(int ack)
{
int byte;
if (byte = i2c_smbus_read_byte(i2c_handle) < 0) {
return -1;
}
return byte;
}
int
I2C::write(int address, const char *data, int length, bool repeated)
{
if (i2c_smbus_write_i2c_block_data(i2c_handle, data[0], length, (uint8_t*) data) < 0) {
fprintf(stderr, "Failed to write to I2C slave\n");
return -1;
}
return 0;
}
int
I2C::write(int data)
{
if (i2c_smbus_write_byte(i2c_handle, data) < 0) {
fprintf(stderr, "Failed to write to I2C slave\n");
return -1;
}
return 0;
}
void
I2C::start()
{
}
void
I2C::stop()
{
}
void
I2C::aquire()
{
}