diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index e9cb2248b722db7f64f7f9b2abca9a637ac78027..5441a2f559bc7f67628b9c3657a5513fd2d65a7b 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -161,9 +161,10 @@ void up_initialize(void)
up_netinitialize();
- /* Initialize USB */
+ /* Initialize USB -- device and/or host */
up_usbinitialize();
+ up_usbhostinitialize();
up_ledon(LED_IRQSENABLED);
}
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index 51f1719dbb9ffca2f7323aadbb433cfc8daa383a..38dc5ac6e5123458ae4d33df72c075438b5fe7da 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -267,7 +267,6 @@ extern void up_netinitialize(void);
# define up_netinitialize()
#endif
-
#ifdef CONFIG_USBDEV
extern void up_usbinitialize(void);
extern void up_usbuninitialize(void);
@@ -276,6 +275,12 @@ extern void up_usbuninitialize(void);
# define up_usbuninitialize()
#endif
+#ifdef CONFIG_USBHOST
+extern void up_usbhostinitialize(void);
+#else
+# define up_usbhostinitialize()
+#endif
+
#endif /* __ASSEMBLY__ */
#endif /* __UP_INTERNAL_H */
diff --git a/arch/arm/src/lpc17xx/Make.defs b/arch/arm/src/lpc17xx/Make.defs
index ce976692c108cec9679a43720aba3a4fbea47ac5..2b4ea0ffc3c1f490bac8cecf41be7d601affa1d4 100755
--- a/arch/arm/src/lpc17xx/Make.defs
+++ b/arch/arm/src/lpc17xx/Make.defs
@@ -69,6 +69,10 @@ ifeq ($(CONFIG_USBDEV),y)
CHIP_CSRCS += lpc17_usbdev.c
endif
+ifeq ($(CONFIG_USBHOST),y)
+CHIP_CSRCS += lpc17_usbhost.c
+endif
+
ifeq ($(CONFIG_LPC17_GPDMA),y)
CHIP_CSRCS += lpc17_gpdma.c
endif
diff --git a/arch/arm/src/lpc17xx/lpc17_usb.h b/arch/arm/src/lpc17xx/lpc17_usb.h
index b88354225db6aa181e407ae02b99d6b089385396..3f4c532eb6dbeaf1b20bf227fcc81b10f56d02ae 100755
--- a/arch/arm/src/lpc17xx/lpc17_usb.h
+++ b/arch/arm/src/lpc17xx/lpc17_usb.h
@@ -41,7 +41,7 @@
************************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/ohci.h>
+#include <nuttx/usb/ohci.h>
#include "chip.h"
#include "lpc17_memorymap.h"
@@ -52,7 +52,7 @@
/* Register offsets *****************************************************************/
/* USB Host Controller (OHCI) *******************************************************/
-/* See include/nuttx/ohci.h */
+/* See include/nuttx/usb/ohci.h */
#define LPC17_USBHOST_MODID_OFFSET 0x00fc /* Module ID/Revision ID */
@@ -270,7 +270,7 @@
/* Register bit definitions *********************************************************/
/* USB Host Controller (OHCI) *******************************************************/
-/* See include/nuttx/ohci.h */
+/* See include/nuttx/usb/ohci.h */
/* Module ID/Revision ID */
@@ -299,8 +299,7 @@
#define USBOTG_STCTRL_PORTFUNC_SHIFT (0) /* Bits 0-1: Controls port function */
#define USBOTG_STCTRL_PORTFUNC_MASK (3 << USBOTG_STCTRL_PORTFUNC_SHIFT)
# define USBOTG_STCTRL_PORTFUNC_HNPOK (1 << USBOTG_STCTRL_PORTFUNC_SHIFT) /* HNP suceeded */
-
-#define USBOTG_STCTRL_TMRSCALE_SHIFT (0) /* Bits 2-3: Timer scale selection */
+#define USBOTG_STCTRL_TMRSCALE_SHIFT (2) /* Bits 2-3: Timer scale selection */
#define USBOTG_STCTRL_TMRSCALE_MASK (3 << USBOTG_STCTRL_TMR_SCALE_SHIFT)
# define USBOTG_STCTRL_TMRSCALE_10US (0 << USBOTG_STCTRL_TMR_SCALE_SHIFT) /* 10uS (100 KHz) */
# define USBOTG_STCTRL_TMRSCALE_100US (1 << USBOTG_STCTRL_TMR_SCALE_SHIFT) /* 100uS (10 KHz) */
@@ -576,6 +575,14 @@
#define USBDEV_CLK_OTGCLK (1 << 3) /* Bit 3: OTG clock (OTG only) */
#define USBDEV_CLK_AHBCLK (1 << 4) /* Bit 4: AHB clock */
/* Bits 5-31: Reserved */
+/* Alternate naming */
+
+#define USBOTG_CLK_HOSTCLK USBDEV_CLK_HOSTCLK
+#define USBOTG_CLK_DEVCLK USBDEV_CLK_DEVCLK
+#define USBOTG_CLK_I2CCLK USBDEV_CLK_I2CCLK
+#define USBOTG_CLK_PORTSELCLK USBDEV_CLK_PORTSELCLK
+#define USBOTG_CLK_OTGCLK USBDEV_CLK_OTGCLK
+#define USBOTG_CLK_AHBCLK USBDEV_CLK_AHBCLK
/* Endpoints *************************************************************************/
diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c
new file mode 100755
index 0000000000000000000000000000000000000000..230037fddca741ebb7083d38cef7918ffda45ea9
--- /dev/null
+++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c
@@ -0,0 +1,480 @@
+/*******************************************************************************
+ * arch/arm/src/lpc17xx/lpc17_usbhost.c
+ *
+ * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Authors: Rafael Noronha
+ * Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ *******************************************************************************/
+
+/*******************************************************************************
+ * Included Files
+ *******************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/arch.h>
+#include <nuttx/usb/usb.h>
+#include <nuttx/usb/usbhost.h>
+#include <nuttx/usb/ohci.h>
+#include <nuttx/usb/usbhost_trace.h>
+
+#include <arch/irq.h>
+#include <arch/board/board.h>
+
+#include "chip.h"
+#include "up_arch.h"
+#include "up_internal.h"
+
+#include "lpc17_internal.h"
+#include "lpc17_usb.h"
+#include "lpc17_syscon.h"
+
+/*******************************************************************************
+ * Definitions
+ *******************************************************************************/
+
+/* Configuration ***************************************************************/
+
+/* CLKCTRL enable bits */
+
+#define LPC17_CLKCTRL_ENABLES (USBOTG_CLK_HOSTCLK|USBOTG_CLK_DEVCLK|\
+ USBOTG_CLK_I2CCLK|USBOTG_CLK_OTGCLK|\
+ USBOTG_CLK_AHBCLK)
+
+/* Dump GPIO registers */
+
+#if defined(CONFIG_LPC17_USBHOST_REGDEBUG) && defined(CONFIG_DEBUG_GPIO)
+# define usbhost_dumpgpio() \
+ do { \
+ lpc17_dumpgpio(GPIO_USB_DP, "D+ P0.29; D- P0.30"); \
+ lpc17_dumpgpio(GPIO_USB_UPLED, "LED P1:18; PPWR P1:19 PWRD P1:22 PVRCR P1:27); \
+ } while (0);
+#else
+# define usbhost_dumpgpio()
+#endif
+
+/* USB Host Memory *************************************************************/
+
+#warning "Needs to be removed from the heap in lpc17_allocateheap.c"
+#define USBHOST_SRAM_BASE LPC17_SRAM_BANK1
+
+/* Debug ***********************************************************************/
+
+/* Trace error codes */
+#warning "To be provided"
+
+/* Trace interrupt codes */
+#warning "To be provided"
+
+/*******************************************************************************
+ * Private Types
+ *******************************************************************************/
+
+/* This structure retains the state of the USB host controller */
+
+struct lpc17_usbhost_s
+{
+ /* Common device fields. This must be the first thing defined in the
+ * structure so that it is possible to simply cast from struct usbhost_s
+ * to structlpc17_usbhost_s.
+ */
+
+ struct usbhost_driver_s usbhost;
+
+ /* The bound device class driver */
+
+ struct usbhost_class_s *class;
+};
+
+/* HostController EndPoint Descriptor */
+
+struct usbhost_hced_s
+{
+ volatile uint32_t control; /* Endpoint descriptor control */
+ volatile uint32_t tailtd; /* Physical address of tail in Transfer descriptor list */
+ volatile uint32_t headtd; /* Physical address of head in Transfer descriptor list */
+ volatile uint32_t hext; /* Physical address of next Endpoint descriptor */
+};
+
+/* HostController Transfer Descriptor */
+
+struct usbhost_hctd_s
+{
+ volatile uint32_t control; /* Transfer descriptor control */
+ volatile uint32_t currbufptr; /* Physical address of current buffer pointer */
+ volatile uint32_t bext; /* Physical pointer to next Transfer Descriptor */
+ volatile uint32_t bufend; /* Physical address of end of buffer */
+};
+
+/* Host Controller Communication Area */
+
+struct usbhost_hcca_s
+{
+ volatile uint32_t inttable[32]; /* Interrupt table */
+ volatile uint32_t framenumber; /* Frame number */
+ volatile uint32_t donehead; /* Done head */
+ volatile uint8_t reserved[116]; /* Reserved for future use */
+ volatile uint8_t unknown[4]; /* Unused */
+};
+
+/* Helper definitions */
+
+#define Hcca = ((volatile struct usbhost_hcca_s *)(USBHOST_SRAM_BASE + 0x000))
+#define TDHead = ((volatile struct usbhost_hctd_s *)(USBHOST_SRAM_BASE + 0x100))
+#define TDTail = ((volatile struct usbhost_hctd_s *)(USBHOST_SRAM_BASE + 0x110))
+#define EDCtrl = ((volatile struct usbhost_hced_s *)(USBHOST_SRAM_BASE + 0x120))
+#define EDBulkIn = ((volatile struct usbhost_hced_s *)(USBHOST_SRAM_BASE + 0x130))
+#define EDBulkOut = ((volatile struct usbhost_hced_s *)(USBHOST_SRAM_BASE + 0x140))
+#define TDBuffer = ((volatile uint8_t *)(USBHOST_SRAM_BASE + 0x150))
+
+/*******************************************************************************
+ * Private Function Prototypes
+ *******************************************************************************/
+
+/* Register operations ********************************************************/
+
+#ifdef CONFIG_LPC17_USBHOST_REGDEBUG
+static void lpc17_printreg(uint32_t addr, uint32_t val, bool iswrite);
+static void lpc17_checkreg(uint32_t addr, uint32_t val, bool iswrite);
+static uint32_t lpc17_getreg(uint32_t addr);
+static void lpc17_putreg(uint32_t val, uint32_t addr);
+#else
+# define lpc17_getreg(addr) getreg32(addr)
+# define lpc17_putreg(val,addr) putreg32(val,addr)
+#endif
+
+/* Interrupt handling **********************************************************/
+
+static int lpc17_usbinterrupt(int irq, FAR void *context);
+
+/* USB host controller operations **********************************************/
+
+/*******************************************************************************
+ * Private Data
+ *******************************************************************************/
+
+/* Since there is only a single USB interface, all status information can be
+ * be simply retained in a single global instance.
+ */
+
+static struct lpc17_usbhost_s g_usbhost;
+
+/*******************************************************************************
+ * Public Data
+ *******************************************************************************/
+
+/*******************************************************************************
+ * Private Functions
+ *******************************************************************************/
+
+/*******************************************************************************
+ * Name: lpc17_printreg
+ *
+ * Description:
+ * Print the contents of an LPC17xx register operation
+ *
+ *******************************************************************************/
+
+#ifdef CONFIG_LPC17_USBHOST_REGDEBUG
+static void lpc17_printreg(uint32_t addr, uint32_t val, bool iswrite)
+{
+ lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+}
+#endif
+
+/*******************************************************************************
+ * Name: lpc17_checkreg
+ *
+ * Description:
+ * Get the contents of an LPC17xx register
+ *
+ *******************************************************************************/
+
+#ifdef CONFIG_LPC17_USBHOST_REGDEBUG
+static void lpc17_checkreg(uint32_t addr, uint32_t val, bool iswrite)
+{
+ static uint32_t prevaddr = 0;
+ static uint32_t preval = 0;
+ static uint32_t count = 0;
+ static bool prevwrite = false;
+
+ /* Is this the same value that we read from/wrote to the same register last time?
+ * Are we polling the register? If so, suppress the output.
+ */
+
+ if (addr == prevaddr && val == preval && prevwrite == iswrite)
+ {
+ /* Yes.. Just increment the count */
+
+ count++;
+ }
+ else
+ {
+ /* No this is a new address or value or operation. Were there any
+ * duplicate accesses before this one?
+ */
+
+ if (count > 0)
+ {
+ /* Yes.. Just one? */
+
+ if (count == 1)
+ {
+ /* Yes.. Just one */
+
+ lpc17_printreg(prevaddr, preval, prevwrite);
+ }
+ else
+ {
+ /* No.. More than one. */
+
+ lldbg("[repeats %d more times]\n", count);
+ }
+ }
+
+ /* Save the new address, value, count, and operation for next time */
+
+ prevaddr = addr;
+ preval = val;
+ count = 0;
+ prevwrite = iswrite;
+
+ /* Show the new regisgter access */
+
+ lpc17_printreg(addr, val, iswrite);
+ }
+}
+#endif
+
+/*******************************************************************************
+ * Name: lpc17_getreg
+ *
+ * Description:
+ * Get the contents of an LPC17xx register
+ *
+ *******************************************************************************/
+
+#ifdef CONFIG_LPC17_USBHOST_REGDEBUG
+static uint32_t lpc17_getreg(uint32_t addr)
+{
+ /* Read the value from the register */
+
+ uint32_t val = getreg32(addr);
+
+ /* Check if we need to print this value */
+
+ lpc17_checkreg(addr, val, false);
+ return val;
+}
+#endif
+
+/*******************************************************************************
+ * Name: lpc17_putreg
+ *
+ * Description:
+ * Set the contents of an LPC17xx register to a value
+ *
+ *******************************************************************************/
+
+#ifdef CONFIG_LPC17_USBHOST_REGDEBUG
+static void lpc17_putreg(uint32_t val, uint32_t addr)
+{
+ /* Check if we need to print this value */
+
+ lpc17_checkreg(addr, val, true);
+
+ /* Write the value */
+
+ putreg32(val, addr);
+}
+#endif
+
+/*******************************************************************************
+ * Name: lpc17_usbinterrupt
+ *
+ * Description:
+ * USB interrupt handler
+ *
+ *******************************************************************************/
+
+static int lpc17_usbinterrupt(int irq, FAR void *context)
+{
+ struct lpc17_usbhost_s *priv = &g_usbhost;
+
+ /* Read the device interrupt status register */
+
+ usbtrace(TRACE_INTENTRY(LPC17_TRACEINTID_USB), 0xbeef);
+#warning "Not implemented"
+ usbtrace(TRACE_INTEXIT(LPC17_TRACEINTID_USB), 0);
+ return OK;
+}
+
+/*******************************************************************************
+ * USB Host Device Operations
+ *******************************************************************************/
+
+/*******************************************************************************
+ * Public Functions
+ *******************************************************************************/
+
+/*******************************************************************************
+ * Name: up_usbhostinitialize
+ *
+ * Description:
+ * Initialize USB host device controller hardware.
+ *
+ * Assumptions:
+ * This function is called very early in the initialization sequence in order
+ * to initialize the USB device functionality.
+ *
+ *******************************************************************************/
+
+void up_usbhostinitialize(void)
+{
+ struct lpc17_usbhost_s *priv = &g_usbhost;
+ uint32_t regval;
+ irqstate_t flags;
+ int i;
+
+ usbtrace(TRACE_DEVINIT, 0);
+
+ /* Enable power by setting PCUSB in the PCONP register */
+
+ flags = irqsave();
+ regval = lpc17_getreg(LPC17_SYSCON_PCONP);
+ regval |= SYSCON_PCONP_PCUSB;
+ lpc17_putreg(regval, LPC17_SYSCON_PCONP);
+
+ /* Enable clocking on USB (USB PLL clocking was initialized in very low-
+ * evel clock setup logic (see lpc17_clockconfig.c)). We do still need
+ * to set up USBOTG CLKCTRL to enable clocking.
+ */
+
+ lpc17_putreg(LPC17_CLKCTRL_ENABLES, LPC17_USBOTG_CLKCTRL);
+
+ /* Then wait for the clocks to be reported as "ON" */
+
+ do
+ {
+ regval = lpc17_getreg(LPC17_USBOTG_CLKST);
+ }
+ while ((regval & LPC17_CLKCTRL_ENABLES) != LPC17_CLKCTRL_ENABLES);
+
+ lpc17_putreg(3, LPC17_USBOTG_STCTRL);
+
+ /* Step 3: Configure I/O pins */
+
+ usbhost_dumpgpio();
+ lpc17_configgpio(GPIO_USB_DP); /* Positive differential data */
+ lpc17_configgpio(GPIO_USB_DM); /* Negative differential data */
+ lpc17_configgpio(GPIO_USB_UPLED); /* GoodLink LED control signal */
+ lpc17_configgpio(GPIO_USB_PPWR); /* Port Power enable signal for USB port */
+ lpc17_configgpio(GPIO_USB_PWRD); /* Power Status for USB port (host power switch) */
+ lpc17_configgpio(GPIO_USB_OVRCR); /* USB port Over-Current status */
+ usbhost_dumpgpio();
+
+ udbg("Initializing Host Stack\n");
+
+ /* Initialize all the TDs, EDs and HCCA to 0 */
+
+ usbhost_edinit(EDCtrl);
+ usbhost_edinit(EDBulkIn);
+ usbhost_edinit(EDBulkOut);
+ usbhost_tdinit(TDHead);
+ usbhost_tdinit(TDTail);
+ usbhost_hccanit(Hcca);
+
+ /* Wait 50MS then perform hardware reset */
+
+ up_mdelay(50);
+
+ lpc17_putreg(0, LPC17_USBHOST_CTRL); /* Hardware reset */
+ lpc17_putreg(0, LPC17_USBHOST_CTRLHEADED); /* Initialize control list head to Zero */
+ lpc17_putreg(0, LPC17_USBHOST_BULKHEADED); /* Initialize bulk list head to Zero */
+
+ /* Software reset */
+
+ lpc17_putreg(OHCI_CMDST_HCR, LPC17_USBHOST_CMDST);
+
+ /* Write Fm interval and largest data packet counter */
+
+ lpc17_putreg(DEFAULT_FMINTERVAL, LPC17_USBHOST_FMINT);
+
+ /* Put HC in operational state */
+
+ regval = lpc17_getreg(LPC17_USBHOST_CTRL);
+ regval &= ~OHCI_CTRL_HCFS_MASK;
+ regval |= OHCI_CTRL_HCFS_OPER;
+ lpc17_putreg(regval, LPC17_USBHOST_CTRL);
+
+ /* Set HCCA base address */
+
+ lpc17_putreg((uint32_t)Hcca, LPC17_USBHOST_HCCA);
+
+ /* Clear pending interrupts */
+
+ regval = lpc17_getreg(LPC17_USBHOST_INTST);
+ lpc17_putreg(revgval, LPC17_USBHOST_INTST);
+
+ /* Enable OHCI interrupts */
+
+ lpc17_putreg((OHCI_INT_MIE | OHCI_INT_WDH | OHCI_INT_RHSC), LPC17_USBHOST_INTEN);
+
+ /* Attach USB host controller interrupt handler */
+
+ if (irq_attach(LPC17_IRQ_USB, lpc17_usbinterrupt) != 0)
+ {
+ usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_IRQREGISTRATION),
+ (uint16_t)LPC17_IRQ_USB);
+ return;
+ }
+
+ /* Enable USB interrupts at the SYCON controller */
+
+ flags = irqsave();
+ regval = lpc17_getreg(LPC17_SYSCON_USBINTST);
+ regval |= SYSCON_USBINTST_ENINTS;
+ lpc17_putreg(regval, LPC17_SYSCON_USBINTST);
+ irqrestore(flags);
+
+ /* Enable interrupts at the interrupt controller */
+
+ up_enable_irq(LPC17_IRQ_USB); /* enable USB interrupt */
+ udbg("USB host Initialized\n");
+}
diff --git a/include/nuttx/ohci.h b/include/nuttx/usb/ohci.h
similarity index 99%
rename from include/nuttx/ohci.h
rename to include/nuttx/usb/ohci.h
index 173ba0718245685691d64529e77a64610d65f70a..5475b542027249de0c4f087c0f12a957e90c198e 100755
--- a/include/nuttx/ohci.h
+++ b/include/nuttx/usb/ohci.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * include/nuttx/ohci.h
+ * include/nuttx/usb/ohci.h
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -37,8 +37,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_NUTTX_OHCI_H
-#define __INCLUDE_NUTTX_OHCI_H
+#ifndef __INCLUDE_NUTTX_USB_OHCI_H
+#define __INCLUDE_NUTTX_USB_OHCI_H
/****************************************************************************
* Included Files
@@ -427,4 +427,4 @@ extern "C" {
}
#endif
-#endif /* __INCLUDE_NUTTX_OHCI_H */
+#endif /* __INCLUDE_NUTTX_USB_OHCI_H */