Merge branch 'master' into pio-host
This commit is contained in:
		@@ -329,9 +329,11 @@ static void _hw_endpoint_init(struct hw_endpoint *ep, uint8_t dev_addr, uint8_t
 | 
			
		||||
        // endpoint number / direction
 | 
			
		||||
        // preamble
 | 
			
		||||
        uint32_t reg = dev_addr | (num << USB_ADDR_ENDP1_ENDPOINT_LSB);
 | 
			
		||||
        // Assert the interrupt endpoint is IN_TO_HOST
 | 
			
		||||
        // TODO Interrupt can also be OUT
 | 
			
		||||
        assert(dir == TUSB_DIR_IN);
 | 
			
		||||
 | 
			
		||||
        if (dir == TUSB_DIR_OUT)
 | 
			
		||||
        {
 | 
			
		||||
            reg |= USB_ADDR_ENDP1_INTEP_DIR_BITS;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (need_pre(dev_addr))
 | 
			
		||||
        {
 | 
			
		||||
 
 | 
			
		||||
@@ -58,8 +58,12 @@ void rp2040_usb_init(void)
 | 
			
		||||
  unreset_block_wait(RESETS_RESET_USBCTRL_BITS);
 | 
			
		||||
 | 
			
		||||
  // Clear any previous state just in case
 | 
			
		||||
  // TODO Suppress warning array-bounds with gcc11
 | 
			
		||||
#pragma GCC diagnostic push
 | 
			
		||||
#pragma GCC diagnostic ignored "-Warray-bounds"
 | 
			
		||||
  memset(usb_hw, 0, sizeof(*usb_hw));
 | 
			
		||||
  memset(usb_dpram, 0, sizeof(*usb_dpram));
 | 
			
		||||
#pragma GCC diagnostic pop
 | 
			
		||||
 | 
			
		||||
  // Mux the controller to the onboard usb phy
 | 
			
		||||
  usb_hw->muxing = USB_USB_MUXING_TO_PHY_BITS | USB_USB_MUXING_SOFTCON_BITS;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user