Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove the Econet code. It was part of acorn26, which was re...
details: https://anonhg.NetBSD.org/src/rev/a0c5b4304212
branches: trunk
changeset: 830168:a0c5b4304212
user: maxv <maxv%NetBSD.org@localhost>
date: Tue Feb 27 14:28:01 2018 +0000
description:
Remove the Econet code. It was part of acorn26, which was removed a
month ago.
diffstat:
doc/TODO.smpnet | 3 +-
sys/conf/files | 5 +-
sys/dev/DEVNAMES | 3 +-
sys/net/files.net | 3 +-
sys/net/if_eco.h | 158 ---------
sys/net/if_ecosubr.c | 856 ---------------------------------------------------
sys/sys/mbuf.h | 4 +-
7 files changed, 6 insertions(+), 1026 deletions(-)
diffs (truncated from 1113 to 300 lines):
diff -r 9c1213e07dc8 -r a0c5b4304212 doc/TODO.smpnet
--- a/doc/TODO.smpnet Tue Feb 27 14:14:19 2018 +0000
+++ b/doc/TODO.smpnet Tue Feb 27 14:28:01 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.18 2017/12/05 03:23:29 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.19 2018/02/27 14:28:01 maxv Exp $
MP-safe components
==================
@@ -40,7 +40,6 @@
- ARCNET (if_arcsubr.c)
- ATM (if_atmsubr.c)
- BRIDGE_IPF
- - if_ecosubr.c
- FDDI (if_fddisubr.c)
- HIPPI (if_hippisubr.c)
- IEEE 1394 (if_ieee1394subr.c)
diff -r 9c1213e07dc8 -r a0c5b4304212 sys/conf/files
--- a/sys/conf/files Tue Feb 27 14:14:19 2018 +0000
+++ b/sys/conf/files Tue Feb 27 14:28:01 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1195 2018/02/22 07:30:43 mrg Exp $
+# $NetBSD: files,v 1.1196 2018/02/27 14:28:01 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -418,11 +418,10 @@
include "dev/videomode/files.videomode"
# net device attributes - we have generic code for arc(net), ether(net),
-# fddi, token ring, atm and eco(net).
+# fddi, token ring, and atm.
#
define arcnet
define atm
-define eco
define ether
define fddi
define hippi
diff -r 9c1213e07dc8 -r a0c5b4304212 sys/dev/DEVNAMES
--- a/sys/dev/DEVNAMES Tue Feb 27 14:14:19 2018 +0000
+++ b/sys/dev/DEVNAMES Tue Feb 27 14:28:01 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.301 2018/02/26 23:09:32 sevan Exp $
+# $NetBSD: DEVNAMES,v 1.302 2018/02/27 14:28:01 maxv Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -382,7 +382,6 @@
ec sun2
eca acorn26
eccmemctl sparc
-eco MI Attribute
ed MI (MCA)
ed amiga
ed amigappc
diff -r 9c1213e07dc8 -r a0c5b4304212 sys/net/files.net
--- a/sys/net/files.net Tue Feb 27 14:14:19 2018 +0000
+++ b/sys/net/files.net Tue Feb 27 14:28:01 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.net,v 1.15 2018/02/16 04:48:32 knakahara Exp $
+# $NetBSD: files.net,v 1.16 2018/02/27 14:28:01 maxv Exp $
# XXX CLEANUP
define net
@@ -12,7 +12,6 @@
file net/if_atmsubr.c atm
file net/if_bridge.c bridge needs-flag
file net/bridgestp.c bridge
-file net/if_ecosubr.c eco
file net/if_etherip.c etherip needs-flag
file net/if_ethersubr.c ether | fddi | netatalk | token |
wlan needs-flag
diff -r 9c1213e07dc8 -r a0c5b4304212 sys/net/if_eco.h
--- a/sys/net/if_eco.h Tue Feb 27 14:14:19 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-/* $NetBSD: if_eco.h,v 1.8 2008/02/20 17:05:52 matt Exp $ */
-
-/*-
- * Copyright (c) 2001 Ben Harris
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _NET_IF_ECO_H_
-#define _NET_IF_ECO_H_
-
-#include <sys/callout.h>
-#include <sys/mbuf.h>
-#include <sys/queue.h>
-
-#include <net/if.h>
-
-/*
- * Econet headers come in two forms. The initial frame of an exchange
- * has source and destination addresses, a control byte and a port.
- * Later frames just have source and destination addresses.
- *
- * Complete packets are generally passed around with the full header on,
- * even if this means assembling them from two separate frames.
- */
-#define ECO_ADDR_LEN 2 /* Length of an Econet address */
-#define ECO_HDR_LEN 6 /* Two addresses, a port and a control byte */
-#define ECO_SHDR_LEN 4 /* "Short" Econet header: just two addresses */
-/* #define ECO_MTU 8192 * Default MTU */
-#define ECO_IPMTU 1280 /* MTU for IP used by RISC iX */
-#define ECO_MTU ECO_IPMTU
-
-struct eco_header {
- uint8_t eco_dhost[ECO_ADDR_LEN];
- uint8_t eco_shost[ECO_ADDR_LEN];
- uint8_t eco_control;
- uint8_t eco_port;
-} __packed;
-
-#define ECO_PORT_IMMEDIATE 0x00
-#define ECO_PORT_DSTAPE 0x54 /* DigitalServicesTapeStore */
-#define ECO_PORT_FS 0x99 /* FileServerCommand */
-#define ECO_PORT_BRIDGE 0x9C /* Bridge */
-#define ECO_PORT_PSINQREP 0x9E /* PrinterServerInquiryReply */
-#define ECO_PORT_PSINQ 0x9F /* PrinterServerInquiry */
-#define ECO_PORT_FAST 0xA0 /* SJ *FAST protocol */
-#define ECO_PORT_NEXNETFIND 0xA1 /* SJ Nexus net find reply port */
-#define ECO_PORT_FINDSRV 0xB0 /* FindServer */
-#define ECO_PORT_FINDSRVREP 0xB1 /* FindServerReply */
-#define ECO_PORT_TTXTCMD 0xB2 /* TeletextServerCommand */
-#define ECO_PORT_TTXTPAGE 0xB3 /* TeletextServerPage */
-#define ECO_PORT_OLDPSDATA 0xD0 /* OldPrinterServer */
-#define ECO_PORT_PSDATA 0xD1 /* PrinterServer */
-#define ECO_PORT_IP 0xD2 /* TCPIPProtocolSuite */
-#define ECO_PORT_SIDSLAVE 0xD3 /* SIDFrameSlave */
-#define ECO_PORT_SCROLLARAMA 0xD4 /* Scrollarama */
-#define ECO_PORT_PHONE 0xD5 /* Phone */
-#define ECO_PORT_BCASTCTL 0xD6 /* BroadcastControl */
-#define ECO_PORT_BCASTDATA 0xD7 /* BroadcastData */
-#define ECO_PORT_IMPLICENCE 0xD8 /* ImpressionLicenceChecker */
-#define ECO_PORT_SQUIRREL 0xD9 /* DigitalServicesSquirrel */
-#define ECO_PORT_SID2NDARY 0xDA /* SIDSecondary */
-#define ECO_PORT_SQUIRREL2 0xDB /* DigitalServicesSquirrel2 */
-#define ECO_PORT_DDCTL 0xDC /* DataDistributionControl */
-#define ECO_PORT_DDDATA 0xDD /* DataDistributionData */
-#define ECO_PORT_CLASSROM 0xDE /* ClassROM */
-#define ECO_PORT_PSCMD 0xDF /* PrinterSpoolerCommand */
-
-/* Control bytes for immediate operations. */
-#define ECO_CTL_PEEK 0x81
-#define ECO_CTL_POKE 0x82
-#define ECO_CTL_JSR 0x83
-#define ECO_CTL_USERPROC 0x84
-#define ECO_CTL_OSPROC 0x85
-#define ECO_CTL_HALT 0x86
-#define ECO_CTL_CONTINUE 0x87
-#define ECO_CTL_MACHINEPEEK 0x88
-#define ECO_CTL_GETREGISTERS 0x89
-
-/* Control bytes for IP */
-#define ECO_CTL_IP 0x81
-#define ECO_CTL_IPBCAST_REPLY 0x8E
-#define ECO_CTL_IPBCAST_REQUEST 0x8F
-#define ECO_CTL_ARP_REQUEST 0xA1
-#define ECO_CTL_ARP_REPLY 0xA2
-
-struct eco_arp {
- uint8_t ecar_spa[4];
- uint8_t ecar_tpa[4];
-};
-
-enum eco_state {
- ECO_UNKNOWN, ECO_IDLE, ECO_SCOUT_RCVD,
- ECO_SCOUT_SENT, ECO_DATA_SENT, ECO_IMMED_SENT,
- ECO_DONE
-};
-
-
-/*
- * This structure contains a packet that might need retransmitting,
- * together with a callout to trigger retransmission. They're kept on
- * a per-interface list so they can be freed when an interface is
- * downed.
- */
-struct eco_retry {
- LIST_ENTRY(eco_retry) er_link;
- struct callout er_callout;
- struct mbuf *er_packet;
- struct ifnet *er_ifp;
-};
-
-/*
- * Common structure used to store state about an Econet interface.
- */
-struct ecocom {
- struct ifnet ec_if;
- int (*ec_claimwire)(struct ifnet *);
- void (*ec_txframe)(struct ifnet *, struct mbuf *);
- enum eco_state ec_state;
- struct mbuf *ec_scout;
- struct mbuf *ec_packet;
- LIST_HEAD(, eco_retry) ec_retries;
-};
-
-#ifdef _KERNEL
-void eco_ifattach(struct ifnet *, const uint8_t *);
-void eco_ifdetach(struct ifnet *);
-int eco_init(struct ifnet *);
-void eco_stop(struct ifnet *, int);
-
-char *eco_sprintf(const uint8_t *);
-
-struct mbuf * eco_inputframe(struct ifnet *, struct mbuf *);
-void eco_inputidle(struct ifnet *);
-#endif
-
-#endif /* !_NET_IF_ECO_H_ */
diff -r 9c1213e07dc8 -r a0c5b4304212 sys/net/if_ecosubr.c
--- a/sys/net/if_ecosubr.c Tue Feb 27 14:14:19 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,856 +0,0 @@
-/* $NetBSD: if_ecosubr.c,v 1.51 2017/01/31 17:13:36 maxv Exp $ */
-
-/*-
- * Copyright (c) 2001 Ben Harris
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * Copyright (c) 1982, 1989, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)if_ethersubr.c 8.2 (Berkeley) 4/4/96
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.51 2017/01/31 17:13:36 maxv Exp $");
Home |
Main Index |
Thread Index |
Old Index