Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[USB] Change endpoint0_setup argument type from uint64_t to setup_t #757

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[USB] Change endpoint0_setup argument type from uint64_t to setup_t #757

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed18deb
Change endpoint0_setup argument type from uint64_t to setup_t
forderud Sep 21, 2024
6775c61
Remove setup_t "bothwords" field to clean up, since it's no longer in…
forderud Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions teensy4/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ typedef union {
uint32_t word1;
uint32_t word2;
};
uint64_t bothwords;
} setup_t;

static setup_t endpoint0_setupdata;
Expand All @@ -102,7 +101,7 @@ void (*usb_timer0_callback)(void) = NULL;
void (*usb_timer1_callback)(void) = NULL;

void usb_isr(void);
static void endpoint0_setup(uint64_t setupdata);
static void endpoint0_setup(setup_t setup);
static void endpoint0_transmit(const void *data, uint32_t len, int notify);
static void endpoint0_receive(void *data, uint32_t len, int notify);
static void endpoint0_complete(void);
Expand Down Expand Up @@ -257,7 +256,7 @@ void usb_isr(void)
USB1_ENDPTFLUSH = (1<<16) | (1<<0); // page 3174
while (USB1_ENDPTFLUSH & ((1<<16) | (1<<0))) ;
endpoint0_notify_mask = 0;
endpoint0_setup(s.bothwords);
endpoint0_setup(s);
setupstatus = USB1_ENDPTSETUPSTAT; // page 3175
}
uint32_t completestatus = USB1_ENDPTCOMPLETE;
Expand Down Expand Up @@ -409,13 +408,11 @@ transfer_t endpoint0_transfer_ack __attribute__ ((aligned(32)));;

static uint8_t reply_buffer[8];

static void endpoint0_setup(uint64_t setupdata)
static void endpoint0_setup(setup_t setup)
{
setup_t setup;
uint32_t endpoint, dir, ctrl;
const usb_descriptor_list_t *list;

setup.bothwords = setupdata;
switch (setup.wRequestAndType) {
case 0x0500: // SET_ADDRESS
endpoint0_receive(NULL, 0, 0);
Expand Down Expand Up @@ -599,15 +596,15 @@ static void endpoint0_setup(uint64_t setupdata)
return;
case 0x2021: // CDC_SET_LINE_CODING
if (setup.wLength != 7) break;
endpoint0_setupdata.bothwords = setupdata;
endpoint0_setupdata = setup;
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_setupdata = setup;
endpoint0_buffer[0] = 0xE9;
endpoint0_receive(endpoint0_buffer, setup.wLength, 1);
return;
Expand Down Expand Up @@ -646,7 +643,7 @@ static void endpoint0_setup(uint64_t setupdata)
case 0x0421:
//printf("set_feature, word1=%x, len=%d\n", setup.word1, setup.wLength);
if (setup.wLength <= sizeof(endpoint0_buffer)) {
endpoint0_setupdata.bothwords = setupdata;
endpoint0_setupdata = setup;
endpoint0_receive(endpoint0_buffer, setup.wLength, 1);
return; // handle these after ACK
}
Expand Down Expand Up @@ -690,7 +687,7 @@ static void endpoint0_setup(uint64_t setupdata)
#if defined(MTP_INTERFACE)
case 0x6421: // Cancel Request, Still Image Class 1.0, 5.2.1, page 8
if (setup.wLength == 6) {
endpoint0_setupdata.bothwords = setupdata;
endpoint0_setupdata = setup;
endpoint0_receive(endpoint0_buffer, setup.wLength, 1);
return;
}
Expand Down Expand Up @@ -793,15 +790,14 @@ static void endpoint0_receive(void *data, uint32_t len, int notify)
uint32_t word1;
uint32_t word2;
};
uint64_t bothwords;
} setup_t; */


static void endpoint0_complete(void)
{
setup_t setup;

setup.bothwords = endpoint0_setupdata.bothwords;
setup = endpoint0_setupdata;
//printf("complete %x %x %x\n", setup.word1, setup.word2, endpoint0_buffer[0]);
#ifdef CDC_STATUS_INTERFACE
// 0x2021 is CDC_SET_LINE_CODING
Expand Down