dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fix an integer overflow bug in LPC17xx GPIO interrupt configuration 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4247 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-01-01 15:57:03 +00:00
parent 9a1c94e294
commit 6a3f04eeab
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nuttx/ChangeLog
View File

@ -2312,13 +2312,15 @@
* configs/olimex-lpc1766stk/src/up_leds.c: Add new interfaces so that is
CONFIG_ARCH_LEDS are not set, the LEDs may be controlled from application
logic.
*configs/olimex-lpc1766stk/src/up_buttons.c: Add support form the buttons
* configs/olimex-lpc1766stk/src/up_buttons.c: Add support form the buttons
on the Olimex LPC1766-STK board.
* Makefile: Added 'apps_clean' and 'apps_distclean' target to simplify
managing the state of the application directory while in the NuttX directory
* Documentation/NuttXGettingStarted.html: Added a "Getting Started" Guide
for NuttX. At present, this is just a stub and it refers to the NuttX
top-level README.txt file which is the only, real "Getting Started" Guide
that exists for the time being.
that exists at the time being.
* arch/arm/src/lpc17xx/lpc17_gpioint.c: Correct an value used as the lower
end of an IRQ number range test.
* arch/arm/src/lpc17xx/lpc17_gpio.c: Fix a integer flow problem in shift.
This error would prevent pins > 15 from being used as interrupt sources.

6
nuttx/arch/arm/src/lpc17xx/lpc17_gpio.c
View File

@ -301,9 +301,9 @@ static void lpc17_setintedge(unsigned int port, unsigned int pin,
/* Set the requested value in the PINSEL register */
shift = pin << 1;
*intedge &= ~(3 << shift);
*intedge |= (value << shift);
shift = pin << 1;
*intedge &= ~((uint64_t)3 << shift);
*intedge |= ((uint64_t)value << shift);
}
#endif

1
nuttx/configs/olimex-lpc1766stk/src/up_leds.c
View File

@ -109,6 +109,7 @@ static bool g_uninitialized = true;
void up_ledinit(void)
{
/* Configure all LED GPIO lines */
led_dumpgpio("up_ledinit() Entry)");
lpc17_configgpio(LPC1766STK_LED1);