Rename jtag_add_end_state to jtag_set_end_state since "add" implies that

[openocd.git] / src / pld / pld.c

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 7325a209a815c1056356928e2665ef2d9f333886..6da105b3c671fedf5d1bf0f2e562ba4ff6c6d8cd 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -21,24 +21,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "pld.h"
-
-#include "jtag.h"
-#include "command.h"
 #include "log.h"
 #include "time_support.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <sys/time.h>
-#include <time.h>
 
 /* pld drivers
  */
@@ -192,7 +178,7 @@ int handle_pld_load_command(struct command_context_s *cmd_ctx, char *cmd, char *
        
        if ((retval = p->driver->load(p, args[1])) != ERROR_OK)
        {
-               command_print(cmd_ctx, "failed loading file %s to pld device %i",
+               command_print(cmd_ctx, "failed loading file %s to pld device %lu",
                        args[1], strtoul(args[0], NULL, 0));
                switch (retval)
                {
@@ -202,9 +188,10 @@ int handle_pld_load_command(struct command_context_s *cmd_ctx, char *cmd, char *
        {
                gettimeofday(&end, NULL);       
                timeval_subtract(&duration, &end, &start);
-               
-               command_print(cmd_ctx, "loaded file %s to pld device %i in %is %ius", 
-                       args[1], strtoul(args[0], NULL, 0), duration.tv_sec, duration.tv_usec);
+
+               command_print(cmd_ctx, "loaded file %s to pld device %lu in %jis %jius",
+                       args[1], strtoul(args[0], NULL, 0),
+                       (intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec);
        }
        
        return ERROR_OK;