len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 21:55:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get interrupt endpoints fully working on Ingenic Jz4740 targets

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20978 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-05-17 15:41:05 +00:00
parent 0023943439
commit 649671eae3
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/export/jz4740.h
View file

@ -2475,6 +2475,7 @@
#define USB_INCSRH_ISO 0x40 #define USB_INCSRH_ISO 0x40
#define USB_INCSRH_MODE 0x20 #define USB_INCSRH_MODE 0x20
#define USB_INCSRH_DMAREQENAB 0x10 #define USB_INCSRH_DMAREQENAB 0x10
#define USB_INCSRH_FRCDATATOG 0x08
#define USB_INCSRH_DMAREQMODE 0x04 #define USB_INCSRH_DMAREQMODE 0x04
#define USB_INCSR_CDT 0x40 #define USB_INCSR_CDT 0x40
#define USB_INCSR_SENTSTALL 0x20 #define USB_INCSR_SENTSTALL 0x20
@ -5112,6 +5113,9 @@ struct Ration2m
#define IPU_DISABLE_IRQ() \ #define IPU_DISABLE_IRQ() \
REG32(IPU_V_BASE + REG_CTRL) &= ~FM_IRQ_EN; REG32(IPU_V_BASE + REG_CTRL) &= ~FM_IRQ_EN;
#define IPU_ENABLE_IRQ() \
REG32(IPU_V_BASE + REG_CTRL) |= FM_IRQ_EN;
#define IPU_DISABLE_RSIZE() \ #define IPU_DISABLE_RSIZE() \
REG32(IPU_V_BASE + REG_CTRL) &= ~RSZ_EN; REG32(IPU_V_BASE + REG_CTRL) &= ~RSZ_EN;

16
firmware/target/mips/ingenic_jz47xx/usb-jz4740.c
View file

@ -20,6 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "config.h" #include "config.h"
#define LOGF_ENABLE
#include "logf.h" #include "logf.h"
#include "system.h" #include "system.h"
#include "usb_ch9.h" #include "usb_ch9.h"
@ -76,9 +77,9 @@ static struct usb_endpoint endpoints[] =
{/* buf length sent busy type use_dma wait fifo_addr fifo_size */ {/* buf length sent busy type use_dma wait fifo_addr fifo_size */
{&ep0_rx_buf, 0, {0}, false, ep_control, false, false, USB_FIFO_EP0, 64 }, {&ep0_rx_buf, 0, {0}, false, ep_control, false, false, USB_FIFO_EP0, 64 },
{NULL, 0, {0}, false, ep_control, false, false, USB_FIFO_EP0, 64 }, {NULL, 0, {0}, false, ep_control, false, false, USB_FIFO_EP0, 64 },
{NULL, 0, {0}, false, ep_interrupt, false, false, USB_FIFO_EP1, 64 },
{NULL, 0, {0}, false, ep_bulk, false, false, USB_FIFO_EP1, 512}, {NULL, 0, {0}, false, ep_bulk, false, false, USB_FIFO_EP1, 512},
{NULL, 0, {0}, false, ep_bulk, false, false, USB_FIFO_EP1, 512}, {NULL, 0, {0}, false, ep_bulk, false, false, USB_FIFO_EP2, 512}
{NULL, 0, {0}, false, ep_interrupt, false, false, USB_FIFO_EP2, 64 }
}; };
static struct wakeup ep_wkup[TOTAL_EP()]; static struct wakeup ep_wkup[TOTAL_EP()];
@ -436,6 +437,9 @@ static void setup_endpoint(struct usb_endpoint *ep)
if(ep->use_dma) if(ep->use_dma)
csrh |= (USB_INCSRH_DMAREQENAB | USB_INCSRH_AUTOSET | USB_INCSRH_DMAREQMODE); csrh |= (USB_INCSRH_DMAREQENAB | USB_INCSRH_AUTOSET | USB_INCSRH_DMAREQMODE);
if(ep->type == ep_interrupt)
csrh |= USB_INCSRH_FRCDATATOG;
REG_USB_REG_INMAXP = ep->fifo_size; REG_USB_REG_INMAXP = ep->fifo_size;
REG_USB_REG_INCSR = csr; REG_USB_REG_INCSR = csr;
REG_USB_REG_INCSRH = csrh; REG_USB_REG_INCSRH = csrh;
@ -860,14 +864,18 @@ int usb_drv_request_endpoint(int type, int dir)
type &= USB_ENDPOINT_XFERTYPE_MASK; type &= USB_ENDPOINT_XFERTYPE_MASK;
/* There are only 3+2 endpoints, so hardcode this ... */ /* There are only 3+2 endpoints, so hardcode this ... */
/* Use the endpoint combinations from the Ingenic Linux USB driver */
switch(type) switch(type)
{ {
case USB_ENDPOINT_XFER_BULK: case USB_ENDPOINT_XFER_BULK:
return (1 | dir); if(dir == USB_DIR_IN)
return (2 | USB_DIR_IN);
else
return (1 | USB_DIR_OUT);
case USB_ENDPOINT_XFER_INT: case USB_ENDPOINT_XFER_INT:
if(dir == USB_DIR_IN) if(dir == USB_DIR_IN)
return (2 | USB_DIR_IN); return (1 | USB_DIR_IN);
default: default:
return -1; return -1;