X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fpld%2Fpld.h;h=3178fd459775f58e2066e794fbe0c8b590eb9d7a;hb=d496da2c20e579f0f8af09928049bfb04d328190;hp=2b88d9dae5fcd2bf9818a882e8e3f05bc55c94e5;hpb=db2086897a581111bb86a0fb49d72b776a9801a9;p=openocd.git
diff --git a/src/pld/pld.h b/src/pld/pld.h
index 2b88d9dae5..3178fd4597 100644
--- a/src/pld/pld.h
+++ b/src/pld/pld.h
@@ -13,44 +13,40 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see . *
***************************************************************************/
-#ifndef PLD_H
-#define PLD_H
-#include "command.h"
+#ifndef OPENOCD_PLD_PLD_H
+#define OPENOCD_PLD_PLD_H
-struct pld_device_s;
+#include
+
+struct pld_device;
#define __PLD_DEVICE_COMMAND(name) \
- COMMAND_HELPER(name, struct pld_device_s *pld)
+ COMMAND_HELPER(name, struct pld_device *pld)
-struct pld_driver
-{
- char *name;
+struct pld_driver {
+ 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);
+ 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)
+#define PLD_DEVICE_COMMAND_HANDLER(name) \
+ static __PLD_DEVICE_COMMAND(name)
-typedef struct pld_device_s
-{
+struct pld_device {
struct pld_driver *driver;
void *driver_priv;
- struct pld_device_s *next;
-} pld_device_t;
-
-int pld_register_commands(struct command_context_s *cmd_ctx);
+ struct pld_device *next;
+};
-int pld_init(struct command_context_s *cmd_ctx);
+int pld_register_commands(struct command_context *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)
+#define ERROR_PLD_DEVICE_INVALID (-1000)
+#define ERROR_PLD_FILE_LOAD_FAILED (-1001)
-#endif /* PLD_H */
+#endif /* OPENOCD_PLD_PLD_H */