Major USB update, fixes most (if not all) known issues

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

diff --git a/Output/pjrcUSB/arm/usb_serial.c b/Output/pjrcUSB/arm/usb_serial.c
index 4510d404f323bd039972166ad51665fec3e82b96..cf20797021939396c9755b0f5eda70c0af1b92e9 100644 (file)
--- a/Output/pjrcUSB/arm/usb_serial.c
+++ b/Output/pjrcUSB/arm/usb_serial.c
@@ -1,7 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
- * Modified by Jacob Alexander 2013-2015
+ * Modified by Jacob Alexander 2013-2016
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -29,6 +29,9 @@
  * SOFTWARE.
  */
 
+#include <kll_defs.h>
+#if enableVirtualSerialPort_define == 1
+
 // ----- Includes -----
 
 // Compiler Includes
@@ -69,9 +72,15 @@
 
 // ----- Variables -----
 
-// serial port settings (baud rate, control signals, etc) set
-// by the PC.  These are ignored, but kept in RAM.
-volatile uint8_t usb_cdc_line_coding[7] = { 0x00, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x08 };
+// Serial port settings (baud rate, control signals, etc) set by the host
+// These are *ignored*, except to return back to the host if requested
+volatile USBCDCLineCoding usb_cdc_line_coding = {
+       115200,
+       0,
+       0,
+       8,
+};
+
 volatile uint8_t usb_cdc_line_rtsdtr = 0;
 volatile uint8_t usb_cdc_transmit_flush_timer = 0;
 
@@ -315,3 +324,5 @@ void usb_serial_flush_callback()
        }
 }
 
+#endif
+