Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option

[openocd.git] / src / jtag / drivers / minidriver_imp.h

diff --git a/src/jtag/drivers/minidriver_imp.h b/src/jtag/drivers/minidriver_imp.h
index 1efd2428b0fb05cca28f882232a0c28e20e3562a..cd59a74fb5b1413577289ca2a7b8758d9d478394 100644 (file)
--- a/src/jtag/drivers/minidriver_imp.h
+++ b/src/jtag/drivers/minidriver_imp.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath <Dominic.Rath@gmx.de>              *
- *   Copyright (C) 2007,2008 Øyvind Harboe <oyvind.harboe@zylin.com>       *
+ *   Copyright (C) 2007-2009 Øyvind Harboe <oyvind.harboe@zylin.com>       *
  *   Copyright (C) 2009 Zachary T Welch <zw@superlucidity.net>             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -14,34 +14,28 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef MINIDRIVER_IMP_H
-#define MINIDRIVER_IMP_H
 
-#include <jtag/commands.h>
+#ifndef OPENOCD_JTAG_DRIVERS_MINIDRIVER_IMP_H
+#define OPENOCD_JTAG_DRIVERS_MINIDRIVER_IMP_H
 
-static inline void interface_jtag_alloc_in_value32(struct scan_field *field)
-{
-       field->in_value = (uint8_t *)cmd_queue_alloc(4);
-}
+#include <jtag/commands.h>
 
 static inline void interface_jtag_add_scan_check_alloc(struct scan_field *field)
 {
        unsigned num_bytes = DIV_ROUND_UP(field->num_bits, 8);
-       field->in_value = (uint8_t *)cmd_queue_alloc(num_bytes);
+       field->in_value = cmd_queue_alloc(num_bytes);
 }
 
-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);
-
 void interface_jtag_add_callback(jtag_callback1_t f, jtag_callback_data_t data0);
 
 void interface_jtag_add_callback4(jtag_callback_t f, jtag_callback_data_t data0,
-               jtag_callback_data_t data1, jtag_callback_data_t data2,
-               jtag_callback_data_t data3);
+                                 jtag_callback_data_t data1, jtag_callback_data_t data2,
+                                 jtag_callback_data_t data3);
+
+void jtag_add_callback4(jtag_callback_t f, jtag_callback_data_t data0,
+                       jtag_callback_data_t data1, jtag_callback_data_t data2,
+                       jtag_callback_data_t data3);
 
-#endif // MINIDRIVER_IMP_H
+#endif /* OPENOCD_JTAG_DRIVERS_MINIDRIVER_IMP_H */