diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index e5b612fc62..5dc540cd35 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** - * common/up_initialize.c + * arch/arm/src/common/up_initialize.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 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. * @@ -38,10 +38,13 @@ ****************************************************************************/ #include + #include #include + #include #include + #include "up_arch.h" #include "up_internal.h" @@ -144,5 +147,10 @@ void up_initialize(void) /* Initialize the netwok */ up_netinitialize(); + + /* Initializ USB */ + + up_usbinitialize(); + up_ledon(LED_IRQSENABLED); } diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c index 8fc94c2c0d..f934d3d2df 100644 --- a/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -2585,10 +2585,10 @@ errout: } /******************************************************************************* - * Name: up_usbunintialize + * Name: up_usbuninitialize *******************************************************************************/ -int up_usbunintialize(void) +void up_usbuninitialize(void) { struct lpc214x_usbdev_s *priv = &g_usbdev; uint32 reg; @@ -2619,7 +2619,6 @@ int up_usbunintialize(void) reg &= ~LPC214X_PCONP_PCUSB; putreg32(reg, LPC214X_PCON_PCONP); irqrestore(flags); - return OK; } /*******************************************************************************