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

Converted u8_t to uint8_t and u16_t to uint16_t in the examples directory.

Browse source
This commit is contained in:
Nicholas J Humfrey 2012-02-20 19:20:03 +00:00 committed by Mariano Alvira
parent efab964451
commit a561d20828
17 changed files with 66 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/er-rest-example/coap-client-example.c
View file

@ -64,7 +64,7 @@
#define DEBUG 0 #define DEBUG 0
#if DEBUG #if DEBUG
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
#define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15]) #define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
#define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5]) #define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
#else #else
#define PRINTF(...) #define PRINTF(...)

2
examples/er-rest-example/rest-server-example.c
View file

@ -95,7 +95,7 @@
#define DEBUG 0 #define DEBUG 0
#if DEBUG #if DEBUG
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
#define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15]) #define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
#define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5]) #define PRINTLLADDR(lladdr) PRINTF("[%02x:%02x:%02x:%02x:%02x:%02x]",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
#else #else
#define PRINTF(...) #define PRINTF(...)

2
examples/er-rest-example/static-routing.c
View file

@ -12,7 +12,7 @@
#if DEBUG #if DEBUG
#include <stdio.h> #include <stdio.h>
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
#define PRINT6ADDR(addr) PRINTF(" %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x ", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15]) #define PRINT6ADDR(addr) PRINTF(" %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x ", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
#define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x ",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5]) #define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x ",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
#else #else
#define PRINTF(...) #define PRINTF(...)

2
examples/ipv6/sky-websense/wget.c
View file

@ -138,7 +138,7 @@ PROCESS_THREAD(wget_process, ev, data)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
webclient_datahandler(char *data, u16_t len) webclient_datahandler(char *data, uint16_t len)
{ {
if(len == 0) { if(len == 0) {
#if STATS #if STATS

16
examples/mb851/webserver-ajax/ajax-cgi.c
View file

@ -176,10 +176,10 @@ make_neighbor(void *arg)
char ipaddr_str[41]; char ipaddr_str[41];
uip_ip6addr(&ipaddr, NET_ADDR_A, NET_ADDR_B, NET_ADDR_C, NET_ADDR_D, uip_ip6addr(&ipaddr, NET_ADDR_A, NET_ADDR_B, NET_ADDR_C, NET_ADDR_D,
(u16_t)(((u16_t)(n->addr.u8[0]^0x02))<<8 | (u16_t)n->addr.u8[1]), (uint16_t)(((uint16_t)(n->addr.u8[0]^0x02))<<8 | (uint16_t)n->addr.u8[1]),
((u16_t)(n->addr.u8[2]))<<8 | (u16_t)n->addr.u8[3], ((uint16_t)(n->addr.u8[2]))<<8 | (uint16_t)n->addr.u8[3],
(u16_t)(n->addr.u8[4])<<8 | n->addr.u8[5], (uint16_t)(n->addr.u8[4])<<8 | n->addr.u8[5],
(u16_t)(n->addr.u8[6])<<8 | n->addr.u8[7]); (uint16_t)(n->addr.u8[6])<<8 | n->addr.u8[7]);
httpd_sprint_ip6(ipaddr, ipaddr_str); httpd_sprint_ip6(ipaddr, ipaddr_str);
return snprintf((char *)uip_appdata, uip_mss(), return snprintf((char *)uip_appdata, uip_mss(),
@ -200,10 +200,10 @@ make_neighbor(void *arg)
*/ */
return snprintf((char *)uip_appdata, uip_mss(), return snprintf((char *)uip_appdata, uip_mss(),
"<li><a id=node name='%x:%x:%x:%x'>%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X</a>\r\n", "<li><a id=node name='%x:%x:%x:%x'>%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X</a>\r\n",
(u16_t)(((u16_t)(n->addr.u8[0]^0x02))<<8 | (u16_t)n->addr.u8[1]), (uint16_t)(((uint16_t)(n->addr.u8[0]^0x02))<<8 | (uint16_t)n->addr.u8[1]),
((u16_t)(n->addr.u8[2]))<<8 | (u16_t)n->addr.u8[3], ((uint16_t)(n->addr.u8[2]))<<8 | (uint16_t)n->addr.u8[3],
(u16_t)(n->addr.u8[4])<<8 | n->addr.u8[5], (uint16_t)(n->addr.u8[4])<<8 | n->addr.u8[5],
(u16_t)(n->addr.u8[6])<<8 | n->addr.u8[7], (uint16_t)(n->addr.u8[6])<<8 | n->addr.u8[7],
n->addr.u8[0], n->addr.u8[0],
n->addr.u8[1], n->addr.u8[1],
n->addr.u8[2], n->addr.u8[2],

14
examples/mb851/webserver-ajax/httpd-fs.c
View file

@ -41,14 +41,14 @@
#include "httpd-fsdata.c" #include "httpd-fsdata.c"
#if HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS
static u16_t count[HTTPD_FS_NUMFILES]; static uint16_t count[HTTPD_FS_NUMFILES];
#endif /* HTTPD_FS_STATISTICS */ #endif /* HTTPD_FS_STATISTICS */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static u8_t static uint8_t
httpd_fs_strcmp(const char *str1, const char *str2) httpd_fs_strcmp(const char *str1, const char *str2)
{ {
u8_t i; uint8_t i;
i = 0; i = 0;
loop: loop:
@ -70,7 +70,7 @@ int
httpd_fs_open(const char *name, struct httpd_fs_file *file) httpd_fs_open(const char *name, struct httpd_fs_file *file)
{ {
#if HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS
u16_t i = 0; uint16_t i = 0;
#endif /* HTTPD_FS_STATISTICS */ #endif /* HTTPD_FS_STATISTICS */
struct httpd_fsdata_file_noconst *f; struct httpd_fsdata_file_noconst *f;
@ -98,7 +98,7 @@ void
httpd_fs_init(void) httpd_fs_init(void)
{ {
#if HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS
u16_t i; uint16_t i;
for(i = 0; i < HTTPD_FS_NUMFILES; i++) { for(i = 0; i < HTTPD_FS_NUMFILES; i++) {
count[i] = 0; count[i] = 0;
} }
@ -106,11 +106,11 @@ httpd_fs_init(void)
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#if HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS
u16_t uint16_t
httpd_fs_count(char *name) httpd_fs_count(char *name)
{ {
struct httpd_fsdata_file_noconst *f; struct httpd_fsdata_file_noconst *f;
u16_t i; uint16_t i;
i = 0; i = 0;
for(f = (struct httpd_fsdata_file_noconst *)HTTPD_FS_ROOT; for(f = (struct httpd_fsdata_file_noconst *)HTTPD_FS_ROOT;

34
examples/ravenusbstick/fakeuip.c
View file

@ -11,13 +11,13 @@
uip_buf_t uip_aligned_buf; uip_buf_t uip_aligned_buf;
u16_t uip_len; uint16_t uip_len;
struct uip_stats uip_stat; struct uip_stats uip_stat;
uip_lladdr_t uip_lladdr; uip_lladdr_t uip_lladdr;
static u8_t (* output)(uip_lladdr_t *); static uint8_t (* output)(uip_lladdr_t *);
extern void mac_LowpanToEthernet(void); extern void mac_LowpanToEthernet(void);
void tcpip_input( void ) void tcpip_input( void )
{ {
@ -25,18 +25,18 @@ void tcpip_input( void )
mac_LowpanToEthernet(); mac_LowpanToEthernet();
} }
u8_t tcpip_output(uip_lladdr_t * lladdr){ uint8_t tcpip_output(uip_lladdr_t * lladdr){
if(output != NULL) { if(output != NULL) {
return output(lladdr); return output(lladdr);
} }
return 0; return 0;
} }
//Called from sicslowpan.c //Called from sicslowpan.c
void tcpip_set_outputfunc(u8_t (* f)(uip_lladdr_t *)) { void tcpip_set_outputfunc(uint8_t (* f)(uip_lladdr_t *)) {
output = f; output = f;
} }
u16_t uip_htons(u16_t val) { return UIP_HTONS(val);} uint16_t uip_htons(uint16_t val) { return UIP_HTONS(val);}
#if THEOLDWAY #if THEOLDWAY
@ -73,12 +73,12 @@ uip_ds6_set_addr_iid(uip_ipaddr_t * ipaddr, uip_lladdr_t * lladdr)
/********** UIP.c ****************/ /********** UIP.c ****************/
static u16_t static uint16_t
chksum(u16_t sum, const u8_t *data, u16_t len) chksum(uint16_t sum, const uint8_t *data, uint16_t len)
{ {
u16_t t; uint16_t t;
const u8_t *dataptr; const uint8_t *dataptr;
const u8_t *last_byte; const uint8_t *last_byte;
dataptr = data; dataptr = data;
last_byte = data + len - 1; last_byte = data + len - 1;
@ -104,19 +104,19 @@ chksum(u16_t sum, const u8_t *data, u16_t len)
return sum; return sum;
} }
static u16_t static uint16_t
upper_layer_chksum(u8_t proto) upper_layer_chksum(uint8_t proto)
{ {
u16_t upper_layer_len; uint16_t upper_layer_len;
u16_t sum; uint16_t sum;
upper_layer_len = (((u16_t)(UIP_IP_BUF->len[0]) << 8) + UIP_IP_BUF->len[1]) ; upper_layer_len = (((uint16_t)(UIP_IP_BUF->len[0]) << 8) + UIP_IP_BUF->len[1]) ;
/* First sum pseudoheader. */ /* First sum pseudoheader. */
/* IP protocol and length fields. This addition cannot carry. */ /* IP protocol and length fields. This addition cannot carry. */
sum = upper_layer_len + proto; sum = upper_layer_len + proto;
/* Sum IP source and destination addresses. */ /* Sum IP source and destination addresses. */
sum = chksum(sum, (u8_t *)&UIP_IP_BUF->srcipaddr, 2 * sizeof(uip_ipaddr_t)); sum = chksum(sum, (uint8_t *)&UIP_IP_BUF->srcipaddr, 2 * sizeof(uip_ipaddr_t));
/* Sum TCP header and data. */ /* Sum TCP header and data. */
sum = chksum(sum, &uip_buf[UIP_IPH_LEN + UIP_LLH_LEN], sum = chksum(sum, &uip_buf[UIP_IPH_LEN + UIP_LLH_LEN],
@ -126,7 +126,7 @@ upper_layer_chksum(u8_t proto)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
u16_t uint16_t
uip_icmp6chksum(void) uip_icmp6chksum(void)
{ {
return upper_layer_chksum(UIP_PROTO_ICMP6); return upper_layer_chksum(UIP_PROTO_ICMP6);

4
examples/rest-example/coap-client-example.c
View file

@ -10,7 +10,7 @@
#if DEBUG #if DEBUG
#include <stdio.h> #include <stdio.h>
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
#define PRINT6ADDR(addr) PRINTF("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15]) #define PRINT6ADDR(addr) PRINTF("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
#define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x ",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5]) #define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x ",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
#else #else
#define PRINTF(...) #define PRINTF(...)
@ -77,7 +77,7 @@ send_data(void)
static void static void
handle_incoming_data() handle_incoming_data()
{ {
PRINTF("Incoming packet size: %u \n", (u16_t)uip_datalen()); PRINTF("Incoming packet size: %u \n", (uint16_t)uip_datalen());
if (init_buffer(COAP_DATA_BUFF_SIZE)) { if (init_buffer(COAP_DATA_BUFF_SIZE)) {
if (uip_newdata()) { if (uip_newdata()) {
coap_packet_t* response = (coap_packet_t*)allocate_buffer(sizeof(coap_packet_t)); coap_packet_t* response = (coap_packet_t*)allocate_buffer(sizeof(coap_packet_t));

2
examples/rest-example/rest-server-example.c
View file

@ -22,7 +22,7 @@
#if DEBUG #if DEBUG
#include <stdio.h> #include <stdio.h>
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
#define PRINT6ADDR(addr) PRINTF(" %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x ", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15]) #define PRINT6ADDR(addr) PRINTF(" %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x ", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
#define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x ",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5]) #define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x ",(lladdr)->addr[0], (lladdr)->addr[1], (lladdr)->addr[2], (lladdr)->addr[3],(lladdr)->addr[4], (lladdr)->addr[5])
#else #else
#define PRINTF(...) #define PRINTF(...)

4
examples/sensinode/clock_test.c
View file

@ -19,7 +19,7 @@ PROCESS_THREAD(clock_test_process, ev, data)
static struct etimer et; static struct etimer et;
static clock_time_t count, start_count, end_count, diff; static clock_time_t count, start_count, end_count, diff;
static unsigned long sec; static unsigned long sec;
static u8_t i; static uint8_t i;
PROCESS_BEGIN(); PROCESS_BEGIN();
@ -56,7 +56,7 @@ PROCESS_THREAD(clock_test_process, ev, data)
etimer_reset(&et); etimer_reset(&et);
sec = clock_seconds(); sec = clock_seconds();
printf("%u seconds\n", (u16_t) sec); printf("%u seconds\n", (uint16_t) sec);
leds_toggle(LEDS_GREEN); leds_toggle(LEDS_GREEN);
i++; i++;

14
examples/sky-ip/httpd-fs.c
View file

@ -41,14 +41,14 @@
#include "httpd-fsdata.c" #include "httpd-fsdata.c"
#if HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS
static u16_t count[HTTPD_FS_NUMFILES]; static uint16_t count[HTTPD_FS_NUMFILES];
#endif /* HTTPD_FS_STATISTICS */ #endif /* HTTPD_FS_STATISTICS */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static u8_t static uint8_t
httpd_fs_strcmp(const char *str1, const char *str2) httpd_fs_strcmp(const char *str1, const char *str2)
{ {
u8_t i; uint8_t i;
i = 0; i = 0;
loop: loop:
@ -70,7 +70,7 @@ int
httpd_fs_open(const char *name, struct httpd_fs_file *file) httpd_fs_open(const char *name, struct httpd_fs_file *file)
{ {
#if HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS
u16_t i = 0; uint16_t i = 0;
#endif /* HTTPD_FS_STATISTICS */ #endif /* HTTPD_FS_STATISTICS */
struct httpd_fsdata_file_noconst *f; struct httpd_fsdata_file_noconst *f;
@ -98,7 +98,7 @@ void
httpd_fs_init(void) httpd_fs_init(void)
{ {
#if HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS
u16_t i; uint16_t i;
for(i = 0; i < HTTPD_FS_NUMFILES; i++) { for(i = 0; i < HTTPD_FS_NUMFILES; i++) {
count[i] = 0; count[i] = 0;
} }
@ -106,11 +106,11 @@ httpd_fs_init(void)
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#if HTTPD_FS_STATISTICS #if HTTPD_FS_STATISTICS
u16_t uint16_t
httpd_fs_count(char *name) httpd_fs_count(char *name)
{ {
struct httpd_fsdata_file_noconst *f; struct httpd_fsdata_file_noconst *f;
u16_t i; uint16_t i;
i = 0; i = 0;
for(f = (struct httpd_fsdata_file_noconst *)HTTPD_FS_ROOT; for(f = (struct httpd_fsdata_file_noconst *)HTTPD_FS_ROOT;

2
examples/sky-ip/httpd-fsdata.c
View file

@ -436,7 +436,7 @@ struct httpd_fsdata_file {
const char *data; //offset to coffee file data const char *data; //offset to coffee file data
const int len; //length of file data const int len; //length of file data
#if HTTPD_FS_STATISTICS == 1 //not enabled since list is in PROGMEM #if HTTPD_FS_STATISTICS == 1 //not enabled since list is in PROGMEM
u16_t count; //storage for file statistics uint16_t count; //storage for file statistics
#endif #endif
} }
*/ */

4
examples/test-ipv6/tapdev.h
View file

@ -40,7 +40,7 @@
#include "contiki-net.h" #include "contiki-net.h"
void tapdev_init(void); void tapdev_init(void);
u8_t tapdev_send(void); uint8_t tapdev_send(void);
u16_t tapdev_poll(void); uint16_t tapdev_poll(void);
void tapdev_do_send(void); void tapdev_do_send(void);
#endif /* __TAPDEV_H__ */ #endif /* __TAPDEV_H__ */

8
examples/test-ipv6/tapdev6.c
View file

@ -75,10 +75,10 @@ static unsigned long lasttime;
#define IPBUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #define IPBUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
static void do_send(void); static void do_send(void);
u8_t tapdev_send(void); uint8_t tapdev_send(void);
u16_t uint16_t
tapdev_poll(void) tapdev_poll(void)
{ {
fd_set fdset; fd_set fdset;
@ -174,8 +174,8 @@ do_send(void)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define DEBUG_PRINTF(...) printf(__VA_ARGS__) #define DEBUG_PRINTF(...) printf(__VA_ARGS__)
#define DEBUG_PRINT6ADDR(addr) DEBUG_PRINTF("%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15]) #define DEBUG_PRINT6ADDR(addr) DEBUG_PRINTF("%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
u8_t uint8_t
tapdev_send(void) tapdev_send(void)
{ {
struct uip_neighbor_addr *addr; struct uip_neighbor_addr *addr;

2
examples/wget/wget.c
View file

@ -236,7 +236,7 @@ webclient_connected(void)
* has arrived. * has arrived.
*/ */
void void
webclient_datahandler(char *data, u16_t len) webclient_datahandler(char *data, uint16_t len)
{ {
static unsigned long dload_bytes; static unsigned long dload_bytes;
int ret; int ret;

2
examples/z1/ipv6/z1-websense/wget.c
View file

@ -107,7 +107,7 @@ PROCESS_THREAD(wget_process, ev, data)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
webclient_datahandler(char *data, u16_t len) webclient_datahandler(char *data, uint16_t len)
{ {
if(len == 0) { if(len == 0) {
#if STATS #if STATS

18
examples/z1/test-adxl345.c
View file

@ -99,24 +99,24 @@ print_int(uint16_t reg){
/* accelerometer free fall detection callback */ /* accelerometer free fall detection callback */
void void
accm_ff_cb(u8_t reg){ accm_ff_cb(uint8_t reg){
L_ON(LEDS_B); L_ON(LEDS_B);
process_post(&led_process, ledOff_event, NULL); process_post(&led_process, ledOff_event, NULL);
printf("~~[%u] Freefall detected! (0x%02X) -- ", ((u16_t) clock_time())/128, reg); printf("~~[%u] Freefall detected! (0x%02X) -- ", ((uint16_t) clock_time())/128, reg);
print_int(reg); print_int(reg);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* accelerometer tap and double tap detection callback */ /* accelerometer tap and double tap detection callback */
void void
accm_tap_cb(u8_t reg){ accm_tap_cb(uint8_t reg){
process_post(&led_process, ledOff_event, NULL); process_post(&led_process, ledOff_event, NULL);
if(reg & ADXL345_INT_DOUBLETAP){ if(reg & ADXL345_INT_DOUBLETAP){
L_ON(LEDS_G); L_ON(LEDS_G);
printf("~~[%u] DoubleTap detected! (0x%02X) -- ", ((u16_t) clock_time())/128, reg); printf("~~[%u] DoubleTap detected! (0x%02X) -- ", ((uint16_t) clock_time())/128, reg);
} else { } else {
L_ON(LEDS_R); L_ON(LEDS_R);
printf("~~[%u] Tap detected! (0x%02X) -- ", ((u16_t) clock_time())/128, reg); printf("~~[%u] Tap detected! (0x%02X) -- ", ((uint16_t) clock_time())/128, reg);
} }
print_int(reg); print_int(reg);
} }
@ -145,11 +145,11 @@ PROCESS_THREAD(led_process, ev, data) {
printf("Port1: %s\n", char2bin(P1IN)); printf("Port1: %s\n", char2bin(P1IN));
*/ */
/* /*
static u8_t b[9]; static uint8_t b[9];
static u8_t static uint8_t
*char2bin(u8_t x) { *char2bin(uint8_t x) {
u8_t z; uint8_t z;
b[8] = '\0'; b[8] = '\0';
for (z = 0; z < 8; z++) { for (z = 0; z < 8; z++) {
b[7-z] = (x & (1 << z)) ? '1' : '0'; b[7-z] = (x & (1 << z)) ? '1' : '0';