flash_v2: packages/redboot/current/src/net/net

annotate packages/redboot/current/src/net/net_io.c @ 1513:c4355f101bf6

Cleanups to remove warnings

author	gthomas
date	Tue, 24 Feb 2004 14:15:14 +0000
parents	2f008c4111e7
children	43a89c18d005

rev	line source
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	1 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	2 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	3 // net/net_io.c
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	4 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	5 // Stand-alone network logical I/O support for RedBoot
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	6 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	7 //==========================================================================
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	8 //####ECOSGPLCOPYRIGHTBEGIN####
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	9 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	10 // This file is part of eCos, the Embedded Configurable Operating System.
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	11 // Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	12 // Copyright (C) 2002, 2003 Gary Thomas
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	13 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	14 // eCos is free software; you can redistribute it and/or modify it under
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	15 // the terms of the GNU General Public License as published by the Free
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	16 // Software Foundation; either version 2 or (at your option) any later version.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	17 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	18 // eCos is distributed in the hope that it will be useful, but WITHOUT ANY
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	19 // WARRANTY; without even the implied warranty of MERCHANTABILITY or
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	20 // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	21 // for more details.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	22 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	23 // You should have received a copy of the GNU General Public License along
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	24 // with eCos; if not, write to the Free Software Foundation, Inc.,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	25 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	26 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	27 // As a special exception, if other files instantiate templates or use macros
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	28 // or inline functions from this file, or you compile this file and link it
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	29 // with other works to produce a work based on this file, this file does not
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	30 // by itself cause the resulting work to be covered by the GNU General Public
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	31 // License. However the source code for this file must still be made available
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	32 // in accordance with section (3) of the GNU General Public License.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	33 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	34 // This exception does not invalidate any other reasons why a work based on
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	35 // this file might be covered by the GNU General Public License.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	36 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	37 // Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	38 // at http://sources.redhat.com/ecos/ecos-license/
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	39 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	40 //####ECOSGPLCOPYRIGHTEND####
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	41 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	42 //#####DESCRIPTIONBEGIN####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	43 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	44 // Author(s): gthomas
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	45 // Contributors: gthomas
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	46 // Date: 2000-07-14
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	47 // Purpose:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	48 // Description:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	49 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	50 // This code is part of RedBoot (tm).
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	51 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	52 //####DESCRIPTIONEND####
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	53 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	54 //==========================================================================
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	55
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	56 #include <redboot.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	57 #include <net/net.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	58 #include <cyg/hal/hal_misc.h> // Helper functions
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	59 #include <cyg/hal/hal_if.h> // HAL I/O interfaces
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	60 #include <cyg/hal/drv_api.h>
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	61 #include <cyg/hal/hal_intr.h>
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	62
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	63 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	64 #include <flash_config.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	65
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	66 RedBoot_config_option("GDB connection port",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	67 gdb_port,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	68 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	69 CONFIG_INT,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	70 CYGNUM_REDBOOT_NETWORKING_TCP_PORT
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	71 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	72 RedBoot_config_option("Network debug at boot time",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	73 net_debug,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	74 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	75 CONFIG_BOOL,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	76 false
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	77 );
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	78 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	79 RedBoot_config_option("Default network device",
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	80 net_device,
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	81 ALWAYS_ENABLED, true,
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	82 CONFIG_NETPORT,
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	83 ""
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	84 );
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	85 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	86 // Note: the following options are related. If 'bootp' is false, then
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	87 // the other values are used in the configuration. Because of the way
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	88 // that configuration tables are generated, they should have names which
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	89 // are related. The configuration options will show up lexicographically
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	90 // ordered, thus the peculiar naming. In this case, the 'use' option is
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	91 // negated (if false, the others apply) which makes the names even more
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	92 // confusing.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	93 RedBoot_config_option("Use BOOTP for network configuration",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	94 bootp,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	95 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	96 CONFIG_BOOL,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	97 true
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	98 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	99 RedBoot_config_option("Local IP address",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	100 bootp_my_ip,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	101 "bootp", false,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	102 CONFIG_IP,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	103 0
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	104 );
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	105 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	106 RedBoot_config_option("Local IP address mask",
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	107 bootp_my_ip_mask,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	108 "bootp", false,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	109 CONFIG_IP,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	110 0
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	111 );
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	112 RedBoot_config_option("Gateway IP address",
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	113 bootp_my_gateway_ip,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	114 "bootp", false,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	115 CONFIG_IP,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	116 0
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	117 );
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	118 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	119 RedBoot_config_option("Default server IP address",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	120 bootp_server_ip,
1223 dbcfe4e0dbd2 New platform - TAMS MOAB - and generic changes to support it gthomas parents: 1116 diff changeset	121 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	122 CONFIG_IP,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	123 0
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	124 );
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	125
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	126 // Note: the following options are related too.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	127 RedBoot_config_option("Force console for special debug messages",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	128 info_console_force,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	129 ALWAYS_ENABLED, true,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	130 CONFIG_BOOL,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	131 false
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	132 );
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	133 RedBoot_config_option("Console number for special debug messages",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	134 info_console_number,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	135 "info_console_force", true,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	136 CONFIG_INT,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	137 0
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	138 );
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	139 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	140
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	141 #define TCP_CHANNEL CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	142
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	143 #ifdef DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	144 int show_tcp = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	145 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	146
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	147 static tcp_socket_t tcp_sock;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	148 static int state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	149 static int _timeout = 500;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	150 static int orig_console, orig_debug;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	151
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	152 static int in_buflen = 0;
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	153 static unsigned char in_buf[64];
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	154 static unsigned char *in_bufp;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	155 static int out_buflen = 0;
240 23a050ad151f RedBoot TCP/stub speedup. msalter parents: 232 diff changeset	156 static unsigned char out_buf[1024];
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	157 static unsigned char *out_bufp;
329 85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	158 static bool flush_output_lines = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	159
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	160 // Functions in this module
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	161 static void net_io_flush(void);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	162 static void net_io_revert_console(void);
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	163 static void net_io_putc(void*, cyg_uint8);
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	164
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	165 // Special characters used by Telnet - must be interpretted here
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	166 #define TELNET_IAC 0xFF // Interpret as command (escape)
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	167 #define TELNET_IP 0xF4 // Interrupt process
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	168 #define TELNET_WONT 0xFC // I Won't do it
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	169 #define TELNET_DO 0xFD // Will you XXX
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	170 #define TELNET_TM 0x06 // Time marker (special DO/WONT after IP)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	171
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	172 static cyg_bool
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	173 _net_io_getc_nonblock(void* __ch_data, cyg_uint8* ch)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	174 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	175 if (in_buflen == 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	176 __tcp_poll();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	177 if (tcp_sock.state == _CLOSE_WAIT) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	178 // This connection is breaking
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	179 if (tcp_sock.data_bytes == 0 && tcp_sock.rxcnt == 0) {
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	180 __tcp_close(&tcp_sock);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	181 return false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	182 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	183 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	184 if (tcp_sock.state == _CLOSED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	185 // The connection is gone
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	186 net_io_revert_console();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	187 *ch = '\n';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	188 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	189 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	190 in_buflen = __tcp_read(&tcp_sock, in_buf, sizeof(in_buf));
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	191 in_bufp = in_buf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	192 #ifdef DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	193 if (show_tcp && (in_buflen > 0)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	194 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	195 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	196 diag_printf("%s:%d\n", __FUNCTION__, __LINE__);
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	197 diag_dump_buf(in_buf, in_buflen);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	198 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	199 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	200 #endif // DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	201 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	202 if (in_buflen) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	203 ch = in_bufp++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	204 in_buflen--;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	205 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	206 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	207 return false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	208 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	209 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	210
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	211 static cyg_bool
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	212 net_io_getc_nonblock(void* __ch_data, cyg_uint8* ch)
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	213 {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	214 cyg_uint8 esc;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	215
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	216 if (!_net_io_getc_nonblock(__ch_data, ch))
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	217 return false;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	218
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	219 if (gdb_active \|\| *ch != TELNET_IAC)
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	220 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	221
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	222 // Telnet escape - need to read/handle more
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	223 while (!_net_io_getc_nonblock(__ch_data, &esc)) ;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	224
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	225 switch (esc) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	226 case TELNET_IAC:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	227 // The other special case - escaped escape
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	228 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	229 case TELNET_IP:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	230 // Special case for ^C == Interrupt Process
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	231 *ch = 0x03;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	232 // Just in case the other end needs synchronizing
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	233 net_io_putc(__ch_data, TELNET_IAC);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	234 net_io_putc(__ch_data, TELNET_WONT);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	235 net_io_putc(__ch_data, TELNET_TM);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	236 net_io_flush();
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	237 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	238 case TELNET_DO:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	239 // Telnet DO option
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	240 while (!_net_io_getc_nonblock(__ch_data, &esc)) ;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	241 // Respond with WONT option
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	242 net_io_putc(__ch_data, TELNET_IAC);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	243 net_io_putc(__ch_data, TELNET_WONT);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	244 net_io_putc(__ch_data, esc);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	245 return false; // Ignore this whole thing!
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	246 default:
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	247 return false;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	248 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	249 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	250
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	251 static cyg_uint8
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	252 net_io_getc(void* __ch_data)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	253 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	254 cyg_uint8 ch;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	255 int idle_timeout = 10; // 10ms
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	256
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	257 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	258 while (true) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	259 if (net_io_getc_nonblock(__ch_data, &ch)) break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	260 if (--idle_timeout == 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	261 net_io_flush();
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	262 idle_timeout = 10;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	263 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	264 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	265 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	266 return ch;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	267 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	268
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	269 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	270 net_io_flush(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	271 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	272 int n;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	273 char *bp = out_buf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	274
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	275 #ifdef DEBUG_TCP
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	276 if (show_tcp) {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	277 int old_console;
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	278 old_console = start_console();
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	279 diag_printf("%s.%d\n", __FUNCTION__, __LINE__);
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	280 diag_dump_buf(out_buf, out_buflen);
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	281 end_console(old_console);
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	282 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	283 #endif // SHOW_TCP
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	284 n = __tcp_write_block(&tcp_sock, bp, out_buflen);
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	285 if (n < 0) {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	286 // The connection is gone!
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	287 net_io_revert_console();
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	288 } else {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	289 out_buflen -= n;
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	290 bp += n;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	291 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	292 out_bufp = out_buf; out_buflen = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	293 // Check interrupt flag
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	294 if (CYGACC_CALL_IF_CONSOLE_INTERRUPT_FLAG()) {
136 a9ac27ec7abc Merge from eCos master repository on 2000-11-17-18:24:25-GMT jlarmour parents: 132 diff changeset	295 CYGACC_CALL_IF_CONSOLE_INTERRUPT_FLAG_SET(0);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	296 cyg_hal_user_break(0);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	297 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	298 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	299
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	300 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	301 net_io_putc(void* __ch_data, cyg_uint8 c)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	302 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	303 static bool have_dollar, have_hash;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	304 static int hash_count;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	305
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	306 CYGARC_HAL_SAVE_GP();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	307 *out_bufp++ = c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	308 if (c == '$') have_dollar = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	309 if (have_dollar && (c == '#')) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	310 have_hash = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	311 hash_count = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	312 }
308 d64d82910fa2 RedBoot console performance tweak msalter parents: 255 diff changeset	313 if ((++out_buflen == sizeof(out_buf)) \|\|
329 85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	314 (flush_output_lines && c == '\n') \|\|
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	315 (have_hash && (++hash_count == 3))) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	316 net_io_flush();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	317 have_dollar = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	318 }
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	319 CYGARC_HAL_RESTORE_GP();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	320 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	321
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	322 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	323 net_io_write(void* __ch_data, const cyg_uint8* __buf, cyg_uint32 __len)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	324 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	325 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	326
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	327 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	328 diag_printf("%s.%d\n", __FUNCTION__, __LINE__);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	329 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	330 #if 0
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	331 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	332
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	333 while(__len-- > 0)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	334 net_io_putc(__ch_data, *__buf++);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	335
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	336 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	337 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	338 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	339
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	340 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	341 net_io_read(void* __ch_data, cyg_uint8* __buf, cyg_uint32 __len)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	342 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	343 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	344
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	345 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	346 diag_printf("%s.%d\n", __FUNCTION__, __LINE__);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	347 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	348 #if 0
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	349 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	350
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	351 while(__len-- > 0)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	352 *__buf++ = net_io_getc(__ch_data);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	353
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	354 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	355 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	356 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	357
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	358 static cyg_bool
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	359 net_io_getc_timeout(void* __ch_data, cyg_uint8* ch)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	360 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	361 int delay_count;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	362 cyg_bool res;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	363
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	364 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	365 net_io_flush(); // Make sure any output has been sent
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	366 delay_count = _timeout;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	367
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	368 for(;;) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	369 res = net_io_getc_nonblock(__ch_data, ch);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	370 if (res \|\| 0 == delay_count--)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	371 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	372 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	373
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	374 CYGARC_HAL_RESTORE_GP();
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	375
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	376 return res;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	377 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	378
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	379 static int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	380 net_io_control(void *__ch_data, __comm_control_cmd_t __func, ...)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	381 {
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	382 static int vector = 0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	383 int ret = 0;
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	384 static int irq_state = 0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	385
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	386 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	387
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	388 switch (__func) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	389 case __COMMCTL_IRQ_ENABLE:
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	390 irq_state = 1;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	391 if (vector == 0) {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	392 vector = eth_drv_int_vector();
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	393 }
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	394 HAL_INTERRUPT_UNMASK(vector);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	395 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	396 case __COMMCTL_IRQ_DISABLE:
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	397 ret = irq_state;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	398 irq_state = 0;
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	399 if (vector == 0) {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	400 vector = eth_drv_int_vector();
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	401 }
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	402 HAL_INTERRUPT_MASK(vector);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	403 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	404 case __COMMCTL_DBG_ISR_VECTOR:
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	405 ret = vector;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	406 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	407 case __COMMCTL_SET_TIMEOUT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	408 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	409 va_list ap;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	410
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	411 va_start(ap, __func);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	412
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	413 ret = _timeout;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	414 _timeout = va_arg(ap, cyg_uint32);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	415
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	416 va_end(ap);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	417 break;
138 289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	418 }
289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	419 case __COMMCTL_FLUSH_OUTPUT:
289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	420 net_io_flush();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	421 break;
329 85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	422 case __COMMCTL_ENABLE_LINE_FLUSH:
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	423 flush_output_lines = true;
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	424 break;
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	425 case __COMMCTL_DISABLE_LINE_FLUSH:
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	426 flush_output_lines = false;
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	427 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	428 default:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	429 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	430 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	431 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	432 return ret;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	433 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	434
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	435 static int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	436 net_io_isr(void __ch_data, int __ctrlc,
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	437 CYG_ADDRWORD __vector, CYG_ADDRWORD __data)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	438 {
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	439 char ch;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	440
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	441 CYGARC_HAL_SAVE_GP();
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	442 *__ctrlc = 0;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	443 if (net_io_getc_nonblock(__ch_data, &ch)) {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	444 if (ch == 0x03) {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	445 *__ctrlc = 1;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	446 }
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	447 }
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	448 CYGARC_HAL_RESTORE_GP();
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	449 return CYG_ISR_HANDLED;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	450 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	451
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	452 // TEMP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	453
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	454 int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	455 start_console(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	456 {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	457 int cur_console =
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	458 CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	459
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	460 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	461 int i = 0;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	462 if ( flash_get_config( "info_console_force", &i, CONFIG_BOOL) )
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	463 if ( i )
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	464 if ( ! flash_get_config( "info_console_number", &i, CONFIG_INT) )
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	465 i = 0; // the default, if that call failed.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	466 if ( i )
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	467 CYGACC_CALL_IF_SET_CONSOLE_COMM(i);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	468 else
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	469 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	470 CYGACC_CALL_IF_SET_CONSOLE_COMM(0);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	471
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	472 return cur_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	473 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	474
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	475 void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	476 end_console(int old_console)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	477 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	478 // Restore original console
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	479 CYGACC_CALL_IF_SET_CONSOLE_COMM(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	480 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	481 // TEMP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	482
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	483 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	484 net_io_revert_console(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	485 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	486 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	487 console_selected = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	488 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	489 CYGACC_CALL_IF_SET_CONSOLE_COMM(orig_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	490 CYGACC_CALL_IF_SET_DEBUG_COMM(orig_debug);
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 117 diff changeset	491 console_echo = true;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	492 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	493
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	494 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	495 net_io_assume_console(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	496 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	497 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	498 console_selected = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	499 #endif
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 117 diff changeset	500 console_echo = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	501 orig_console = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	502 CYGACC_CALL_IF_SET_CONSOLE_COMM(TCP_CHANNEL);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	503 orig_debug = CYGACC_CALL_IF_SET_DEBUG_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	504 CYGACC_CALL_IF_SET_DEBUG_COMM(TCP_CHANNEL);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	505 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	506
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	507 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	508 net_io_init(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	509 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	510 static int init = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	511 if (!init) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	512 hal_virtual_comm_table_t* comm;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	513 int cur = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	514
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	515 // Setup procs in the vector table
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	516 CYGACC_CALL_IF_SET_CONSOLE_COMM(TCP_CHANNEL);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	517 comm = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	518 //CYGACC_COMM_IF_CH_DATA_SET(*comm, chan);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	519 CYGACC_COMM_IF_WRITE_SET(*comm, net_io_write);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	520 CYGACC_COMM_IF_READ_SET(*comm, net_io_read);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	521 CYGACC_COMM_IF_PUTC_SET(*comm, net_io_putc);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	522 CYGACC_COMM_IF_GETC_SET(*comm, net_io_getc);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	523 CYGACC_COMM_IF_CONTROL_SET(*comm, net_io_control);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	524 CYGACC_COMM_IF_DBG_ISR_SET(*comm, net_io_isr);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	525 CYGACC_COMM_IF_GETC_TIMEOUT_SET(*comm, net_io_getc_timeout);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	526
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	527 // Disable interrupts via this interface to set static
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	528 // state into correct state.
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	529 net_io_control( comm, __COMMCTL_IRQ_DISABLE );
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	530
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	531 // Restore original console
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	532 CYGACC_CALL_IF_SET_CONSOLE_COMM(cur);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	533
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	534 init = 1;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	535 gdb_active = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	536 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	537 __tcp_listen(&tcp_sock, gdb_port);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	538 state = tcp_sock.state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	539 #ifdef DEBUG_TCP
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	540 diag_printf("show tcp = %p\n", (void *)&show_tcp);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	541 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	542 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	543
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	544 // Check for incoming TCP debug connection
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	545 void
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 151 diff changeset	546 net_io_test(bool is_idle)
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	547 {
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 151 diff changeset	548 if (!is_idle) return; // Only care about idle case
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	549 if (!have_net) return;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	550 __tcp_poll();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	551 if (state != tcp_sock.state) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	552 // Something has changed
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	553 if (tcp_sock.state == _ESTABLISHED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	554 // A new connection has arrived
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	555 net_io_assume_console();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	556 in_bufp = in_buf; in_buflen = 1; *in_bufp = '\r';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	557 out_bufp = out_buf; out_buflen = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	558 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	559 if (tcp_sock.state == _CLOSED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	560 net_io_init(); // Get ready for another connection
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	561 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	562 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	563 state = tcp_sock.state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	564 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	565
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	566 // This schedules the 'net_io_test()' function to be run by RedBoot's
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	567 // main command loop when idle (i.e. when no input arrives after some
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	568 // period of time).
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	569 RedBoot_idle(net_io_test, RedBoot_IDLE_NETIO);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	570
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	571 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	572 // Network initialization
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	573 //
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	574 #include <cyg/io/eth/eth_drv.h>
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	575 #include <cyg/io/eth/netdev.h>
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	576 #include <cyg/hal/hal_tables.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	577
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	578 // Define table boundaries
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	579 CYG_HAL_TABLE_BEGIN( __NETDEVTAB__, netdev );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	580 CYG_HAL_TABLE_END( __NETDEVTAB_END__, netdev );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	581
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	582 RedBoot_init(net_init, RedBoot_INIT_LAST);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	583
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	584 static void
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	585 show_addrs(void)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	586 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	587 diag_printf("IP: %s", inet_ntoa((in_addr_t *)&__local_ip_addr));
255 21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	588 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	589 diag_printf("/%s", inet_ntoa((in_addr_t *)&__local_ip_mask));
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	590 diag_printf(", Gateway: %s\n", inet_ntoa((in_addr_t *)&__local_ip_gate));
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	591 #else
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	592 diag_printf(", ");
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	593 #endif
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	594 diag_printf("Default server: %s", inet_ntoa(&my_bootp_info.bp_siaddr));
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	595 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	596 show_dns();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	597 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	598 diag_printf("\n");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	599 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	600
232 4316e167c83b Fix compile error when no FLASH. gthomas parents: 231 diff changeset	601 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	602 static void
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	603 flash_get_IP(char id, ip_addr_t val)
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	604 {
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	605 ip_addr_t my_ip;
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	606 int i;
255 21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	607
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	608 if (flash_get_config(id, &my_ip, CONFIG_IP)) {
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	609 if (my_ip[0] != 0 \|\| my_ip[1] != 0 \|\|
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	610 my_ip[2] != 0 \|\| my_ip[3] != 0) {
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	611 // 'id' is set to something so let it override any static IP
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	612 for (i=0; i<4; i++)
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	613 (*val)[i] = my_ip[i];
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	614 }
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	615 }
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	616 }
232 4316e167c83b Fix compile error when no FLASH. gthomas parents: 231 diff changeset	617 #endif
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	618
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	619 static cyg_netdevtab_entry_t *
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	620 net_devtab_entry(unsigned index)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	621 {
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	622 cyg_netdevtab_entry_t *t = &__NETDEVTAB__[index];
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	623
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	624 if (t < &__NETDEVTAB__[0] \|\| t >= &__NETDEVTAB_END__)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	625 return NULL;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	626
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	627 return t;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	628 }
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	629
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	630 const char *
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	631 net_devname(unsigned index)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	632 {
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	633 cyg_netdevtab_entry_t *t = net_devtab_entry(index);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	634 if (t)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	635 return t->name;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	636 return NULL;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	637 }
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	638
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	639 int
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	640 net_devindex(char *name)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	641 {
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	642 const char *devname;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	643 int index;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	644
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	645 for (index = 0; (devname = net_devname(index)) != NULL; index++)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	646 if (!strcmp(name, devname))
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	647 return index;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	648 return -1;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	649 }
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	650
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	651 static void
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	652 show_eth_info(void)
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	653 {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	654 diag_printf("Ethernet %s: MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	655 __local_enet_sc->dev_name,
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	656 __local_enet_addr[0],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	657 __local_enet_addr[1],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	658 __local_enet_addr[2],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	659 __local_enet_addr[3],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	660 __local_enet_addr[4],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	661 __local_enet_addr[5]);
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	662 }
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	663
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	664 void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	665 net_init(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	666 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	667 cyg_netdevtab_entry_t *t;
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	668 unsigned index;
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	669 struct eth_drv_sc primary_net = (struct eth_drv_sc )0;
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	670 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	671 char *default_devname;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	672 int default_index;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	673 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	674
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	675 // Set defaults as appropriate
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	676 #ifdef CYGSEM_REDBOOT_DEFAULT_NO_BOOTP
206 eff1bb37158a quick bootp fix jlarmour parents: 199 diff changeset	677 use_bootp = false;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	678 #else
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	679 use_bootp = true;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	680 #endif
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	681 #ifdef CYGDBG_REDBOOT_NET_DEBUG
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	682 net_debug = true;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	683 #else
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	684 net_debug = false;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	685 #endif
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	686 gdb_port = CYGNUM_REDBOOT_NETWORKING_TCP_PORT;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	687 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	688 // Fetch values from saved config data, if available
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	689 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	690 flash_get_config("net_device", &default_devname, CONFIG_NETPORT);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	691 #endif
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	692 flash_get_config("net_debug", &net_debug, CONFIG_BOOL);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	693 flash_get_config("gdb_port", &gdb_port, CONFIG_INT);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	694 flash_get_config("bootp", &use_bootp, CONFIG_BOOL);
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	695 if (!use_bootp) {
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	696 flash_get_IP("bootp_my_ip", &__local_ip_addr);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	697 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	698 flash_get_IP("bootp_my_ip_mask", &__local_ip_mask);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	699 flash_get_IP("bootp_my_gateway_ip", &__local_ip_gate);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	700 #endif
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	701 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	702 #endif
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	703 # ifdef CYGDBG_IO_ETH_DRIVERS_DEBUG
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	704 // Don't override if the user has deliberately set something more
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	705 // verbose.
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	706 if (0 == cyg_io_eth_net_debug)
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	707 cyg_io_eth_net_debug = net_debug;
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	708 # endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	709 have_net = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	710 // Make sure the recv buffers are set up
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	711 eth_drv_buffers_init();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	712 __pktbuf_init();
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	713
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	714 // Initialize network device(s).
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	715 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	716 default_index = net_devindex(default_devname);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	717 if (default_index < 0)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	718 default_index = 0;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	719 #endif
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	720 for (index = 0; (t = net_devtab_entry(index)) != NULL; index++) {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	721 if (t->init(t)) {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	722 t->status = CYG_NETDEVTAB_STATUS_AVAIL;
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	723 if (primary_net == (struct eth_drv_sc *)0) {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	724 primary_net = __local_enet_sc;
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	725 }
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	726 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	727 if (index == default_index) {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	728 primary_net = __local_enet_sc;
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	729 }
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	730 #endif
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	731 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	732 }
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	733 __local_enet_sc = primary_net;
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	734
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	735 if (!__local_enet_sc) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	736 diag_printf("No network interfaces found\n");
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	737 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	738 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	739 // Initialize the network [if present]
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	740 if (use_bootp) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	741 if (__bootp_find_local_ip(&my_bootp_info) == 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	742 have_net = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	743 } else {
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	744 // Is it an unset address, or has it been set to a static addr
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	745 if (__local_ip_addr[0] == 0 && __local_ip_addr[1] == 0 &&
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	746 __local_ip_addr[2] == 0 && __local_ip_addr[3] == 0) {
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	747 show_eth_info();
198 ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	748 diag_printf("Can't get BOOTP info for device!\n");
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	749 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	750 diag_printf("Can't get BOOTP info, using default IP address\n");
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	751 have_net = true;
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	752 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	753 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	754 } else {
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	755 enet_addr_t enet_addr;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	756 have_net = true; // Assume values in FLASH were OK
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	757 // Tell the world that we are using this fixed IP address
f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	758 if (__arp_request((ip_addr_t *)__local_ip_addr, &enet_addr, 1) >= 0) {
f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	759 diag_printf("Warning: IP address %s in use\n", inet_ntoa((in_addr_t *)&__local_ip_addr));
f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	760 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	761 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	762 if (have_net) {
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	763 show_eth_info();
318 5f33b08f9a93 Fix DNS server address printing. msalter parents: 308 diff changeset	764
1223 dbcfe4e0dbd2 New platform - TAMS MOAB - and generic changes to support it gthomas parents: 1116 diff changeset	765 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
1513 c4355f101bf6 Cleanups to remove warnings gthomas parents: 1292 diff changeset	766 flash_get_IP("bootp_server_ip", (ip_addr_t *)&my_bootp_info.bp_siaddr);
1223 dbcfe4e0dbd2 New platform - TAMS MOAB - and generic changes to support it gthomas parents: 1116 diff changeset	767 #endif
318 5f33b08f9a93 Fix DNS server address printing. msalter parents: 308 diff changeset	768 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
5f33b08f9a93 Fix DNS server address printing. msalter parents: 308 diff changeset	769 redboot_dns_res_init();
5f33b08f9a93 Fix DNS server address printing. msalter parents: 308 diff changeset	770 #endif
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	771 show_addrs();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	772 net_io_init();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	773 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	774 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	775
1080 8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	776 static char usage[] = "[-l <local_ip_address>[/<mask_len>]] [-h <server_address>]";
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	777
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	778 // Exported CLI function
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	779 static void do_ip_addr(int argc, char *argv[]);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	780 RedBoot_cmd("ip_address",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	781 "Set/change IP addresses",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	782 usage,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	783 do_ip_addr
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	784 );
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	785
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	786 void
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	787 do_ip_addr(int argc, char *argv[])
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	788 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	789 struct option_info opts[3];
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	790 char ip_addr, host_addr;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	791 bool ip_addr_set, host_addr_set;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	792 struct sockaddr_in host;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	793 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	794 char *dns_addr;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	795 bool dns_addr_set;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	796 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	797 int num_opts;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	798
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	799 init_opts(&opts[0], 'l', true, OPTION_ARG_TYPE_STR,
1513 c4355f101bf6 Cleanups to remove warnings gthomas parents: 1292 diff changeset	800 (void )&ip_addr, (bool )&ip_addr_set, "local IP address");
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	801 init_opts(&opts[1], 'h', true, OPTION_ARG_TYPE_STR,
1513 c4355f101bf6 Cleanups to remove warnings gthomas parents: 1292 diff changeset	802 (void )&host_addr, (bool )&host_addr_set, "default server address");
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	803 num_opts = 2;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	804 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	805 init_opts(&opts[2], 'd', true, OPTION_ARG_TYPE_STR,
1513 c4355f101bf6 Cleanups to remove warnings gthomas parents: 1292 diff changeset	806 (void )&dns_addr, (bool )&dns_addr_set, "DNS server address");
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	807 num_opts++;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	808 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	809 if (!scan_opts(argc, argv, 1, opts, num_opts, 0, 0, "")) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	810 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	811 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	812 if (ip_addr_set) {
1288 c07ec2765e3e Fix compile problems if GATEWAY support disabled gthomas parents: 1223 diff changeset	813 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
1080 8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	814 char *slash_pos;
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	815 /* see if the (optional) mask length was given */
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	816 if( (slash_pos = strchr(ip_addr, '/')) ) {
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	817 int mask_len;
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	818 unsigned long mask;
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	819 *slash_pos = '\0';
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	820 slash_pos++;
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	821 if( !parse_num(slash_pos, (unsigned long *)&mask_len, 0, 0) \|\|
f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	822 mask_len <= 0 \|\| mask_len > 32 ) {
1080 8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	823 diag_printf("Invalid mask length: %s\n", slash_pos);
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	824 return;
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	825 }
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	826 mask = htonl((0xffffffff << (32-mask_len))&0xffffffff);
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	827 memcpy(&__local_ip_mask, &mask, 4);
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	828 }
1288 c07ec2765e3e Fix compile problems if GATEWAY support disabled gthomas parents: 1223 diff changeset	829 #endif
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	830 if (!_gethostbyname(ip_addr, (in_addr_t *)&host)) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	831 diag_printf("Invalid local IP address: %s\n", ip_addr);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	832 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	833 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	834 // Of course, each address goes in its own place :-)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	835 memcpy(&__local_ip_addr, &host.sin_addr, sizeof(host.sin_addr));
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	836 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	837 if (host_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	838 if (!_gethostbyname(host_addr, (in_addr_t *)&host)) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	839 diag_printf("Invalid server address: %s\n", host_addr);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	840 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	841 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	842 my_bootp_info.bp_siaddr = host.sin_addr;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	843 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	844 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	845 if (dns_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	846 set_dns(dns_addr);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	847 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	848 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	849 show_addrs();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	850 if (!have_net) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	851 have_net = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	852 net_io_init();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	853 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	854 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	855
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	856 // EOF net_io.c

Mercurial > flash_v2

annotate packages/redboot/current/src/net/net_io.c @ 1513:c4355f101bf6