diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-07-04 07:47:32 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-07-04 07:47:32 -0600 |
| commit | ff47b9ab818be6cf3cf3dc27b411af889d232ef2 (patch) | |
| tree | d538bd7a9ba187ef7ad948414dde45ec5f7c03e8 | |
| parent | 274fb045cf9fc1132977b76ace08bcfa8130043b (diff) | |
| download | px4-nuttx-ff47b9ab818be6cf3cf3dc27b411af889d232ef2.tar.gz px4-nuttx-ff47b9ab818be6cf3cf3dc27b411af889d232ef2.tar.bz2 px4-nuttx-ff47b9ab818be6cf3cf3dc27b411af889d232ef2.zip | |
Fix type in the USB composite device driver
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/configs/arduino-due/README.txt | 4 | ||||
| -rw-r--r-- | nuttx/drivers/usbdev/composite.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 9750a63f8..17c230968 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -5108,4 +5108,7 @@ Change error to ERROR (2013-7-3). * arch/arm/src/sam34/sam_gpioirq.c: Fix some errors for interrupts on ports D-F (2013-7-3). + * /drivers/usbdev/composite.c: Fix a type in the composite device + driver unitialization logic. DEV1 should be DEV2 in one case + (2013-7-4). diff --git a/nuttx/configs/arduino-due/README.txt b/nuttx/configs/arduino-due/README.txt index 0e0f4224b..546a57ec4 100644 --- a/nuttx/configs/arduino-due/README.txt +++ b/nuttx/configs/arduino-due/README.txt @@ -187,7 +187,9 @@ ITEAD 2.4" TFT with Touch 5. Either PA28 or PC29 may drive PWM10 6. The schematics I have do not agree with the documentation. The Touch IRQ and Dout pins are reversed in the Documentation (D9 an D8, respectively). - I am assuming that the schematic is correct. + I am assuming that the schematic is correct (and the schematic does seem + to match up with what little I can see on the single visible side of the + board). SD Interface: diff --git a/nuttx/drivers/usbdev/composite.c b/nuttx/drivers/usbdev/composite.c index 530d64416..118f70e28 100644 --- a/nuttx/drivers/usbdev/composite.c +++ b/nuttx/drivers/usbdev/composite.c @@ -891,7 +891,7 @@ void composite_uninitialize(FAR void *handle) if (priv->dev2) { - DEV1_UNINITIALIZE(priv->dev2); + DEV2_UNINITIALIZE(priv->dev2); priv->dev2 = NULL; } |