diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-30 08:08:02 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-30 08:08:02 -0600 |
| commit | 4b6733594977f659fea662cfa3721f72c89da367 (patch) | |
| tree | deef5972b277e22c678f4a13f5f2c8845f5f1609 /nuttx | |
| parent | ba6a4a66fda85ebe1162e1ec4d74e09d6bf4991c (diff) | |
| download | px4-nuttx-4b6733594977f659fea662cfa3721f72c89da367.tar.gz px4-nuttx-4b6733594977f659fea662cfa3721f72c89da367.tar.bz2 px4-nuttx-4b6733594977f659fea662cfa3721f72c89da367.zip | |
LPC17: Interrupts not being re-enabled in the initialization function
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c | 5 | ||||
| -rw-r--r-- | nuttx/configs/olimex-lpc1766stk/src/up_nsh.c | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index c8ad648eb..add6650a3 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -4637,3 +4637,7 @@ dragging task_delete() into the link when it is never called. 6.28 2013-xx-xx Gregory Nutt <gnutt@nuttx.org> + + * arch/arm/src/lpc17xx/lpc17_i2c.c: Interrupts were not being + re-enabled in the I2C intializatin function. + diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c b/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c index 777349def..4c4fdb0b1 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c @@ -9,7 +9,7 @@ * * Author: David Hewson * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -537,6 +537,7 @@ struct i2c_dev_s *up_i2cinitialize(int port) else #endif { + irqrestore(flags); return NULL; } @@ -561,6 +562,8 @@ struct i2c_dev_s *up_i2cinitialize(int port) /* Install our operations */ priv->dev.ops = &lpc17_i2c_ops; + + irqrestore(flags); return &priv->dev; } diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c index c18493c94..2174856e5 100644 --- a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c +++ b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c @@ -49,6 +49,7 @@ #include <nuttx/mmcsd.h> #include <nuttx/usb/usbhost.h> +#include "lpc17_ssp.h" #include "lpc17_gpio.h" #include "lpc1766stk_internal.h" |