Code cleanup

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

diff --git a/Output/pjrcUSB/arm/usb_serial.h b/Output/pjrcUSB/arm/usb_serial.h
index d64396bba2f4128560b26ad4b4a3b753ae57a526..09980d33c2912d3028e9a89baa88052035451936 100644 (file)
--- a/Output/pjrcUSB/arm/usb_serial.h
+++ b/Output/pjrcUSB/arm/usb_serial.h
@@ -1,6 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
+ * Modifications by Jacob Alexander (2013-2015)
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -28,32 +29,46 @@
  * SOFTWARE.
  */
 
-#ifndef USBserial_h_
-#define USBserial_h_
+#pragma once
 
+// ----- Includes -----
+
+// Compiler Includes
 #include <inttypes.h>
 
+
+
+// ----- Defines -----
+
 // Compatibility defines from AVR
 #define PROGMEM
 #define PGM_P  const char *
 #define PSTR(str) (str)
 
+#define USB_SERIAL_DTR  0x01
+#define USB_SERIAL_RTS  0x02
+
+
+
+// ----- Variables -----
+
+extern volatile uint8_t usb_cdc_line_coding[7];
 
-int usb_serial_getchar(void);
-int usb_serial_peekchar(void);
-int usb_serial_available(void);
-int usb_serial_read(void *buffer, uint32_t size);
-void usb_serial_flush_input(void);
-int usb_serial_putchar(uint8_t c);
-int usb_serial_write(const void *buffer, uint32_t size);
-void usb_serial_flush_output(void);
-extern uint32_t usb_cdc_line_coding[2];
 extern volatile uint8_t usb_cdc_line_rtsdtr;
 extern volatile uint8_t usb_cdc_transmit_flush_timer;
 extern volatile uint8_t usb_configuration;
 
-#define USB_SERIAL_DTR  0x01
-#define USB_SERIAL_RTS  0x02
 
-#endif // USBserial_h_
+
+// ----- Functions -----
+
+int usb_serial_available();
+int usb_serial_getchar();
+int usb_serial_peekchar();
+int usb_serial_putchar( uint8_t c );
+int usb_serial_read( void *buffer, uint32_t size );
+int usb_serial_write( const void *buffer, uint32_t size );
+
+void usb_serial_flush_input();
+void usb_serial_flush_output();