Lephenixnoir
/
gint
10
14
Fork 8
Code Issues 4 Pull Requests Releases Wiki Activity

usb: fix some messages being lost after a post-world-switch reconnect

This commit is contained in:
Lephe 2022-12-03 11:05:35 +01:00
parent 177879d432
commit a4cf3516e7
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/usb/configure.c
View File

@ -77,7 +77,6 @@ static int find_pipe(int type)
return -1;
}
/* usb_configure_solve(): Allocate resources for all activated interfaces */
int usb_configure_solve(usb_interface_t const **interfaces)
{
/* Reset the previous configuration */
@ -177,7 +176,6 @@ int usb_configure_solve(usb_interface_t const **interfaces)
return 0;
}
/* usb_configure_log(): Print configuration results in the USB_LOG() */
void usb_configure_log(void)
{
#ifdef GINT_USB_DEBUG
@ -200,7 +198,6 @@ void usb_configure_log(void)
#endif
}
/* usb_configure(): Load the generated configuration to the USB module */
void usb_configure(void)
{
for(int i = 0; i < 32; i++)
@ -208,11 +205,18 @@ void usb_configure(void)
if(!conf_ep[i].intf) continue;
int address = (i & 0xf) + (i >= 16 ? 0x80 : 0);
usb_pipe_configure(address, &conf_ep[i]);
}
}
void usb_configure_clear_pipes(void)
{
for(int i = 0; i < 32; i++)
{
if(!conf_ep[i].intf) continue;
usb_pipe_clear(conf_ep[i].pipe);
}
}
/* usb_configure_interfaces(): List configures interfaces */
usb_interface_t const * const *usb_configure_interfaces(void)
{
return conf_if;

3
src/usb/pipes.c
View File

@ -49,7 +49,10 @@ void usb_pipe_clear(int pipe)
usb_while(!USB.PIPECTR[pipe-1].BSTS);
USB.PIPECTR[pipe-1].PID = 0;
usb_while(USB.PIPECTR[pipe-1].CSSTS || USB.PIPECTR[pipe-1].PBUSY);
USB.PIPECTR[pipe-1].SQCLR = 1;
usb_while(USB.PIPECTR[pipe-1].SQMON != 0);
}
//---

3
src/usb/usb.c
View File

@ -175,6 +175,7 @@ int usb_open(usb_interface_t const **interfaces, gint_call_t callback)
/* Configure other pipes to use activated interfaces */
usb_configure();
usb_configure_clear_pipes();
/* Initialize transfer tracker for multi-part transfers */
usb_pipe_init_transfers();
@ -244,6 +245,8 @@ static void usb_interrupt_handler(void)
/* When configured, run the callback for usb_open() */
if(USB.INTSTS0.DVSQ == 3)
{
usb_configure_clear_pipes();
usb_open_status = true;
if(usb_open_callback.function)
{

18
src/usb/usb_private.h
View File

@ -27,18 +27,30 @@
Returns an USB_* error code. */
int usb_configure_solve(usb_interface_t const **interfaces);
/* usb_configure_log(): Print configuration results in the usb_log()
/* usb_configure_log(): Print configuration results with USB_LOG()
This function can be called even if usb_configure_solve() fails. */
void usb_configure_log(void);
/* usb_configure(): Load the generated configuration to the USB module
/* usb_configure(): Load the solved configuration to the USB module
This function configures the USB module's pipes and FIFO memory to prepare
handling requests to the interfaces activated in usb_configure_solve(). This
configuration step is un-done by either another configuration through a
successful usb_open(), or a context restore in the USB driver. */
successful usb_open(), or a context restore in the USB driver.
This function loads all of the "static" data for the pipes, ie. PIPCFG,
PIPEBUF, PIPEMAXP, and PIPERI, and doesn't change the "dynamic" data in
PIPECTR. */
void usb_configure(void);
/* usb_configure_clear_pipes(): Clear configured pipes
This function clears configured pipes' dynamic data in PIPECTR. It shoud be
used when initializing the module but also when resetting the connection to
the host (eg. after a world switch), since a renewed host will not expect
any leftover data, non-zero sequence bits, etc. */
void usb_configure_clear_pipes(void);
/* endpoint_t: Driver information for each open endpoint in the device
There is one such structure for all 16 configurable endpoints, for each