RawHID on Teensy 4.0, initial prep work

teensy4/WProgram.h

@@ -52,12 +52,12 @@
 
 #include "avr_emulation.h"
 #include "usb_serial.h"
-//#include "usb_seremu.h"
+#include "usb_seremu.h"
 //#include "usb_keyboard.h"
 //#include "usb_mouse.h"
 //#include "usb_joystick.h"
 //#include "usb_midi.h"
-//#include "usb_rawhid.h"
+#include "usb_rawhid.h"
 //#include "usb_flightsim.h"
 //#include "usb_mtp.h"
 //#include "usb_audio.h"

teensy4/usb.c

@@ -431,6 +431,7 @@ static void endpoint0_setup(uint64_t setupdata)
 			}
 		}
 		break;
+#if defined(CDC_STATUS_INTERFACE)
 	  case 0x2221: // CDC_SET_CONTROL_LINE_STATE
 		usb_cdc_line_rtsdtr_millis = systick_millis_count;
 		usb_cdc_line_rtsdtr = setup.wValue;
@@ -442,6 +443,7 @@ static void endpoint0_setup(uint64_t setupdata)
 		endpoint0_setupdata.bothwords = setupdata;
 		endpoint0_receive(endpoint0_buffer, 7, 1);
 		return;
+#endif
 	}
 	USB1_ENDPTCTRL0 = 0x000010001; // stall
 }

teensy4/usb_desc.h

@@ -553,10 +553,10 @@ let me know?  http://forum.pjrc.com/forums/4-Suggestions-amp-Bug-Reports
   #define SEREMU_RX_ENDPOINT    2
   #define SEREMU_RX_SIZE        32
   #define SEREMU_RX_INTERVAL    2
-  #define ENDPOINT1_CONFIG	ENDPOINT_TRANSMIT_ONLY
-  #define ENDPOINT2_CONFIG	ENDPOINT_RECEIVE_ONLY
-  #define ENDPOINT3_CONFIG	ENDPOINT_TRANSMIT_ONLY
-  #define ENDPOINT4_CONFIG	ENDPOINT_RECEIVE_ONLY
+  #define ENDPOINT1_CONFIG	ENDPOINT_RECEIVE_UNUSED + ENDPOINT_TRANSMIT_INTERRUPT
+  #define ENDPOINT2_CONFIG	ENDPOINT_RECEIVE_INTERRUPT + ENDPOINT_TRANSMIT_UNUSED
+  #define ENDPOINT3_CONFIG	ENDPOINT_RECEIVE_UNUSED + ENDPOINT_TRANSMIT_INTERRUPT
+  #define ENDPOINT4_CONFIG	ENDPOINT_RECEIVE_INTERRUPT + ENDPOINT_TRANSMIT_UNUSED
 
 #elif defined(USB_FLIGHTSIM)
   #define VENDOR_ID		0x16C0

teensy4/usb_rawhid.h

@@ -0,0 +1,65 @@
+/* Teensyduino Core Library
+ * http://www.pjrc.com/teensy/
+ * Copyright (c) 2017 PJRC.COM, LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * 2. If the Software is incorporated into a build system that allows
+ * selection among a list of target devices, then similar target
+ * devices manufactured by PJRC.COM must be included in the list of
+ * target devices and selectable in the same manner.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+
+#include "usb_desc.h"
+
+#if defined(RAWHID_INTERFACE)
+
+#include <inttypes.h>
+
+// C language implementation
+#ifdef __cplusplus
+extern "C" {
+#endif
+int usb_rawhid_recv(void *buffer, uint32_t timeout);
+int usb_rawhid_available(void);
+int usb_rawhid_send(const void *buffer, uint32_t timeout);
+#ifdef __cplusplus
+}
+#endif
+
+
+// C++ interface
+#ifdef __cplusplus
+class usb_rawhid_class
+{
+public:
+	int available(void) {return usb_rawhid_available(); }
+	int recv(void *buffer, uint16_t timeout) { return usb_rawhid_recv(buffer, timeout); }
+	int send(const void *buffer, uint16_t timeout) { return usb_rawhid_send(buffer, timeout); }
+};
+
+extern usb_rawhid_class RawHID;
+
+#endif // __cplusplus
+
+#endif // RAWHID_INTERFACE

teensy4/usb_seremu.h

@@ -0,0 +1,131 @@
+/* Teensyduino Core Library
+ * http://www.pjrc.com/teensy/
+ * Copyright (c) 2017 PJRC.COM, LLC.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * 2. If the Software is incorporated into a build system that allows
+ * selection among a list of target devices, then similar target
+ * devices manufactured by PJRC.COM must be included in the list of
+ * target devices and selectable in the same manner.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+
+#include "usb_desc.h"
+
+#if defined(SEREMU_INTERFACE)
+
+#include <stdint.h>
+
+// C language implementation
+#ifdef __cplusplus
+extern "C" {
+#endif
+int usb_seremu_getchar(void);
+int usb_seremu_peekchar(void);
+int usb_seremu_available(void);
+void usb_seremu_flush_input(void);
+int usb_seremu_putchar(uint8_t c);
+int usb_seremu_write(const void *buffer, uint32_t size);
+int usb_seremu_write_buffer_free(void);
+void usb_seremu_flush_output(void);
+void usb_seremu_flush_callback(void);
+extern volatile uint8_t usb_seremu_transmit_flush_timer;
+extern volatile uint8_t usb_configuration;
+#ifdef __cplusplus
+}
+#endif
+
+// C++ interface
+#ifdef __cplusplus
+#include "Stream.h"
+class usb_seremu_class : public Stream
+{
+public:
+	constexpr usb_seremu_class() {}
+        void begin(long) { /* TODO: call a function that tries to wait for enumeration */ };
+        void end() { /* TODO: flush output and shut down USB port */ };
+        virtual int available() { return usb_seremu_available(); }
+        virtual int read() { return usb_seremu_getchar(); }
+        virtual int peek() { return usb_seremu_peekchar(); }
+        virtual void flush() { usb_seremu_flush_output(); }
+        virtual size_t write(uint8_t c) { return usb_seremu_putchar(c); }
+        virtual size_t write(const uint8_t *buffer, size_t size) { return usb_seremu_write(buffer, size); }
+        size_t write(unsigned long n) { return write((uint8_t)n); }
+        size_t write(long n) { return write((uint8_t)n); }
+        size_t write(unsigned int n) { return write((uint8_t)n); }
+        size_t write(int n) { return write((uint8_t)n); }
+	virtual int availableForWrite() { return usb_seremu_write_buffer_free(); }
+	using Print::write;
+        void send_now(void) { usb_seremu_flush_output(); };
+        uint32_t baud(void) { return 9600; }
+        uint8_t stopbits(void) { return 1; }
+        uint8_t paritytype(void) { return 0; }
+        uint8_t numbits(void) { return 8; }
+        uint8_t dtr(void) { return 1; }
+        uint8_t rts(void) { return 1; }
+        operator bool() { return usb_configuration; }
+};
+extern usb_seremu_class Serial;
+extern void serialEvent(void);
+#endif // __cplusplus
+
+
+#if 0
+// Allow Arduino programs using Serial to compile, but Serial will do nothing.
+#ifdef __cplusplus
+#include "Stream.h"
+class usb_seremu_class : public Stream
+{
+public:
+	constexpr usb_seremu_class() {}
+	void begin(long) { };
+	void end() { };
+	virtual int available() { return 0; }
+	virtual int read() { return -1; }
+	virtual int peek() { return -1; }
+	virtual void flush() { }
+	virtual size_t write(uint8_t c) { return 1; }
+	virtual size_t write(const uint8_t *buffer, size_t size) { return size; }
+	size_t write(unsigned long n) { return 1; }
+	size_t write(long n) { return 1; }
+	size_t write(unsigned int n) { return 1; }
+	size_t write(int n) { return 1; }
+	int availableForWrite() { return 0; }
+	using Print::write;
+	void send_now(void) { }
+	uint32_t baud(void) { return 0; }
+	uint8_t stopbits(void) { return 1; }
+	uint8_t paritytype(void) { return 0; }
+	uint8_t numbits(void) { return 8; }
+	uint8_t dtr(void) { return 1; }
+	uint8_t rts(void) { return 1; }
+	operator bool() { return true; }
+};
+
+extern usb_seremu_class Serial;
+extern void serialEvent(void);
+#endif // __cplusplus
+#endif
+
+
+#endif // SEREMU_INTERFACE

teensy4/usb_serial.h

@@ -57,7 +57,6 @@ extern volatile uint32_t systick_millis_count;
 extern volatile uint8_t usb_cdc_line_rtsdtr;
 extern volatile uint8_t usb_cdc_transmit_flush_timer;
 extern volatile uint8_t usb_configuration;
-extern uint8_t usb_enable_serial_event_processing;
 #ifdef __cplusplus
 }
 #endif

teensy4/yield.cpp

@@ -31,6 +31,8 @@
 #include <Arduino.h>
 #include "EventResponder.h"
 
+extern uint8_t usb_enable_serial_event_processing; // from usb_inst.cpp
+
 void yield(void) __attribute__ ((weak));
 void yield(void)
 {