diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-23 11:36:03 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-23 11:36:03 -0600 |
| commit | 0ebbf0438116b8771e4ae2c06232b7828bfdaf45 (patch) | |
| tree | aec8938de69c18284ea6512874bb303027bbeee4 | |
| parent | 16ed90cd1c95c6ac27206195dc78e16b675b331f (diff) | |
| parent | cf7a32e30508512fba37657ca07cfcc060f2f7e7 (diff) | |
| download | nuttx-0ebbf0438116b8771e4ae2c06232b7828bfdaf45.tar.gz nuttx-0ebbf0438116b8771e4ae2c06232b7828bfdaf45.tar.bz2 nuttx-0ebbf0438116b8771e4ae2c06232b7828bfdaf45.zip | |
Merge remote-tracking branch 'origin/master' into netiob
| -rw-r--r-- | nuttx/ChangeLog | 5 | ||||
| -rw-r--r-- | nuttx/arch/avr/Kconfig | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/Kconfig | 2 | ||||
| -rw-r--r-- | nuttx/net/net_send_unbuffered.c | 6 |
4 files changed, 10 insertions, 5 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index c2d5e808b..e24fbdfd1 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -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). + diff --git a/nuttx/arch/avr/Kconfig b/nuttx/arch/avr/Kconfig index 917653fdc..8d26b183e 100644 --- a/nuttx/arch/avr/Kconfig +++ b/nuttx/arch/avr/Kconfig @@ -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. diff --git a/nuttx/arch/avr/src/avr32/Kconfig b/nuttx/arch/avr/src/avr32/Kconfig index b542381ea..5e04c40da 100644 --- a/nuttx/arch/avr/src/avr32/Kconfig +++ b/nuttx/arch/avr/src/avr32/Kconfig @@ -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 diff --git a/nuttx/net/net_send_unbuffered.c b/nuttx/net/net_send_unbuffered.c index d9d3dc9c9..5c3b4f626 100644 --- a/nuttx/net/net_send_unbuffered.c +++ b/nuttx/net/net_send_unbuffered.c @@ -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 */ |