alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 01:41:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

java: Changed size_t and unsigned int to int in array declarations. Renamed buf to buffer where necesarry. Moved most Java array typemaps to java_buffer.i. Fixed some String buffers.

Browse Source 
Signed-off-by: Petre Eftime <petre.p.eftime@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

Conflicts:
	src/upm.i
This commit is contained in:
Petre Eftime
2015-09-07 19:00:30 +03:00
committed by Mihai Tudor Panu
parent ab730038fd
commit 2cab79b4c2
50 changed files with 237 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mpr121/javaupm_mpr121.i
View File

@ -1,24 +1,10 @@
%module javaupm_mpr121
%include "../upm.i"
%include "arrays_java.i";
%include "../java_buffer.i"
%{
#include "mpr121.h"
%}
%typemap(jni) (uint8_t *buffer, unsigned int len) "jbyteArray";
%typemap(jtype) (uint8_t *buffer, unsigned int len) "byte[]";
%typemap(jstype) (uint8_t *buffer, unsigned int len) "byte[]";
%typemap(javain) (uint8_t *buffer, unsigned int len) "$javainput";
%typemap(in) (uint8_t *buffer, unsigned int len) {
$1 = (uint8_t *) JCALL2(GetByteArrayElements, jenv, $input, NULL);
$2 = JCALL1(GetArrayLength, jenv, $input);
}
%typemap(freearg) (uint8_t *buffer, unsigned int len) {
JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
}
%include "mpr121.h"

8
src/mpr121/mpr121.cxx
View File

@ -44,7 +44,7 @@ MPR121::MPR121(int bus, uint8_t address) : m_i2c(bus)
m_overCurrentFault = false;
}
mraa::Result MPR121::writeBytes(uint8_t reg, uint8_t *buffer, unsigned int len)
mraa::Result MPR121::writeBytes(uint8_t reg, uint8_t *buffer, int len)
{
if (!len || !buffer)
return mraa::SUCCESS;
@ -64,17 +64,17 @@ mraa::Result MPR121::writeBytes(uint8_t reg, uint8_t *buffer, unsigned int len)
return m_i2c.write(buf2, len + 1);
}
void MPR121::readBytes(uint8_t reg, uint8_t *buffer, unsigned int len)
int MPR121::readBytes(uint8_t reg, uint8_t *buffer, int len)
{
if (!len || !buffer)
return;
return 0;
// The usual m_i2c.read() does not work here, so we need to
// read each byte individually.
for (int i=0; i<len; i++)
buffer[i] = m_i2c.readReg(reg + i);
return;
return len;
}
bool MPR121::configAN3944()

4
src/mpr121/mpr121.h
View File

@ -93,7 +93,7 @@ namespace upm {
* @param len Number of bytes to write
* @return mraa::Result
*/
mraa::Result writeBytes(uint8_t reg, uint8_t *buffer, unsigned int len);
mraa::Result writeBytes(uint8_t reg, uint8_t *buffer, int len);
/**
* Reads value(s) from registers
@ -102,7 +102,7 @@ namespace upm {
* @param buffer Buffer for data storage
* @param len Number of bytes to read
*/
void readBytes(uint8_t reg, uint8_t *buffer, unsigned int len);
int readBytes(uint8_t reg, uint8_t *buffer, int len);
/**
* Button states