devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

onda usb code: merge into .c file

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31496 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2011-12-31 18:44:37 +00:00
parent a51879dd01
commit c721c69987
3 changed files with 17 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

40
firmware/target/mips/ingenic_jz47xx/onda_vx747/usb-target.h
View file

@ -1,42 +1,2 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2008 by Maurus Cuelenaere
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#ifndef __USB_TARGET_H
#define __USB_TARGET_H
#include "config.h"
#define GPIO_UDC_DETE (32 * 3 + 28) /* A18 = ADP_CHK */
#define IRQ_GPIO_UDC_DETE (IRQ_GPIO_0 + GPIO_UDC_DETE)
#define USB_GPIO_IRQ GPIO124
#define USB_INIT_GPIO() \
{ \
REG_GPIO_PXPES(3) = 0x10000000; \
__gpio_as_irq_rise_edge(GPIO_UDC_DETE); \
}
#define USB_DRV_CONNECTED() (__gpio_get_pin(GPIO_UDC_DETE) == 1)
/* Connect by events, not by tick polling */
#define USB_STATUS_BY_EVENT
#endif

40
firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h
View file

@ -1,40 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2008 by Maurus Cuelenaere
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#ifndef __USB_TARGET_H
#define __USB_TARGET_H
#include "config.h"
#define GPIO_UDC_DETE (32 * 3 + 28)
#define IRQ_GPIO_UDC_DETE (IRQ_GPIO_0 + GPIO_UDC_DETE)
#define USB_INIT_GPIO() \
{ \
REG_GPIO_PXFUNS(3) = 0x10000000; \
REG_GPIO_PXSELS(3) = 0x10000000; \
REG_GPIO_PXPES(3) = 0x10000000; \
__gpio_as_input(GPIO_UDC_DETE); \
}
#define USB_DRV_CONNECTED() (__gpio_get_pin(GPIO_UDC_DETE) == 1)
#endif

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

@ -577,19 +577,29 @@ void usb_drv_stall(int endpoint, bool stall, bool in)
}
}
bool usb_drv_connected(void)
{
return USB_DRV_CONNECTED();
}
#define GPIO_UDC_DETE (32 * 3 + 28) /* A18 = ADP_CHK */
#define IRQ_GPIO_UDC_DETE (IRQ_GPIO_0 + GPIO_UDC_DETE)
#ifndef ONDA_VX767
# define USB_GPIO_IRQ GPIO124
#endif
int usb_detect(void)
{
return usb_drv_connected() ? USB_INSERTED : USB_EXTRACTED;
return (__gpio_get_pin(GPIO_UDC_DETE) == 1)
? USB_INSERTED : USB_EXTRACTED;
}
void usb_init_device(void)
{
unsigned int i;
#ifdef ONDA_VX767
REG_GPIO_PXFUNS(3) = 0x10000000;
REG_GPIO_PXSELS(3) = 0x10000000;
REG_GPIO_PXPES(3) = 0x10000000;
__gpio_as_input(GPIO_UDC_DETE);
#else
REG_GPIO_PXPES(3) = 0x10000000;
__gpio_as_irq_rise_edge(GPIO_UDC_DETE);
#endif
USB_INIT_GPIO();
#ifdef USB_GPIO_IRQ
@ -597,7 +607,7 @@ void usb_init_device(void)
#endif
system_enable_irq(IRQ_UDC);
for(i=0; i<TOTAL_EP(); i++)
for(unsigned i=0; i<TOTAL_EP(); i++)
semaphore_init(&endpoints[i].complete, 1, 0);
}