Make #include guard naming consistent

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

diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h
index 810bb0e503d82ffe9d4a2792da83c33f604f0244..688c396309b455a8d3da2abc1bfc1fac75550cdb 100644 (file)
--- a/src/jtag/minidriver.h
+++ b/src/jtag/minidriver.h
@@ -19,12 +19,11 @@
  *   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_H
-#define MINIDRIVER_H
+
+#ifndef OPENOCD_JTAG_MINIDRIVER_H
+#define OPENOCD_JTAG_MINIDRIVER_H
 
 /**
  * @page jtagminidriver JTAG Mini-Driver
@@ -38,33 +37,32 @@
  * define static inline versions of them):
  * - jtag_add_callback
  * - jtag_add_callback4
- * - interface_jtag_add_dr_out
  *
  * The following core functions are declared in this file for use by
  * the minidriver and do @b not need to be defined by an implementation:
  * - default_interface_jtag_execute_queue()
  */
 
-// this header will be provided by the minidriver implementation,
-// and it may provide additional declarations that must be defined.
+/* this header will be provided by the minidriver implementation, */
+/* and it may provide additional declarations that must be defined. */
 #include <jtag/minidriver_imp.h>
 
-int interface_jtag_add_ir_scan(
-               int num_fields, const struct scan_field* fields,
+int interface_jtag_add_ir_scan(struct jtag_tap *active,
+               const struct scan_field *fields,
                tap_state_t endstate);
 int interface_jtag_add_plain_ir_scan(
-               int num_fields, const struct scan_field* fields,
+               int num_bits, const uint8_t *out_bits, uint8_t *in_bits,
                tap_state_t endstate);
 
-int interface_jtag_add_dr_scan(
-               int num_fields, const struct scan_field* fields,
+int interface_jtag_add_dr_scan(struct jtag_tap *active,
+               int num_fields, const struct scan_field *fields,
                tap_state_t endstate);
 int interface_jtag_add_plain_dr_scan(
-               int num_fields, const struct scan_field* fields,
+               int num_bits, const uint8_t *out_bits, uint8_t *in_bits,
                tap_state_t endstate);
 
 int interface_jtag_add_tlr(void);
-int interface_jtag_add_pathmove(int num_states, const tap_state_t* path);
+int interface_jtag_add_pathmove(int num_states, const tap_state_t *path);
 int interface_jtag_add_runtest(int num_cycles, tap_state_t endstate);
 
 int interface_add_tms_seq(unsigned num_bits,
@@ -89,4 +87,4 @@ int interface_jtag_execute_queue(void);
  */
 int default_interface_jtag_execute_queue(void);
 
-#endif // MINIDRIVER_H
+#endif /* OPENOCD_JTAG_MINIDRIVER_H */