Changeset 158


Ignore:
Timestamp:
Feb 20, 2016, 10:43:32 PM (6 years ago)
Author:
coas-nagasima
Message:

インクルードのパス指定をContikiに合わせ変更。
整数型の型名をContikiに合わせ変更。

Location:
uKadecot/trunk
Files:
36 edited
1 moved

Legend:

Unmodified
Added
Removed
  • uKadecot/trunk/csp/ukadecot/ukadecot.mtpj

    r157 r158  
    10351035-include=..\..\ssp\pdic
    10361036-include=..\..\ssp\target\grsakura_ccrx
    1037 -include=..\..\uip\net\ip
    1038 -include=..\..\uip\net\ipv4
    1039 -include=..\..\uip\sys
     1037-include=..\..\uip
    10401038-include=..\..\uip\task
    1041 -include=..\..\uip\apps\dhcpc
    1042 -include=..\..\uip\apps\webserver
     1039-include=..\..\uip\apps
    10431040-include=..\..\uip\target\if_rx62n
    10441041-include=..\..\pfatfs
     
    11261123..\..\ssp\pdic
    11271124..\..\ssp\target\grsakura_ccrx
    1128 ..\..\uip\net\ip
    1129 ..\..\uip\net\ipv4
    1130 ..\..\uip\sys
     1125..\..\uip
    11311126..\..\uip\task
    1132 ..\..\uip\apps\dhcpc
    1133 ..\..\uip\apps\webserver
     1127..\..\uip\apps
    11341128..\..\uip\target\if_rx62n
    11351129..\..\pfatfs
     
    11611155-include=..\..\ssp\pdic
    11621156-include=..\..\ssp\target\grsakura_ccrx
    1163 -include=..\..\uip\net\ip
    1164 -include=..\..\uip\net\ipv4
    1165 -include=..\..\uip\sys
     1157-include=..\..\uip
    11661158-include=..\..\uip\task
    1167 -include=..\..\uip\apps\dhcpc
    1168 -include=..\..\uip\apps\webserver
     1159-include=..\..\uip\apps
    11691160-include=..\..\uip\target\if_rx62n
    11701161-include=..\..\pfatfs
  • uKadecot/trunk/ecnl_ssp/echonet_task.c

    r152 r158  
    5050#include "syssvc/syslog.h"
    5151
    52 #include "uip.h"
     52#include "net/ip/uip.h"
    5353
    5454#include "echonet.h"
  • uKadecot/trunk/ecnl_ssp/echonet_uip_task.c

    r152 r158  
    4747#include <t_syslog.h>
    4848#include <sil.h>
    49 #include <uip.h>
     49#include <net/ip/uip.h>
    5050#include "uip_adpt.h"
    5151
  • uKadecot/trunk/kadecot/wamp_dealer.c

    r125 r158  
    4646#include "arduino.h"
    4747#include "data_flash.h"
    48 #include "uip.h"
     48#include "net/ip/uip.h"
    4949#include "uip_adpt.h"
    5050
  • uKadecot/trunk/src/ukadecot/main.c

    r152 r158  
    5353#include "rx630_msvc/rx630.h"
    5454#endif
    55 #include <uip.h>
    56 #include <pt.h>
     55#include <net/ip/uip.h>
     56#include <sys/pt.h>
    5757#include "uip_adpt.h"
    5858#include "wamp.h"
     
    458458static void main_initialize()
    459459{
    460         extern u8_t my_ip[4];
    461         extern u8_t my_netmask[4];
    462         extern u8_t my_default_router[4];
     460        extern uint8_t my_ip[4];
     461        extern uint8_t my_netmask[4];
     462        extern uint8_t my_default_router[4];
    463463        uint8_t btn1, btn2;
    464464        uint8_t data[32], c;
  • uKadecot/trunk/src/ukadecot/uip-conf.h

    r108 r158  
    6363 * \hideinitializer
    6464 */
    65 typedef unsigned char u8_t;
     65typedef unsigned char uint8_t;
    6666
    6767/**
     
    7272 * \hideinitializer
    7373 */
    74 typedef unsigned short u16_t;
     74typedef unsigned short uint16_t;
    7575
    7676/**
     
    181181/*#include "hello-world.h"*/
    182182/*#include "telnetd.h"*/
    183 #include "webserver.h"
    184 #include "dhcpc.h"
     183#include "webserver/webserver.h"
     184#include "dhcpc/dhcpc.h"
    185185/*#include "resolv.h"*/
    186186/*#include "webclient.h"*/
    187187/*#include "httpd.h"*/
    188188
    189 #include "timer.h"
    190 #include "pt.h"
     189#include "sys/timer.h"
     190#include "sys/pt.h"
    191191
    192192struct ecnl_state {
  • uKadecot/trunk/uip/apps/dhcpc/dhcpc.c

    r125 r158  
    3535#include <string.h>
    3636
    37 #include "uip.h"
    38 #include "dhcpc.h"
    39 #include "timer.h"
    40 #include "pt.h"
     37#include "net/ip/uip.h"
     38#include "dhcpc/dhcpc.h"
     39#include "sys/timer.h"
     40#include "sys/pt.h"
    4141
    4242#define STATE_INITIAL         0
     
    5353
    5454struct dhcp_msg {
    55   u8_t op, htype, hlen, hops;
    56   u8_t xid[4];
    57   u16_t secs, flags;
    58   u8_t ciaddr[4];
    59   u8_t yiaddr[4];
    60   u8_t siaddr[4];
    61   u8_t giaddr[4];
    62   u8_t chaddr[16];
     55  uint8_t op, htype, hlen, hops;
     56  uint8_t xid[4];
     57  uint16_t secs, flags;
     58  uint8_t ciaddr[4];
     59  uint8_t yiaddr[4];
     60  uint8_t siaddr[4];
     61  uint8_t giaddr[4];
     62  uint8_t chaddr[16];
    6363#ifndef UIP_CONF_DHCP_LIGHT
    64   u8_t sname[64];
    65   u8_t file[128];
    66 #endif
    67   u8_t options[312];
     64  uint8_t sname[64];
     65  uint8_t file[128];
     66#endif
     67  uint8_t options[312];
    6868};
    6969
     
    103103#define DHCP_OPTION_END         255
    104104
    105 static const u8_t xid[4] = {0xad, 0xde, 0x12, 0x23};
    106 static const u8_t magic_cookie[4] = {99, 130, 83, 99};
    107 /*---------------------------------------------------------------------------*/
    108 static u8_t *
    109 add_msg_type(u8_t *optptr, u8_t type)
     105static const uint8_t xid[4] = {0xad, 0xde, 0x12, 0x23};
     106static const uint8_t magic_cookie[4] = {99, 130, 83, 99};
     107/*---------------------------------------------------------------------------*/
     108static uint8_t *
     109add_msg_type(uint8_t *optptr, uint8_t type)
    110110{
    111111  *optptr++ = DHCP_OPTION_MSG_TYPE;
     
    115115}
    116116/*---------------------------------------------------------------------------*/
    117 static u8_t *
    118 add_server_id(struct dhcpc_state *s, u8_t *optptr)
     117static uint8_t *
     118add_server_id(struct dhcpc_state *s, uint8_t *optptr)
    119119{
    120120  *optptr++ = DHCP_OPTION_SERVER_ID;
     
    124124}
    125125/*---------------------------------------------------------------------------*/
    126 static u8_t *
    127 add_req_ipaddr(struct dhcpc_state *s, u8_t *optptr)
     126static uint8_t *
     127add_req_ipaddr(struct dhcpc_state *s, uint8_t *optptr)
    128128{
    129129  *optptr++ = DHCP_OPTION_REQ_IPADDR;
     
    133133}
    134134/*---------------------------------------------------------------------------*/
    135 static u8_t *
    136 add_req_options(u8_t *optptr)
     135static uint8_t *
     136add_req_options(uint8_t *optptr)
    137137{
    138138  *optptr++ = DHCP_OPTION_REQ_LIST;
     
    144144}
    145145/*---------------------------------------------------------------------------*/
    146 static u8_t *
    147 add_end(u8_t *optptr)
     146static uint8_t *
     147add_end(uint8_t *optptr)
    148148{
    149149  *optptr++ = DHCP_OPTION_END;
     
    179179send_discover(struct dhcpc_state *s)
    180180{
    181   u8_t *end;
     181  uint8_t *end;
    182182  struct dhcp_msg *m = (struct dhcp_msg *)uip_appdata;
    183183
     
    188188  end = add_end(end);
    189189
    190   uip_send(uip_appdata, end - (u8_t *)uip_appdata);
     190  uip_send(uip_appdata, end - (uint8_t *)uip_appdata);
    191191}
    192192/*---------------------------------------------------------------------------*/
     
    194194send_request(struct dhcpc_state *s)
    195195{
    196   u8_t *end;
     196  uint8_t *end;
    197197  struct dhcp_msg *m = (struct dhcp_msg *)uip_appdata;
    198198
     
    204204  end = add_end(end);
    205205
    206   uip_send(uip_appdata, end - (u8_t *)uip_appdata);
    207 }
    208 /*---------------------------------------------------------------------------*/
    209 static u8_t
    210 parse_options(struct dhcpc_state *s, u8_t *optptr, int len)
    211 {
    212   u8_t *end = optptr + len;
    213   u8_t type = 0;
     206  uip_send(uip_appdata, end - (uint8_t *)uip_appdata);
     207}
     208/*---------------------------------------------------------------------------*/
     209static uint8_t
     210parse_options(struct dhcpc_state *s, uint8_t *optptr, int len)
     211{
     212  uint8_t *end = optptr + len;
     213  uint8_t type = 0;
    214214
    215215  while(optptr < end) {
     
    242242}
    243243/*---------------------------------------------------------------------------*/
    244 static u8_t
     244static uint8_t
    245245parse_msg(struct dhcpc_state *s)
    246246{
     
    386386dhcpc_request(struct dhcpc_state *s)
    387387{
    388   u16_t ipaddr[2];
     388  uint16_t ipaddr[2];
    389389
    390390  s->state = STATE_REQUEST;
  • uKadecot/trunk/uip/apps/dhcpc/dhcpc.h

    r108 r158  
    3434#define __DHCPC_H__
    3535
    36 #include "timer.h"
    37 #include "pt.h"
     36#include "sys/timer.h"
     37#include "sys/pt.h"
    3838
    3939struct dhcpc_state {
     
    4242  struct uip_udp_conn *conn;
    4343  struct uip_timer timer;
    44   u16_t ticks;
     44  uint16_t ticks;
    4545  const void *mac_addr;
    4646  int mac_len;
    4747
    48   u8_t serverid[4];
     48  uint8_t serverid[4];
    4949
    50   u16_t lease_time[2];
    51   u16_t ipaddr[2];
    52   u16_t netmask[2];
    53   u16_t dnsaddr[2];
    54   u16_t default_router[2];
     50  uint16_t lease_time[2];
     51  uint16_t ipaddr[2];
     52  uint16_t netmask[2];
     53  uint16_t dnsaddr[2];
     54  uint16_t default_router[2];
    5555};
    5656
  • uKadecot/trunk/uip/apps/webserver/http_parser.c

    r108 r158  
    2222 * IN THE SOFTWARE.
    2323 */
    24 #include "http_parser.h"
     24#include "webserver/http_parser.h"
    2525//#include <assert.h>
    2626#include <stddef.h>
  • uKadecot/trunk/uip/apps/webserver/http_pcb.h

    r108 r158  
    2323#define __HTTP_PCB_H__
    2424
    25 #include "http_parser.h"
     25#include "webserver/http_parser.h"
    2626
    2727#define MAX_ELEMENT_SIZE 256
  • uKadecot/trunk/uip/apps/webserver/httpd-fs.h

    r155 r158  
    5454#ifdef HTTPD_FS_STATISTICS
    5555#if HTTPD_FS_STATISTICS == 1
    56 u16_t httpd_fs_count(char *name);
     56uint16_t httpd_fs_count(char *name);
    5757#endif /* HTTPD_FS_STATISTICS */
    5858#endif /* HTTPD_FS_STATISTICS */
  • uKadecot/trunk/uip/apps/webserver/httpd.c

    r156 r158  
    5656 */
    5757
    58 #include "uip.h"
     58#include "net/ip/uip.h"
    5959#include "httpd.h"
    6060#include "httpd-fs.h"
  • uKadecot/trunk/uip/apps/webserver/httpd.h

    r156 r158  
    3636#define __HTTPD_H__
    3737
    38 #include "psock.h"
     38#include "net/ip/psock.h"
    3939#include "httpd-fs.h"
    4040#include "http_pcb.h"
     
    7676
    7777void httpd_log(char *msg);
    78 void httpd_log_file(u16_t *requester, char *file);
     78void httpd_log_file(uint16_t *requester, char *file);
    7979
    8080#endif /* __HTTPD_H__ */
  • uKadecot/trunk/uip/apps/webserver/websocket.c

    r148 r158  
    3838#include <string.h>
    3939#include "websocket.h"
    40 #include "uip.h"
     40#include "net/ip/uip.h"
    4141#include "kernel.h"
    4242#include "kernel_cfg.h"
     
    6969{
    7070        ws_state_t *s = &ws->rstate;
    71         const u8_t *pos = (const u8_t *)data, *end = &((const u8_t *)data)[len];
     71        const uint8_t *pos = (const uint8_t *)data, *end = &((const uint8_t *)data)[len];
    7272
    7373        for(; pos < end; pos++){
     
    192192{
    193193        ws_state_t *s = &ws->wstate;
    194         u8_t *pos = (u8_t *)data, *end = &((u8_t *)data)[len];
     194        uint8_t *pos = (uint8_t *)data, *end = &((uint8_t *)data)[len];
    195195
    196196        for(; pos < end; pos++){
  • uKadecot/trunk/uip/net/ip/psock.c

    r157 r158  
    3737#include <string.h>
    3838
    39 #include "uipopt.h"
    40 #include "psock.h"
    41 #include "uip.h"
     39#include "net/ip/uipopt.h"
     40#include "net/ip/psock.h"
     41#include "net/ip/uip.h"
    4242
    4343#define STATE_NONE 0
     
    7474static void
    7575buf_setup(struct psock_buf *buf,
    76           u8_t *bufptr, u16_t bufsize)
     76          uint8_t *bufptr, uint16_t bufsize)
    7777{
    7878  buf->ptr = bufptr;
     
    8080}
    8181/*---------------------------------------------------------------------------*/
    82 static u8_t
    83 buf_bufdata(struct psock_buf *buf, u16_t len,
    84             u8_t **dataptr, u16_t *datalen)
     82static uint8_t
     83buf_bufdata(struct psock_buf *buf, uint16_t len,
     84            uint8_t **dataptr, uint16_t *datalen)
    8585{
    8686  if(*datalen < buf->left) {
     
    108108}
    109109/*---------------------------------------------------------------------------*/
    110 static u8_t
    111 buf_bufto(register struct psock_buf *buf, u8_t endmarker,
    112           register u8_t **dataptr, register u16_t *datalen)
    113 {
    114   u8_t c;
     110static uint8_t
     111buf_bufto(register struct psock_buf *buf, uint8_t endmarker,
     112          register uint8_t **dataptr, register uint16_t *datalen)
     113{
     114  uint8_t c;
    115115  while(buf->left > 0 && *datalen > 0) {
    116116    c = *buf->ptr = **dataptr;
     
    244244}
    245245/*---------------------------------------------------------------------------*/
    246 u16_t
     246uint16_t
    247247psock_datalen(struct psock *psock)
    248248{
     
    283283      PT_WAIT_UNTIL(&psock->psockpt, psock_newdata(psock));
    284284      psock->state = STATE_READ;
    285       psock->readptr = (u8_t *)uip_appdata;
     285      psock->readptr = (uint8_t *)uip_appdata;
    286286      psock->readlen = uip_datalen();
    287287    }
     
    311311      printf("Waited for newdata\n");
    312312      psock->state = STATE_READ;
    313       psock->readptr = (u8_t *)uip_appdata;
     313      psock->readptr = (uint8_t *)uip_appdata;
    314314      psock->readlen = uip_datalen();
    315315    }
  • uKadecot/trunk/uip/net/ip/psock.h

    r157 r158  
    8282#define __PSOCK_H__
    8383
    84 #include "uipopt.h"
    85 #include "pt.h"
     84#include "net/ip/uipopt.h"
     85#include "sys/pt.h"
    8686
    8787 /*
     
    9494 */
    9595struct psock_buf {
    96   u8_t *ptr;
     96  uint8_t *ptr;
    9797  unsigned short left;
    9898};
     
    108108                            functions, and one that runs inside the
    109109                            psock functions. */
    110   const u8_t *sendptr;   /* Pointer to the next data to be sent. */
    111   u8_t *readptr;         /* Pointer to the next data to be read. */
     110  const uint8_t *sendptr;   /* Pointer to the next data to be sent. */
     111  uint8_t *readptr;         /* Pointer to the next data to be read. */
    112112
    113113  char *bufptr;          /* Pointer to the buffer used for buffering
    114114                            incoming data. */
    115115
    116   u16_t sendlen;         /* The number of bytes left to be sent. */
    117   u16_t readlen;         /* The number of bytes left to be read. */
     116  uint16_t sendlen;         /* The number of bytes left to be sent. */
     117  uint16_t readlen;         /* The number of bytes left to be read. */
    118118
    119119  struct psock_buf buf;  /* The structure holding the state of the
     
    281281#define PSOCK_DATALEN(psock) psock_datalen(psock)
    282282
    283 u16_t psock_datalen(struct psock *psock);
     283uint16_t psock_datalen(struct psock *psock);
    284284
    285285/**
  • uKadecot/trunk/uip/net/ip/uip-split.c

    r157 r158  
    3636#include <string.h>
    3737
    38 #include "uip-split.h"
    39 #include "uip.h"
    40 #include "uip-fw.h"
    41 #include "uip_arch.h"
     38#include "net/ip/uip-split.h"
     39#include "net/ip/uip.h"
     40#include "net/ipv4/uip-fw.h"
     41#include "net/ip/uip_arch.h"
    4242
    4343
     
    4949uip_split_output(void)
    5050{
    51   u16_t tcplen, len1, len2;
     51  uint16_t tcplen, len1, len2;
    5252
    5353  /* We only try to split maximum sized TCP segments. */
     
    107107   
    108108    /*    uip_appdata += len1;*/
    109     memcpy(uip_appdata, (u8_t *)uip_appdata + len1, len2);
     109    memcpy(uip_appdata, (uint8_t *)uip_appdata + len1, len2);
    110110
    111111    uip_add32(BUF->seqno, len1);
  • uKadecot/trunk/uip/net/ip/uip.h

    r157 r158  
    5454#define __UIP_H__
    5555
    56 #include "uipopt.h"
     56#include "net/ip/uipopt.h"
    5757
    5858/**
     
    6060 *
    6161 */
    62 typedef u16_t uip_ip4addr_t[2];
    63 typedef u16_t uip_ip6addr_t[8];
     62typedef uint16_t uip_ip4addr_t[2];
     63typedef uint16_t uip_ip6addr_t[8];
    6464#if UIP_CONF_IPV6
    6565typedef uip_ip6addr_t uip_ipaddr_t;
     
    193193 * This function may be used at boot time to set the initial ip_id.
    194194 */
    195 void uip_setipid(u16_t id);
     195void uip_setipid(uint16_t id);
    196196
    197197/** @} */
     
    421421 */
    422422#if 0
    423 extern u8_t uip_buf[UIP_BUFSIZE+2];
     423extern uint8_t uip_buf[UIP_BUFSIZE+2];
    424424#else
    425 extern u8_t *uip_buf;
     425extern uint8_t *uip_buf;
    426426#endif
    427427
     
    452452 * \param port A 16-bit port number in network byte order.
    453453 */
    454 void uip_listen(u16_t port);
     454void uip_listen(uint16_t port);
    455455
    456456/**
     
    466466 * \param port A 16-bit port number in network byte order.
    467467 */
    468 void uip_unlisten(u16_t port);
     468void uip_unlisten(uint16_t port);
    469469
    470470/**
     
    500500 *
    501501 */
    502 struct uip_conn *uip_connect(uip_ipaddr_t *ripaddr, u16_t port);
     502struct uip_conn *uip_connect(uip_ipaddr_t *ripaddr, uint16_t port);
    503503
    504504
     
    768768 * if no connection could be allocated.
    769769 */
    770 struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport);
     770struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, uint16_t rport);
    771771
    772772/**
     
    843843 */
    844844#define uip_ipaddr(addr, addr0,addr1,addr2,addr3) do { \
    845                      ((u16_t *)(addr))[0] = HTONS(((addr0) << 8) | (addr1)); \
    846                      ((u16_t *)(addr))[1] = HTONS(((addr2) << 8) | (addr3)); \
     845                     ((uint16_t *)(addr))[0] = HTONS(((addr0) << 8) | (addr1)); \
     846                     ((uint16_t *)(addr))[1] = HTONS(((addr2) << 8) | (addr3)); \
    847847                  } while(0)
    848848
     
    855855 */
    856856#define uip_ip6addr(addr, addr0,addr1,addr2,addr3,addr4,addr5,addr6,addr7) do { \
    857                      ((u16_t *)(addr))[0] = HTONS((addr0)); \
    858                      ((u16_t *)(addr))[1] = HTONS((addr1)); \
    859                      ((u16_t *)(addr))[2] = HTONS((addr2)); \
    860                      ((u16_t *)(addr))[3] = HTONS((addr3)); \
    861                      ((u16_t *)(addr))[4] = HTONS((addr4)); \
    862                      ((u16_t *)(addr))[5] = HTONS((addr5)); \
    863                      ((u16_t *)(addr))[6] = HTONS((addr6)); \
    864                      ((u16_t *)(addr))[7] = HTONS((addr7)); \
     857                     ((uint16_t *)(addr))[0] = HTONS((addr0)); \
     858                     ((uint16_t *)(addr))[1] = HTONS((addr1)); \
     859                     ((uint16_t *)(addr))[2] = HTONS((addr2)); \
     860                     ((uint16_t *)(addr))[3] = HTONS((addr3)); \
     861                     ((uint16_t *)(addr))[4] = HTONS((addr4)); \
     862                     ((uint16_t *)(addr))[5] = HTONS((addr5)); \
     863                     ((uint16_t *)(addr))[6] = HTONS((addr6)); \
     864                     ((uint16_t *)(addr))[7] = HTONS((addr7)); \
    865865                  } while(0)
    866866
     
    885885#if !UIP_CONF_IPV6
    886886#define uip_ipaddr_copy(dest, src) do { \
    887                      ((u16_t *)dest)[0] = ((u16_t *)src)[0]; \
    888                      ((u16_t *)dest)[1] = ((u16_t *)src)[1]; \
     887                     ((uint16_t *)dest)[0] = ((uint16_t *)src)[0]; \
     888                     ((uint16_t *)dest)[1] = ((uint16_t *)src)[1]; \
    889889                  } while(0)
    890890#else /* !UIP_CONF_IPV6 */
     
    913913 */
    914914#if !UIP_CONF_IPV6
    915 #define uip_ipaddr_cmp(addr1, addr2) (((u16_t *)addr1)[0] == ((u16_t *)addr2)[0] && \
    916                                       ((u16_t *)addr1)[1] == ((u16_t *)addr2)[1])
     915#define uip_ipaddr_cmp(addr1, addr2) (((uint16_t *)addr1)[0] == ((uint16_t *)addr2)[0] && \
     916                                      ((uint16_t *)addr1)[1] == ((uint16_t *)addr2)[1])
    917917#else /* !UIP_CONF_IPV6 */
    918918#define uip_ipaddr_cmp(addr1, addr2) (memcmp(addr1, addr2, sizeof(uip_ip6addr_t)) == 0)
     
    944944 */
    945945#define uip_ipaddr_maskcmp(addr1, addr2, mask) \
    946                           (((((u16_t *)addr1)[0] & ((u16_t *)mask)[0]) == \
    947                             (((u16_t *)addr2)[0] & ((u16_t *)mask)[0])) && \
    948                            ((((u16_t *)addr1)[1] & ((u16_t *)mask)[1]) == \
    949                             (((u16_t *)addr2)[1] & ((u16_t *)mask)[1])))
     946                          (((((uint16_t *)addr1)[0] & ((uint16_t *)mask)[0]) == \
     947                            (((uint16_t *)addr2)[0] & ((uint16_t *)mask)[0])) && \
     948                           ((((uint16_t *)addr1)[1] & ((uint16_t *)mask)[1]) == \
     949                            (((uint16_t *)addr2)[1] & ((uint16_t *)mask)[1])))
    950950
    951951
     
    975975 */
    976976#define uip_ipaddr_mask(dest, src, mask) do { \
    977                      ((u16_t *)dest)[0] = ((u16_t *)src)[0] & ((u16_t *)mask)[0]; \
    978                      ((u16_t *)dest)[1] = ((u16_t *)src)[1] & ((u16_t *)mask)[1]; \
     977                     ((uint16_t *)dest)[0] = ((uint16_t *)src)[0] & ((uint16_t *)mask)[0]; \
     978                     ((uint16_t *)dest)[1] = ((uint16_t *)src)[1] & ((uint16_t *)mask)[1]; \
    979979                  } while(0)
    980980
     
    987987 \code
    988988 uip_ipaddr_t ipaddr;
    989  u8_t octet;
     989 uint8_t octet;
    990990
    991991 uip_ipaddr(&ipaddr, 1,2,3,4);
     
    997997 * \hideinitializer
    998998 */
    999 #define uip_ipaddr1(addr) (htons(((u16_t *)(addr))[0]) >> 8)
     999#define uip_ipaddr1(addr) (htons(((uint16_t *)(addr))[0]) >> 8)
    10001000
    10011001/**
     
    10071007 \code
    10081008 uip_ipaddr_t ipaddr;
    1009  u8_t octet;
     1009 uint8_t octet;
    10101010
    10111011 uip_ipaddr(&ipaddr, 1,2,3,4);
     
    10171017 * \hideinitializer
    10181018 */
    1019 #define uip_ipaddr2(addr) (htons(((u16_t *)(addr))[0]) & 0xff)
     1019#define uip_ipaddr2(addr) (htons(((uint16_t *)(addr))[0]) & 0xff)
    10201020
    10211021/**
     
    10271027 \code
    10281028 uip_ipaddr_t ipaddr;
    1029  u8_t octet;
     1029 uint8_t octet;
    10301030
    10311031 uip_ipaddr(&ipaddr, 1,2,3,4);
     
    10371037 * \hideinitializer
    10381038 */
    1039 #define uip_ipaddr3(addr) (htons(((u16_t *)(addr))[1]) >> 8)
     1039#define uip_ipaddr3(addr) (htons(((uint16_t *)(addr))[1]) >> 8)
    10401040
    10411041/**
     
    10471047 \code
    10481048 uip_ipaddr_t ipaddr;
    1049  u8_t octet;
     1049 uint8_t octet;
    10501050
    10511051 uip_ipaddr(&ipaddr, 1,2,3,4);
     
    10571057 * \hideinitializer
    10581058 */
    1059 #define uip_ipaddr4(addr) (htons(((u16_t *)(addr))[1]) & 0xff)
     1059#define uip_ipaddr4(addr) (htons(((uint16_t *)(addr))[1]) & 0xff)
    10601060
    10611061/**
     
    10721072#      define HTONS(n) (n)
    10731073#   else /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
    1074 #      define HTONS(n) (u16_t)((((u16_t) (n)) << 8) | (((u16_t) (n)) >> 8))
     1074#      define HTONS(n) (uint16_t)((((uint16_t) (n)) << 8) | (((uint16_t) (n)) >> 8))
    10751075#   endif /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
    10761076#else
     
    10861086 */
    10871087#ifndef htons
    1088 u16_t htons(u16_t val);
     1088uint16_t htons(uint16_t val);
    10891089#endif /* htons */
    10901090#ifndef ntohs
     
    11041104
    11051105#if UIP_URGDATA > 0
    1106 /* u8_t *uip_urgdata:
     1106/* uint8_t *uip_urgdata:
    11071107 *
    11081108 * This pointer points to any urgent data that has been received. Only
     
    11361136 *
    11371137 */
    1138 extern u16_t uip_len;
     1138extern uint16_t uip_len;
    11391139
    11401140/** @} */
    11411141
    11421142#if UIP_URGDATA > 0
    1143 extern u16_t uip_urglen, uip_surglen;
     1143extern uint16_t uip_urglen, uip_surglen;
    11441144#endif /* UIP_URGDATA > 0 */
    11451145
     
    11581158  uip_ipaddr_t ripaddr;   /**< The IP address of the remote host. */
    11591159
    1160   u16_t lport;        /**< The local TCP port, in network byte order. */
    1161   u16_t rport;        /**< The local remote TCP port, in network byte
     1160  uint16_t lport;        /**< The local TCP port, in network byte order. */
     1161  uint16_t rport;        /**< The local remote TCP port, in network byte
    11621162                         order. */
    11631163
    1164   u8_t rcv_nxt[4];    /**< The sequence number that we expect to
     1164  uint8_t rcv_nxt[4];    /**< The sequence number that we expect to
    11651165                         receive next. */
    1166   u8_t snd_nxt[4];    /**< The sequence number that was last sent by
     1166  uint8_t snd_nxt[4];    /**< The sequence number that was last sent by
    11671167                         us. */
    1168   u16_t len;          /**< Length of the data that was previously sent. */
    1169   u16_t mss;          /**< Current maximum segment size for the
     1168  uint16_t len;          /**< Length of the data that was previously sent. */
     1169  uint16_t mss;          /**< Current maximum segment size for the
    11701170                         connection. */
    1171   u16_t initialmss;   /**< Initial maximum segment size for the
     1171  uint16_t initialmss;   /**< Initial maximum segment size for the
    11721172                         connection. */
    1173   u8_t sa;            /**< Retransmission time-out calculation state
     1173  uint8_t sa;            /**< Retransmission time-out calculation state
    11741174                         variable. */
    1175   u8_t sv;            /**< Retransmission time-out calculation state
     1175  uint8_t sv;            /**< Retransmission time-out calculation state
    11761176                         variable. */
    1177   u8_t rto;           /**< Retransmission time-out. */
    1178   u8_t tcpstateflags; /**< TCP state and flags. */
    1179   u8_t timer;         /**< The retransmission timer. */
    1180   u8_t nrtx;          /**< The number of retransmissions for the last
     1177  uint8_t rto;           /**< Retransmission time-out. */
     1178  uint8_t tcpstateflags; /**< TCP state and flags. */
     1179  uint8_t timer;         /**< The retransmission timer. */
     1180  uint8_t nrtx;          /**< The number of retransmissions for the last
    11811181                         segment sent. */
    11821182
     
    12031203 * 4-byte array used for the 32-bit sequence number calculations.
    12041204 */
    1205 extern u8_t uip_acc32[4];
     1205extern uint8_t uip_acc32[4];
    12061206
    12071207/** @} */
     
    12141214struct uip_udp_conn {
    12151215  uip_ipaddr_t ripaddr;   /**< The IP address of the remote peer. */
    1216   u16_t lport;        /**< The local port number in network byte order. */
    1217   u16_t rport;        /**< The remote port number in network byte order. */
    1218   u8_t  ttl;          /**< Default time-to-live. */
     1216  uint16_t lport;        /**< The local port number in network byte order. */
     1217  uint16_t rport;        /**< The remote port number in network byte order. */
     1218  uint8_t  ttl;          /**< Default time-to-live. */
    12191219
    12201220  /** The application state. */
     
    13011301 */
    13021302/*---------------------------------------------------------------------------*/
    1303 /* u8_t uip_flags:
     1303/* uint8_t uip_flags:
    13041304 *
    13051305 * When the application is called, uip_flags will contain the flags
     
    13071307 * infomation.
    13081308 */
    1309 extern u8_t uip_flags;
     1309extern uint8_t uip_flags;
    13101310
    13111311/* The following flags may be set in the global variable uip_flags
     
    13491349 * The actual uIP function which does all the work.
    13501350 */
    1351 void uip_process(u8_t flag);
     1351void uip_process(uint8_t flag);
    13521352
    13531353/* The following flags are passed as an argument to the uip_process()
     
    13971397#if UIP_CONF_IPV6
    13981398  /* IPv6 header. */
    1399   u8_t vtc,
     1399  uint8_t vtc,
    14001400    tcflow;
    1401   u16_t flow;
    1402   u8_t len[2];
    1403   u8_t proto, ttl;
     1401  uint16_t flow;
     1402  uint8_t len[2];
     1403  uint8_t proto, ttl;
    14041404  uip_ip6addr_t srcipaddr, destipaddr;
    14051405#else /* UIP_CONF_IPV6 */
    14061406  /* IPv4 header. */
    1407   u8_t vhl,
     1407  uint8_t vhl,
    14081408    tos,
    14091409    len[2],
     
    14121412    ttl,
    14131413    proto;
    1414   u16_t ipchksum;
    1415   u16_t srcipaddr[2],
     1414  uint16_t ipchksum;
     1415  uint16_t srcipaddr[2],
    14161416    destipaddr[2];
    14171417#endif /* UIP_CONF_IPV6 */
    14181418
    14191419  /* TCP header. */
    1420   u16_t srcport,
     1420  uint16_t srcport,
    14211421    destport;
    1422   u8_t seqno[4],
     1422  uint8_t seqno[4],
    14231423    ackno[4],
    14241424    tcpoffset,
    14251425    flags,
    14261426    wnd[2];
    1427   u16_t tcpchksum;
    1428   u8_t urgp[2];
    1429   u8_t optdata[4];
     1427  uint16_t tcpchksum;
     1428  uint8_t urgp[2];
     1429  uint8_t optdata[4];
    14301430};
    14311431
     
    14341434#if UIP_CONF_IPV6
    14351435  /* IPv6 header. */
    1436   u8_t vtc,
     1436  uint8_t vtc,
    14371437    tcf;
    1438   u16_t flow;
    1439   u8_t len[2];
    1440   u8_t proto, ttl;
     1438  uint16_t flow;
     1439  uint8_t len[2];
     1440  uint8_t proto, ttl;
    14411441  uip_ip6addr_t srcipaddr, destipaddr;
    14421442#else /* UIP_CONF_IPV6 */
    14431443  /* IPv4 header. */
    1444   u8_t vhl,
     1444  uint8_t vhl,
    14451445    tos,
    14461446    len[2],
     
    14491449    ttl,
    14501450    proto;
    1451   u16_t ipchksum;
    1452   u16_t srcipaddr[2],
     1451  uint16_t ipchksum;
     1452  uint16_t srcipaddr[2],
    14531453    destipaddr[2];
    14541454#endif /* UIP_CONF_IPV6 */
    14551455
    14561456  /* ICMP (echo) header. */
    1457   u8_t type, icode;
    1458   u16_t icmpchksum;
     1457  uint8_t type, icode;
     1458  uint16_t icmpchksum;
    14591459#if !UIP_CONF_IPV6
    1460   u16_t id, seqno;
     1460  uint16_t id, seqno;
    14611461#else /* !UIP_CONF_IPV6 */
    1462   u8_t flags, reserved1, reserved2, reserved3;
    1463   u8_t icmp6data[16];
    1464   u8_t options[1];
     1462  uint8_t flags, reserved1, reserved2, reserved3;
     1463  uint8_t icmp6data[16];
     1464  uint8_t options[1];
    14651465#endif /* !UIP_CONF_IPV6 */
    14661466};
     
    14711471#if UIP_CONF_IPV6
    14721472  /* IPv6 header. */
    1473   u8_t vtc,
     1473  uint8_t vtc,
    14741474    tcf;
    1475   u16_t flow;
    1476   u8_t len[2];
    1477   u8_t proto, ttl;
     1475  uint16_t flow;
     1476  uint8_t len[2];
     1477  uint8_t proto, ttl;
    14781478  uip_ip6addr_t srcipaddr, destipaddr;
    14791479#else /* UIP_CONF_IPV6 */
    14801480  /* IP header. */
    1481   u8_t vhl,
     1481  uint8_t vhl,
    14821482    tos,
    14831483    len[2],
     
    14861486    ttl,
    14871487    proto;
    1488   u16_t ipchksum;
    1489   u16_t srcipaddr[2],
     1488  uint16_t ipchksum;
     1489  uint16_t srcipaddr[2],
    14901490    destipaddr[2];
    14911491#endif /* UIP_CONF_IPV6 */
    14921492
    14931493  /* UDP header. */
    1494   u16_t srcport,
     1494  uint16_t srcport,
    14951495    destport;
    1496   u16_t udplen;
    1497   u16_t udpchksum;
     1496  uint16_t udplen;
     1497  uint16_t udpchksum;
    14981498};
    14991499
     
    15551555 */
    15561556struct uip_eth_addr {
    1557   u8_t addr[6];
     1557  uint8_t addr[6];
    15581558};
    15591559
     
    15741574 * \return The Internet checksum of the buffer.
    15751575 */
    1576 u16_t uip_chksum(u16_t *buf, u16_t len);
     1576uint16_t uip_chksum(uint16_t *buf, uint16_t len);
    15771577
    15781578/**
     
    15851585 * buffer.
    15861586 */
    1587 u16_t uip_ipchksum(void);
     1587uint16_t uip_ipchksum(void);
    15881588
    15891589/**
     
    15961596 * to by uip_appdata.
    15971597 */
    1598 u16_t uip_tcpchksum(void);
     1598uint16_t uip_tcpchksum(void);
    15991599
    16001600/**
     
    16071607 * to by uip_appdata.
    16081608 */
    1609 u16_t uip_udpchksum(void);
     1609uint16_t uip_udpchksum(void);
    16101610
    16111611
  • uKadecot/trunk/uip/net/ip/uip_arch.h

    r157 r158  
    6262#define __UIP_ARCH_H__
    6363
    64 #include "uip.h"
     64#include "net/ip/uip.h"
    6565
    6666/**
     
    8282 * \param op16 A 16-bit integer in host byte order.
    8383 */
    84 void uip_add32(u8_t *op32, u16_t op16);
     84void uip_add32(uint8_t *op32, uint16_t op16);
    8585
    8686/**
     
    103103 * \return The Internet checksum of the buffer.
    104104 */
    105 u16_t uip_chksum(u16_t *buf, u16_t len);
     105uint16_t uip_chksum(uint16_t *buf, uint16_t len);
    106106
    107107/**
     
    114114 * buffer.
    115115 */
    116 u16_t uip_ipchksum(void);
     116uint16_t uip_ipchksum(void);
    117117
    118118/**
     
    129129 * to by uip_appdata.
    130130 */
    131 u16_t uip_tcpchksum(void);
     131uint16_t uip_tcpchksum(void);
    132132
    133 u16_t uip_udpchksum(void);
     133uint16_t uip_udpchksum(void);
    134134
    135135/** @} */
  • uKadecot/trunk/uip/net/ip/uiplib.c

    r157 r158  
    3535
    3636
    37 #include "uip.h"
    38 #include "uiplib.h"
     37#include "net/ip/uip.h"
     38#include "net/ip/uiplib.h"
    3939
    4040
  • uKadecot/trunk/uip/net/ip/uipopt.h

    r157 r158  
    502502
    503503struct httpd_state {
    504   u8_t state;
    505   u16_t count;
     504  uint8_t state;
     505  uint16_t count;
    506506  char *dataptr;
    507507  char *script;
  • uKadecot/trunk/uip/net/ipv4/uip-fw.c

    r157 r158  
    5454 */
    5555
    56 #include "uip.h"
    57 #include "uip_arch.h"
    58 #include "uip-fw.h"
     56#include "net/ip/uip.h"
     57#include "net/ip/uip_arch.h"
     58#include "net/ipv4/uip-fw.h"
    5959
    6060#include <string.h> /* for memcpy() */
     
    7878struct tcpip_hdr {
    7979  /* IP header. */
    80   u8_t vhl,
     80  uint8_t vhl,
    8181    tos;
    82   u16_t len,
     82  uint16_t len,
    8383    ipid,
    8484    ipoffset;
    85   u8_t ttl,
     85  uint8_t ttl,
    8686    proto;
    87   u16_t ipchksum;
    88   u16_t srcipaddr[2],
     87  uint16_t ipchksum;
     88  uint16_t srcipaddr[2],
    8989    destipaddr[2];
    9090 
    9191  /* TCP header. */
    92   u16_t srcport,
     92  uint16_t srcport,
    9393    destport;
    94   u8_t seqno[4],
     94  uint8_t seqno[4],
    9595    ackno[4],
    9696    tcpoffset,
    9797    flags,
    9898    wnd[2];
    99   u16_t tcpchksum;
    100   u8_t urgp[2];
    101   u8_t optdata[4];
     99  uint16_t tcpchksum;
     100  uint8_t urgp[2];
     101  uint8_t optdata[4];
    102102};
    103103
    104104struct icmpip_hdr {
    105105  /* IP header. */
    106   u8_t vhl,
     106  uint8_t vhl,
    107107    tos,
    108108    len[2],
     
    111111    ttl,
    112112    proto;
    113   u16_t ipchksum;
    114   u16_t srcipaddr[2],
     113  uint16_t ipchksum;
     114  uint16_t srcipaddr[2],
    115115    destipaddr[2];
    116116  /* ICMP (echo) header. */
    117   u8_t type, icode;
    118   u16_t icmpchksum;
    119   u16_t id, seqno;
    120   u8_t payload[1];
     117  uint8_t type, icode;
     118  uint16_t icmpchksum;
     119  uint16_t id, seqno;
     120  uint8_t payload[1];
    121121};
    122122
     
    142142 */
    143143struct fwcache_entry {
    144   u16_t timer;
    145  
    146   u16_t srcipaddr[2];
    147   u16_t destipaddr[2];
    148   u16_t ipid;
    149   u8_t proto;
    150   u8_t unused;
     144  uint16_t timer;
     145 
     146  uint16_t srcipaddr[2];
     147  uint16_t destipaddr[2];
     148  uint16_t ipid;
     149  uint8_t proto;
     150  uint8_t unused;
    151151
    152152#if notdef
    153   u16_t payload[2];
     153  uint16_t payload[2];
    154154#endif
    155155
    156156#if UIP_REASSEMBLY > 0
    157   u16_t len, offset;
     157  uint16_t len, offset;
    158158#endif
    159159};
     
    217217/*------------------------------------------------------------------------------*/
    218218static unsigned char
    219 ipaddr_maskcmp(u16_t *ipaddr, u16_t *netipaddr, u16_t *netmask)
     219ipaddr_maskcmp(uint16_t *ipaddr, uint16_t *netipaddr, uint16_t *netmask)
    220220{
    221221  return (ipaddr[0] & netmask [0]) == (netipaddr[0] & netmask[0]) &&
     
    234234time_exceeded(void)
    235235{
    236   u16_t tmp16;
     236  uint16_t tmp16;
    237237
    238238  /* We don't send out ICMP errors for ICMP messages. */
     
    250250  /* Calculate the ICMP checksum. */
    251251  ICMPBUF->icmpchksum = 0;
    252   ICMPBUF->icmpchksum = ~uip_chksum((u16_t *)&(ICMPBUF->type), 36);
     252  ICMPBUF->icmpchksum = ~uip_chksum((uint16_t *)&(ICMPBUF->type), 36);
    253253
    254254  /* Set the IP destination address to be the source address of the
     
    367367 */
    368368/*------------------------------------------------------------------------------*/
    369 u8_t
     369uint8_t
    370370uip_fw_output(void)
    371371{
     
    415415 */
    416416/*------------------------------------------------------------------------------*/
    417 u8_t
     417uint8_t
    418418uip_fw_forward(void)
    419419{
  • uKadecot/trunk/uip/net/ipv4/uip-fw.h

    r157 r158  
    4747#define __UIP_FW_H__
    4848
    49 #include "uip.h"
     49#include "net/ip/uip.h"
    5050
    5151/**
     
    5555  struct uip_fw_netif *next;  /**< Pointer to the next interface when
    5656                                 linked in a list. */
    57   u16_t ipaddr[2];            /**< The IP address of this interface. */
    58   u16_t netmask[2];           /**< The netmask of the interface. */
    59   u8_t (* output)(void);
     57  uint16_t ipaddr[2];            /**< The IP address of this interface. */
     58  uint16_t netmask[2];           /**< The netmask of the interface. */
     59  uint8_t (* output)(void);
    6060                              /**< A pointer to the function that
    6161                                 sends a packet. */
     
    9494 */
    9595#define uip_fw_setipaddr(netif, addr) \
    96         do { (netif)->ipaddr[0] = ((u16_t *)(addr))[0]; \
    97              (netif)->ipaddr[1] = ((u16_t *)(addr))[1]; } while(0)
     96        do { (netif)->ipaddr[0] = ((uint16_t *)(addr))[0]; \
     97             (netif)->ipaddr[1] = ((uint16_t *)(addr))[1]; } while(0)
    9898/**
    9999 * Set the netmask of a network interface.
     
    106106 */
    107107#define uip_fw_setnetmask(netif, addr) \
    108         do { (netif)->netmask[0] = ((u16_t *)(addr))[0]; \
    109              (netif)->netmask[1] = ((u16_t *)(addr))[1]; } while(0)
     108        do { (netif)->netmask[0] = ((uint16_t *)(addr))[0]; \
     109             (netif)->netmask[1] = ((uint16_t *)(addr))[1]; } while(0)
    110110
    111111void uip_fw_init(void);
    112 u8_t uip_fw_forward(void);
    113 u8_t uip_fw_output(void);
     112uint8_t uip_fw_forward(void);
     113uint8_t uip_fw_output(void);
    114114void uip_fw_register(struct uip_fw_netif *netif);
    115115void uip_fw_default(struct uip_fw_netif *netif);
  • uKadecot/trunk/uip/net/ipv4/uip-neighbor.c

    r157 r158  
    4040 */
    4141
    42 #include "uip-neighbor.h"
     42#include "net/ipv4/uip-neighbor.h"
    4343
    4444#include <string.h>
     
    5555  uip_ipaddr_t ipaddr;
    5656  struct uip_neighbor_addr addr;
    57   u8_t time;
     57  uint8_t time;
    5858};
    5959static struct neighbor_entry entries[ENTRIES];
     
    8686{
    8787  int i, oldest;
    88   u8_t oldest_time;
     88  uint8_t oldest_time;
    8989
    9090  printf("Adding neighbor with link address %02x:%02x:%02x:%02x:%02x:%02x\n",
  • uKadecot/trunk/uip/net/ipv4/uip-neighbor.h

    r157 r158  
    4343#define __UIP_NEIGHBOR_H__
    4444
    45 #include "uip.h"
     45#include "net/ip/uip.h"
    4646
    4747struct uip_neighbor_addr {
  • uKadecot/trunk/uip/net/ipv4/uip.c

    r157 r158  
    8080*/
    8181
    82 #include "uip.h"
    83 #include "uipopt.h"
    84 #include "uip_arch.h"
     82#include "net/ip/uip.h"
     83#include "net/ip/uipopt.h"
     84#include "net/ip/uip_arch.h"
    8585
    8686#if UIP_CONF_IPV6
    87 #include "uip-neighbor.h"
     87#include "net/ipv4/uip-neighbor.h"
    8888#endif /* UIP_CONF_IPV6 */
    8989
     
    137137
    138138#ifndef UIP_CONF_EXTERNAL_BUFFER
    139 u8_t uip_buf[UIP_BUFSIZE + 2];   /* The packet buffer that contains
     139uint8_t uip_buf[UIP_BUFSIZE + 2];   /* The packet buffer that contains
    140140                                    incoming packets. */
    141141#endif /* UIP_CONF_EXTERNAL_BUFFER */
     
    150150                                       urgent data (out-of-band data), if
    151151                                       present. */
    152 u16_t uip_urglen, uip_surglen;
     152uint16_t uip_urglen, uip_surglen;
    153153#endif /* UIP_URGDATA > 0 */
    154154
    155 u16_t uip_len, uip_slen;
     155uint16_t uip_len, uip_slen;
    156156                             /* The uip_len is either 8 or 16 bits,
    157157                                depending on the maximum packet
    158158                                size. */
    159159
    160 u8_t uip_flags;     /* The uip_flags variable is used for
     160uint8_t uip_flags;     /* The uip_flags variable is used for
    161161                                communication between the TCP/IP stack
    162162                                and the application program. */
     
    167167                             /* The uip_conns array holds all TCP
    168168                                connections. */
    169 u16_t uip_listenports[UIP_LISTENPORTS];
     169uint16_t uip_listenports[UIP_LISTENPORTS];
    170170                             /* The uip_listenports list all currently
    171171                                listning ports. */
     
    175175#endif /* UIP_UDP */
    176176
    177 static u16_t ipid;           /* Ths ipid variable is an increasing
     177static uint16_t ipid;           /* Ths ipid variable is an increasing
    178178                                number that is used for the IP ID
    179179                                field. */
    180180
    181 void uip_setipid(u16_t id) { ipid = id; }
    182 
    183 static u8_t iss[4];          /* The iss variable is used for the TCP
     181void uip_setipid(uint16_t id) { ipid = id; }
     182
     183static uint8_t iss[4];          /* The iss variable is used for the TCP
    184184                                initial sequence number. */
    185185
    186186#if UIP_ACTIVE_OPEN
    187 static u16_t lastport;       /* Keeps track of the last port used for
     187static uint16_t lastport;       /* Keeps track of the last port used for
    188188                                a new connection. */
    189189#endif /* UIP_ACTIVE_OPEN */
    190190
    191191/* Temporary variables. */
    192 u8_t uip_acc32[4];
    193 static u8_t c, opt;
    194 static u16_t tmp16;
     192uint8_t uip_acc32[4];
     193static uint8_t c, opt;
     194static uint16_t tmp16;
    195195
    196196/* Structures and definitions. */
     
    247247#if ! UIP_ARCH_ADD32
    248248void
    249 uip_add32(u8_t *op32, u16_t op16)
     249uip_add32(uint8_t *op32, uint16_t op16)
    250250{
    251251  uip_acc32[3] = op32[3] + (op16 & 0xff);
     
    277277#if ! UIP_ARCH_CHKSUM
    278278/*---------------------------------------------------------------------------*/
    279 static u16_t
    280 chksum(u16_t sum, const u8_t *data, u16_t len)
     279static uint16_t
     280chksum(uint16_t sum, const uint8_t *data, uint16_t len)
    281281{
    282   u16_t t;
    283   const u8_t *dataptr;
    284   const u8_t *last_byte;
     282  uint16_t t;
     283  const uint8_t *dataptr;
     284  const uint8_t *last_byte;
    285285
    286286  dataptr = data;
     
    308308}
    309309/*---------------------------------------------------------------------------*/
    310 u16_t
    311 uip_chksum(u16_t *data, u16_t len)
     310uint16_t
     311uip_chksum(uint16_t *data, uint16_t len)
    312312{
    313   return htons(chksum(0, (u8_t *)data, len));
     313  return htons(chksum(0, (uint8_t *)data, len));
    314314}
    315315/*---------------------------------------------------------------------------*/
    316316#ifndef UIP_ARCH_IPCHKSUM
    317 u16_t
     317uint16_t
    318318uip_ipchksum(void)
    319319{
    320   u16_t sum;
     320  uint16_t sum;
    321321
    322322  sum = chksum(0, &uip_buf[UIP_LLH_LEN], UIP_IPH_LEN);
     
    326326#endif
    327327/*---------------------------------------------------------------------------*/
    328 static u16_t
    329 upper_layer_chksum(u8_t proto)
     328static uint16_t
     329upper_layer_chksum(uint8_t proto)
    330330{
    331   u16_t upper_layer_len;
    332   u16_t sum;
     331  uint16_t upper_layer_len;
     332  uint16_t sum;
    333333
    334334#if UIP_CONF_IPV6
    335   upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]);
     335  upper_layer_len = (((uint16_t)(BUF->len[0]) << 8) + BUF->len[1]);
    336336#else /* UIP_CONF_IPV6 */
    337   upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN;
     337  upper_layer_len = (((uint16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN;
    338338#endif /* UIP_CONF_IPV6 */
    339339
     
    343343  sum = upper_layer_len + proto;
    344344  /* Sum IP source and destination addresses. */
    345   sum = chksum(sum, (u8_t *)&BUF->srcipaddr[0], 2 * sizeof(uip_ipaddr_t));
     345  sum = chksum(sum, (uint8_t *)&BUF->srcipaddr[0], 2 * sizeof(uip_ipaddr_t));
    346346
    347347  /* Sum TCP header and data. */
     
    353353/*---------------------------------------------------------------------------*/
    354354#if UIP_CONF_IPV6
    355 u16_t
     355uint16_t
    356356uip_icmp6chksum(void)
    357357{
     
    361361#endif /* UIP_CONF_IPV6 */
    362362/*---------------------------------------------------------------------------*/
    363 u16_t
     363uint16_t
    364364uip_tcpchksum(void)
    365365{
     
    368368/*---------------------------------------------------------------------------*/
    369369#if UIP_UDP_CHECKSUMS
    370 u16_t
     370uint16_t
    371371uip_udpchksum(void)
    372372{
     
    375375#endif /* UIP_UDP_CHECKSUMS */
    376376#endif /* UIP_ARCH_CHKSUM */
    377 u8_t
     377uint8_t
    378378uip_ismulticast(uip_ipaddr_t ipaddr)
    379379{
     
    381381  return 0;
    382382#else
    383   static const u16_t multicast_ipaddr[2] = { 0x00e0, 0x0000 };
    384   static const u16_t multicast_mask[2] = { 0x00f0, 0x0000 };
     383  static const uint16_t multicast_ipaddr[2] = { 0x00e0, 0x0000 };
     384  static const uint16_t multicast_mask[2] = { 0x00f0, 0x0000 };
    385385  return uip_ipaddr_maskcmp(ipaddr, multicast_ipaddr, multicast_mask);
    386386#endif
     
    416416#if UIP_ACTIVE_OPEN
    417417struct uip_conn *
    418 uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
     418uip_connect(uip_ipaddr_t *ripaddr, uint16_t rport)
    419419{
    420420  register struct uip_conn *conn, *cconn;
     
    482482#if UIP_UDP
    483483struct uip_udp_conn *
    484 uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport)
     484uip_udp_new(uip_ipaddr_t *ripaddr, uint16_t rport)
    485485{
    486486  register struct uip_udp_conn *conn;
     
    527527/*---------------------------------------------------------------------------*/
    528528void
    529 uip_unlisten(u16_t port)
     529uip_unlisten(uint16_t port)
    530530{
    531531  for(c = 0; c < UIP_LISTENPORTS; ++c) {
     
    538538/*---------------------------------------------------------------------------*/
    539539void
    540 uip_listen(u16_t port)
     540uip_listen(uint16_t port)
    541541{
    542542  for(c = 0; c < UIP_LISTENPORTS; ++c) {
     
    552552#if UIP_REASSEMBLY && !UIP_CONF_IPV6
    553553#define UIP_REASS_BUFSIZE (UIP_BUFSIZE - UIP_LLH_LEN)
    554 static u8_t uip_reassbuf[UIP_REASS_BUFSIZE];
    555 static u8_t uip_reassbitmap[UIP_REASS_BUFSIZE / (8 * 8)];
    556 static const u8_t bitmap_bits[8] = {0xff, 0x7f, 0x3f, 0x1f,
     554static uint8_t uip_reassbuf[UIP_REASS_BUFSIZE];
     555static uint8_t uip_reassbitmap[UIP_REASS_BUFSIZE / (8 * 8)];
     556static const uint8_t bitmap_bits[8] = {0xff, 0x7f, 0x3f, 0x1f,
    557557                                    0x0f, 0x07, 0x03, 0x01};
    558 static u16_t uip_reasslen;
    559 static u8_t uip_reassflags;
     558static uint16_t uip_reasslen;
     559static uint8_t uip_reassflags;
    560560#define UIP_REASS_FLAG_LASTFRAG 0x01
    561 static u8_t uip_reasstmr;
     561static uint8_t uip_reasstmr;
    562562
    563563#define IP_MF   0x20
    564564
    565 static u8_t
     565static uint8_t
    566566uip_reass(void)
    567567{
    568   u16_t offset, len;
    569   u16_t i;
     568  uint16_t offset, len;
     569  uint16_t i;
    570570
    571571  /* If ip_reasstmr is zero, no packet is present in the buffer, so we
     
    653653         right amount of bits. */
    654654      if(uip_reassbitmap[uip_reasslen / (8 * 8)] !=
    655          (u8_t)~bitmap_bits[uip_reasslen / 8 & 7]) {
     655         (uint8_t)~bitmap_bits[uip_reasslen / 8 & 7]) {
    656656        goto nullreturn;
    657657      }
     
    681681/*---------------------------------------------------------------------------*/
    682682static void
    683 uip_add_rcv_nxt(u16_t n)
     683uip_add_rcv_nxt(uint16_t n)
    684684{
    685685  uip_add32(uip_conn->rcv_nxt, n);
     
    691691/*---------------------------------------------------------------------------*/
    692692void
    693 uip_process(u8_t flag)
     693uip_process(uint8_t flag)
    694694{
    695695  register struct uip_conn *uip_connr = uip_conn;
     
    13491349                uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == TCP_OPT_MSS_LEN) {
    13501350        /* An MSS option with the right option length. */
    1351         tmp16 = ((u16_t)uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c] << 8) |
    1352           (u16_t)uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + 3 + c];
     1351        tmp16 = ((uint16_t)uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c] << 8) |
     1352          (uint16_t)uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + 3 + c];
    13531353        uip_connr->initialmss = uip_connr->mss =
    13541354          tmp16 > UIP_TCP_MSS? UIP_TCP_MSS: tmp16;
     
    16311631       "persistent timer" and uses the retransmission mechanim.
    16321632    */
    1633     tmp16 = ((u16_t)BUF->wnd[0] << 8) + (u16_t)BUF->wnd[1];
     1633    tmp16 = ((uint16_t)BUF->wnd[0] << 8) + (uint16_t)BUF->wnd[1];
    16341634    if(tmp16 > uip_connr->initialmss ||
    16351635       tmp16 == 0) {
     
    18911891}
    18921892/*---------------------------------------------------------------------------*/
    1893 u16_t
    1894 htons(u16_t val)
     1893uint16_t
     1894htons(uint16_t val)
    18951895{
    18961896  return HTONS(val);
  • uKadecot/trunk/uip/net/ipv4/uip_arp.c

    r157 r158  
    6060
    6161
    62 #include "uip_arp.h"
     62#include "net/ipv4/uip_arp.h"
    6363
    6464#include <string.h>
     
    7272struct arp_hdr {
    7373  struct uip_eth_hdr ethhdr;
    74   u16_t hwtype;
    75   u16_t protocol;
    76   u8_t hwlen;
    77   u8_t protolen;
    78   u16_t opcode;
     74  uint16_t hwtype;
     75  uint16_t protocol;
     76  uint8_t hwlen;
     77  uint8_t protolen;
     78  uint16_t opcode;
    7979  struct uip_eth_addr shwaddr;
    80   u16_t sipaddr[2];
     80  uint16_t sipaddr[2];
    8181  struct uip_eth_addr dhwaddr;
    82   u16_t dipaddr[2];
     82  uint16_t dipaddr[2];
    8383};
    8484
     
    8686  struct uip_eth_hdr ethhdr;
    8787  /* IP header. */
    88   u8_t vhl,
     88  uint8_t vhl,
    8989    tos,
    9090    len[2],
     
    9393    ttl,
    9494    proto;
    95   u16_t ipchksum;
    96   u16_t srcipaddr[2],
     95  uint16_t ipchksum;
     96  uint16_t srcipaddr[2],
    9797    destipaddr[2];
    9898};
     
    110110
    111111struct arp_entry {
    112   u16_t ipaddr[2];
     112  uint16_t ipaddr[2];
    113113  struct uip_eth_addr ethaddr;
    114   u8_t time;
     114  uint8_t time;
    115115};
    116116
    117117static const struct uip_eth_addr broadcast_ethaddr =
    118118  {{0xff,0xff,0xff,0xff,0xff,0xff}};
    119 static const u16_t broadcast_ipaddr[2] = {0xffff,0xffff};
    120 static const u16_t multicast_ipaddr[2] = { 0x00e0, 0x0000 };
    121 static const u16_t multicast_mask[2] = { 0x00f0, 0x0000 };
     119static const uint16_t broadcast_ipaddr[2] = {0xffff,0xffff};
     120static const uint16_t multicast_ipaddr[2] = { 0x00e0, 0x0000 };
     121static const uint16_t multicast_mask[2] = { 0x00f0, 0x0000 };
    122122
    123123static struct arp_entry arp_table[UIP_ARPTAB_SIZE];
    124 static u16_t ipaddr[2];
    125 static u8_t i, c;
    126 
    127 static u8_t arptime;
    128 static u8_t tmpage;
     124static uint16_t ipaddr[2];
     125static uint8_t i, c;
     126
     127static uint8_t arptime;
     128static uint8_t tmpage;
    129129
    130130#define BUF   ((struct arp_hdr *)&uip_buf[0])
     
    170170/*-----------------------------------------------------------------------------------*/
    171171static void
    172 uip_arp_update(u16_t *ipaddr, struct uip_eth_addr *ethaddr)
     172uip_arp_update(uint16_t *ipaddr, struct uip_eth_addr *ethaddr)
    173173{
    174174  register struct arp_entry *tabptr = NULL;
  • uKadecot/trunk/uip/net/ipv4/uip_arp.h

    r157 r158  
    5353#define __UIP_ARP_H__
    5454
    55 #include "uip.h"
     55#include "net/ip/uip.h"
    5656
    5757#ifdef __RX
     
    6969  struct uip_eth_addr dest;
    7070  struct uip_eth_addr src;
    71   u16_t type;
     71  uint16_t type;
    7272};
    7373
  • uKadecot/trunk/uip/sys/lc.h

    r157 r158  
    123123#include LC_CONF_INCLUDE
    124124#else
    125 #include "lc-switch.h"
     125#include "sys/lc-switch.h"
    126126#endif /* LC_CONF_INCLUDE */
    127127
  • uKadecot/trunk/uip/sys/pt.h

    r157 r158  
    5050#define __PT_H__
    5151
    52 #include "lc.h"
     52#include "sys/lc.h"
    5353
    5454struct pt {
  • uKadecot/trunk/uip/sys/timer.c

    r157 r158  
    4646 */
    4747
    48 #include "clock.h"
    49 #include "timer.h"
     48#include "sys/clock.h"
     49#include "sys/timer.h"
    5050
    5151/*---------------------------------------------------------------------------*/
  • uKadecot/trunk/uip/sys/timer.h

    r157 r158  
    6262#define __TIMER_H__
    6363
    64 #include "clock.h"
     64#include "sys/clock.h"
    6565
    6666/**
  • uKadecot/trunk/uip/target/if_rx62n/ether_phy.c

    r108 r158  
    4040#include "ether_phy.h"
    4141#include <kernel.h>
    42 #include "uip.h"
     42#include "net/ip/uip.h"
    4343#include <sil.h>
    4444
  • uKadecot/trunk/uip/target/if_rx62n/if_rx62n.c

    r148 r158  
    4545#include "kernel/kernel_impl.h"
    4646#include "uip_target_config.h"
    47 #include "uip_arp.h"
     47#include "net/ipv4/uip_arp.h"
    4848#include "if_rx62n.h"
    4949#include "ether_phy.h"
  • uKadecot/trunk/uip/task/uip_adpt.c

    r108 r158  
    3737
    3838#include <kernel.h>
    39 #include "uip.h"
     39#include "net/ip/uip.h"
    4040#include "uip_adpt.h"
    4141#include "t_syslog.h"
  • uKadecot/trunk/uip/task/uip_adpt.h

    r108 r158  
    5555typedef struct t_ipv4ep {
    5656        T_IN4_ADDR      ipaddr;         /* IPv4アドレス             */
    57         u16_t           portno;         /* ポート番号                */
     57        uint16_t                portno;         /* ポート番号                */
    5858} T_IPV4EP;
    5959
     
    6363{
    6464        T_IN4_ADDR      ripaddr;                /* リモートIPv4アドレス         */
    65         u16_t           rport;                  /* リモートポート番号            */
    66         u16_t           lport;                  /* ローカルポート番号            */
     65        uint16_t                rport;                  /* リモートポート番号            */
     66        uint16_t                lport;                  /* ローカルポート番号            */
    6767        void(*callback)(struct uip_conn *uip_conn, int fncd, void *p_parblk);
    6868} T_TCP_CCEP;
     
    7575{
    7676        T_IN4_ADDR      ripaddr;                /* リモートIPv4アドレス         */
    77         u16_t           rport;                  /* リモートポート番号            */
    78         u16_t           lport;                  /* ローカルポート番号            */
     77        uint16_t                rport;                  /* リモートポート番号            */
     78        uint16_t                lport;                  /* ローカルポート番号            */
    7979        void (*callback)(struct uip_udp_conn *uip_udp_conn, int fncd, void *p_parblk);
    8080} T_UDP_CCEP;
  • uKadecot/trunk/uip/task/uip_task.c

    r148 r158  
    3838#include <string.h>
    3939#include <kernel.h>
    40 #include "uip.h"
    41 #include "uip_arp.h"
    42 #include "timer.h"
     40#include "net/ip/uip.h"
     41#include "net/ipv4/uip_arp.h"
     42#include "sys/timer.h"
    4343#include "uip_task.h"
    4444#include "uip_nic_config.h"
     
    5757        struct uip_timer periodic_timer, arp_timer;
    5858        clock_time_t timer;
    59         u8_t uip_buf[UIP_BUFSIZE + 2];
     59        uint8_t uip_buf[UIP_BUFSIZE + 2];
    6060};
    6161
     
    6464};
    6565
    66 u8_t *uip_buf = uiptsk.uip_buf;
     66uint8_t *uip_buf = uiptsk.uip_buf;
    6767
    6868typedef struct _uip_out_buf_t
     
    7373        } cepid;
    7474        uip_ipaddr_t ripaddr;
    75         u16_t rport;
     75        uint16_t rport;
    7676        int len;
    77         u8_t data[UIP_BUFSIZE + 2];
     77        uint8_t data[UIP_BUFSIZE + 2];
    7878} UIP_OUT_BUF_T;
    7979
     
    8282int uip_out_wpos = 0;
    8383int uip_out_rpos = 0;
    84 u8_t my_ip[4] = { IPV4_ADDR_LOCAL };
    85 u8_t my_netmask[4] = { IPV4_ADDR_LOCAL_MASK };
    86 u8_t my_default_router[4] = { IPV4_ADDR_DEFAULT_GW };
     84uint8_t my_ip[4] = { IPV4_ADDR_LOCAL };
     85uint8_t my_netmask[4] = { IPV4_ADDR_LOCAL_MASK };
     86uint8_t my_default_router[4] = { IPV4_ADDR_DEFAULT_GW };
    8787int ws_out_req;
    8888int ws_out_res;
Note: See TracChangeset for help on using the changeset viewer.