Adding McHCK flash reload function and some cleanup.

[kiibohd-controller.git] / Output / pjrcUSB / arm / usb_dev.h

diff --git a/Output/pjrcUSB/arm/usb_dev.h b/Output/pjrcUSB/arm/usb_dev.h
index 96b5f84eb4674711057c043098deceb888ebf99f..4e8af8beb152ccf83218f3e195a1cc47a34f1c91 100644 (file)
--- a/Output/pjrcUSB/arm/usb_dev.h
+++ b/Output/pjrcUSB/arm/usb_dev.h
@@ -1,6 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
+ * Modifications by Jacob Alexander 2014
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -39,14 +40,19 @@
 #include "usb_mem.h"
 #include "usb_desc.h"
 
-void usb_init();
+#define usb_device_software_reset() SOFTWARE_RESET()
+
 uint8_t usb_configured(); // is the USB port configured
+
+void usb_init();
 void usb_isr();
-usb_packet_t *usb_rx(uint32_t endpoint);
-uint32_t usb_tx_byte_count(uint32_t endpoint);
-uint32_t usb_tx_packet_count(uint32_t endpoint);
-void usb_tx(uint32_t endpoint, usb_packet_t *packet);
-void usb_tx_isr(uint32_t endpoint, usb_packet_t *packet);
+void usb_tx( uint32_t endpoint, usb_packet_t *packet );
+void usb_tx_isr( uint32_t endpoint, usb_packet_t *packet );
+
+uint32_t usb_tx_byte_count( uint32_t endpoint );
+uint32_t usb_tx_packet_count( uint32_t endpoint );
+
+usb_packet_t *usb_rx( uint32_t endpoint );
 
 void usb_device_reload();