remove TAP_SCAN_BYTES macro

[openocd.git] / src / jtag / minidriver.h

diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h
index 57d1d6e91a4bb0aec58269d949922d743f64bf6b..392a1906eec8272ee347f0ec824ed4a49c8b0273 100644 (file)
--- a/src/jtag/minidriver.h
+++ b/src/jtag/minidriver.h
@@ -48,17 +48,17 @@
 
 #include "jtag_minidriver.h"
 
-static inline void interface_jtag_alloc_in_value32(scan_field_t *field)
+static inline void interface_jtag_alloc_in_value32(struct scan_field *field)
 {
        field->in_value = field->intmp;
 }
 
-static inline void interface_jtag_add_scan_check_alloc(scan_field_t *field)
+static inline void interface_jtag_add_scan_check_alloc(struct scan_field *field)
 {
        /* We're executing this synchronously, so try to use local storage. */
        if (field->num_bits > 32)
        {
-               unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
+               unsigned num_bytes = DIV_ROUND_UP(field->num_bits, 8);
                field->in_value = (uint8_t *)malloc(num_bytes);
                field->allocated = 1;
        }
@@ -70,18 +70,18 @@ static inline void interface_jtag_add_scan_check_alloc(scan_field_t *field)
 
 #include "commands.h"
 
-static inline void interface_jtag_alloc_in_value32(scan_field_t *field)
+static inline void interface_jtag_alloc_in_value32(struct scan_field *field)
 {
        field->in_value = (uint8_t *)cmd_queue_alloc(4);
 }
 
-static inline void interface_jtag_add_scan_check_alloc(scan_field_t *field)
+static inline void interface_jtag_add_scan_check_alloc(struct scan_field *field)
 {
-       unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
+       unsigned num_bytes = DIV_ROUND_UP(field->num_bits, 8);
        field->in_value = (uint8_t *)cmd_queue_alloc(num_bytes);
 }
 
-void interface_jtag_add_dr_out(jtag_tap_t* tap,
+void interface_jtag_add_dr_out(struct jtag_tap* tap,
                int num_fields, const int* num_bits, const uint32_t* value,
                tap_state_t end_state);
 
@@ -94,17 +94,17 @@ void interface_jtag_add_callback4(jtag_callback_t f, jtag_callback_data_t data0,
 #endif
 
 int interface_jtag_add_ir_scan(
-               int num_fields, const scan_field_t* fields,
+               int num_fields, const struct scan_field* fields,
                tap_state_t endstate);
 int interface_jtag_add_plain_ir_scan(
-               int num_fields, const scan_field_t* fields,
+               int num_fields, const struct scan_field* fields,
                tap_state_t endstate);
 
 int interface_jtag_add_dr_scan(
-               int num_fields, const scan_field_t* fields,
+               int num_fields, const struct scan_field* fields,
                tap_state_t endstate);
 int interface_jtag_add_plain_dr_scan(
-               int num_fields, const scan_field_t* fields,
+               int num_fields, const struct scan_field* fields,
                tap_state_t endstate);
 
 int interface_jtag_add_tlr(void);