Remove support for the GPL incompatible FTDI D2XX library

[openocd.git] / src / helper / jim-nvp.h

diff --git a/src/helper/jim-nvp.h b/src/helper/jim-nvp.h
index 4428f5d2fc62bfe255fe21b52fc002ecc89ec6b7..7b4a491d3320831ee1b8d7c490cfb9445de8ec5a 100644 (file)
--- a/src/helper/jim-nvp.h
+++ b/src/helper/jim-nvp.h
@@ -41,8 +41,8 @@
  * official policies, either expressed or implied, of the Jim Tcl Project.
  */
 
-#ifndef JIM_NVP_H
-#define JIM_NVP_H
+#ifndef OPENOCD_HELPER_JIM_NVP_H
+#define OPENOCD_HELPER_JIM_NVP_H
 
 #include <jim.h>
 
@@ -83,34 +83,47 @@
  */
 typedef struct {
        const char *name;
-       int         value;
+       int value;
 } Jim_Nvp;
 
-
-int Jim_GetNvp (Jim_Interp *interp,
-                                                                       Jim_Obj *objPtr,
-                                                                       const Jim_Nvp *nvp_table,
-                                                                       const Jim_Nvp **result);
+int Jim_GetNvp(Jim_Interp *interp,
+               Jim_Obj *objPtr,
+               const Jim_Nvp *nvp_table,
+               const Jim_Nvp **result);
 
 /* Name Value Pairs Operations */
 Jim_Nvp *Jim_Nvp_name2value_simple(const Jim_Nvp *nvp_table, const char *name);
 Jim_Nvp *Jim_Nvp_name2value_nocase_simple(const Jim_Nvp *nvp_table, const char *name);
 Jim_Nvp *Jim_Nvp_value2name_simple(const Jim_Nvp *nvp_table, int v);
 
-int Jim_Nvp_name2value(Jim_Interp *interp, const Jim_Nvp *nvp_table, const char *name, Jim_Nvp **result);
-int Jim_Nvp_name2value_nocase(Jim_Interp *interp, const Jim_Nvp *nvp_table, const char *name, Jim_Nvp **result);
+int Jim_Nvp_name2value(Jim_Interp *interp,
+               const Jim_Nvp *nvp_table,
+               const char *name,
+               Jim_Nvp **result);
+int Jim_Nvp_name2value_nocase(Jim_Interp *interp,
+               const Jim_Nvp *nvp_table,
+               const char *name,
+               Jim_Nvp **result);
 int Jim_Nvp_value2name(Jim_Interp *interp, const Jim_Nvp *nvp_table, int value, Jim_Nvp **result);
 
-int Jim_Nvp_name2value_obj(Jim_Interp *interp, const Jim_Nvp *nvp_table, Jim_Obj *name_obj, Jim_Nvp **result);
-int Jim_Nvp_name2value_obj_nocase(Jim_Interp *interp, const Jim_Nvp *nvp_table, Jim_Obj *name_obj, Jim_Nvp **result);
-int Jim_Nvp_value2name_obj(Jim_Interp *interp, const Jim_Nvp *nvp_table, Jim_Obj *value_obj, Jim_Nvp **result);
+int Jim_Nvp_name2value_obj(Jim_Interp *interp,
+               const Jim_Nvp *nvp_table,
+               Jim_Obj *name_obj,
+               Jim_Nvp **result);
+int Jim_Nvp_name2value_obj_nocase(Jim_Interp *interp,
+               const Jim_Nvp *nvp_table,
+               Jim_Obj *name_obj,
+               Jim_Nvp **result);
+int Jim_Nvp_value2name_obj(Jim_Interp *interp,
+               const Jim_Nvp *nvp_table,
+               Jim_Obj *value_obj,
+               Jim_Nvp **result);
 
 /** prints a nice 'unknown' parameter error message to the 'result' */
 void Jim_SetResult_NvpUnknown(Jim_Interp *interp,
-                                                                                                  Jim_Obj *param_name,
-                                                                                                  Jim_Obj *param_value,
-                                                                                                  const Jim_Nvp *nvp_table);
-
+               Jim_Obj *param_name,
+               Jim_Obj *param_value,
+               const Jim_Nvp *nvp_table);
 
 /** Debug: convert argc/argv into a printable string for printf() debug
  *
@@ -145,10 +158,10 @@ const char *Jim_Debug_ArgvString(Jim_Interp *interp, int argc, Jim_Obj *const *a
  */
 
 typedef struct jim_getopt {
-       Jim_Interp     *interp;
-       int            argc;
-       Jim_Obj        * const * argv;
-       int            isconfigure; /* non-zero if configure */
+       Jim_Interp *interp;
+       int argc;
+       Jim_Obj *const *argv;
+       int isconfigure;                /* non-zero if configure */
 } Jim_GetOptInfo;
 
 /** GetOpt - how to.
@@ -208,9 +221,9 @@ typedef struct jim_getopt {
  */
 
 int Jim_GetOpt_Setup(Jim_GetOptInfo *goi,
-                                                                                       Jim_Interp *interp,
-                                                                                       int argc,
-                                                                                       Jim_Obj * const *  argv);
+               Jim_Interp *interp,
+               int argc,
+               Jim_Obj *const *argv);
 
 
 /** Debug - Dump parameters to stderr
@@ -218,8 +231,6 @@ int Jim_GetOpt_Setup(Jim_GetOptInfo *goi,
  */
 void Jim_GetOpt_Debug(Jim_GetOptInfo *goi);
 
-
-
 /** Remove argv[0] from the list.
  *
  * \param goi - get opt info
@@ -234,7 +245,7 @@ int Jim_GetOpt_Obj(Jim_GetOptInfo *goi, Jim_Obj **puthere);
  * \param puthere - where param is put
  * \param len     - return its length
  */
-int Jim_GetOpt_String(Jim_GetOptInfo *goi, char **puthere, int *len);
+int Jim_GetOpt_String(Jim_GetOptInfo *goi, const char **puthere, int *len);
 
 /** Remove argv[0] as double.
  *
@@ -313,6 +324,6 @@ void Jim_GetOpt_NvpUnknown(Jim_GetOptInfo *goi, const Jim_Nvp *lookup, int hadpr
  * \param puthere - where param is put.
  *
  */
-int Jim_GetOpt_Enum(Jim_GetOptInfo *goi, const char * const *  lookup, int *puthere);
+int Jim_GetOpt_Enum(Jim_GetOptInfo *goi, const char *const *lookup, int *puthere);
 
-#endif
+#endif /* OPENOCD_HELPER_JIM_NVP_H */