diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-03-27 11:27:55 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-03-27 11:27:55 +0200 |
| commit | d1822e55c075d62d07b1c7ae74fa92b192dbc5c1 (patch) | |
| tree | 66257713a021d5ec64fa5a16e0d1edf959932cca | |
| parent | e1000 driver now compiles with fewer modifications (diff) | |
| download | rtems-libbsd-d1822e55c075d62d07b1c7ae74fa92b192dbc5c1.tar.bz2 | |
testsuite/usb01: Support multiple BSPs
| -rw-r--r-- | testsuite/usb01/init.c | 4 | ||||
| -rw-r--r-- | testsuite/usb01/usb-sysinit.h | 36 |
2 files changed, 29 insertions, 11 deletions
diff --git a/testsuite/usb01/init.c b/testsuite/usb01/init.c index 0cd833b2..0bde78d7 100644 --- a/testsuite/usb01/init.c +++ b/testsuite/usb01/init.c @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010 embedded brains GmbH. All rights reserved. + * Copyright (c) 2010-2012 embedded brains GmbH. All rights reserved. * * embedded brains GmbH * Obere Lagerstr. 30 @@ -260,7 +260,7 @@ static void Init(rtems_task_argument arg) sc = rtems_media_server_initialize(200, 32 * 1024, RTEMS_DEFAULT_MODES, RTEMS_DEFAULT_ATTRIBUTES); ASSERT_SC(sc); - sc = rtems_bsd_initialize(); + sc = rtems_bsd_initialize_with_interrupt_server(); ASSERT_SC(sc); rtems_bsd_shell_initialize(); diff --git a/testsuite/usb01/usb-sysinit.h b/testsuite/usb01/usb-sysinit.h index d4513c14..367ea69a 100644 --- a/testsuite/usb01/usb-sysinit.h +++ b/testsuite/usb01/usb-sysinit.h @@ -7,7 +7,7 @@ */ /* - * Copyright (c) 2009, 2010 embedded brains GmbH. All rights reserved. + * Copyright (c) 2009-2012 embedded brains GmbH. All rights reserved. * * embedded brains GmbH * Obere Lagerstr. 30 @@ -26,22 +26,40 @@ #ifdef USB_SYSINIT_INIT +#if defined(LIBBSP_ARM_LPC24XX_BSP_H) || defined(LIBBSP_ARM_LPC32XX_BSP_H) + #define NEED_USB_OHCI +#elif defined(__GEN83xx_BSP_h) || defined(LIBBSP_POWERPC_QORIQ_BSP_H) + #define NEED_USB_EHCI +#endif + +#if defined(LIBBSP_POWERPC_QORIQ_BSP_H) + #define NEED_SDHC +#endif + SYSINIT_NEED_FREEBSD_CORE; SYSINIT_NEED_USB_CORE; -#if defined(LIBBSP_ARM_LPC24XX_BSP_H) || defined(LIBBSP_ARM_LPC32XX_BSP_H) +#ifdef NEED_USB_OHCI SYSINIT_NEED_USB_OHCI; -#elif defined(__GEN83xx_BSP_h) +#endif +#ifdef NEED_USB_EHCI SYSINIT_NEED_USB_EHCI; #endif SYSINIT_NEED_USB_MASS_STORAGE; +#ifdef NEED_SDHC + SYSINIT_NEED_SDHC; +#endif const char *const _bsd_nexus_devices [] = { - #if defined(LIBBSP_ARM_LPC24XX_BSP_H) || defined(LIBBSP_ARM_LPC32XX_BSP_H) - "ohci", - #elif defined(__GEN83xx_BSP_h) - "ehci", - #endif - NULL + #ifdef NEED_USB_OHCI + "ohci", + #endif + #ifdef NEED_USB_EHCI + "ehci", + #endif + #ifdef NEED_SDHC + "sdhci", + #endif + NULL }; #endif /* USB_SYSINIT_INIT */ |