X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fjtag.h;h=5328ff81861e4d9ac918d81c6518e6e9e9c96dc1;hp=e3f81489682ec7de27639f1444732d2a4531b036;hb=a94748ec6da9bdc6e25a7f73bbea723b8b55fa33;hpb=5874d5f2ea2ef9bd7d759d47ed868269ba99ab65

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index e3f8148968..5328ff8186 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -47,7 +47,7 @@
 #define DIM(x)					(sizeof(x)/sizeof((x)[0]))
 
 /** Calculate the number of bytes required to hold @a n TAP scan bits */
-#define TAP_SCAN_BYTES(n)		CEIL(n, 8)
+#define TAP_SCAN_BYTES(n)		DIV_ROUND_UP(n, 8)
 
 /*-----</Macros>-------------------------------------------------*/
 
@@ -315,7 +315,7 @@ bool jtag_will_verify_capture_ir(void);
  * Initialize interface upon startup.  Return a successful no-op upon
  * subsequent invocations.
  */
-int  jtag_interface_init(struct command_context_s* cmd_ctx);
+int  jtag_interface_init(struct command_context* cmd_ctx);
 
 /// Shutdown the JTAG interface upon program exit.
 int  jtag_interface_quit(void);
@@ -324,12 +324,12 @@ int  jtag_interface_quit(void);
  * Initialize JTAG chain using only a RESET reset. If init fails,
  * try reset + init.
  */
-int  jtag_init(struct command_context_s* cmd_ctx);
+int  jtag_init(struct command_context* cmd_ctx);
 
 /// reset, then initialize JTAG chain
-int jtag_init_reset(struct command_context_s* cmd_ctx);
-int jtag_register_commands(struct command_context_s* cmd_ctx);
-int jtag_init_inner(struct command_context_s *cmd_ctx);
+int jtag_init_reset(struct command_context* cmd_ctx);
+int jtag_register_commands(struct command_context* cmd_ctx);
+int jtag_init_inner(struct command_context *cmd_ctx);
 
 /**
  * @file