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

annotate packages/redboot/current/src/net/net_io.c @ 1605:43a89c18d005

Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems.

author	gthomas
date	Fri, 23 Apr 2004 20:38:17 +0000
parents	c4355f101bf6
children

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.
1605 43a89c18d005 Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems. gthomas parents: 1513 diff changeset	12 // Copyright (C) 2002, 2003, 2004 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>
1605 43a89c18d005 Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems. gthomas parents: 1513 diff changeset	62 #include <cyg/infra/cyg_ass.h> // assertion macros
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	63
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	64 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	65 #include <flash_config.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	66
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	67 RedBoot_config_option("GDB connection port",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	68 gdb_port,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	69 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	70 CONFIG_INT,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	71 CYGNUM_REDBOOT_NETWORKING_TCP_PORT
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	72 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	73 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	74 net_debug,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	75 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	76 CONFIG_BOOL,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	77 false
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	78 );
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	79 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	80 RedBoot_config_option("Default network device",
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	81 net_device,
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	82 ALWAYS_ENABLED, true,
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	83 CONFIG_NETPORT,
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 );
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	86 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	87 // 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	88 // 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	89 // 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	90 // 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	91 // 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	92 // 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	93 // confusing.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	94 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	95 bootp,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	96 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	97 CONFIG_BOOL,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	98 true
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	99 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	100 RedBoot_config_option("Local IP address",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	101 bootp_my_ip,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	102 "bootp", false,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	103 CONFIG_IP,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	104 0
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	105 );
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	106 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	107 RedBoot_config_option("Local IP address mask",
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	108 bootp_my_ip_mask,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	109 "bootp", false,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	110 CONFIG_IP,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	111 0
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	112 );
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	113 RedBoot_config_option("Gateway IP address",
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	114 bootp_my_gateway_ip,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	115 "bootp", false,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	116 CONFIG_IP,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	117 0
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	118 );
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	119 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	120 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	121 bootp_server_ip,
1223 dbcfe4e0dbd2 New platform - TAMS MOAB - and generic changes to support it gthomas parents: 1116 diff changeset	122 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	123 CONFIG_IP,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	124 0
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	125 );
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	126
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	127 // 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	128 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	129 info_console_force,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	130 ALWAYS_ENABLED, true,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	131 CONFIG_BOOL,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	132 false
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	133 );
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	134 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	135 info_console_number,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	136 "info_console_force", true,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	137 CONFIG_INT,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	138 0
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	139 );
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	140 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	141
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	142 #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	143
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	144 #ifdef DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	145 int show_tcp = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	146 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	147
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	148 static tcp_socket_t tcp_sock;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	149 static int state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	150 static int _timeout = 500;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	151 static int orig_console, orig_debug;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	152
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	153 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	154 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	155 static unsigned char *in_bufp;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	156 static int out_buflen = 0;
240 23a050ad151f RedBoot TCP/stub speedup. msalter parents: 232 diff changeset	157 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	158 static unsigned char *out_bufp;
329 85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	159 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	160
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	161 // Functions in this module
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	162 static void net_io_flush(void);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	163 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	164 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	165
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	166 // 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	167 #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	168 #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	169 #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	170 #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	171 #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	172
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	173 static cyg_bool
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	174 _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	175 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	176 if (in_buflen == 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	177 __tcp_poll();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	178 if (tcp_sock.state == _CLOSE_WAIT) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	179 // This connection is breaking
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	180 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	181 __tcp_close(&tcp_sock);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	182 return false;
115 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 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	185 if (tcp_sock.state == _CLOSED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	186 // The connection is gone
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	187 net_io_revert_console();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	188 *ch = '\n';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	189 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	190 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	191 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	192 in_bufp = in_buf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	193 #ifdef DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	194 if (show_tcp && (in_buflen > 0)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	195 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	196 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	197 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	198 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	199 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	200 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	201 #endif // DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	202 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	203 if (in_buflen) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	204 ch = in_bufp++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	205 in_buflen--;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	206 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	207 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	208 return false;
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 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	211
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	212 static cyg_bool
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	213 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	214 {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	215 cyg_uint8 esc;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	216
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	217 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	218 return false;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	219
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	220 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	221 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	222
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	223 // 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	224 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	225
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	226 switch (esc) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	227 case TELNET_IAC:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	228 // 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	229 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	230 case TELNET_IP:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	231 // 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	232 *ch = 0x03;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	233 // 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	234 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	235 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	236 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	237 net_io_flush();
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	238 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	239 case TELNET_DO:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	240 // Telnet DO option
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	241 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	242 // Respond with WONT option
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_IAC);
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, TELNET_WONT);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	245 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	246 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	247 default:
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	248 return false;
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 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	251
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	252 static cyg_uint8
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	253 net_io_getc(void* __ch_data)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	254 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	255 cyg_uint8 ch;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	256 int idle_timeout = 10; // 10ms
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	257
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	258 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	259 while (true) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	260 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	261 if (--idle_timeout == 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	262 net_io_flush();
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	263 idle_timeout = 10;
115 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 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	266 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	267 return ch;
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	270 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	271 net_io_flush(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	272 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	273 int n;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	274 char *bp = out_buf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	275
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	276 #ifdef DEBUG_TCP
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	277 if (show_tcp) {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	278 int old_console;
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	279 old_console = start_console();
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	280 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	281 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	282 end_console(old_console);
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	283 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	284 #endif // SHOW_TCP
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	285 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	286 if (n < 0) {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	287 // The connection is gone!
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	288 net_io_revert_console();
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	289 } else {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	290 out_buflen -= n;
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	291 bp += n;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	292 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	293 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	294 // Check interrupt flag
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	295 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	296 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	297 cyg_hal_user_break(0);
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	301 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	302 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	303 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	304 static bool have_dollar, have_hash;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	305 static int hash_count;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	306
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	307 CYGARC_HAL_SAVE_GP();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	308 *out_bufp++ = c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	309 if (c == '$') have_dollar = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	310 if (have_dollar && (c == '#')) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	311 have_hash = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	312 hash_count = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	313 }
308 d64d82910fa2 RedBoot console performance tweak msalter parents: 255 diff changeset	314 if ((++out_buflen == sizeof(out_buf)) \|\|
329 85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	315 (flush_output_lines && c == '\n') \|\|
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	316 (have_hash && (++hash_count == 3))) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	317 net_io_flush();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	318 have_dollar = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	319 }
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	320 CYGARC_HAL_RESTORE_GP();
115 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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	323 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	324 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	325 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	326 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	327
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	328 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	329 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	330 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	331 #if 0
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	332 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	333
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	334 while(__len-- > 0)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	335 net_io_putc(__ch_data, *__buf++);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	336
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	337 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	338 #endif
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	341 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	342 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	343 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	344 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	345
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	346 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	347 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	348 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	349 #if 0
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	350 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	351
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	352 while(__len-- > 0)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	353 *__buf++ = net_io_getc(__ch_data);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	354
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	355 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	356 #endif
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	359 static cyg_bool
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	360 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	361 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	362 int delay_count;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	363 cyg_bool res;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	364
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	365 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	366 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	367 delay_count = _timeout;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	368
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	369 for(;;) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	370 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	371 if (res \|\| 0 == delay_count--)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	372 break;
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	375 CYGARC_HAL_RESTORE_GP();
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	376
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	377 return res;
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	380 static int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	381 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	382 {
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	383 static int vector = 0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	384 int ret = 0;
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	385 static int irq_state = 0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	386
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	387 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	388
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	389 switch (__func) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	390 case __COMMCTL_IRQ_ENABLE:
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	391 irq_state = 1;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	392 if (vector == 0) {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	393 vector = eth_drv_int_vector();
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	394 }
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	395 HAL_INTERRUPT_UNMASK(vector);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	396 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	397 case __COMMCTL_IRQ_DISABLE:
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	398 ret = irq_state;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	399 irq_state = 0;
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	400 if (vector == 0) {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	401 vector = eth_drv_int_vector();
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	402 }
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	403 HAL_INTERRUPT_MASK(vector);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	404 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	405 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	406 ret = vector;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	407 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	408 case __COMMCTL_SET_TIMEOUT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	409 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	410 va_list ap;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	411
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	412 va_start(ap, __func);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	413
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	414 ret = _timeout;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	415 _timeout = va_arg(ap, cyg_uint32);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	416
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	417 va_end(ap);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	418 break;
138 289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	419 }
289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	420 case __COMMCTL_FLUSH_OUTPUT:
289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	421 net_io_flush();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	422 break;
329 85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	423 case __COMMCTL_ENABLE_LINE_FLUSH:
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	424 flush_output_lines = true;
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	425 break;
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	426 case __COMMCTL_DISABLE_LINE_FLUSH:
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	427 flush_output_lines = false;
85c0eb753287 Add control for netio line flushing. msalter parents: 318 diff changeset	428 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	429 default:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	430 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	431 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	432 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	433 return ret;
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	436 static int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	437 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	438 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	439 {
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	440 char ch;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	441
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	442 CYGARC_HAL_SAVE_GP();
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	443 *__ctrlc = 0;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	444 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	445 if (ch == 0x03) {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	446 *__ctrlc = 1;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	447 }
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	448 }
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	449 CYGARC_HAL_RESTORE_GP();
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	450 return CYG_ISR_HANDLED;
115 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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	453 // TEMP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	454
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	455 int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	456 start_console(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	457 {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	458 int cur_console =
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	459 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	460
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	461 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	462 int i = 0;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	463 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	464 if ( i )
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	465 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	466 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	467 if ( i )
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	468 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	469 else
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	470 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	471 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	472
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	473 return cur_console;
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	476 void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	477 end_console(int old_console)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	478 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	479 // Restore original console
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	480 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	481 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	482 // TEMP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	483
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	484 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	485 net_io_revert_console(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	486 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	487 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	488 console_selected = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	489 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	490 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	491 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	492 console_echo = true;
115 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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	495 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	496 net_io_assume_console(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	497 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	498 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	499 console_selected = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	500 #endif
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 117 diff changeset	501 console_echo = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	502 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	503 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	504 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	505 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	506 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	507
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	508 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	509 net_io_init(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	510 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	511 static int init = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	512 if (!init) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	513 hal_virtual_comm_table_t* comm;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	514 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	515
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	516 // Setup procs in the vector table
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	517 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	518 comm = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	519 //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	520 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	521 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	522 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	523 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	524 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	525 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	526 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	527
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	528 // 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	529 // state into correct state.
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	530 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	531
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	532 // Restore original console
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	533 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	534
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	535 init = 1;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	536 gdb_active = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	537 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	538 __tcp_listen(&tcp_sock, gdb_port);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	539 state = tcp_sock.state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	540 #ifdef DEBUG_TCP
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	541 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	542 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	543 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	544
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	545 // 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	546 void
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 151 diff changeset	547 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	548 {
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 151 diff changeset	549 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	550 if (!have_net) return;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	551 __tcp_poll();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	552 if (state != tcp_sock.state) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	553 // Something has changed
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	554 if (tcp_sock.state == _ESTABLISHED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	555 // A new connection has arrived
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	556 net_io_assume_console();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	557 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	558 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	559 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	560 if (tcp_sock.state == _CLOSED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	561 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	562 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	563 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	564 state = tcp_sock.state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	565 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	566
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	567 // 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	568 // 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	569 // period of time).
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	570 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	571
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	572 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	573 // Network initialization
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	574 //
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	575 #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	576 #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	577 #include <cyg/hal/hal_tables.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	578
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	579 // Define table boundaries
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	580 CYG_HAL_TABLE_BEGIN( __NETDEVTAB__, netdev );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	581 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	582
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	583 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	584
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	585 static void
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	586 show_addrs(void)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	587 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	588 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	589 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	590 diag_printf("/%s", inet_ntoa((in_addr_t *)&__local_ip_mask));
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	591 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	592 #else
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	593 diag_printf(", ");
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	594 #endif
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	595 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	596 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	597 show_dns();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	598 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	599 diag_printf("\n");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	600 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	601
232 4316e167c83b Fix compile error when no FLASH. gthomas parents: 231 diff changeset	602 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	603 static void
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	604 flash_get_IP(char id, ip_addr_t val)
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	605 {
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	606 ip_addr_t my_ip;
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	607 int i;
255 21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	608
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	609 if (flash_get_config(id, &my_ip, CONFIG_IP)) {
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	610 if (my_ip[0] != 0 \|\| my_ip[1] != 0 \|\|
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	611 my_ip[2] != 0 \|\| my_ip[3] != 0) {
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	612 // 'id' is set to something so let it override any static IP
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	613 for (i=0; i<4; i++)
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	614 (*val)[i] = my_ip[i];
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	615 }
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	616 }
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	617 }
232 4316e167c83b Fix compile error when no FLASH. gthomas parents: 231 diff changeset	618 #endif
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	619
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	620 static cyg_netdevtab_entry_t *
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	621 net_devtab_entry(unsigned index)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	622 {
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	623 cyg_netdevtab_entry_t *t = &__NETDEVTAB__[index];
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	624
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	625 if (t < &__NETDEVTAB__[0] \|\| t >= &__NETDEVTAB_END__)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	626 return NULL;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	627
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	628 return t;
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
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	631 const char *
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	632 net_devname(unsigned index)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	633 {
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	634 cyg_netdevtab_entry_t *t = net_devtab_entry(index);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	635 if (t)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	636 return t->name;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	637 return NULL;
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
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	640 int
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	641 net_devindex(char *name)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	642 {
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	643 const char *devname;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	644 int index;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	645
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	646 for (index = 0; (devname = net_devname(index)) != NULL; index++)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	647 if (!strcmp(name, devname))
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	648 return index;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	649 return -1;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	650 }
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	651
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	652 static void
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	653 show_eth_info(void)
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	654 {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	655 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	656 __local_enet_sc->dev_name,
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	657 __local_enet_addr[0],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	658 __local_enet_addr[1],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	659 __local_enet_addr[2],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	660 __local_enet_addr[3],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	661 __local_enet_addr[4],
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	662 __local_enet_addr[5]);
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	663 }
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	664
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	665 void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	666 net_init(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	667 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	668 cyg_netdevtab_entry_t *t;
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	669 unsigned index;
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	670 struct eth_drv_sc primary_net = (struct eth_drv_sc )0;
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	671 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	672 char *default_devname;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	673 int default_index;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	674 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	675
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	676 // Set defaults as appropriate
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	677 #ifdef CYGSEM_REDBOOT_DEFAULT_NO_BOOTP
206 eff1bb37158a quick bootp fix jlarmour parents: 199 diff changeset	678 use_bootp = false;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	679 #else
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	680 use_bootp = true;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	681 #endif
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	682 #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	683 net_debug = true;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	684 #else
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	685 net_debug = false;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	686 #endif
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	687 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	688 #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	689 // Fetch values from saved config data, if available
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	690 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	691 flash_get_config("net_device", &default_devname, CONFIG_NETPORT);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	692 #endif
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	693 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	694 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	695 flash_get_config("bootp", &use_bootp, CONFIG_BOOL);
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	696 if (!use_bootp) {
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	697 flash_get_IP("bootp_my_ip", &__local_ip_addr);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	698 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	699 flash_get_IP("bootp_my_ip_mask", &__local_ip_mask);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	700 flash_get_IP("bootp_my_gateway_ip", &__local_ip_gate);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	701 #endif
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	702 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	703 #endif
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	704 # 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	705 // 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	706 // verbose.
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	707 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	708 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	709 # endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	710 have_net = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	711 // 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	712 eth_drv_buffers_init();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	713 __pktbuf_init();
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	714
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	715 // Initialize network device(s).
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	716 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	717 default_index = net_devindex(default_devname);
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	718 if (default_index < 0)
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	719 default_index = 0;
23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	720 #endif
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	721 for (index = 0; (t = net_devtab_entry(index)) != NULL; index++) {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	722 if (t->init(t)) {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	723 t->status = CYG_NETDEVTAB_STATUS_AVAIL;
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	724 if (primary_net == (struct eth_drv_sc *)0) {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	725 primary_net = __local_enet_sc;
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	726 }
849 23fd347aba65 support multiple net drivers in RedBoot msalter parents: 329 diff changeset	727 #if defined(CYGHWR_NET_DRIVERS) && (CYGHWR_NET_DRIVERS > 1)
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	728 if (index == default_index) {
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	729 primary_net = __local_enet_sc;
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	730 }
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	731 #endif
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	732 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	733 }
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	734 __local_enet_sc = primary_net;
2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	735
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	736 if (!__local_enet_sc) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	737 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	738 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	739 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	740 // Initialize the network [if present]
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	741 if (use_bootp) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	742 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	743 have_net = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	744 } else {
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	745 // 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	746 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	747 __local_ip_addr[2] == 0 && __local_ip_addr[3] == 0) {
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	748 show_eth_info();
198 ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	749 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	750 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	751 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	752 have_net = true;
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	753 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	754 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	755 } else {
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	756 enet_addr_t enet_addr;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	757 have_net = true; // Assume values in FLASH were OK
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	758 // 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	759 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	760 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	761 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	762 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	763 if (have_net) {
1292 2f008c4111e7 Improve handling of multiple ethernet devices gthomas parents: 1288 diff changeset	764 show_eth_info();
318 5f33b08f9a93 Fix DNS server address printing. msalter parents: 308 diff changeset	765
1223 dbcfe4e0dbd2 New platform - TAMS MOAB - and generic changes to support it gthomas parents: 1116 diff changeset	766 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
1513 c4355f101bf6 Cleanups to remove warnings gthomas parents: 1292 diff changeset	767 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	768 #endif
318 5f33b08f9a93 Fix DNS server address printing. msalter parents: 308 diff changeset	769 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
5f33b08f9a93 Fix DNS server address printing. msalter parents: 308 diff changeset	770 redboot_dns_res_init();
5f33b08f9a93 Fix DNS server address printing. msalter parents: 308 diff changeset	771 #endif
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	772 show_addrs();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	773 net_io_init();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	774 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	775 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	776
1080 8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	777 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	778
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	779 // Exported CLI function
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	780 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	781 RedBoot_cmd("ip_address",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	782 "Set/change IP addresses",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	783 usage,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	784 do_ip_addr
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
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	787 void
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	788 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	789 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	790 struct option_info opts[3];
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	791 char ip_addr, host_addr;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	792 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	793 struct sockaddr_in host;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	794 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	795 char *dns_addr;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	796 bool dns_addr_set;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	797 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	798 int num_opts;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	799
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	800 init_opts(&opts[0], 'l', true, OPTION_ARG_TYPE_STR,
1513 c4355f101bf6 Cleanups to remove warnings gthomas parents: 1292 diff changeset	801 (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	802 init_opts(&opts[1], 'h', true, OPTION_ARG_TYPE_STR,
1513 c4355f101bf6 Cleanups to remove warnings gthomas parents: 1292 diff changeset	803 (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	804 num_opts = 2;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	805 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	806 init_opts(&opts[2], 'd', true, OPTION_ARG_TYPE_STR,
1513 c4355f101bf6 Cleanups to remove warnings gthomas parents: 1292 diff changeset	807 (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	808 num_opts++;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	809 #endif
1605 43a89c18d005 Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems. gthomas parents: 1513 diff changeset	810
43a89c18d005 Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems. gthomas parents: 1513 diff changeset	811 CYG_ASSERT(num_opts <= NUM_ELEMS(opts), "Too many options");
43a89c18d005 Add checking (assert) for size of option arrays. Also fix port for TFTP on little endian systems. gthomas parents: 1513 diff changeset	812
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	813 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	814 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	815 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	816 if (ip_addr_set) {
1288 c07ec2765e3e Fix compile problems if GATEWAY support disabled gthomas parents: 1223 diff changeset	817 #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	818 char *slash_pos;
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	819 /* 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	820 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	821 int mask_len;
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	822 unsigned long mask;
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	823 *slash_pos = '\0';
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	824 slash_pos++;
1116 f886ab6517f0 Add initial ARP for better IP address handling gthomas parents: 1080 diff changeset	825 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	826 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	827 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	828 return;
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	829 }
8e4712b0416d * src/net/net_io.c: Add the ability to specify a netmask length to jlarmour parents: 849 diff changeset	830 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	831 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	832 }
1288 c07ec2765e3e Fix compile problems if GATEWAY support disabled gthomas parents: 1223 diff changeset	833 #endif
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	834 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	835 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	836 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	837 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	838 // 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	839 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	840 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	841 if (host_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	842 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	843 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	844 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	845 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	846 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	847 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	848 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	849 if (dns_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	850 set_dns(dns_addr);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	851 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	852 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	853 show_addrs();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	854 if (!have_net) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	855 have_net = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	856 net_io_init();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	857 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	858 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	859
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	860 // EOF net_io.c

Mercurial > flash_v2

annotate packages/redboot/current/src/net/net_io.c @ 1605:43a89c18d005