From 45a7656465ad1b5163dc5d5872edd96210ecbb61 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 29 Nov 2013 14:27:20 -0600 Subject: examples/hidkbd now expects an architecture-specific USB HOST initialization function --- nuttx/configs/mbed/src/Makefile | 4 ++ nuttx/configs/mbed/src/up_hidkbd.c | 71 +++++++++++++++++++++++++ nuttx/configs/olimex-lpc1766stk/src/Makefile | 4 ++ nuttx/configs/olimex-lpc1766stk/src/up_hidkbd.c | 71 +++++++++++++++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 nuttx/configs/mbed/src/up_hidkbd.c create mode 100644 nuttx/configs/olimex-lpc1766stk/src/up_hidkbd.c diff --git a/nuttx/configs/mbed/src/Makefile b/nuttx/configs/mbed/src/Makefile index 18019c0be..02fee7649 100644 --- a/nuttx/configs/mbed/src/Makefile +++ b/nuttx/configs/mbed/src/Makefile @@ -46,6 +46,10 @@ ifeq ($(CONFIG_USBMSC),y) CSRCS += up_usbmsc.c endif +ifeq ($(CONFIG_EXAMPLES_HIDKBD),y) +CSRCS += up_hidkbd.c +endif + AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/mbed/src/up_hidkbd.c b/nuttx/configs/mbed/src/up_hidkbd.c new file mode 100644 index 000000000..4cf927e27 --- /dev/null +++ b/nuttx/configs/mbed/src/up_hidkbd.c @@ -0,0 +1,71 @@ +/**************************************************************************** + * configs/mbed/src/up_hidkbd.c + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 + +#include + +#include "lpc17_usbhost.h" + +#if defined(CONFIG_LPC17_USBHOST) && defined(CONFIG_USBHOST) && \ + defined(CONFIG_EXAMPLES_HIDKBD) + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: arch_usbhost_initialize + * + * Description: + * The apps/example/hidkbd test requires that platform-specific code + * provide a wrapper called arch_usbhost_initialize() that will perform + * the actual USB host initialization. + * + ****************************************************************************/ + +struct usbhost_connection_s *arch_usbhost_initialize(void) +{ + return lpc17_usbhost_initialize(0); +} +#endif /* CONFIG_LPC17_USBHOST && CONFIG_USBHOST && CONFIG_EXAMPLES_HIDKBD */ diff --git a/nuttx/configs/olimex-lpc1766stk/src/Makefile b/nuttx/configs/olimex-lpc1766stk/src/Makefile index cf5b962fe..3bec91f88 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/Makefile +++ b/nuttx/configs/olimex-lpc1766stk/src/Makefile @@ -60,6 +60,10 @@ ifeq ($(CONFIG_CAN),y) CSRCS += up_can.c endif +ifeq ($(CONFIG_EXAMPLES_HIDKBD),y) +CSRCS += up_hidkbd.c +endif + AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_hidkbd.c b/nuttx/configs/olimex-lpc1766stk/src/up_hidkbd.c new file mode 100644 index 000000000..b11800829 --- /dev/null +++ b/nuttx/configs/olimex-lpc1766stk/src/up_hidkbd.c @@ -0,0 +1,71 @@ +/**************************************************************************** + * configs/olimex-lpc1766stk/src/up_hidkbd.c + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 + +#include + +#include "lpc17_usbhost.h" + +#if defined(CONFIG_LPC17_USBHOST) && defined(CONFIG_USBHOST) && \ + defined(CONFIG_EXAMPLES_HIDKBD) + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: arch_usbhost_initialize + * + * Description: + * The apps/example/hidkbd test requires that platform-specific code + * provide a wrapper called arch_usbhost_initialize() that will perform + * the actual USB host initialization. + * + ****************************************************************************/ + +struct usbhost_connection_s *arch_usbhost_initialize(void) +{ + return lpc17_usbhost_initialize(0); +} +#endif /* CONFIG_LPC17_USBHOST && CONFIG_USBHOST && CONFIG_EXAMPLES_HIDKBD */ -- cgit v1.2.3