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.

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

View File

@ -94,7 +94,7 @@ bool HMTRP::dataAvailable(unsigned int millis)
return false;
}
int HMTRP::readData(char *buffer, size_t len, int millis)
int HMTRP::readData(char *buffer, int len, int millis)
{
if (m_ttyFd == -1)
return(-1);
@ -114,7 +114,7 @@ int HMTRP::readData(char *buffer, size_t len, int millis)
return rv;
}
int HMTRP::writeData(char *buffer, size_t len)
int HMTRP::writeData(char *buffer, int len)
{
if (m_ttyFd == -1)
return(-1);

View File

@ -124,7 +124,7 @@ namespace upm {
* waiting forever (default).
* @return Number of bytes read; 0 if timed out and millis is >= 0
*/
int readData(char *buffer, size_t len, int millis=-1);
int readData(char *buffer, int len, int millis=-1);
/**
* Writes the data in the buffer to the device
@ -133,7 +133,7 @@ namespace upm {
* @param len Length of the buffer
* @return Number of bytes written
*/
int writeData(char *buffer, size_t len);
int writeData(char *buffer, int len);
/**
* Sets up proper tty I/O modes and the baud rate. The default

View File

@ -2,6 +2,7 @@
%include "../upm.i"
%include "stdint.i"
%include "typemaps.i"
%include "../java_buffer.i"
%apply uint32_t *OUTPUT { uint32_t *freq, uint32_t *dataRate };
%apply uint16_t *OUTPUT { uint16_t *rxBandwidth };