jclass Value = jenv->FindClass("org/sigrok/core/classes/" #JValue);
jmethodID Value_init = jenv->GetMethodID(Value, "<init>", "(JZ)V");
$result = jenv->NewObject(Vector, Vector_init);
- jlong value;
+ jlong value = 0;
for (auto entry : $1)
{
*(CValue **) &value = new CValue(entry);
jclass Value = jenv->FindClass("org/sigrok/core/classes/" #ClassName);
jmethodID Value_init = jenv->GetMethodID(Value, "<init>", "(JZ)V");
$result = jenv->NewObject(HashMap, HashMap_init);
- jlong value;
+ jlong value = 0;
for (auto entry : $1)
{
*(std::shared_ptr< sigrok::ClassName > **)&value =
jclass Variant = jenv->FindClass("org/sigrok/core/classes/Variant");
jmethodID Variant_init = jenv->GetMethodID(Variant, "<init>", "(JZ)V");
$result = jenv->NewObject(HashMap, HashMap_init);
- jlong key;
- jlong value;
+ jlong key = 0;
+ jlong value = 0;
for (auto entry : $1)
{
*(const sigrok::ConfigKey **) &key = entry.first;
}
}
+/* Specialisation for ConfigKey->set<Capability> maps */
+
+MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
+ ConfigKey, java.util.Set<Capability>)
+
+%typemap(jni) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > "jobject"
+%typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> >
+ "java.util.Map<ConfigKey,java.util.Set<Capability>>"
+
+%typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > {
+ jclass HashMap = jenv->FindClass("java/util/HashMap");
+ jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V");
+ jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",
+ "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+ jclass HashSet = jenv->FindClass("java/util/HashSet");
+ jmethodID HashSet_init = jenv->GetMethodID(HashSet, "<init>", "()V");
+ jmethodID HashSet_add = jenv->GetMethodID(HashSet, "add",
+ "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+ jclass ConfigKey = jenv->FindClass("org/sigrok/core/classes/ConfigKey");
+ jmethodID ConfigKey_init = jenv->GetMethodID(ConfigKey, "<init>", "(JZ)V");
+ jclass Capability = jenv->FindClass("org/sigrok/core/classes/Capability");
+ jmethodID Capability_swigToEnum = jenv->GetStaticMethodID(Capability,
+ "swigToEnum", "(I)Lorg/sigrok/core/classes/Capability;");
+ $result = jenv->NewObject(HashMap, HashMap_init);
+ jlong key = 0;
+ for (auto map_entry : $1)
+ {
+ *(const sigrok::ConfigKey **) &key = map_entry.first;
+ jobject value = jenv->NewObject(HashSet, HashSet_init);
+ for (auto &set_entry : map_entry.second)
+ jenv->CallObjectMethod(value, HashSet_add,
+ jenv->CallStaticObjectMethod(Capability,
+ Capability_swigToEnum, set_entry));
+ jenv->CallObjectMethod($result, HashMap_put,
+ jenv->NewObject(ConfigKey, ConfigKey_init, key, false), value);
+ }
+}
+
/* Pass JNIEnv parameter to C++ extension methods requiring it. */
%typemap(in, numinputs=0) JNIEnv * %{
const sigrok::LogLevel *loglevel,
std::string message)
{
- jlong loglevel_addr;
+ jlong loglevel_addr = 0;
*(const sigrok::LogLevel **) &loglevel_addr = loglevel;
jobject loglevel_obj = env->NewObject(
LogLevel, LogLevel_init, loglevel_addr, false);
std::shared_ptr<sigrok::Device> device,
std::shared_ptr<sigrok::Packet> packet)
{
- jlong device_addr;
- jlong packet_addr;
+ jlong device_addr = 0;
+ jlong packet_addr = 0;
*(std::shared_ptr<sigrok::Device> **) &device_addr =
new std::shared_ptr<sigrok::Device>(device);
*(std::shared_ptr<sigrok::Packet> **) &packet_addr =
%include "doc.i"
-%define %attributevector(Class, Type, Name, Get)
-%attributeval(sigrok::Class, Type, Name, Get);
-%enddef
-
-%define %attributemap(Class, Type, Name, Get)
-%attributeval(sigrok::Class, Type, Name, Get);
-%enddef
-
%define %enumextras(Class)
%enddef
/* Ignore these for now, need fixes. */
%ignore sigrok::Context::create_analog_packet;
%ignore sigrok::Context::create_meta_packet;
+%ignore sigrok::Meta::config;
%include "bindings/swig/classes.i"