Factoring of jtag_examine_chain for maintainability:

[openocd] / src / pld / pld.c

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 6f08ee1983a964e99f2f398461cce3c1e46ac9f0..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
  */
@@ -95,7 +81,7 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
                
        if (argc < 1)
        {
-               WARNING("incomplete 'pld bank' configuration");
+               LOG_WARNING("incomplete 'pld bank' configuration");
                return ERROR_OK;
        }
        
@@ -108,7 +94,7 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
                        /* register pld specific commands */
                        if (pld_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
                        {
-                               ERROR("couldn't register '%s' commands", args[0]);
+                               LOG_ERROR("couldn't register '%s' commands", args[0]);
                                exit(-1);
                        }
                        
@@ -118,7 +104,7 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
                        
                        if (pld_drivers[i]->pld_device_command(cmd_ctx, cmd, args, argc, c) != ERROR_OK)
                        {
-                               ERROR("'%s' driver rejected pld device", args[0]);
+                               LOG_ERROR("'%s' driver rejected pld device", args[0]);
                                free(c);
                                return ERROR_OK;
                        }
@@ -143,7 +129,7 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
        /* no matching pld driver found */
        if (!found)
        {
-               ERROR("pld driver '%s' not found", args[0]);
+               LOG_ERROR("pld driver '%s' not found", args[0]);
                exit(-1);
        }
        
@@ -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;