diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-06 23:17:03 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-06 23:17:03 +0000 |
| commit | 80789dd4c455f7e1226152750c007205e59f3172 (patch) | |
| tree | 9cd3077815a37f5c7fd02f23434417338f6e9bfe /nuttx | |
| parent | 89acebd2f0100884427100b43c9d07942437229e (diff) | |
| download | px4-nuttx-80789dd4c455f7e1226152750c007205e59f3172.tar.gz px4-nuttx-80789dd4c455f7e1226152750c007205e59f3172.tar.bz2 px4-nuttx-80789dd4c455f7e1226152750c007205e59f3172.zip | |
PIC32 USB driver fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4273 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c b/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c index 2eb292bc4..948c7b9d1 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c @@ -1,8 +1,8 @@ /**************************************************************************** * arch/mips/src/pic32mx/pic32mx_usbdev.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.orgr> + * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * References: * This file derives from the STM32 USB device driver with modifications @@ -2158,7 +2158,7 @@ static int pic32mx_interrupt(int irq, void *context) /* Get the set of pending USB interrupts */ - pending = pic32mx_getreg(PIC32MX_USBOTG_IR) & pic32mx_getreg(PIC32MX_USBOTG_IE); + pending = pic32mx_getreg(PIC32MX_USB_IR) & pic32mx_getreg(PIC32MX_USB_IE); usbtrace(TRACE_INTENTRY(PIC32MX_TRACEINTID_INTERRUPT), pending); #ifdef CONFIG_USBOTG @@ -2440,14 +2440,14 @@ static void pic32mx_resume(struct pic32mx_usbdev_s *priv) regval = pic32mx_getreg(PIC32MX_USB_CON); regval |= USB_CON_RESUME; - pic32mx_putreg(regval, PIC32MX_USBOTG_IE); + pic32mx_putreg(regval, PIC32MX_USB_CON); - /* Keep the RESUME line for 1-13 ms */ + /* Keep the RESUME line set for 1-13 ms */ up_mdelay(10); regval &= ~USB_CON_RESUME; - pic32mx_putreg(regval, PIC32MX_USBOTG_IE); + pic32mx_putreg(regval, PIC32MX_USB_CON); /* This function is called when the USB activity interrupt occurs. * If using clock switching, this is the place to call out to |