OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into netiob

This commit is contained in:
Gregory Nutt 2014-06-23 11:36:03 -06:00
parent dbcbbf1adf 5fe252ce25
commit 240092a025
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -7468,3 +7468,8 @@
* include/time.h and sched/clock_gettime.c: Fix typo in conditional
compilation: CONFIG_CLOCK_MONOTONIC vs. CLOCK_MONOTONIC. From Manuel
Stühn (2014-6-23).
* arch/avr/Kconfig and arch/avr/src/avr32/Kconfig: Fix typos in
Kconfig files from Stefan Sperling (2014-6-23).
* net/net_send_unbuffered.c: Remove some spurious white space from
field selectors. SourceForge ticket #42 (2014-6-23).

2
arch/avr/Kconfig
View File

@ -22,7 +22,7 @@ config ARCH_CHIP_AT90USB
Atmel AT90USB family of 8-bit AVRs.
config ARCH_CHIP_AT32UC3
bool "AVR23 AT32UC3* family"
bool "AVR32 AT32UC3* family"
select ARCH_FAMILY_AVR32
---help---
Atmel AT32UC3A/B/C family of 32-bit AVR32s.

2
arch/avr/src/avr32/Kconfig
View File

@ -16,7 +16,7 @@ config AVR32_AVRTOOLSW
depends on HOST_WINDOWS
config AVR32_AVRTOOLSL
bool "AVR tools for Windows"
bool "AVR tools for Linux"
depends on HOST_LINUX
endchoice # Toolchain

6
net/net_send_unbuffered.c
View File

@ -680,7 +680,7 @@ ssize_t tcpsend(FAR struct socket *psock, FAR const void *buf, size_t len,
save = uip_lock();
memset(&state, 0, sizeof(struct send_s));
(void)sem_init(&state. snd_sem, 0, 0); /* Doesn't really fail */
(void)sem_init(&state.snd_sem, 0, 0); /* Doesn't really fail */
state.snd_sock = psock; /* Socket descriptor to use */
state.snd_buflen = len; /* Number of bytes to send */
state.snd_buffer = buf; /* Buffer to send from */
@ -725,7 +725,7 @@ ssize_t tcpsend(FAR struct socket *psock, FAR const void *buf, size_t len,
* automatically re-enabled when the task restarts.
*/
ret = uip_lockedwait(&state. snd_sem);
ret = uip_lockedwait(&state.snd_sem);
/* Make sure that no further interrupts are processed */
@ -733,7 +733,7 @@ ssize_t tcpsend(FAR struct socket *psock, FAR const void *buf, size_t len,
}
}
sem_destroy(&state. snd_sem);
sem_destroy(&state.snd_sem);
uip_unlock(save);
/* Set the socket state to idle */