openocd: properly use jim data types

The jim library exports all the data types through typedef, so
there is no need to use the internal struct types.

Fix the few remaining inconsistencies in the code.

Change-Id: Id4ae0083563ea7a371833374e7b39f17158f66a4
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5662
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Tested-by: jenkins

diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index 22123482869566e56763c1c64daa29fab68efc8d..ff0fb9286c7db46628bb800c06cae3fcbb0c9570 100644 (file)
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -121,7 +121,7 @@ int rtos_create(Jim_GetOptInfo *goi, struct target *target)
 {
        int x;
        const char *cp;
-       struct Jim_Obj *res;
+       Jim_Obj *res;
        int e;
 
        if (!goi->isconfigure && goi->argc != 0) {

diff --git a/src/target/target.c b/src/target/target.c
index b0deadb0b034c19f54fa55f4d6825389e49127e9..c0953a3f1ca666eebc4deec6bf75f6eb0308579a 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -5011,7 +5011,7 @@ static int jim_target_examine(Jim_Interp *interp, int argc, Jim_Obj *const *argv
        if (goi.argc > 0 &&
            strcmp(Jim_GetString(argv[1], NULL), "allow-defer") == 0) {
                /* consume it */
-               struct Jim_Obj *obj;
+               Jim_Obj *obj;
                int e = Jim_GetOpt_Obj(&goi, &obj);
                if (e != JIM_OK)
                        return e;

diff --git a/src/target/target.h b/src/target/target.h
index fc150442d4f01d88a0e173c3dcc4721595c8b0b6..c69aa934a60898dd2e7c0a393824bb1bf5d4163f 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -32,6 +32,7 @@
 #define OPENOCD_TARGET_TARGET_H
 
 #include <helper/list.h>
+#include <jim.h>
 
 struct reg;
 struct trace;
@@ -293,8 +294,8 @@ enum target_event {
 
 struct target_event_action {
        enum target_event event;
-       struct Jim_Interp *interp;
-       struct Jim_Obj *body;
+       Jim_Interp *interp;
+       Jim_Obj *body;
        struct target_event_action *next;
 };