* ------------
*
* The sigrok-java API provides an object-oriented Java interface to the
- * functionality in libsigrok. It is built on top of the sigrok++ C++ API.
+ * functionality in libsigrok. It is built on top of the libsigrokcxx C++ API.
*
* Getting started
* ---------------
import org.sigrok.core.interfaces.LogCallback;
import org.sigrok.core.interfaces.DatafeedCallback;
-import org.sigrok.core.interfaces.SourceCallback;
%}
-/* Map Java FileDescriptor objects to int fds */
-%typemap(jni) int fd "jobject"
-%typemap(jtype) int fd "java.io.FileDescriptor"
-%typemap(jstype) int fd "java.io.FileDescriptor"
-%typemap(javain) int fd "$javainput"
-
-%typemap(in) int fd {
- jclass FileDescriptor = jenv->FindClass("java/io/FileDescriptor");
- jfieldID fd = jenv->GetFieldID(FileDescriptor, "fd", "I");
- $1 = jenv->GetIntField($input, fd);
-}
-
/* Map Glib::VariantBase to a Variant class in Java */
%rename(Variant) VariantBase;
namespace Glib {
class VariantBase {};
}
+%include "bindings/swig/templates.i"
+
/* Map between std::vector and java.util.Vector */
%define VECTOR(CValue, JValue)
%typemap(jstype) std::vector< CValue > "java.util.Vector<JValue>"
%typemap(javain,
- pre=" $javaclassname temp$javainput = $javaclassname.convertVector($javainput);",
+ pre=" $javaclassname temp$javainput = new $javaclassname();
+ for (JValue value : $javainput)
+ temp$javainput.add(value);",
pgcppname="temp$javainput")
std::vector< CValue > "$javaclassname.getCPtr(temp$javainput)"
-%typemap(javacode) std::vector< CValue > %{
- static $javaclassname convertVector(java.util.Vector<JValue> in)
- {
- $javaclassname out = new $javaclassname();
- for (JValue value : in)
- out.add(value);
- return out;
- }
-%}
-
%typemap(javaout) std::vector< CValue > {
return (java.util.Vector<JValue>)$jnicall;
}
"java.util.Map<JKey, JValue>"
%typemap(javain,
- pre=" $javaclassname temp$javainput = $javaclassname.convertMap($javainput);",
+ pre=" $javaclassname temp$javainput = new $javaclassname();
+ for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet())
+ temp$javainput.set(entry.getKey(), entry.getValue());",
pgcppname="temp$javainput")
std::map< CKey, CValue > "$javaclassname.getCPtr(temp$javainput)"
-%typemap(javacode) std::map< CKey, CValue > %{
- static $javaclassname convertMap(java.util.Map<JKey,JValue> in)
- {
- $javaclassname out = new $javaclassname();
- for (java.util.Map.Entry<JKey, JValue> entry : in.entrySet())
- out.set(entry.getKey(), entry.getValue());
- return out;
- }
-%}
-
%typemap(javaout) std::map< CKey, CValue > {
return (java.util.Map<JKey, JValue>)$jnicall;
}
MAP_COMMON(std::string, std::string, String, String)
+%typemap(jni) std::map<std::string, std::string>
+ "jobject"
+%typemap(jtype) std::map<std::string, std::string>
+ "java.util.Map<String,String>"
+
%typemap(out) std::map<std::string, std::string> {
jclass HashMap = jenv->FindClass("java/util/HashMap");
jmethodID init = jenv->GetMethodID(HashMap, "<init>", "()V");
}
/* Support Driver.scan() with no arguments. */
+%ignore sigrok::Driver::scan;
+
%extend sigrok::Driver {
std::vector<std::shared_ptr<sigrok::HardwareDevice> > scan()
{
std::map<const sigrok::ConfigKey *, Glib::VariantBase> options;
return $self->scan(options);
}
+
+ std::vector<std::shared_ptr<sigrok::HardwareDevice> > scan(
+ std::map<const sigrok::ConfigKey *, Glib::VariantBase> options)
+ {
+ return $self->scan(options);
+ }
}
-/* Support InputFormat.create_input() with no options. */
+/* Support InputFormat.create_input() with or without options. */
+%ignore sigrok::InputFormat::create_input;
+
%extend sigrok::InputFormat {
std::shared_ptr<sigrok::Input> create_input()
{
- std::map<std::string, Glib::VariantBase> options;
+ return $self->create_input();
+ }
+
+ std::shared_ptr<sigrok::Input> create_input(
+ std::map<std::string, Glib::VariantBase> options)
+ {
return $self->create_input(options);
}
}
-/* Support OutputFormat.create_output(device) with no options. */
+/* Support OutputFormat.create_output() with or without options. */
+%ignore sigrok::OutputFormat::create_output;
+
%extend sigrok::OutputFormat {
std::shared_ptr<sigrok::Output> create_output(
std::shared_ptr<sigrok::Device> device)
{
- std::map<std::string, Glib::VariantBase> options;
+ return $self->create_output(device);
+ }
+
+ std::shared_ptr<sigrok::Output> create_output(
+ std::shared_ptr<sigrok::Device> device,
+ std::map<std::string, Glib::VariantBase> options)
+ {
return $self->create_output(device, options);
}
+
+ std::shared_ptr<sigrok::Output> create_output(
+ std::string filename,
+ std::shared_ptr<sigrok::Device> device)
+ {
+ return $self->create_output(filename, device);
+ }
+
+ std::shared_ptr<sigrok::Output> create_output(
+ std::string filename,
+ std::shared_ptr<sigrok::Device> device,
+ std::map<std::string, Glib::VariantBase> options)
+ {
+ return $self->create_output(filename, device, options);
+ }
}
/* Pass JNIEnv parameter to C++ extension methods requiring it. */
}
}
-/* Support Java event source callbacks. */
-
-%typemap(javaimports) sigrok::EventSource
- "import org.sigrok.core.interfaces.SourceCallback;"
-
-%inline {
-typedef jobject jsourcecallback;
-}
+%include "doc.i"
-%typemap(jni) jsourcecallback "jsourcecallback"
-%typemap(jtype) jsourcecallback "SourceCallback"
-%typemap(jstype) jsourcecallback "SourceCallback"
-%typemap(javain) jsourcecallback "$javainput"
+%define %attributevector(Class, Type, Name, Get)
+%attributeval(sigrok::Class, Type, Name, Get);
+%enddef
-%extend sigrok::EventSource
-{
- std::shared_ptr<sigrok::EventSource> create(
- int fd, Glib::IOCondition events, int timeout,
- JNIEnv *env, jsourcecallback obj)
- {
- (void) $self;
- jclass obj_class = env->GetObjectClass(obj);
- jmethodID method = env->GetMethodID(obj_class, "run", "(I)V");
- jobject obj_ref = env->NewGlobalRef(obj);
+%define %attributemap(Class, Type, Name, Get)
+%attributeval(sigrok::Class, Type, Name, Get);
+%enddef
- return sigrok::EventSource::create(fd, events, timeout, [=] (int revents)
- {
- bool result = env->CallBooleanMethod(obj_ref, method, revents);
- if (env->ExceptionCheck())
- throw sigrok::Error(SR_ERR);
- return result;
- });
- }
-}
+%define %enumextras(Class)
+%enddef
-/* Currently broken due to some std::map typemap issues. */
-%ignore sigrok::Meta::get_config;
+/* Ignore these for now, need fixes. */
+%ignore sigrok::Context::create_analog_packet;
+%ignore sigrok::Context::create_meta_packet;
-%include "doc.i"
%include "bindings/swig/classes.i"
+