Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix up ZVM builds. It appeared to share common definitions with PP502x targets so use those. Remove one stale comment left behind in last commit.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19798 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2009-01-19 14:06:47 +00:00
parent 616c98b38f
commit 47509fafa4
4 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bootloader/gigabeat-s.c
View file

@ -93,10 +93,7 @@ static void handle_usb(void)
/* Check if plugged and pause to look at messages. If the cable was pulled
* while waiting, proceed as if it never was plugged. */
if (!usb_plugged() || !pause_if_button_pressed(true))
{
/* Bang on the controller */
return;
}
/** Enter USB mode **/

12
firmware/drivers/isp1583.c
View file

@ -55,7 +55,7 @@ struct usb_endpoint
};
static unsigned char setup_pkt_buf[8];
static struct usb_endpoint endpoints[NUM_ENDPOINTS];
static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS];
static bool high_speed_mode = false;
@ -366,7 +366,7 @@ static void setup_endpoints(void)
usb_setup_endpoint(ep_index(0, DIR_TX), 64, 0);
int i;
for(i = 1; i < NUM_ENDPOINTS-1; i++)
for(i = 1; i < USB_NUM_ENDPOINTS-1; i++)
{
usb_setup_endpoint(ep_index(i, DIR_RX), (high_speed_mode ? 512 : 64), 2); /* 2 = TYPE_BULK */
usb_setup_endpoint(ep_index(i, DIR_TX), (high_speed_mode ? 512 : 64), 2);
@ -375,7 +375,7 @@ static void setup_endpoints(void)
usb_enable_endpoint(ep_index(0, DIR_RX));
usb_enable_endpoint(ep_index(0, DIR_TX));
for (i = 1; i < NUM_ENDPOINTS-1; i++)
for (i = 1; i < USB_NUM_ENDPOINTS-1; i++)
{
usb_enable_endpoint(ep_index(i, DIR_RX));
usb_enable_endpoint(ep_index(i, DIR_TX));
@ -598,7 +598,7 @@ void usb_drv_cancel_all_transfers(void)
logf("usb_drv_cancel_all_tranfers()");
int i;
for(i=0;i<NUM_ENDPOINTS-1;i++)
for(i=0;i<USB_NUM_ENDPOINTS-1;i++)
endpoints[i].halt[0] = endpoints[i].halt[1] = 1;
}
@ -608,7 +608,7 @@ int usb_drv_request_endpoint(int dir)
bit=(dir & USB_DIR_IN)? 2:1;
for (i=1; i < NUM_ENDPOINTS; i++) {
for (i=1; i < USB_NUM_ENDPOINTS; i++) {
if((endpoints[i].allocation & bit)!=0)
continue;
endpoints[i].allocation |= bit;
@ -738,7 +738,7 @@ void usb_drv_set_address(int address)
int dbg_usb_num_items(void)
{
return 2+NUM_ENDPOINTS*2;
return 2+USB_NUM_ENDPOINTS*2;
}
char* dbg_usb_item(int selected_item, void *data, char *buffer, size_t buffer_len)

8
firmware/export/dm320.h
View file

@ -43,6 +43,14 @@
#define PHY_IO_BASE2 0x00060000
#define DM320_REG2(addr) (*(volatile unsigned int *)(PHY_IO_BASE2 + (addr)))
/* USBOTG */
#define USB_NUM_ENDPOINTS 3
/* This needs to be 2048 byte aligned, but USB_QHARRAY_ATTR should take care
* of that */
#define USB_QHARRAY_ATTR __attribute__((section(".qharray"),nocommon,aligned(4)))
#define USB_DEVBSS_ATTR IBSS_ATTR
/* Timer 0-3 */
#define IO_TIMER0_TMMD DM320_REG(0x0000)
#define IO_TIMER0_TMRSV0 DM320_REG(0x0002)

5
firmware/target/arm/tms320dm320/creative-zvm/usb-creativezvm.c
View file

@ -56,6 +56,11 @@ void usb_enable(bool on)
usb_core_exit();
}
void usb_attach(void)
{
usb_enable(true);
}
void IRAM_ATTR GIO7(void)
{
#ifdef DEBUG