diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-09-30 12:26:12 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-09-30 12:26:12 +0000 |
| commit | 1e3f4c4e17369d903b03908ae6def8e6aa8caaac (patch) | |
| tree | 40b3513ca5bb5a5dc6c16ddc397dc1de325d73d1 /nuttx | |
| parent | b3ca835d77a6d2c85c133a5007e2603b6feaaae4 (diff) | |
| download | px4-nuttx-1e3f4c4e17369d903b03908ae6def8e6aa8caaac.tar.gz px4-nuttx-1e3f4c4e17369d903b03908ae6def8e6aa8caaac.tar.bz2 px4-nuttx-1e3f4c4e17369d903b03908ae6def8e6aa8caaac.zip | |
Integrate USB into ARM initialization
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@965 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/common/up_initialize.c | 14 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c index e5b612fc6..5dc540cd3 100644 --- a/nuttx/arch/arm/src/common/up_initialize.c +++ b/nuttx/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 <spudmonkey@racsa.co.cr> * * 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 <nuttx/config.h> + #include <sys/types.h> #include <debug.h> + #include <nuttx/arch.h> #include <nuttx/fs.h> + #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/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c index 8fc94c2c0..f934d3d2d 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/nuttx/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; } /******************************************************************************* |