diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-12-27 12:44:39 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-12-27 12:44:39 +0000 |
| commit | 8deca84debb66a97f9d57ed0299659196e31b5f2 (patch) | |
| tree | 99bb0ca16fb966c4f58e42e1f4cacfec02fabfd1 /nuttx/arch | |
| parent | c6e7c0b93a2d4b917b81b294f504a56eadb5289d (diff) | |
| download | px4-nuttx-8deca84debb66a97f9d57ed0299659196e31b5f2.tar.gz px4-nuttx-8deca84debb66a97f9d57ed0299659196e31b5f2.tar.bz2 px4-nuttx-8deca84debb66a97f9d57ed0299659196e31b5f2.zip | |
Changes to tools to support MAC OS
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4232 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_usbdev.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/pic32mx/Make.defs | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_usbdev.c b/nuttx/arch/arm/src/stm32/stm32_usbdev.c index 54148b230..85a0b6400 100644 --- a/nuttx/arch/arm/src/stm32/stm32_usbdev.c +++ b/nuttx/arch/arm/src/stm32/stm32_usbdev.c @@ -2,7 +2,7 @@ * arch/arm/src/stm32/stm32_usbdev.c * * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.orgr> * * References: * - RM0008 Reference manual, STMicro document ID 13902 @@ -148,7 +148,7 @@ #define REQRECIPIENT_MASK (USB_REQ_TYPE_MASK | USB_REQ_RECIPIENT_MASK) -/* Endpoint rister masks (handling toggle fields) */ +/* Endpoint register masks (handling toggle fields) */ #define EPR_NOTOG_MASK (USB_EPR_CTR_RX | USB_EPR_SETUP | USB_EPR_EPTYPE_MASK |\ USB_EPR_EP_KIND | USB_EPR_CTR_TX | USB_EPR_EA_MASK) diff --git a/nuttx/arch/mips/src/pic32mx/Make.defs b/nuttx/arch/mips/src/pic32mx/Make.defs index a021dcb83..3aee3179f 100644 --- a/nuttx/arch/mips/src/pic32mx/Make.defs +++ b/nuttx/arch/mips/src/pic32mx/Make.defs @@ -67,5 +67,9 @@ CHIP_CSRCS = pic32mx-irq.c pic32mx-decodeirq.c pic32mx-exception.c pic32mx-gpio. # Configuration-dependent PIC32MX files ifeq ($(CONFIG_GPIO_IRQ),y) -CHIP_CSRCS += up_gpioirq.c +CHIP_CSRCS += pic32mx_gpioirq.c +endif + +ifeq ($(CONFIG_PIC32MX_USBDEV),y) +CHIP_CSRCS += pic32mx-usbdev.c endif |