Code 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 01f98cb9b09ed16471fdc9b17cab49d2598139ed..e4f8add506070425126af3ceef32f824689d597f 100644 (file)
--- a/Output/pjrcUSB/arm/usb_dev.h
+++ b/Output/pjrcUSB/arm/usb_dev.h
@@ -1,7 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
- * Modifications by Jacob Alexander 2014
+ * Modifications by Jacob Alexander 2014-2015
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -29,8 +29,7 @@
  * SOFTWARE.
  */
 
-#ifndef _usb_dev_h_
-#define _usb_dev_h_
+#pragma once
 
 // ----- Includes -----
 
@@ -56,13 +55,15 @@ extern volatile uint8_t usb_cdc_line_coding[7];
 extern volatile uint8_t usb_cdc_line_rtsdtr;
 extern volatile uint8_t usb_cdc_transmit_flush_timer;
 
+extern volatile uint8_t remote_wakeup_enabled;
+
 
 
 // ----- Functions -----
 
 uint8_t usb_configured(); // is the USB port configured
+uint8_t usb_init(); // Returns 1 on success, 0 if no cable is attached
 
-void usb_init();
 void usb_isr();
 void usb_tx( uint32_t endpoint, usb_packet_t *packet );
 void usb_tx_isr( uint32_t endpoint, usb_packet_t *packet );
@@ -75,17 +76,13 @@ usb_packet_t *usb_rx( uint32_t endpoint );
 static inline uint32_t usb_rx_byte_count(uint32_t endpoint) __attribute__((always_inline));
 static inline uint32_t usb_rx_byte_count(uint32_t endpoint)
 {
-        endpoint--;
-        if ( endpoint >= NUM_ENDPOINTS )
+       endpoint--;
+       if ( endpoint >= NUM_ENDPOINTS )
                return 0;
-        return usb_rx_byte_count_data[ endpoint ];
+       return usb_rx_byte_count_data[ endpoint ];
 }
 
 void usb_device_reload();
 
 extern void usb_serial_flush_callback();
 
-
-
-#endif
-