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

annotate packages/redboot/current/src/net/net_io.c @ 308:d64d82910fa2

RedBoot console performance tweak

author	msalter
date	Tue, 27 Aug 2002 01:31:49 +0000
parents	21264951b120
children	5f33b08f9a93

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.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	11 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	12 // Copyright (C) 2002 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>
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	57 #include <cyg/io/eth/eth_drv.h> // Logical driver interfaces
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	58 #include <net/net.h>
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	59 #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	60 #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	61 #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	62 #include <cyg/hal/hal_intr.h>
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	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 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	79 // 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	80 // 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	81 // 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	82 // 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	83 // 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	84 // 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	85 // confusing.
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	86 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	87 bootp,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	88 ALWAYS_ENABLED, true,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	89 CONFIG_BOOL,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	90 true
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	91 );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	92 RedBoot_config_option("Local IP address",
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	93 bootp_my_ip,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	94 "bootp", false,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	95 CONFIG_IP,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	96 0
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	97 );
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	98 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	99 RedBoot_config_option("Local IP address mask",
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	100 bootp_my_ip_mask,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	101 "bootp", false,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	102 CONFIG_IP,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	103 0
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	104 );
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	105 RedBoot_config_option("Gateway IP address",
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	106 bootp_my_gateway_ip,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	107 "bootp", false,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	108 CONFIG_IP,
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	109 0
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	110 );
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	111 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	112 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	113 bootp_server_ip,
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	114 "bootp", false,
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	115 CONFIG_IP,
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	116 0
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	117 );
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	118
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	119 // 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	120 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	121 info_console_force,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	122 ALWAYS_ENABLED, true,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	123 CONFIG_BOOL,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	124 false
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	125 );
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	126 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	127 info_console_number,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	128 "info_console_force", true,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	129 CONFIG_INT,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	130 0
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	131 );
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	132 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	133
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	134 #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	135
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	136 #ifdef DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	137 int show_tcp = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	138 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	139
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	140 static tcp_socket_t tcp_sock;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	141 static int state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	142 static int _timeout = 500;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	143 static int orig_console, orig_debug;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	144
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	145 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	146 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	147 static unsigned char *in_bufp;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	148 static int out_buflen = 0;
240 23a050ad151f RedBoot TCP/stub speedup. msalter parents: 232 diff changeset	149 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	150 static unsigned char *out_bufp;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	151
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	152 // Functions in this module
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	153 static void net_io_flush(void);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	154 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	155 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	156
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	157 // 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	158 #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	159 #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	160 #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	161 #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	162 #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	163
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	164 static cyg_bool
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	165 _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	166 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	167 if (in_buflen == 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	168 __tcp_poll();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	169 if (tcp_sock.state == _CLOSE_WAIT) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	170 // This connection is breaking
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	171 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	172 __tcp_close(&tcp_sock);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	173 return false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	174 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	175 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	176 if (tcp_sock.state == _CLOSED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	177 // The connection is gone
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	178 net_io_revert_console();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	179 *ch = '\n';
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	180 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	181 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	182 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	183 in_bufp = in_buf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	184 #ifdef DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	185 if (show_tcp && (in_buflen > 0)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	186 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	187 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	188 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	189 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	190 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	191 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	192 #endif // DEBUG_TCP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	193 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	194 if (in_buflen) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	195 ch = in_bufp++;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	196 in_buflen--;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	197 return true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	198 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	199 return false;
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 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	202
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	203 static cyg_bool
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	204 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	205 {
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	206 cyg_uint8 esc;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	207
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	208 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	209 return false;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	210
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	211 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	212 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	213
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	214 // 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	215 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	216
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	217 switch (esc) {
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	218 case TELNET_IAC:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	219 // 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	220 return true;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	221 case TELNET_IP:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	222 // 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	223 *ch = 0x03;
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	224 // 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	225 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	226 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	227 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	228 net_io_flush();
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_DO:
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	231 // Telnet DO option
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	232 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	233 // Respond with WONT option
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, esc);
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	237 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	238 default:
143 6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	239 return false;
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	240 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	241 }
6b5f480c6929 Merge from eCos master repository on 2000-12-08-02:09:36-GMT jlarmour parents: 138 diff changeset	242
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	243 static cyg_uint8
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	244 net_io_getc(void* __ch_data)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	245 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	246 cyg_uint8 ch;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	247 int idle_timeout = 10; // 10ms
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	248
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	249 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	250 while (true) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	251 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	252 if (--idle_timeout == 0) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	253 net_io_flush();
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	254 idle_timeout = 10;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	255 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	256 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	257 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	258 return ch;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	259 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	260
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	261 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	262 net_io_flush(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	263 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	264 int n;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	265 char *bp = out_buf;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	266
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	267 #ifdef DEBUG_TCP
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	268 if (show_tcp) {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	269 int old_console;
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	270 old_console = start_console();
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	271 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	272 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	273 end_console(old_console);
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	274 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	275 #endif // SHOW_TCP
210 d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	276 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	277 if (n < 0) {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	278 // The connection is gone!
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	279 net_io_revert_console();
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	280 } else {
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	281 out_buflen -= n;
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST jlarmour parents: 208 diff changeset	282 bp += n;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	283 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	284 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	285 // Check interrupt flag
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	286 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	287 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	288 cyg_hal_user_break(0);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	289 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	290 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	291
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	292 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	293 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	294 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	295 static bool have_dollar, have_hash;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	296 static int hash_count;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	297
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	298 CYGARC_HAL_SAVE_GP();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	299 *out_bufp++ = c;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	300 if (c == '$') have_dollar = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	301 if (have_dollar && (c == '#')) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	302 have_hash = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	303 hash_count = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	304 }
308 d64d82910fa2 RedBoot console performance tweak msalter parents: 255 diff changeset	305 if ((++out_buflen == sizeof(out_buf)) \|\|
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	306 (have_hash && (++hash_count == 3))) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	307 net_io_flush();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	308 have_dollar = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	309 }
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	310 CYGARC_HAL_RESTORE_GP();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	311 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	312
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	313 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	314 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	315 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	316 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	317
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	318 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	319 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	320 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	321 #if 0
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	322 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	323
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	324 while(__len-- > 0)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	325 net_io_putc(__ch_data, *__buf++);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	326
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	327 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	328 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	329 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	330
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	331 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	332 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	333 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	334 int old_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	335
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	336 old_console = start_console();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	337 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	338 end_console(old_console);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	339 #if 0
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	340 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	341
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	342 while(__len-- > 0)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	343 *__buf++ = net_io_getc(__ch_data);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	344
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	345 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	346 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	347 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	348
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	349 static cyg_bool
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	350 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	351 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	352 int delay_count;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	353 cyg_bool res;
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	354
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	355 CYGARC_HAL_SAVE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	356 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	357 delay_count = _timeout;
115 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 for(;;) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	360 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	361 if (res \|\| 0 == delay_count--)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	362 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	363 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	364
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	365 CYGARC_HAL_RESTORE_GP();
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	366
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	367 return res;
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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	370 static int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	371 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	372 {
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	373 static int vector = 0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	374 int ret = 0;
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	375 static int irq_state = 0;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	376
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	377 CYGARC_HAL_SAVE_GP();
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 switch (__func) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	380 case __COMMCTL_IRQ_ENABLE:
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	381 irq_state = 1;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	382 if (vector == 0) {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	383 vector = eth_drv_int_vector();
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	384 }
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	385 HAL_INTERRUPT_UNMASK(vector);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	386 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	387 case __COMMCTL_IRQ_DISABLE:
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	388 ret = irq_state;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	389 irq_state = 0;
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	390 if (vector == 0) {
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	391 vector = eth_drv_int_vector();
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	392 }
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	393 HAL_INTERRUPT_MASK(vector);
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	394 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	395 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	396 ret = vector;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	397 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	398 case __COMMCTL_SET_TIMEOUT:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	399 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	400 va_list ap;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	401
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	402 va_start(ap, __func);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	403
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	404 ret = _timeout;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	405 _timeout = va_arg(ap, cyg_uint32);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	406
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	407 va_end(ap);
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	408 break;
138 289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	409 }
289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	410 case __COMMCTL_FLUSH_OUTPUT:
289bf90c6a9b Merge from eCos master repository on 2000-11-24-06:43:05-GMT jlarmour parents: 136 diff changeset	411 net_io_flush();
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	412 break;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	413 default:
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	414 break;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	415 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	416 CYGARC_HAL_RESTORE_GP();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	417 return ret;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	418 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	419
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	420 static int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	421 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	422 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	423 {
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	424 char ch;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	425
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	426 CYGARC_HAL_SAVE_GP();
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	427 *__ctrlc = 0;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	428 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	429 if (ch == 0x03) {
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	430 *__ctrlc = 1;
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	431 }
bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	432 }
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	433 CYGARC_HAL_RESTORE_GP();
117 bd1a71e3e476 Merge from eCos master repository on 2000-08-25-19:22:58-BST jlarmour parents: 115 diff changeset	434 return CYG_ISR_HANDLED;
115 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
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	437 // TEMP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	438
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	439 int
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	440 start_console(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	441 {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	442 int cur_console =
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	443 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	444
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	445 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	446 int i = 0;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	447 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	448 if ( i )
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	449 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	450 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	451 if ( i )
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	452 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	453 else
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	454 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	455 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	456
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	457 return cur_console;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	458 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	459
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	460 void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	461 end_console(int old_console)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	462 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	463 // Restore original console
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	464 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	465 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	466 // TEMP
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	467
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	468 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	469 net_io_revert_console(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	470 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	471 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	472 console_selected = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	473 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	474 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	475 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	476 console_echo = true;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	477 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	478
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	479 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	480 net_io_assume_console(void)
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 #ifdef CYGPKG_REDBOOT_ANY_CONSOLE
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	483 console_selected = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	484 #endif
128 0c2b7be0d798 Merge from eCos master repository on 2000-10-12-08:46:24-BST jlarmour parents: 117 diff changeset	485 console_echo = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	486 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	487 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	488 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	489 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	490 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	491
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	492 static void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	493 net_io_init(void)
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 int init = 0;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	496 if (!init) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	497 hal_virtual_comm_table_t* comm;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	498 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	499
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	500 // Setup procs in the vector table
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	501 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	502 comm = CYGACC_CALL_IF_CONSOLE_PROCS();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	503 //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	504 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	505 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	506 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	507 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	508 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	509 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	510 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	511
161 ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	512 // 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	513 // state into correct state.
ac086aa3217e Merge from eCos master repository on 2001-06-08-21:11:51-BST jlarmour parents: 159 diff changeset	514 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	515
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	516 // Restore original console
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(cur);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	518
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	519 init = 1;
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	520 gdb_active = false;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	521 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	522 __tcp_listen(&tcp_sock, gdb_port);
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	523 state = tcp_sock.state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	524 #ifdef DEBUG_TCP
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	525 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	526 #endif
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	527 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	528
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	529 // 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	530 void
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 151 diff changeset	531 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	532 {
156 b939e9cada46 Merge from eCos master repository on 2001-03-29-21:44:39-BST jlarmour parents: 151 diff changeset	533 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	534 if (!have_net) return;
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	535 __tcp_poll();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	536 if (state != tcp_sock.state) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	537 // Something has changed
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	538 if (tcp_sock.state == _ESTABLISHED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	539 // A new connection has arrived
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	540 net_io_assume_console();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	541 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	542 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	543 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	544 if (tcp_sock.state == _CLOSED) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	545 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	546 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	547 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	548 state = tcp_sock.state;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	549 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	550
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	551 // 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	552 // 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	553 // period of time).
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	554 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	555
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	556 //
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	557 // Network initialization
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	558 //
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	559 #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	560 #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	561 #include <cyg/hal/hal_tables.h>
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 // Define table boundaries
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	564 CYG_HAL_TABLE_BEGIN( __NETDEVTAB__, netdev );
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	565 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	566
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	567 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	568
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	569 static void
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	570 show_addrs(void)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	571 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	572 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	573 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	574 diag_printf("/%s", inet_ntoa((in_addr_t *)&__local_ip_mask));
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	575 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	576 #else
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	577 diag_printf(", ");
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	578 #endif
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	579 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	580 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	581 show_dns();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	582 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	583 diag_printf("\n");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	584 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	585
232 4316e167c83b Fix compile error when no FLASH. gthomas parents: 231 diff changeset	586 #ifdef CYGSEM_REDBOOT_FLASH_CONFIG
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	587 static void
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	588 flash_get_IP(char id, ip_addr_t val)
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	589 {
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	590 ip_addr_t my_ip;
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	591 int i;
255 21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	592
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	593 if (flash_get_config(id, &my_ip, CONFIG_IP)) {
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	594 if (my_ip[0] != 0 \|\| my_ip[1] != 0 \|\|
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	595 my_ip[2] != 0 \|\| my_ip[3] != 0) {
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	596 // 'id' is set to something so let it override any static IP
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	597 for (i=0; i<4; i++)
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	598 (*val)[i] = my_ip[i];
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	599 }
21264951b120 Fix problems with gateway/mask setup. gthomas parents: 240 diff changeset	600 }
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	601 }
232 4316e167c83b Fix compile error when no FLASH. gthomas parents: 231 diff changeset	602 #endif
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	603
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	604 void
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	605 net_init(void)
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	606 {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	607 cyg_netdevtab_entry_t *t;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	608
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	609 // Set defaults as appropriate
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	610 #ifdef CYGSEM_REDBOOT_DEFAULT_NO_BOOTP
206 eff1bb37158a quick bootp fix jlarmour parents: 199 diff changeset	611 use_bootp = false;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	612 #else
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	613 use_bootp = true;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	614 #endif
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	615 #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	616 net_debug = true;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	617 #else
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	618 net_debug = false;
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	619 #endif
151 25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	620 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	621 #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	622 // Fetch values from saved config data, if available
25e238959bae Merge from eCos master repository on 2001-02-12-23:44:24-GMT jlarmour parents: 143 diff changeset	623 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	624 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	625 flash_get_config("bootp", &use_bootp, CONFIG_BOOL);
174 38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 173 diff changeset	626 if (!use_bootp)
173 547dc35af910 Fix bootp local ip addr bug from last commit jlarmour parents: 172 diff changeset	627 {
231 4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	628 flash_get_IP("bootp_my_ip", &__local_ip_addr);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	629 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	630 flash_get_IP("bootp_my_ip_mask", &__local_ip_mask);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	631 flash_get_IP("bootp_my_gateway_ip", &__local_ip_gate);
4ebdd3788c30 Merge gateway support from Grant Edwards gthomas parents: 210 diff changeset	632 #endif
174 38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 173 diff changeset	633 flash_get_config("bootp_server_ip", &my_bootp_info.bp_siaddr,
38892b97b685 Merge from eCos master repository on 2001-07-28-00:17:32-BST jlarmour parents: 173 diff changeset	634 CONFIG_IP);
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	635 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	636 #endif
191 678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	637 # 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	638 // 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	639 // verbose.
678094f34118 Merge from eCos master repository on 2001-10-19-06:43:02-BST jlarmour parents: 184 diff changeset	640 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	641 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	642 # endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	643 have_net = false;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	644 // 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	645 eth_drv_buffers_init();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	646 __pktbuf_init();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	647 // Initialize all network devices
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	648 for (t = &__NETDEVTAB__[0]; t != &__NETDEVTAB_END__; t++) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	649 if (t->init(t)) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	650 t->status = CYG_NETDEVTAB_STATUS_AVAIL;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	651 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	652 // What to do if device init fails?
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	653 t->status = 0; // Device not [currently] available
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	654 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	655 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	656 if (!__local_enet_sc) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	657 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	658 return;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	659 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	660 // Initialize the network [if present]
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	661 if (use_bootp) {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	662 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	663 have_net = true;
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	664 } else {
172 cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	665 // 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	666 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	667 __local_ip_addr[2] == 0 && __local_ip_addr[3] == 0) {
198 ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	668 diag_printf("Ethernet %s: MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	669 __local_enet_sc->dev_name,
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	670 __local_enet_addr[0],
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	671 __local_enet_addr[1],
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	672 __local_enet_addr[2],
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	673 __local_enet_addr[3],
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	674 __local_enet_addr[4],
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	675 __local_enet_addr[5]);
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT jlarmour parents: 191 diff changeset	676 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	677 } else {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	678 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	679 have_net = true;
cd45958b28ff Merge from eCos master repository on 2001-07-20-10:24:43-BST jlarmour parents: 162 diff changeset	680 }
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	681 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	682 } else {
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	683 have_net = true; // Assume values in FLASH were OK
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	684 }
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	685 if (have_net) {
182 f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	686 diag_printf("Ethernet %s: MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	687 __local_enet_sc->dev_name,
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	688 __local_enet_addr[0],
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	689 __local_enet_addr[1],
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	690 __local_enet_addr[2],
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	691 __local_enet_addr[3],
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	692 __local_enet_addr[4],
f62680ef1804 Merge from eCos master repository on 2001-09-07-06:43:02-BST jlarmour parents: 177 diff changeset	693 __local_enet_addr[5]);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	694 show_addrs();
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	695 net_io_init();
6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	696 }
184 022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	697
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	698 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	699 redboot_dns_res_init();
022f1e506033 Merge from eCos master repository on 2001-10-02-17:59:22-BST jlarmour parents: 182 diff changeset	700 #endif
115 6ed91473a1cd Merge from eCos master repository on 2000-08-21-22:40:54-BST jlarmour parents: diff changeset	701 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	702
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	703 static char usage[] = "[-l <local_ip_address>] [-h <server_address>]";
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	704
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	705 // Exported CLI function
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	706 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	707 RedBoot_cmd("ip_address",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	708 "Set/change IP addresses",
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	709 usage,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	710 do_ip_addr
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	711 );
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	712
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	713 void
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	714 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	715 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	716 struct option_info opts[3];
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	717 char ip_addr, host_addr;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	718 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	719 struct sockaddr_in host;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	720 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	721 char *dns_addr;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	722 bool dns_addr_set;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	723 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	724 int num_opts;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	725
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	726 init_opts(&opts[0], 'l', true, OPTION_ARG_TYPE_STR,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	727 (void *)&ip_addr, (bool )&ip_addr_set, "local IP address");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	728 init_opts(&opts[1], 'h', true, OPTION_ARG_TYPE_STR,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	729 (void *)&host_addr, (bool )&host_addr_set, "default server address");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	730 num_opts = 2;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	731 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	732 init_opts(&opts[2], 'd', true, OPTION_ARG_TYPE_STR,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	733 (void *)&dns_addr, (bool )&dns_addr_set, "DNS server address");
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	734 num_opts++;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	735 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	736 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	737 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	738 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	739 if (ip_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	740 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	741 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	742 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	743 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	744 // 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	745 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	746 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	747 if (host_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	748 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	749 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	750 return;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	751 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	752 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	753 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	754 #ifdef CYGPKG_REDBOOT_NETWORKING_DNS
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	755 if (dns_addr_set) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	756 set_dns(dns_addr);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	757 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	758 #endif
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	759 show_addrs();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	760 if (!have_net) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	761 have_net = true;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	762 net_io_init();
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	763 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	764 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	765
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: 206 diff changeset	766 // EOF net_io.c

Mercurial > flash_v2

annotate packages/redboot/current/src/net/net_io.c @ 308:d64d82910fa2