fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 07:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct a typo in STM32 I2C3 support

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4345 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-01-29 14:15:20 +00:00
parent 41d243ce3e
commit 6c72068d14
6 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/ChangeLog
+2 -2
View File
@@ -2396,10 +2396,10 @@
* arch/arm/src/stm32/stm32_i2c.c: Add support for I2C3
* drivers/usbdev/: Lots of name changes: cdc_serial->cdcacm, usbstrg->usbmsc,
usbser->pl2303
* drivers/usbdev/composite*: Fleshed out support for a composite USB device.
* drivers/usbdev/composite: Fleshed out support for a composite USB device.
* drivers/stm3210e-eval/composite and drivers/stm3210e-eval/src/up_composite.c:
Add a configuration test the USB composite device.
* include/nuttx/usb/usb.h, drivers/usbdev/composite_descriptors.c, and
drivers/usbdev/cdcacm_descriptors.c: Add support for the USB Interface
Association Descriptor (IAD)
* arch/arm/src/stm32/stm32_i2c.c: Correct a typo in STM32 I2C3 support
nuttx/arch/arm/src/stm32/stm32_i2c.c
+1 -1
View File
@@ -1209,7 +1209,7 @@ static int stm32_i2c2_isr(int irq, void *context)
************************************************************************************/
#ifdef CONFIG_STM32_I2C3
static int stm32_i2c2_isr(int irq, void *context)
static int stm32_i2c3_isr(int irq, void *context)
{
return stm32_i2c_isr(&stm32_i2c3_priv);
}
nuttx/drivers/usbdev/composite.c
+6 -2
View File
@@ -489,14 +489,18 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
{
ret = composite_mkstrdesc(strid, buf);
}
else if (strid < DEV1_STRIDBASE + DEV1_NSTRIDS)
#if DEV1_NSTRIDS > 0
else if (strid <= DEV1_STRIDBASE + DEV1_NSTRIDS)
{
ret = DEV1_MKSTRDESC(strid, buf);
}
else if (strid < DEV2_STRIDBASE + DEV2_NSTRIDS)
#endif
#if DEV2_NSTRIDS > 0
else if (strid <= DEV2_STRIDBASE + DEV2_NSTRIDS)
{
ret = DEV2_MKSTRDESC(strid, buf);
}
#endif
}
break;