sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Integrate USB into ARM initialization

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@965 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-09-30 12:26:12 +00:00
parent a6bbd0ea80
commit 648f9716a8
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/src/common/up_initialize.c
View File

@ -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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * 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 * notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the * the documentation and/or other materials provided with the
* distribution. * 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 * used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -38,10 +38,13 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <sys/types.h>
#include <debug.h> #include <debug.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/fs.h> #include <nuttx/fs.h>
#include "up_arch.h" #include "up_arch.h"
#include "up_internal.h" #include "up_internal.h"
@ -144,5 +147,10 @@ void up_initialize(void)
/* Initialize the netwok */ /* Initialize the netwok */
up_netinitialize(); up_netinitialize();
/* Initializ USB */
up_usbinitialize();
up_ledon(LED_IRQSENABLED); up_ledon(LED_IRQSENABLED);
} }

5
arch/arm/src/lpc214x/lpc214x_usbdev.c
View File

@ -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; struct lpc214x_usbdev_s *priv = &g_usbdev;
uint32 reg; uint32 reg;
@ -2619,7 +2619,6 @@ int up_usbunintialize(void)
reg &= ~LPC214X_PCONP_PCUSB; reg &= ~LPC214X_PCONP_PCUSB;
putreg32(reg, LPC214X_PCON_PCONP); putreg32(reg, LPC214X_PCON_PCONP);
irqrestore(flags); irqrestore(flags);
return OK;
} }
/******************************************************************************* /*******************************************************************************