Change return value on error.

[fw/openocd] / src / pld / pld.h

diff --git a/src/pld/pld.h b/src/pld/pld.h
index 22f2c137714d0643f3c7cbc1f2260d7a052c4eb4..3c7e4ffba8283e01baf53dd876c571fbac6dad3e 100644 (file)
--- a/src/pld/pld.h
+++ b/src/pld/pld.h
@@ -20,35 +20,33 @@
 #ifndef PLD_H
 #define PLD_H
 
-#include "command.h"
+#include <helper/command.h>
 
-struct pld_device_s;
+struct pld_device;
 
 #define __PLD_DEVICE_COMMAND(name) \
-               COMMAND_HELPER(name, struct pld_device_s *pld)
+               COMMAND_HELPER(name, struct pld_device *pld)
 
-typedef struct pld_driver_s
+struct pld_driver
 {
-       char *name;
+       const char *name;
        __PLD_DEVICE_COMMAND((*pld_device_command));
-       int (*register_commands)(struct command_context_s *cmd_ctx);
-       int (*load)(struct pld_device_s *pld_device, const char *filename);
-} pld_driver_t;
+       const struct command_registration *commands;
+       int (*load)(struct pld_device *pld_device, const char *filename);
+};
 
 #define PLD_DEVICE_COMMAND_HANDLER(name) static __PLD_DEVICE_COMMAND(name)
 
-typedef struct pld_device_s
+struct pld_device
 {
-       pld_driver_t *driver;
+       struct pld_driver *driver;
        void *driver_priv;
-       struct pld_device_s *next;
-} pld_device_t;
+       struct pld_device *next;
+};
 
-int pld_register_commands(struct command_context_s *cmd_ctx);
+int pld_register_commands(struct command_context *cmd_ctx);
 
-int pld_init(struct command_context_s *cmd_ctx);
-
-pld_device_t *get_pld_device_by_num(int num);
+struct pld_device *get_pld_device_by_num(int num);
 
 #define ERROR_PLD_DEVICE_INVALID       (-1000)
 #define ERROR_PLD_FILE_LOAD_FAILED     (-1001)