Parcourir la source

RawHID compiles (empty functions) and auto-reboot works

teensy4-core
PaulStoffregen il y a 5 ans
Parent
révision
695f22ef79
4 fichiers modifiés avec 189 ajouts et 3 suppressions
  1. +2
    -0
      teensy4/startup.c
  2. +25
    -3
      teensy4/usb.c
  3. +54
    -0
      teensy4/usb_rawhid.c
  4. +108
    -0
      teensy4/usb_seremu.c

+ 2
- 0
teensy4/startup.c Voir le fichier

@@ -104,6 +104,8 @@ void ResetHandler(void)
set_arm_clock(600000000);
//set_arm_clock(984000000); Ludicrous Speed

asm volatile("nop\n nop\n nop\n nop": : :"memory"); // why oh why?

// initialize RTC
if (!(SNVS_LPCR & SNVS_LPCR_SRTC_ENV)) {
// if SRTC isn't running, start it with default Jan 1, 2019

+ 25
- 3
teensy4/usb.c Voir le fichier

@@ -443,6 +443,17 @@ static void endpoint0_setup(uint64_t setupdata)
endpoint0_setupdata.bothwords = setupdata;
endpoint0_receive(endpoint0_buffer, 7, 1);
return;
#endif
#if defined(SEREMU_INTERFACE) || defined(KEYBOARD_INTERFACE)
case 0x0921: // HID SET_REPORT
if (setup.wLength <= sizeof(endpoint0_buffer)) {
//printf("hid set report %x %x\n", setup.word1, setup.word2);
endpoint0_setupdata.bothwords = setup.bothwords;
endpoint0_buffer[0] = 0xE9;
endpoint0_receive(endpoint0_buffer, setup.wLength, 1);
return;
}
break;
#endif
}
USB1_ENDPTCTRL0 = 0x000010001; // stall
@@ -472,6 +483,7 @@ static void endpoint0_transmit(const void *data, uint32_t len, int notify)
endpoint0_transfer_ack.pointer0 = 0;
endpoint_queue_head[0].next = (uint32_t)&endpoint0_transfer_ack;
endpoint_queue_head[0].status = 0;
USB1_ENDPTCOMPLETE |= (1<<0) | (1<<16);
USB1_ENDPTPRIME |= (1<<0);
endpoint0_notify_mask = (notify ? (1 << 0) : 0);
while (USB1_ENDPTPRIME) ;
@@ -483,7 +495,7 @@ static void endpoint0_receive(void *data, uint32_t len, int notify)
if (len > 0) {
// Executing A Transfer Descriptor, page 3182
endpoint0_transfer_data.next = 1;
endpoint0_transfer_data.status = (len << 16) | (1<<7) | (notify ? (1 << 15) : 0);
endpoint0_transfer_data.status = (len << 16) | (1<<7);
uint32_t addr = (uint32_t)data;
endpoint0_transfer_data.pointer0 = addr; // format: table 55-60, pg 3159
endpoint0_transfer_data.pointer1 = addr + 4096;
@@ -497,10 +509,11 @@ static void endpoint0_receive(void *data, uint32_t len, int notify)
while (USB1_ENDPTPRIME) ;
}
endpoint0_transfer_ack.next = 1;
endpoint0_transfer_ack.status = (1<<7);
endpoint0_transfer_ack.status = (1<<7) | (notify ? (1 << 15) : 0);
endpoint0_transfer_ack.pointer0 = 0;
endpoint_queue_head[1].next = (uint32_t)&endpoint0_transfer_ack;
endpoint_queue_head[1].status = 0;
USB1_ENDPTCOMPLETE |= (1<<0) | (1<<16);
USB1_ENDPTPRIME |= (1<<16);
endpoint0_notify_mask = (notify ? (1 << 16) : 0);
while (USB1_ENDPTPRIME) ;
@@ -532,7 +545,7 @@ static void endpoint0_complete(void)
setup_t setup;

setup.bothwords = endpoint0_setupdata.bothwords;
//printf("complete\n");
//printf("complete %x %x %x\n", setup.word1, setup.word2, endpoint0_buffer[0]);
#ifdef CDC_STATUS_INTERFACE
if (setup.wRequestAndType == 0x2021 /*CDC_SET_LINE_CODING*/) {
memcpy(usb_cdc_line_coding, endpoint0_buffer, 7);
@@ -543,6 +556,15 @@ static void endpoint0_complete(void)
}
}
#endif
#ifdef SEREMU_INTERFACE
if (setup.word1 == 0x03000921 && setup.word2 == ((4<<16)|SEREMU_INTERFACE)
&& endpoint0_buffer[0] == 0xA9 && endpoint0_buffer[1] == 0x45
&& endpoint0_buffer[2] == 0xC2 && endpoint0_buffer[3] == 0x6B) {
printf("seremu reboot request\n");
USB1_USBINTR |= USB_USBINTR_SRE;
usb_reboot_timer = 80; // TODO: 10 if only 12 Mbit/sec
}
#endif
}

static void usb_endpoint_config(endpoint_t *qh, uint32_t config, void (*callback)(transfer_t *))

+ 54
- 0
teensy4/usb_rawhid.c Voir le fichier

@@ -0,0 +1,54 @@
/* 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.
*/

#include "usb_dev.h"
#include "usb_rawhid.h"
#include "core_pins.h" // for yield(), millis()
#include <string.h> // for memcpy()
//#include "HardwareSerial.h"

#ifdef RAWHID_INTERFACE // defined by usb_dev.h -> usb_desc.h

int usb_rawhid_recv(void *buffer, uint32_t timeout)
{
return -1;
}

int usb_rawhid_available(void)
{
return 0;
}

int usb_rawhid_send(const void *buffer, uint32_t timeout)
{
return -1;
}

#endif // RAWHID_INTERFACE

+ 108
- 0
teensy4/usb_seremu.c Voir le fichier

@@ -0,0 +1,108 @@
/* Teensyduino Core Library
* http://www.pjrc.com/teensy/
* Copyright (c) 2019 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.
*/

#include "usb_dev.h"
#include "usb_seremu.h"
#include "core_pins.h" // for yield()
//#include "HardwareSerial.h"

#ifdef SEREMU_INTERFACE // defined by usb_dev.h -> usb_desc.h

volatile uint8_t usb_seremu_transmit_flush_timer=0;

//static volatile uint8_t tx_noautoflush=0;

#define TRANSMIT_FLUSH_TIMEOUT 5 /* in milliseconds */


// get the next character, or -1 if nothing received
int usb_seremu_getchar(void)
{
return -1;
}

// peek at the next character, or -1 if nothing received
int usb_seremu_peekchar(void)
{
return -1;
}

// number of bytes available in the receive buffer
int usb_seremu_available(void)
{
return 0;
}


// discard any buffered input
void usb_seremu_flush_input(void)
{
}



// When the PC isn't listening, how long do we wait before discarding data? If this is
// too short, we risk losing data during the stalls that are common with ordinary desktop
// software. If it's too long, we stall the user's program when no software is running.
#define TX_TIMEOUT_MSEC 30

// When we've suffered the transmit timeout, don't wait again until the computer
// begins accepting data. If no software is running to receive, we'll just discard
// data as rapidly as Serial.print() can generate it, until there's something to
// actually receive it.
static uint8_t transmit_previous_timeout=0;


// transmit a character. 0 returned on success, -1 on error
int usb_seremu_putchar(uint8_t c)
{
return usb_seremu_write(&c, 1);
}


int usb_seremu_write(const void *buffer, uint32_t size)
{
return 0;
}

int usb_seremu_write_buffer_free(void)
{
return 1;
}

void usb_seremu_flush_output(void)
{
}

void usb_seremu_flush_callback(void)
{
}

#endif // SEREMU_INTERFACE

Chargement…
Annuler
Enregistrer