diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-06 10:52:05 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-06 10:52:05 -0600 |
| commit | 0e1697302a5692d2fa81af5c76d3277b3a19a656 (patch) | |
| tree | a4c883b13bc98be189e07a3ac43fcf1940e31461 | |
| parent | 0132de56e42fbebc1a96d8a82609e3dffc017ec9 (diff) | |
| download | nuttx-0e1697302a5692d2fa81af5c76d3277b3a19a656.tar.gz nuttx-0e1697302a5692d2fa81af5c76d3277b3a19a656.tar.bz2 nuttx-0e1697302a5692d2fa81af5c76d3277b3a19a656.zip | |
Update ChangeLog
| -rwxr-xr-x | nuttx/ChangeLog | 10 | ||||
| -rw-r--r-- | nuttx/include/nuttx/sensors/lm75.h | 14 |
2 files changed, 13 insertions, 11 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index b0cb0e841..8307647a1 100755 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -9208,7 +9208,7 @@ and the FS clock enable bits are set in FS mode, then the ARM never awakens from WFI due to a chip issue. This is only an issue if you are using the internal PHY. From Ken Pettit (2014-12-13). - * drivers/serial/serial.c: In case a thread is doing a blockingi + * drivers/serial/serial.c: In case a thread is doing a blocking operation (e.g. read()) on a serial device, while it is being terminated by pthread_cancel(), then uart_close() gets called, but the semaphore (dev->recv.sem in the above example) is still blocked. @@ -9354,7 +9354,7 @@ * arch/arm/src/stm32/stm32_ltdc.c: Clean up documentation, some formatting improvements. From Marco Krahl (2014-12-29). * arch/arm/src/tiva/chip/tiva_ethernet.h, lm3s_ethernet.c, and - tm4c_ethernet.h: Add logic to descriminate betwen LM3S class Ethernet + tm4c_ethernet.h: Add logic to discriminate betwen LM3S class Ethernet register definitions and TM4C129X class Ethernet register definitions. Add TM4C129X Ethernet register definitions (2014-12-30). * arch/arm/src/tiva/tm4c_ethernet.c, lm3s_ethernet.c, Kconfig, and @@ -9368,5 +9368,7 @@ defining CONFIG_RTC_LSICLOCK. From Kevin Hester (2015-01-02). * net/tcp/tcp_conn.c: Fix a logic error when CONFIG_NETDEV_MULTINIC is selected: net_unlock(flags) will be called will an uninitialized - variable (2015-01-03). - + variable (2015-01-03). + * arch/arm/src/tiva/tiva_irq.c: Fix Tiva IRQ control logic; was limited + to only 64 IRQs. That is a problem for higher numbered IRQs on many + platforms (2015-01-06). diff --git a/nuttx/include/nuttx/sensors/lm75.h b/nuttx/include/nuttx/sensors/lm75.h index d34509ada..9d3e19424 100644 --- a/nuttx/include/nuttx/sensors/lm75.h +++ b/nuttx/include/nuttx/sensors/lm75.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/lm75.h + * include/nuttx/sensors/lm75.h * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_SENSORS_LM75_H -#define __NUTTX_SENSORS_LM75_H +#ifndef __INCLUDE_NUTTX_SENSORS_LM75_H +#define __INCLUDE_NUTTX_SENSORS_LM75_H /**************************************************************************** * Included Files @@ -86,15 +86,15 @@ */ /**************************************************************************** - * Global Data + * Public Data ****************************************************************************/ /**************************************************************************** - * Global Function Prototypes + * Public Function Prototypes ****************************************************************************/ /**************************************************************************** - * Global Function Prototypes + * Public Function Prototypes ****************************************************************************/ #ifdef __cplusplus @@ -130,4 +130,4 @@ EXTERN int lm75_register(FAR const char *devpath, FAR struct i2c_dev_s *i2c, } #endif -#endif /* __NUTTX_SENSORS_LM75_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_LM75_H */ |