RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-06 04:20:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

swig pm3_device -> pm3

Browse source
This commit is contained in:
Philippe Teuwen 2020-06-14 21:56:02 +02:00
parent d59630183e
commit 05ba6a73f8
11 changed files with 164 additions and 164 deletions

2
client/client_with_swig/testembedded.lua
View file

@ -1,4 +1,4 @@
local pm3 = require("pm3") local pm3 = require("pm3")
p=pm3.device() p=pm3.pm3()
p:console("hw status") p:console("hw status")
print(p.name) print(p.name)

2
client/client_with_swig/testembedded.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import pm3 import pm3
p=pm3.device() p=pm3.pm3()
p.console("hw status") p.console("hw status")
print("Device:", p.name) print("Device:", p.name)

12
client/include/pm3.h
View file

@ -1,11 +1,11 @@
#ifndef LIBPM3_H #ifndef LIBPM3_H
#define LIBPM3_H #define LIBPM3_H
typedef struct pm3_device pm3_device; typedef struct pm3_device pm3;
pm3_device* pm3_open(char *port); pm3 *pm3_open(char *port);
int pm3_device_console(pm3_device* dev, char *cmd); int pm3_console(pm3* dev, char *cmd);
const char * pm3_device_name_get(pm3_device* dev); const char *pm3_name_get(pm3* dev);
void pm3_device_close(pm3_device* dev); void pm3_close(pm3* dev);
pm3_device* pm3_device_get_current_dev(void); pm3 *pm3_get_current_dev(void);
#endif // LIBPM3_H #endif // LIBPM3_H

6
client/lib/example_c/test.c
View file

@ -1,8 +1,8 @@
#include "pm3.h" #include "pm3.h"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
pm3_device *p; pm3 *p;
p = pm3_open("/dev/ttyACM0"); p = pm3_open("/dev/ttyACM0");
pm3_device_console(p, "hw status"); pm3_console(p, "hw status");
pm3_device_close(p); pm3_close(p);
} }

2
client/lib/example_lua/test.lua
View file

@ -1,6 +1,6 @@
#!/usr/bin/env lua #!/usr/bin/env lua
local pm3 = require("pm3") local pm3 = require("pm3")
p=pm3.device("/dev/ttyACM0") p=pm3.pm3("/dev/ttyACM0")
p:console("hw status") p:console("hw status")
print(p.name) print(p.name)

2
client/lib/example_py/test.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import pm3 import pm3
p=pm3.device("/dev/ttyACM0") p=pm3.pm3("/dev/ttyACM0")
p.console("hw status") p.console("hw status")
print("Device:", p.name) print("Device:", p.name)

22
client/src/pm3.i
View file

@ -10,30 +10,30 @@
%feature("immutable","1") pm3_current_dev; %feature("immutable","1") pm3_current_dev;
typedef struct { typedef struct {
%extend { %extend {
pm3_device() { pm3() {
printf("SWIG pm3_device constructor, get current pm3\n"); printf("SWIG pm3 constructor, get current pm3\n");
pm3_device * p = pm3_device_get_current_dev(); pm3_device * p = pm3_get_current_dev();
p->script_embedded = 1; p->script_embedded = 1;
return p; return p;
} }
pm3_device(char *port) { pm3(char *port) {
printf("SWIG pm3_device constructor with port, open pm3\n"); printf("SWIG pm3 constructor with port, open pm3\n");
pm3_device * p = pm3_open(port); pm3_device * p = pm3_open(port);
p->script_embedded = 0; p->script_embedded = 0;
return p; return p;
} }
~pm3_device() { ~pm3() {
if ($self->script_embedded) { if ($self->script_embedded) {
printf("SWIG pm3_device destructor, nothing to do\n"); printf("SWIG pm3 destructor, nothing to do\n");
} else { } else {
printf("SWIG pm3_device destructor, close pm3\n"); printf("SWIG pm3 destructor, close pm3\n");
pm3_device_close($self); pm3_close($self);
} }
} }
int console(char *cmd); int console(char *cmd);
char const * const name; char const * const name;
} }
} pm3_device; } pm3;
//%nodefaultctor device; //%nodefaultctor device;
//%nodefaultdtor device; //%nodefaultdtor device;
/* Parse the header file to generate wrappers */ /* Parse the header file to generate wrappers */

14
client/src/pm3.py
View file

@ -61,20 +61,20 @@ class _SwigNonDynamicMeta(type):
__setattr__ = _swig_setattr_nondynamic_class_variable(type.__setattr__) __setattr__ = _swig_setattr_nondynamic_class_variable(type.__setattr__)
class device(object): class pm3(object):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag") thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr __repr__ = _swig_repr
def __init__(self, *args): def __init__(self, *args):
_pm3.device_swiginit(self, _pm3.new_device(*args)) _pm3.pm3_swiginit(self, _pm3.new_pm3(*args))
__swig_destroy__ = _pm3.delete_device __swig_destroy__ = _pm3.delete_pm3
def console(self, cmd): def console(self, cmd):
return _pm3.device_console(self, cmd) return _pm3.pm3_console(self, cmd)
name = property(_pm3.device_name_get) name = property(_pm3.pm3_name_get)
# Register device in _pm3: # Register pm3 in _pm3:
_pm3.device_swigregister(device) _pm3.pm3_swigregister(pm3)

140
client/src/pm3_luawrap.c
View file

@ -2668,7 +2668,7 @@ SWIG_Lua_dostring(lua_State *L, const char *str) {
/* -------- TYPES TABLE (BEGIN) -------- */ /* -------- TYPES TABLE (BEGIN) -------- */
#define SWIGTYPE_p_pm3_device swig_types[0] #define SWIGTYPE_p_pm3 swig_types[0]
static swig_type_info *swig_types[2]; static swig_type_info *swig_types[2];
static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0}; static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
@ -2686,9 +2686,9 @@ static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0};
#include "pm3.h" #include "pm3.h"
#include "comms.h" #include "comms.h"
SWIGINTERN pm3_device *new_pm3_device__SWIG_0(void){ SWIGINTERN pm3 *new_pm3__SWIG_0(void){
printf("SWIG pm3_device constructor, get current pm3\n"); printf("SWIG pm3 constructor, get current pm3\n");
pm3_device * p = pm3_device_get_current_dev(); pm3_device * p = pm3_get_current_dev();
p->script_embedded = 1; p->script_embedded = 1;
return p; return p;
} }
@ -2700,30 +2700,30 @@ SWIGINTERN int SWIG_lua_isnilstring(lua_State *L, int idx) {
return ret; return ret;
} }
SWIGINTERN pm3_device *new_pm3_device__SWIG_1(char *port){ SWIGINTERN pm3 *new_pm3__SWIG_1(char *port){
printf("SWIG pm3_device constructor with port, open pm3\n"); printf("SWIG pm3 constructor with port, open pm3\n");
pm3_device * p = pm3_open(port); pm3_device * p = pm3_open(port);
p->script_embedded = 0; p->script_embedded = 0;
return p; return p;
} }
SWIGINTERN void delete_pm3_device(pm3_device *self){ SWIGINTERN void delete_pm3(pm3 *self){
if (self->script_embedded) { if (self->script_embedded) {
printf("SWIG pm3_device destructor, nothing to do\n"); printf("SWIG pm3 destructor, nothing to do\n");
} else { } else {
printf("SWIG pm3_device destructor, close pm3\n"); printf("SWIG pm3 destructor, close pm3\n");
pm3_device_close(self); pm3_close(self);
} }
} }
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
static int _wrap_new_device__SWIG_0(lua_State* L) { static int _wrap_new_pm3__SWIG_0(lua_State* L) {
int SWIG_arg = 0; int SWIG_arg = 0;
pm3_device *result = 0 ; pm3 *result = 0 ;
SWIG_check_num_args("pm3_device::pm3_device",0,0) SWIG_check_num_args("pm3::pm3",0,0)
result = (pm3_device *)new_pm3_device__SWIG_0(); result = (pm3 *)new_pm3__SWIG_0();
SWIG_NewPointerObj(L,result,SWIGTYPE_p_pm3_device,1); SWIG_arg++; SWIG_NewPointerObj(L,result,SWIGTYPE_p_pm3,1); SWIG_arg++;
return SWIG_arg; return SWIG_arg;
if(0) SWIG_fail; if(0) SWIG_fail;
@ -2734,16 +2734,16 @@ fail:
} }
static int _wrap_new_device__SWIG_1(lua_State* L) { static int _wrap_new_pm3__SWIG_1(lua_State* L) {
int SWIG_arg = 0; int SWIG_arg = 0;
char *arg1 = (char *) 0 ; char *arg1 = (char *) 0 ;
pm3_device *result = 0 ; pm3 *result = 0 ;
SWIG_check_num_args("pm3_device::pm3_device",1,1) SWIG_check_num_args("pm3::pm3",1,1)
if(!SWIG_lua_isnilstring(L,1)) SWIG_fail_arg("pm3_device::pm3_device",1,"char *"); if(!SWIG_lua_isnilstring(L,1)) SWIG_fail_arg("pm3::pm3",1,"char *");
arg1 = (char *)lua_tostring(L, 1); arg1 = (char *)lua_tostring(L, 1);
result = (pm3_device *)new_pm3_device__SWIG_1(arg1); result = (pm3 *)new_pm3__SWIG_1(arg1);
SWIG_NewPointerObj(L,result,SWIGTYPE_p_pm3_device,1); SWIG_arg++; SWIG_NewPointerObj(L,result,SWIGTYPE_p_pm3,1); SWIG_arg++;
return SWIG_arg; return SWIG_arg;
if(0) SWIG_fail; if(0) SWIG_fail;
@ -2754,7 +2754,7 @@ fail:
} }
static int _wrap_new_device(lua_State* L) { static int _wrap_new_pm3(lua_State* L) {
int argc; int argc;
int argv[2]={ int argv[2]={
1,2 1,2
@ -2762,7 +2762,7 @@ static int _wrap_new_device(lua_State* L) {
argc = lua_gettop(L); argc = lua_gettop(L);
if (argc == 0) { if (argc == 0) {
return _wrap_new_device__SWIG_0(L); return _wrap_new_pm3__SWIG_0(L);
} }
if (argc == 1) { if (argc == 1) {
int _v; int _v;
@ -2770,34 +2770,34 @@ static int _wrap_new_device(lua_State* L) {
_v = SWIG_lua_isnilstring(L,argv[0]); _v = SWIG_lua_isnilstring(L,argv[0]);
} }
if (_v) { if (_v) {
return _wrap_new_device__SWIG_1(L); return _wrap_new_pm3__SWIG_1(L);
} }
} }
SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_device'\n" SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_pm3'\n"
" Possible C/C++ prototypes are:\n" " Possible C/C++ prototypes are:\n"
" pm3_device::pm3_device()\n" " pm3::pm3()\n"
" pm3_device::pm3_device(char *)\n"); " pm3::pm3(char *)\n");
lua_error(L);return 0; lua_error(L);return 0;
} }
static int _wrap_device_console(lua_State* L) { static int _wrap_pm3_console(lua_State* L) {
int SWIG_arg = 0; int SWIG_arg = 0;
pm3_device *arg1 = (pm3_device *) 0 ; pm3 *arg1 = (pm3 *) 0 ;
char *arg2 = (char *) 0 ; char *arg2 = (char *) 0 ;
int result; int result;
SWIG_check_num_args("pm3_device::console",2,2) SWIG_check_num_args("pm3::console",2,2)
if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("pm3_device::console",1,"pm3_device *"); if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("pm3::console",1,"pm3 *");
if(!SWIG_lua_isnilstring(L,2)) SWIG_fail_arg("pm3_device::console",2,"char *"); if(!SWIG_lua_isnilstring(L,2)) SWIG_fail_arg("pm3::console",2,"char *");
if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_pm3_device,0))){ if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_pm3,0))){
SWIG_fail_ptr("device_console",1,SWIGTYPE_p_pm3_device); SWIG_fail_ptr("pm3_console",1,SWIGTYPE_p_pm3);
} }
arg2 = (char *)lua_tostring(L, 2); arg2 = (char *)lua_tostring(L, 2);
result = (int)pm3_device_console(arg1,arg2); result = (int)pm3_console(arg1,arg2);
lua_pushnumber(L, (lua_Number) result); SWIG_arg++; lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
return SWIG_arg; return SWIG_arg;
@ -2809,19 +2809,19 @@ fail:
} }
static int _wrap_device_name_get(lua_State* L) { static int _wrap_pm3_name_get(lua_State* L) {
int SWIG_arg = 0; int SWIG_arg = 0;
pm3_device *arg1 = (pm3_device *) 0 ; pm3 *arg1 = (pm3 *) 0 ;
char *result = 0 ; char *result = 0 ;
SWIG_check_num_args("pm3_device::name",1,1) SWIG_check_num_args("pm3::name",1,1)
if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("pm3_device::name",1,"pm3_device *"); if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("pm3::name",1,"pm3 *");
if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_pm3_device,0))){ if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_pm3,0))){
SWIG_fail_ptr("device_name_get",1,SWIGTYPE_p_pm3_device); SWIG_fail_ptr("pm3_name_get",1,SWIGTYPE_p_pm3);
} }
result = (char *)pm3_device_name_get(arg1); result = (char *)pm3_name_get(arg1);
lua_pushstring(L,(const char *)result); SWIG_arg++; lua_pushstring(L,(const char *)result); SWIG_arg++;
return SWIG_arg; return SWIG_arg;
@ -2833,54 +2833,54 @@ fail:
} }
static void swig_delete_device(void *obj) { static void swig_delete_pm3(void *obj) {
pm3_device *arg1 = (pm3_device *) obj; pm3 *arg1 = (pm3 *) obj;
delete_pm3_device(arg1); delete_pm3(arg1);
} }
static int _proxy__wrap_new_device(lua_State *L) { static int _proxy__wrap_new_pm3(lua_State *L) {
assert(lua_istable(L,1)); assert(lua_istable(L,1));
lua_pushcfunction(L,_wrap_new_device); lua_pushcfunction(L,_wrap_new_pm3);
assert(!lua_isnil(L,-1)); assert(!lua_isnil(L,-1));
lua_replace(L,1); /* replace our table with real constructor */ lua_replace(L,1); /* replace our table with real constructor */
lua_call(L,lua_gettop(L)-1,1); lua_call(L,lua_gettop(L)-1,1);
return 1; return 1;
} }
static swig_lua_attribute swig_device_attributes[] = { static swig_lua_attribute swig_pm3_attributes[] = {
{ "name", _wrap_device_name_get, SWIG_Lua_set_immutable }, { "name", _wrap_pm3_name_get, SWIG_Lua_set_immutable },
{0,0,0} {0,0,0}
}; };
static swig_lua_method swig_device_methods[]= { static swig_lua_method swig_pm3_methods[]= {
{ "console", _wrap_device_console}, { "console", _wrap_pm3_console},
{0,0} {0,0}
}; };
static swig_lua_method swig_device_meta[] = { static swig_lua_method swig_pm3_meta[] = {
{0,0} {0,0}
}; };
static swig_lua_attribute swig_device_Sf_SwigStatic_attributes[] = { static swig_lua_attribute swig_pm3_Sf_SwigStatic_attributes[] = {
{0,0,0} {0,0,0}
}; };
static swig_lua_const_info swig_device_Sf_SwigStatic_constants[]= { static swig_lua_const_info swig_pm3_Sf_SwigStatic_constants[]= {
{0,0,0,0,0,0} {0,0,0,0,0,0}
}; };
static swig_lua_method swig_device_Sf_SwigStatic_methods[]= { static swig_lua_method swig_pm3_Sf_SwigStatic_methods[]= {
{0,0} {0,0}
}; };
static swig_lua_class* swig_device_Sf_SwigStatic_classes[]= { static swig_lua_class* swig_pm3_Sf_SwigStatic_classes[]= {
0 0
}; };
static swig_lua_namespace swig_device_Sf_SwigStatic = { static swig_lua_namespace swig_pm3_Sf_SwigStatic = {
"device", "pm3",
swig_device_Sf_SwigStatic_methods, swig_pm3_Sf_SwigStatic_methods,
swig_device_Sf_SwigStatic_attributes, swig_pm3_Sf_SwigStatic_attributes,
swig_device_Sf_SwigStatic_constants, swig_pm3_Sf_SwigStatic_constants,
swig_device_Sf_SwigStatic_classes, swig_pm3_Sf_SwigStatic_classes,
0 0
}; };
static swig_lua_class *swig_device_bases[] = {0}; static swig_lua_class *swig_pm3_bases[] = {0};
static const char *swig_device_base_names[] = {0}; static const char *swig_pm3_base_names[] = {0};
static swig_lua_class _wrap_class_device = { "device", "device", &SWIGTYPE_p_pm3_device,_proxy__wrap_new_device, swig_delete_device, swig_device_methods, swig_device_attributes, &swig_device_Sf_SwigStatic, swig_device_meta, swig_device_bases, swig_device_base_names }; static swig_lua_class _wrap_class_pm3 = { "pm3", "pm3", &SWIGTYPE_p_pm3,_proxy__wrap_new_pm3, swig_delete_pm3, swig_pm3_methods, swig_pm3_attributes, &swig_pm3_Sf_SwigStatic, swig_pm3_meta, swig_pm3_bases, swig_pm3_base_names };
static swig_lua_attribute swig_SwigModule_attributes[] = { static swig_lua_attribute swig_SwigModule_attributes[] = {
{0,0,0} {0,0,0}
@ -2892,7 +2892,7 @@ static swig_lua_method swig_SwigModule_methods[]= {
{0,0} {0,0}
}; };
static swig_lua_class* swig_SwigModule_classes[]= { static swig_lua_class* swig_SwigModule_classes[]= {
&_wrap_class_device, &_wrap_class_pm3,
0 0
}; };
static swig_lua_namespace* swig_SwigModule_namespaces[] = { static swig_lua_namespace* swig_SwigModule_namespaces[] = {
@ -2913,16 +2913,16 @@ static swig_lua_namespace swig_SwigModule = {
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
static swig_type_info _swigt__p_pm3_device = {"_p_pm3_device", "pm3_device *", 0, 0, (void*)&_wrap_class_device, 0}; static swig_type_info _swigt__p_pm3 = {"_p_pm3", "pm3 *", 0, 0, (void*)&_wrap_class_pm3, 0};
static swig_type_info *swig_type_initial[] = { static swig_type_info *swig_type_initial[] = {
&_swigt__p_pm3_device, &_swigt__p_pm3,
}; };
static swig_cast_info _swigc__p_pm3_device[] = { {&_swigt__p_pm3_device, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_pm3[] = { {&_swigt__p_pm3, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info *swig_cast_initial[] = { static swig_cast_info *swig_cast_initial[] = {
_swigc__p_pm3_device, _swigc__p_pm3,
}; };

118
client/src/pm3_pywrap.c
View file

@ -2634,7 +2634,7 @@ SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyO
/* -------- TYPES TABLE (BEGIN) -------- */ /* -------- TYPES TABLE (BEGIN) -------- */
#define SWIGTYPE_p_char swig_types[0] #define SWIGTYPE_p_char swig_types[0]
#define SWIGTYPE_p_pm3_device swig_types[1] #define SWIGTYPE_p_pm3 swig_types[1]
static swig_type_info *swig_types[3]; static swig_type_info *swig_types[3];
static swig_module_info swig_module = {swig_types, 2, 0, 0, 0, 0}; static swig_module_info swig_module = {swig_types, 2, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
@ -2671,9 +2671,9 @@ static swig_module_info swig_module = {swig_types, 2, 0, 0, 0, 0};
#include "pm3.h" #include "pm3.h"
#include "comms.h" #include "comms.h"
SWIGINTERN pm3_device *new_pm3_device__SWIG_0(void){ SWIGINTERN pm3 *new_pm3__SWIG_0(void){
printf("SWIG pm3_device constructor, get current pm3\n"); printf("SWIG pm3 constructor, get current pm3\n");
pm3_device * p = pm3_device_get_current_dev(); pm3_device * p = pm3_get_current_dev();
p->script_embedded = 1; p->script_embedded = 1;
return p; return p;
} }
@ -2800,18 +2800,18 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
SWIGINTERN pm3_device *new_pm3_device__SWIG_1(char *port){ SWIGINTERN pm3 *new_pm3__SWIG_1(char *port){
printf("SWIG pm3_device constructor with port, open pm3\n"); printf("SWIG pm3 constructor with port, open pm3\n");
pm3_device * p = pm3_open(port); pm3_device * p = pm3_open(port);
p->script_embedded = 0; p->script_embedded = 0;
return p; return p;
} }
SWIGINTERN void delete_pm3_device(pm3_device *self){ SWIGINTERN void delete_pm3(pm3 *self){
if (self->script_embedded) { if (self->script_embedded) {
printf("SWIG pm3_device destructor, nothing to do\n"); printf("SWIG pm3 destructor, nothing to do\n");
} else { } else {
printf("SWIG pm3_device destructor, close pm3\n"); printf("SWIG pm3 destructor, close pm3\n");
pm3_device_close(self); pm3_close(self);
} }
} }
@ -2856,35 +2856,35 @@ SWIG_FromCharPtr(const char *cptr)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
SWIGINTERN PyObject *_wrap_new_device__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { SWIGINTERN PyObject *_wrap_new_pm3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
pm3_device *result = 0 ; pm3 *result = 0 ;
if ((nobjs < 0) || (nobjs > 0)) SWIG_fail; if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
result = (pm3_device *)new_pm3_device__SWIG_0(); result = (pm3 *)new_pm3__SWIG_0();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pm3_device, SWIG_POINTER_NEW | 0 ); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pm3, SWIG_POINTER_NEW | 0 );
return resultobj; return resultobj;
fail: fail:
return NULL; return NULL;
} }
SWIGINTERN PyObject *_wrap_new_device__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { SWIGINTERN PyObject *_wrap_new_pm3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
char *arg1 = (char *) 0 ; char *arg1 = (char *) 0 ;
int res1 ; int res1 ;
char *buf1 = 0 ; char *buf1 = 0 ;
int alloc1 = 0 ; int alloc1 = 0 ;
pm3_device *result = 0 ; pm3 *result = 0 ;
if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
res1 = SWIG_AsCharPtrAndSize(swig_obj[0], &buf1, NULL, &alloc1); res1 = SWIG_AsCharPtrAndSize(swig_obj[0], &buf1, NULL, &alloc1);
if (!SWIG_IsOK(res1)) { if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_device" "', argument " "1"" of type '" "char *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_pm3" "', argument " "1"" of type '" "char *""'");
} }
arg1 = (char *)(buf1); arg1 = (char *)(buf1);
result = (pm3_device *)new_pm3_device__SWIG_1(arg1); result = (pm3 *)new_pm3__SWIG_1(arg1);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pm3_device, SWIG_POINTER_NEW | 0 ); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_pm3, SWIG_POINTER_NEW | 0 );
if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
return resultobj; return resultobj;
fail: fail:
@ -2893,50 +2893,50 @@ fail:
} }
SWIGINTERN PyObject *_wrap_new_device(PyObject *self, PyObject *args) { SWIGINTERN PyObject *_wrap_new_pm3(PyObject *self, PyObject *args) {
Py_ssize_t argc; Py_ssize_t argc;
PyObject *argv[2] = { PyObject *argv[2] = {
0 0
}; };
if (!(argc = SWIG_Python_UnpackTuple(args, "new_device", 0, 1, argv))) SWIG_fail; if (!(argc = SWIG_Python_UnpackTuple(args, "new_pm3", 0, 1, argv))) SWIG_fail;
--argc; --argc;
if (argc == 0) { if (argc == 0) {
return _wrap_new_device__SWIG_0(self, argc, argv); return _wrap_new_pm3__SWIG_0(self, argc, argv);
} }
if (argc == 1) { if (argc == 1) {
int _v; int _v;
int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0); int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
_v = SWIG_CheckState(res); _v = SWIG_CheckState(res);
if (_v) { if (_v) {
return _wrap_new_device__SWIG_1(self, argc, argv); return _wrap_new_pm3__SWIG_1(self, argc, argv);
} }
} }
fail: fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_device'.\n" SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_pm3'.\n"
" Possible C/C++ prototypes are:\n" " Possible C/C++ prototypes are:\n"
" pm3_device::pm3_device()\n" " pm3::pm3()\n"
" pm3_device::pm3_device(char *)\n"); " pm3::pm3(char *)\n");
return 0; return 0;
} }
SWIGINTERN PyObject *_wrap_delete_device(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_delete_pm3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
pm3_device *arg1 = (pm3_device *) 0 ; pm3 *arg1 = (pm3 *) 0 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
PyObject *swig_obj[1] ; PyObject *swig_obj[1] ;
if (!args) SWIG_fail; if (!args) SWIG_fail;
swig_obj[0] = args; swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_pm3_device, SWIG_POINTER_DISOWN | 0 ); res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_pm3, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) { if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_device" "', argument " "1"" of type '" "pm3_device *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_pm3" "', argument " "1"" of type '" "pm3 *""'");
} }
arg1 = (pm3_device *)(argp1); arg1 = (pm3 *)(argp1);
delete_pm3_device(arg1); delete_pm3(arg1);
resultobj = SWIG_Py_Void(); resultobj = SWIG_Py_Void();
return resultobj; return resultobj;
fail: fail:
@ -2944,9 +2944,9 @@ fail:
} }
SWIGINTERN PyObject *_wrap_device_console(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_pm3_console(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
pm3_device *arg1 = (pm3_device *) 0 ; pm3 *arg1 = (pm3 *) 0 ;
char *arg2 = (char *) 0 ; char *arg2 = (char *) 0 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
@ -2956,18 +2956,18 @@ SWIGINTERN PyObject *_wrap_device_console(PyObject *SWIGUNUSEDPARM(self), PyObje
PyObject *swig_obj[2] ; PyObject *swig_obj[2] ;
int result; int result;
if (!SWIG_Python_UnpackTuple(args, "device_console", 2, 2, swig_obj)) SWIG_fail; if (!SWIG_Python_UnpackTuple(args, "pm3_console", 2, 2, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_pm3_device, 0 | 0 ); res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_pm3, 0 | 0 );
if (!SWIG_IsOK(res1)) { if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "device_console" "', argument " "1"" of type '" "pm3_device *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pm3_console" "', argument " "1"" of type '" "pm3 *""'");
} }
arg1 = (pm3_device *)(argp1); arg1 = (pm3 *)(argp1);
res2 = SWIG_AsCharPtrAndSize(swig_obj[1], &buf2, NULL, &alloc2); res2 = SWIG_AsCharPtrAndSize(swig_obj[1], &buf2, NULL, &alloc2);
if (!SWIG_IsOK(res2)) { if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "device_console" "', argument " "2"" of type '" "char *""'"); SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "pm3_console" "', argument " "2"" of type '" "char *""'");
} }
arg2 = (char *)(buf2); arg2 = (char *)(buf2);
result = (int)pm3_device_console(arg1,arg2); result = (int)pm3_console(arg1,arg2);
resultobj = SWIG_From_int((int)(result)); resultobj = SWIG_From_int((int)(result));
if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
return resultobj; return resultobj;
@ -2977,9 +2977,9 @@ fail:
} }
SWIGINTERN PyObject *_wrap_device_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_pm3_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
pm3_device *arg1 = (pm3_device *) 0 ; pm3 *arg1 = (pm3 *) 0 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
PyObject *swig_obj[1] ; PyObject *swig_obj[1] ;
@ -2987,12 +2987,12 @@ SWIGINTERN PyObject *_wrap_device_name_get(PyObject *SWIGUNUSEDPARM(self), PyObj
if (!args) SWIG_fail; if (!args) SWIG_fail;
swig_obj[0] = args; swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_pm3_device, 0 | 0 ); res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_pm3, 0 | 0 );
if (!SWIG_IsOK(res1)) { if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "device_name_get" "', argument " "1"" of type '" "pm3_device *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pm3_name_get" "', argument " "1"" of type '" "pm3 *""'");
} }
arg1 = (pm3_device *)(argp1); arg1 = (pm3 *)(argp1);
result = (char *)pm3_device_name_get(arg1); result = (char *)pm3_name_get(arg1);
resultobj = SWIG_FromCharPtr((const char *)result); resultobj = SWIG_FromCharPtr((const char *)result);
return resultobj; return resultobj;
fail: fail:
@ -3000,25 +3000,25 @@ fail:
} }
SWIGINTERN PyObject *device_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *pm3_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj; PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL; if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_pm3_device, SWIG_NewClientData(obj)); SWIG_TypeNewClientData(SWIGTYPE_p_pm3, SWIG_NewClientData(obj));
return SWIG_Py_Void(); return SWIG_Py_Void();
} }
SWIGINTERN PyObject *device_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *pm3_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args); return SWIG_Python_InitShadowInstance(args);
} }
static PyMethodDef SwigMethods[] = { static PyMethodDef SwigMethods[] = {
{ "SWIG_PyInstanceMethod_New", SWIG_PyInstanceMethod_New, METH_O, NULL}, { "SWIG_PyInstanceMethod_New", SWIG_PyInstanceMethod_New, METH_O, NULL},
{ "new_device", _wrap_new_device, METH_VARARGS, NULL}, { "new_pm3", _wrap_new_pm3, METH_VARARGS, NULL},
{ "delete_device", _wrap_delete_device, METH_O, NULL}, { "delete_pm3", _wrap_delete_pm3, METH_O, NULL},
{ "device_console", _wrap_device_console, METH_VARARGS, NULL}, { "pm3_console", _wrap_pm3_console, METH_VARARGS, NULL},
{ "device_name_get", _wrap_device_name_get, METH_O, NULL}, { "pm3_name_get", _wrap_pm3_name_get, METH_O, NULL},
{ "device_swigregister", device_swigregister, METH_O, NULL}, { "pm3_swigregister", pm3_swigregister, METH_O, NULL},
{ "device_swiginit", device_swiginit, METH_VARARGS, NULL}, { "pm3_swiginit", pm3_swiginit, METH_VARARGS, NULL},
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL }
}; };
@ -3030,19 +3030,19 @@ static PyMethodDef SwigMethods_proxydocs[] = {
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_pm3_device = {"_p_pm3_device", "pm3_device *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_pm3 = {"_p_pm3", "pm3 *", 0, 0, (void*)0, 0};
static swig_type_info *swig_type_initial[] = { static swig_type_info *swig_type_initial[] = {
&_swigt__p_char, &_swigt__p_char,
&_swigt__p_pm3_device, &_swigt__p_pm3,
}; };
static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_pm3_device[] = { {&_swigt__p_pm3_device, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_pm3[] = { {&_swigt__p_pm3, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info *swig_cast_initial[] = { static swig_cast_info *swig_cast_initial[] = {
_swigc__p_char, _swigc__p_char,
_swigc__p_pm3_device, _swigc__p_pm3,
}; };

8
client/src/proxmark3.c
View file

@ -727,7 +727,7 @@ pm3_device* pm3_open(char *port) {
return session.current_device; return session.current_device;
} }
void pm3_device_close(pm3_device* dev) { void pm3_close(pm3_device* dev) {
// For now, there is no real device context: // For now, there is no real device context:
(void) dev; (void) dev;
// Clean up the port // Clean up the port
@ -739,17 +739,17 @@ void pm3_device_close(pm3_device* dev) {
} }
} }
int pm3_device_console(pm3_device* dev, char *Cmd) { int pm3_console(pm3_device* dev, char *Cmd) {
// For now, there is no real device context: // For now, there is no real device context:
(void) dev; (void) dev;
return CommandReceived(Cmd); return CommandReceived(Cmd);
} }
const char *pm3_device_name_get(pm3_device* dev) { const char *pm3_name_get(pm3_device* dev) {
return dev->conn->serial_port_name; return dev->conn->serial_port_name;
} }
pm3_device* pm3_device_get_current_dev(void) { pm3_device* pm3_get_current_dev(void) {
return session.current_device; return session.current_device;
} }
/* ======================================================= */ /* ======================================================= */