Make #include guard naming consistent

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

diff --git a/src/jtag/drivers/versaloon/versaloon.h b/src/jtag/drivers/versaloon/versaloon.h
index 96812252369080d42832abe572a063745b22e0e9..9d92bcaa195a5cb62d4fdcb516d4b9aa841c67ed 100644 (file)
--- a/src/jtag/drivers/versaloon/versaloon.h
+++ b/src/jtag/drivers/versaloon/versaloon.h
@@ -12,13 +12,13 @@
  *   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 __VERSALOON_H_INCLUDED__
-#define __VERSALOON_H_INCLUDED__
+#ifndef OPENOCD_JTAG_DRIVERS_VERSALOON_VERSALOON_H
+#define OPENOCD_JTAG_DRIVERS_VERSALOON_VERSALOON_H
+
+#include <libusb.h>
 
 struct usart_status_t {
        uint32_t tx_buff_avail;
@@ -59,7 +59,8 @@ struct interface_swd_t {
        RESULT(*fini)(uint8_t interface_index);
        RESULT(*config)(uint8_t interface_index, uint8_t trn, uint16_t retry,
                uint16_t dly);
-       RESULT(*seqout)(uint8_t interface_index, uint8_t *data, uint16_t bitlen);
+       RESULT(*seqout)(uint8_t interface_index, const uint8_t *data,
+                       uint16_t bitlen);
        RESULT(*seqin)(uint8_t interface_index, uint8_t *data, uint16_t bitlen);
        RESULT(*transact)(uint8_t interface_index, uint8_t request,
                uint32_t *data, uint8_t *ack);
@@ -106,7 +107,6 @@ struct versaloon_interface_t {
 };
 
 extern struct versaloon_interface_t versaloon_interface;
-extern usb_dev_handle *versaloon_usb_device_handle;
-
-#endif /* __VERSALOON_H_INCLUDED__ */
+extern libusb_device_handle *versaloon_usb_device_handle;
 
+#endif /* OPENOCD_JTAG_DRIVERS_VERSALOON_VERSALOON_H */