deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleanup trailing spaces and convert tabs to spaces

Browse source 
This commit removes trailing spaces and converts
tabs to spaces in all files affected by fix-doxygen PR.
This commit is contained in:
Tommy Sparber 2015-10-30 21:41:59 +11:00
parent 9bb3a3a235
commit 938a425949
29 changed files with 1001 additions and 1033 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
core/net/ip/uip.h
View file

@ -64,17 +64,11 @@
#define UIP_TCPH_LEN 20 /* Size of TCP header */ #define UIP_TCPH_LEN 20 /* Size of TCP header */
#define UIP_ICMPH_LEN 4 /* Size of ICMP header */ #define UIP_ICMPH_LEN 4 /* Size of ICMP header */
#define UIP_IPUDPH_LEN (UIP_UDPH_LEN + UIP_IPH_LEN) /* Size of IP + #define UIP_IPUDPH_LEN (UIP_UDPH_LEN + UIP_IPH_LEN) /* Size of IP + UDP header */
* UDP #define UIP_IPTCPH_LEN (UIP_TCPH_LEN + UIP_IPH_LEN) /* Size of IP + TCP header */
* header */
#define UIP_IPTCPH_LEN (UIP_TCPH_LEN + UIP_IPH_LEN) /* Size of IP +
* TCP
* header */
#define UIP_TCPIP_HLEN UIP_IPTCPH_LEN #define UIP_TCPIP_HLEN UIP_IPTCPH_LEN
#define UIP_IPICMPH_LEN (UIP_IPH_LEN + UIP_ICMPH_LEN) /* size of ICMP #define UIP_IPICMPH_LEN (UIP_IPH_LEN + UIP_ICMPH_LEN) /* Size of ICMP + IP header */
+ IP header */ #define UIP_LLIPH_LEN (UIP_LLH_LEN + UIP_IPH_LEN) /* Size of L2 + IP header */
#define UIP_LLIPH_LEN (UIP_LLH_LEN + UIP_IPH_LEN) /* size of L2
+ IP header */
#if NETSTACK_CONF_WITH_IPV6 #if NETSTACK_CONF_WITH_IPV6
/** /**
* The sums below are quite used in ND. When used for uip_buf, we * The sums below are quite used in ND. When used for uip_buf, we
@ -1362,17 +1356,12 @@ struct uip_conn {
uint8_t rcv_nxt[4]; /**< The sequence number that we expect to uint8_t rcv_nxt[4]; /**< The sequence number that we expect to
receive next. */ receive next. */
uint8_t snd_nxt[4]; /**< The sequence number that was last sent by uint8_t snd_nxt[4]; /**< The sequence number that was last sent by us. */
us. */
uint16_t len; /**< Length of the data that was previously sent. */ uint16_t len; /**< Length of the data that was previously sent. */
uint16_t mss; /**< Current maximum segment size for the uint16_t mss; /**< Current maximum segment size for the connection. */
connection. */ uint16_t initialmss; /**< Initial maximum segment size for the connection. */
uint16_t initialmss; /**< Initial maximum segment size for the uint8_t sa; /**< Retransmission time-out calculation state variable. */
connection. */ uint8_t sv; /**< Retransmission time-out calculation state variable. */
uint8_t sa; /**< Retransmission time-out calculation state
variable. */
uint8_t sv; /**< Retransmission time-out calculation state
variable. */
uint8_t rto; /**< Retransmission time-out. */ uint8_t rto; /**< Retransmission time-out. */
uint8_t tcpstateflags; /**< TCP state and flags. */ uint8_t tcpstateflags; /**< TCP state and flags. */
uint8_t timer; /**< The retransmission timer. */ uint8_t timer; /**< The retransmission timer. */
@ -1464,14 +1453,10 @@ extern struct uip_stats uip_stat;
*/ */
struct uip_stats { struct uip_stats {
struct { struct {
uip_stats_t recv; /**< Number of received packets at the IP uip_stats_t recv; /**< Number of received packets at the IP layer. */
layer. */ uip_stats_t sent; /**< Number of sent packets at the IP layer. */
uip_stats_t sent; /**< Number of sent packets at the IP uip_stats_t forwarded;/**< Number of forwarded packets at the IP layer. */
layer. */ uip_stats_t drop; /**< Number of dropped packets at the IP layer. */
uip_stats_t forwarded;/**< Number of forwarded packets at the IP
layer. */
uip_stats_t drop; /**< Number of dropped packets at the IP
layer. */
uip_stats_t vhlerr; /**< Number of packets dropped due to wrong uip_stats_t vhlerr; /**< Number of packets dropped due to wrong
IP version or header length. */ IP version or header length. */
uip_stats_t hblenerr; /**< Number of packets dropped due to wrong uip_stats_t hblenerr; /**< Number of packets dropped due to wrong
@ -1489,20 +1474,16 @@ struct uip_stats {
uip_stats_t recv; /**< Number of received ICMP packets. */ uip_stats_t recv; /**< Number of received ICMP packets. */
uip_stats_t sent; /**< Number of sent ICMP packets. */ uip_stats_t sent; /**< Number of sent ICMP packets. */
uip_stats_t drop; /**< Number of dropped ICMP packets. */ uip_stats_t drop; /**< Number of dropped ICMP packets. */
uip_stats_t typeerr; /**< Number of ICMP packets with a wrong uip_stats_t typeerr; /**< Number of ICMP packets with a wrong type. */
type. */ uip_stats_t chkerr; /**< Number of ICMP packets with a bad checksum. */
uip_stats_t chkerr; /**< Number of ICMP packets with a bad
checksum. */
} icmp; /**< ICMP statistics. */ } icmp; /**< ICMP statistics. */
#if UIP_TCP #if UIP_TCP
struct { struct {
uip_stats_t recv; /**< Number of recived TCP segments. */ uip_stats_t recv; /**< Number of recived TCP segments. */
uip_stats_t sent; /**< Number of sent TCP segments. */ uip_stats_t sent; /**< Number of sent TCP segments. */
uip_stats_t drop; /**< Number of dropped TCP segments. */ uip_stats_t drop; /**< Number of dropped TCP segments. */
uip_stats_t chkerr; /**< Number of TCP segments with a bad uip_stats_t chkerr; /**< Number of TCP segments with a bad checksum. */
checksum. */ uip_stats_t ackerr; /**< Number of TCP segments with a bad ACK number. */
uip_stats_t ackerr; /**< Number of TCP segments with a bad ACK
number. */
uip_stats_t rst; /**< Number of received TCP RST (reset) segments. */ uip_stats_t rst; /**< Number of received TCP RST (reset) segments. */
uip_stats_t rexmit; /**< Number of retransmitted TCP segments. */ uip_stats_t rexmit; /**< Number of retransmitted TCP segments. */
uip_stats_t syndrop; /**< Number of dropped SYNs because too few uip_stats_t syndrop; /**< Number of dropped SYNs because too few

7
core/net/ipv6/sicslowpan.c
View file

@ -684,7 +684,8 @@ compress_hdr_hc06(linkaddr_t *link_destaddr)
/* compession compare with link adress (destination) */ /* compession compare with link adress (destination) */
iphc1 |= compress_addr_64(SICSLOWPAN_IPHC_DAM_BIT, iphc1 |= compress_addr_64(SICSLOWPAN_IPHC_DAM_BIT,
&UIP_IP_BUF->destipaddr, (uip_lladdr_t *)link_destaddr); &UIP_IP_BUF->destipaddr,
(uip_lladdr_t *)link_destaddr);
/* No context found for this address */ /* No context found for this address */
} else if(uip_is_addr_linklocal(&UIP_IP_BUF->destipaddr) && } else if(uip_is_addr_linklocal(&UIP_IP_BUF->destipaddr) &&
UIP_IP_BUF->destipaddr.u16[1] == 0 && UIP_IP_BUF->destipaddr.u16[1] == 0 &&
@ -908,8 +909,7 @@ uncompress_hdr_hc06(uint16_t ip_len)
/* no multicast */ /* no multicast */
/* Context based */ /* Context based */
if(iphc1 & SICSLOWPAN_IPHC_DAC) { if(iphc1 & SICSLOWPAN_IPHC_DAC) {
uint8_t dci = (iphc1 & SICSLOWPAN_IPHC_CID) ? uint8_t dci = (iphc1 & SICSLOWPAN_IPHC_CID) ? PACKETBUF_IPHC_BUF[2] & 0x0f : 0;
PACKETBUF_IPHC_BUF[2] & 0x0f : 0;
context = addr_context_lookup_by_number(dci); context = addr_context_lookup_by_number(dci);
/* all valid cases below need the context! */ /* all valid cases below need the context! */
@ -1905,7 +1905,6 @@ sicslowpan_init(void)
#else #else
addr_contexts[i].used = 0; addr_contexts[i].used = 0;
#endif /* SICSLOWPAN_CONF_ADDR_CONTEXT_1 */ #endif /* SICSLOWPAN_CONF_ADDR_CONTEXT_1 */
} }
} }
#endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 1 */ #endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 1 */

11
cpu/arm/at91sam7s/loader/elfloader-otf.h
View file

@ -164,10 +164,10 @@
* This object defines methods (callbacks) for writing the segments to memory. * This object defines methods (callbacks) for writing the segments to memory.
* It can be extended by the user to include any necessary state. * It can be extended by the user to include any necessary state.
*/ */
struct elfloader_output { struct elfloader_output {
const struct elfloader_output_ops *ops; const struct elfloader_output_ops *ops;
}; };
/** /**
* \brief Allocate a new segment * \brief Allocate a new segment
* \param input The output object * \param input The output object
@ -178,7 +178,6 @@ struct elfloader_output {
* The returned address doesn't need to correspond to any real memory, * The returned address doesn't need to correspond to any real memory,
* since it's only used for calculating the relocations. * since it's only used for calculating the relocations.
*/ */
void *elfloader_allocate_segment(struct elfloader_output *output, void *elfloader_allocate_segment(struct elfloader_output *output,
unsigned int type, int size); unsigned int type, int size);
@ -191,15 +190,14 @@ void *elfloader_allocate_segment(struct elfloader_output *output,
* \return Returns ELFLOADER_OK if successful, otherwise an error code * \return Returns ELFLOADER_OK if successful, otherwise an error code
* *
*/ */
int elfloader_start_segment(struct elfloader_output *output, int elfloader_start_segment(struct elfloader_output *output,
unsigned int type, void *addr, int size); unsigned int type, void *addr, int size);
/** /**
* \brief Mark end of segment * \brief Mark end of segment
* \param input The output object * \param input The output object
* \return Zero if successful * \return Zero if successful
*/ */
int elfloader_end_segment(struct elfloader_output *output); int elfloader_end_segment(struct elfloader_output *output);
/** /**
@ -209,7 +207,6 @@ int elfloader_end_segment(struct elfloader_output *output);
* \param len Length of data * \param len Length of data
* \return The number of bytes actually written, or negative if failed. * \return The number of bytes actually written, or negative if failed.
*/ */
int elfloader_write_segment(struct elfloader_output *output, const char *buf, int elfloader_write_segment(struct elfloader_output *output, const char *buf,
unsigned int len); unsigned int len);
@ -219,7 +216,6 @@ int elfloader_write_segment(struct elfloader_output *output, const char *buf,
* \param input The output object * \param input The output object
* \return The current offset. * \return The current offset.
*/ */
unsigned int elfloader_segment_offset(struct elfloader_output *output); unsigned int elfloader_segment_offset(struct elfloader_output *output);
#define elfloader_output_alloc_segment(output, type, size) \ #define elfloader_output_alloc_segment(output, type, size) \
@ -269,8 +265,7 @@ void elfloader_init(void);
* elfloader_loaded_process variable. * elfloader_loaded_process variable.
* *
*/ */
int elfloader_load(int input_fd, int elfloader_load(int input_fd, struct elfloader_output *output);
struct elfloader_output *output);
/** /**
* A pointer to the processes loaded with elfloader_load(). * A pointer to the processes loaded with elfloader_load().

1
cpu/avr/minileds.c
View file

@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
*
/** /**
* \file * \file
* Dummy implementation of minileds module * Dummy implementation of minileds module

2
cpu/stm32w108/hal/error.h
View file

@ -52,5 +52,3 @@ enum {
/**@} // End of addtogroup /**@} // End of addtogroup
*/ */

1
cpu/stm32w108/hal/micro/micro-common.h
View file

@ -149,4 +149,3 @@ StStatus halBootloaderStart(uint8_t mode, uint8_t channel, uint16_t panId);
/** @} END micro group */ /** @} END micro group */
/** @} */ /** @} */

3
platform/cooja/contiki-cooja-main.c
View file

@ -417,8 +417,7 @@ JNIEXPORT void JNICALL
Java_org_contikios_cooja_corecomm_CLASSNAME_setMemory(JNIEnv *env, jobject obj, jint rel_addr, jint length, jbyteArray mem_arr) Java_org_contikios_cooja_corecomm_CLASSNAME_setMemory(JNIEnv *env, jobject obj, jint rel_addr, jint length, jbyteArray mem_arr)
{ {
jbyte *mem = (*env)->GetByteArrayElements(env, mem_arr, 0); jbyte *mem = (*env)->GetByteArrayElements(env, mem_arr, 0);
memcpy( memcpy((char*) (((long)rel_addr) + referenceVar),
(char*) (((long)rel_addr) + referenceVar),
mem, mem,
length); length);
(*env)->ReleaseByteArrayElements(env, mem_arr, mem, 0); (*env)->ReleaseByteArrayElements(env, mem_arr, mem, 0);

3
platform/wismote/dev/acc-sensor.c
View file

@ -122,5 +122,4 @@ status(int type)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
SENSORS_SENSOR(acc_sensor, ACC_SENSOR, SENSORS_SENSOR(acc_sensor, ACC_SENSOR, value, configure, status);
value, configure, status);

3
platform/wismote/dev/ext-sensor.c
View file

@ -100,5 +100,4 @@ configure(int type, int c)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
SENSORS_SENSOR(ext_sensor, "Ext", SENSORS_SENSOR(ext_sensor, "Ext", value, configure, status);
value, configure, status);