ban4jp -
/
uIP-1-0_webserver
uIP 1.0 based webserver for LPC1114 + ENC28J60
Diff: uip/uip-fw.h
- Revision:
- 3:a2715e9c7737
- Parent:
- 0:685224d2f66d
diff -r 4da9ed411bdc -r a2715e9c7737 uip/uip-fw.h --- a/uip/uip-fw.h Sat Jun 21 11:54:24 2014 +0000 +++ b/uip/uip-fw.h Mon Jun 30 16:00:08 2014 +0000 @@ -11,37 +11,36 @@ /* * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * This file is part of the uIP TCP/IP stack - * + * This file is part of the Contiki operating system. + * * Author: Adam Dunkels <adam@sics.se> * - * $Id: uip-fw.h,v 1.2 2006/06/12 08:00:30 adam Exp $ */ #ifndef __UIP_FW_H__ #define __UIP_FW_H__ @@ -54,15 +53,15 @@ struct uip_fw_netif { struct uip_fw_netif *next; /**< Pointer to the next interface when linked in a list. */ - u16_t ipaddr[2]; /**< The IP address of this interface. */ - u16_t netmask[2]; /**< The netmask of the interface. */ - u8_t (* output)(void); + uip_ipaddr_t ipaddr; /**< The IP address of this interface. */ + uip_ipaddr_t netmask; /**< The netmask of the interface. */ + uint8_t (* output)(void); /**< A pointer to the function that sends a packet. */ }; /** - * Intantiating macro for a uIP network interface. + * Instantiating macro for a uIP network interface. * * Example: \code @@ -79,8 +78,8 @@ */ #define UIP_FW_NETIF(ip1,ip2,ip3,ip4, nm1,nm2,nm3,nm4, outputfunc) \ NULL, \ - {HTONS((ip1 << 8) | ip2), HTONS((ip3 << 8) | ip4)}, \ - {HTONS((nm1 << 8) | nm2), HTONS((nm3 << 8) | nm4)}, \ + { {ip1, ip2, ip3, ip4} }, \ + { {nm1, nm2, nm3, nm4} }, \ outputfunc /** @@ -93,8 +92,8 @@ * \hideinitializer */ #define uip_fw_setipaddr(netif, addr) \ - do { (netif)->ipaddr[0] = ((u16_t *)(addr))[0]; \ - (netif)->ipaddr[1] = ((u16_t *)(addr))[1]; } while(0) + do { (netif)->ipaddr[0] = ((uint16_t *)(addr))[0]; \ + (netif)->ipaddr[1] = ((uint16_t *)(addr))[1]; } while(0) /** * Set the netmask of a network interface. * @@ -105,12 +104,12 @@ * \hideinitializer */ #define uip_fw_setnetmask(netif, addr) \ - do { (netif)->netmask[0] = ((u16_t *)(addr))[0]; \ - (netif)->netmask[1] = ((u16_t *)(addr))[1]; } while(0) + do { (netif)->netmask[0] = ((uint16_t *)(addr))[0]; \ + (netif)->netmask[1] = ((uint16_t *)(addr))[1]; } while(0) void uip_fw_init(void); -u8_t uip_fw_forward(void); -u8_t uip_fw_output(void); +uint8_t uip_fw_forward(void); +uint8_t uip_fw_output(void); void uip_fw_register(struct uip_fw_netif *netif); void uip_fw_default(struct uip_fw_netif *netif); void uip_fw_periodic(void);