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

4
src/grovescam/grovescam.cxx
View File

@ -105,7 +105,7 @@ bool GROVESCAM::dataAvailable(unsigned int millis)
return false;
}
int GROVESCAM::readData(uint8_t *buffer, size_t len)
int GROVESCAM::readData(uint8_t *buffer, int len)
{
if (m_ttyFd == -1)
return(-1);
@ -118,7 +118,7 @@ int GROVESCAM::readData(uint8_t *buffer, size_t len)
return rv;
}
int GROVESCAM::writeData(uint8_t *buffer, size_t len)
int GROVESCAM::writeData(uint8_t *buffer, int len)
{
if (m_ttyFd == -1)
return(-1);

4
src/grovescam/grovescam.h
View File

@ -117,7 +117,7 @@ namespace upm {
* @param len Length of the buffer
* @return Number of bytes read
*/
int readData(uint8_t *buffer, size_t len);
int readData(uint8_t *buffer, int len);
/**
* Writes the data in the buffer to the device
@ -126,7 +126,7 @@ namespace upm {
* @param len Length of the buffer
* @return Number of bytes written
*/
int writeData(uint8_t *buffer, size_t len);
int writeData(uint8_t *buffer, int len);
/**
* Sets up proper tty I/O modes and the baud rate. For this device, the default

16
src/grovescam/javaupm_grovescam.i
View File

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