After moved the code, align the include files.
Change-Id: I514a3020648816810d69f76c2ec4f6e52a1c57ab
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6643
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
#include <stddef.h>
#include <stdint.h>
+struct command_context;
+
+/** Initialize debug adapter upon startup. */
+int adapter_init(struct command_context *cmd_ctx);
+
+/** Shutdown the debug adapter upon program exit. */
+int adapter_quit(void);
+
/** @returns true if adapter has been initialized */
bool is_adapter_initialized(void);
/** @returns true if USB location string is "<dev_bus>-<port_path[0]>[.<port_path[1]>[...]]" */
bool adapter_usb_location_equal(uint8_t dev_bus, uint8_t *port_path, size_t path_len);
+/** @returns The current JTAG speed setting. */
+int jtag_get_speed(int *speed);
+
+/**
+ * Given a @a speed setting, use the interface @c speed_div callback to
+ * adjust the setting.
+ * @param speed The speed setting to convert back to readable KHz.
+ * @returns ERROR_OK if the interface has not been initialized or on success;
+ * otherwise, the error code produced by the @c speed_div callback.
+ */
+int jtag_get_speed_readable(int *speed);
+
+/** Attempt to configure the interface for the specified KHz. */
+int jtag_config_khz(unsigned khz);
+
+/**
+ * Attempt to enable RTCK/RCLK. If that fails, fallback to the
+ * specified frequency.
+ */
+int jtag_config_rclk(unsigned fallback_speed_khz);
+
+/** Retrieves the clock speed of the JTAG interface in KHz. */
+unsigned jtag_get_speed_khz(void);
+
#endif /* OPENOCD_JTAG_ADAPTER_H */
#include "config.h"
#endif
+#include <jtag/adapter.h>
#include <jtag/interface.h>
#if PARPORT_USE_PPDEV == 1
#include <transport/transport.h>
#include "helper/replacements.h"
+#include <jtag/adapter.h>
#include <jtag/swd.h>
#include <jtag/interface.h>
#include <jtag/commands.h>
#include "config.h"
#endif
+#include <jtag/adapter.h>
#include <jtag/interface.h>
#include "bitbang.h"
#include "config.h"
#endif
+#include <jtag/adapter.h>
#include <jtag/interface.h>
#include <jtag/commands.h>
#include <jtag/swd.h>
int jtag_call_event_callbacks(enum jtag_event event);
-
-/** @returns The current JTAG speed setting. */
-int jtag_get_speed(int *speed);
-
-/**
- * Given a @a speed setting, use the interface @c speed_div callback to
- * adjust the setting.
- * @param speed The speed setting to convert back to readable KHz.
- * @returns ERROR_OK if the interface has not been initialized or on success;
- * otherwise, the error code produced by the @c speed_div callback.
- */
-int jtag_get_speed_readable(int *speed);
-
-/** Attempt to configure the interface for the specified KHz. */
-int jtag_config_khz(unsigned khz);
-
-/**
- * Attempt to enable RTCK/RCLK. If that fails, fallback to the
- * specified frequency.
- */
-int jtag_config_rclk(unsigned fallback_speed_khz);
-
-/** Retrieves the clock speed of the JTAG interface in KHz. */
-unsigned jtag_get_speed_khz(void);
-
enum reset_types {
RESET_NONE = 0x0,
RESET_HAS_TRST = 0x1,
/** @returns True if IR scan verification will be performed. */
bool jtag_will_verify_capture_ir(void);
-/** Initialize debug adapter upon startup. */
-int adapter_init(struct command_context *cmd_ctx);
-
-/** Shutdown the debug adapter upon program exit. */
-int adapter_quit(void);
-
/** Set ms to sleep after jtag_execute_queue() flushes queue. Debug purposes. */
void jtag_set_flush_queue_sleep(int ms);
#include "config.h"
#endif
+#include "adapter.h"
#include "jtag.h"
#include "swd.h"
#include "minidriver.h"
#endif
#include "openocd.h"
+#include <jtag/adapter.h>
#include <jtag/driver.h>
#include <jtag/jtag.h>
#include <transport/transport.h>
#include <helper/align.h>
#include <helper/time_support.h>
+#include <jtag/adapter.h>
#include "mips32.h"
#include "mips32_pracc.h"
#include "mips64_pracc.h"
#include <helper/time_support.h>
+#include <jtag/adapter.h>
#define STACK_DEPTH 32