From cdfcdfb0b9555e0bb309bc32e1ecff6de49d0cf9 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Mon, 21 Feb 2005 05:25:49 +0000 Subject: [PATCH] GC TULIP_CRC32_POLY, TULIP_ADDREQUAL and TULIP_ADDRBRDCST. Move tulips definition into if_de.c. --- sys/dev/netif/de/if_de.c | 4 +++- sys/dev/netif/de/if_devar.h | 14 +------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c index 1deb108b9e..a67c23c159 100644 --- a/sys/dev/netif/de/if_de.c +++ b/sys/dev/netif/de/if_de.c @@ -1,7 +1,7 @@ /* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */ /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */ -/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.27 2005/02/21 05:18:29 joerg Exp $ */ +/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.28 2005/02/21 05:25:49 joerg Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -97,6 +97,8 @@ #include "if_devar.h" +static tulip_softc_t *tulips[TULIP_MAX_DEVICES]; + /* * This module supports * the DEC 21040 PCI Ethernet Controller. diff --git a/sys/dev/netif/de/if_devar.h b/sys/dev/netif/de/if_devar.h index e313750386..0c3d0fcdf3 100644 --- a/sys/dev/netif/de/if_devar.h +++ b/sys/dev/netif/de/if_devar.h @@ -1,7 +1,7 @@ /* $NetBSD: if_devar.h,v 1.32 1999/04/01 14:55:25 tsubai Exp $ */ /* $FreeBSD: src/sys/pci/if_devar.h,v 1.23.2.1 2000/08/04 23:25:10 peter Exp $ */ -/* $DragonFly: src/sys/dev/netif/de/if_devar.h,v 1.11 2005/02/21 05:16:16 joerg Exp $ */ +/* $DragonFly: src/sys/dev/netif/de/if_devar.h,v 1.12 2005/02/21 05:25:49 joerg Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -698,8 +698,6 @@ static const struct { #define SIOCGCHIPID _IOWR('i', 241, struct ifreq) /* get chipid */ #endif -static tulip_softc_t *tulips[TULIP_MAX_DEVICES]; - #define loudprintf if (bootverbose) printf #ifndef tulip_if @@ -717,16 +715,6 @@ static tulip_softc_t *tulips[TULIP_MAX_DEVICES]; #define TULIP_KVATOPHYS(sc, va) vtophys(va) #endif -#define TULIP_CRC32_POLY 0xEDB88320UL /* CRC-32 Poly -- Little Endian */ #define TULIP_MAX_TXSEG 30 -#define TULIP_ADDREQUAL(a1, a2) \ - (((u_int16_t *)a1)[0] == ((u_int16_t *)a2)[0] \ - && ((u_int16_t *)a1)[1] == ((u_int16_t *)a2)[1] \ - && ((u_int16_t *)a1)[2] == ((u_int16_t *)a2)[2]) -#define TULIP_ADDRBRDCST(a1) \ - (((u_int16_t *)a1)[0] == 0xFFFFU \ - && ((u_int16_t *)a1)[1] == 0xFFFFU \ - && ((u_int16_t *)a1)[2] == 0xFFFFU) - #endif /* !defined(_DEVAR_H) */ -- 2.41.0