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 cpu directory.

Browse source
This commit is contained in:
Nicholas J Humfrey 2012-02-20 18:42:51 +00:00 • committed by Mariano Alvira
parent 372de7d08a
commit 1cda3da17e
46 changed files with 208 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cpu/native/net/tapdev-drv.c
View file

@ -48,7 +48,7 @@ PROCESS(tapdev_process, "TAP driver");
/*---------------------------------------------------------------------------*/
#if !UIP_CONF_IPV6
u8_t
uint8_t
tapdev_output(void)
{
uip_arp_out();

2
cpu/native/net/tapdev-drv.h
View file

@ -38,6 +38,6 @@
PROCESS_NAME(tapdev_process);
u8_t tapdev_output(void);
uint8_t tapdev_output(void);
#endif /* __TAPDEV_DRV_H__ */

2
cpu/native/net/tapdev.c
View file

@ -122,7 +122,7 @@ tapdev_init(void)
lasttime = 0;
}
/*---------------------------------------------------------------------------*/
u16_t
uint16_t
tapdev_poll(void)
{
fd_set fdset;

2
cpu/native/net/tapdev.h
View file

@ -38,7 +38,7 @@
#define __TAPDEV_H__
void tapdev_init(void);
u16_t tapdev_poll(void);
uint16_t tapdev_poll(void);
void tapdev_send(void);
void tapdev_exit(void);

8
cpu/native/net/tapdev6.c
View file

@ -77,17 +77,17 @@ static unsigned long lasttime;
#define DEBUG 0
#if DEBUG
#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])
#else
#define PRINTF(...)
#define PRINT6ADDR(addr)
#endif
static void do_send(void);
u8_t tapdev_send(uip_lladdr_t *lladdr);
uint8_t tapdev_send(uip_lladdr_t *lladdr);
u16_t
uint16_t
tapdev_poll(void)
{
fd_set fdset;
@ -192,7 +192,7 @@ do_send(void)
}
}
/*---------------------------------------------------------------------------*/
u8_t tapdev_send(uip_lladdr_t *lladdr)
uint8_t tapdev_send(uip_lladdr_t *lladdr)
{
/*
* If L3 dest is multicast, build L2 multicast address

4
cpu/native/net/tapdev6.h
View file

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

2
cpu/native/net/wpcap-drv.c
View file

@ -65,7 +65,7 @@ PROCESS(wpcap_process, "WinPcap driver");
/*---------------------------------------------------------------------------*/
#if !UIP_CONF_IPV6
u8_t
uint8_t
wpcap_output(void)
{
uip_arp_out();

2
cpu/native/net/wpcap-drv.h
View file

@ -38,6 +38,6 @@
PROCESS_NAME(wpcap_process);
u8_t wpcap_output(void);
uint8_t wpcap_output(void);
#endif /* __WPCAP_DRV_H__ */

14
cpu/native/net/wpcap.c
View file

@ -185,7 +185,7 @@ init(void)
/* Nothing to do here */
}
/*---------------------------------------------------------------------------*/
u8_t wfall_send(uip_lladdr_t *lladdr);
uint8_t wfall_send(uip_lladdr_t *lladdr);
#if FALLBACK_HAS_ETHERNET_HEADERS
#undef IPBUF
#define IPBUF ((struct uip_tcpip_hdr *)&uip_buf[14])
@ -597,7 +597,7 @@ wpcap_init(void)
}
/*---------------------------------------------------------------------------*/
u16_t
uint16_t
wpcap_poll(void)
{
struct pcap_pkthdr *packet_header;
@ -656,12 +656,12 @@ wpcap_poll(void)
}
// PRINTF("SIN: %lu\n", packet_header->caplen);
CopyMemory(uip_buf, packet, packet_header->caplen);
return (u16_t)packet_header->caplen;
return (uint16_t)packet_header->caplen;
}
#ifdef UIP_FALLBACK_INTERFACE
u16_t
uint16_t
wfall_poll(void)
{
struct pcap_pkthdr *packet_header;
@ -699,7 +699,7 @@ wfall_poll(void)
}
PRINTF("FIN: %lu\n", packet_header->caplen);
CopyMemory(uip_buf, packet, packet_header->caplen);
return (u16_t)packet_header->caplen;
return (uint16_t)packet_header->caplen;
}
@ -707,7 +707,7 @@ wfall_poll(void)
/*---------------------------------------------------------------------------*/
#if UIP_CONF_IPV6
u8_t
uint8_t
wpcap_send(uip_lladdr_t *lladdr)
{
if(lladdr == NULL) {
@ -744,7 +744,7 @@ wpcap_send(uip_lladdr_t *lladdr)
return 0;
}
#ifdef UIP_FALLBACK_INTERFACE
u8_t
uint8_t
wfall_send(uip_lladdr_t *lladdr)
{
#if FALLBACK_HAS_ETHERNET_HEADERS

8
cpu/native/net/wpcap.h
View file

@ -37,11 +37,11 @@
#define __WPCAP_H__
void wpcap_init(void);
u16_t wpcap_poll(void);
u16_t wfall_poll(void);
uint16_t wpcap_poll(void);
uint16_t wfall_poll(void);
#if UIP_CONF_IPV6
u8_t wpcap_send(uip_lladdr_t *lladdr);
u8_t wfall_send(uip_lladdr_t *lladdr);
uint8_t wpcap_send(uip_lladdr_t *lladdr);
uint8_t wfall_send(uip_lladdr_t *lladdr);
#else
void wpcap_send(void);
#endif