From 39d63ae89da5fb1039111246dd300908bf89761f Mon Sep 17 00:00:00 2001
From: "Federico G. Schwindt" <fgsch@cvs.openbsd.org>
Date: Sat, 23 Jun 2001 22:03:14 +0000
Subject: More constants cleaning.

---
 sys/arch/sparc/dev/if_ie.c | 6 +-----
 sys/dev/ic/dcreg.h         | 6 +-----
 sys/dev/ic/rtl81x9reg.h    | 9 +--------
 sys/dev/isa/if_hp.c        | 3 +--
 sys/dev/isa/if_iy.c        | 5 +----
 sys/dev/pci/if_skreg.h     | 9 +--------
 sys/dev/pci/if_wbreg.h     | 5 +----
 7 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c
index 55771f3d02e..7e4a9bafaaf 100644
--- a/sys/arch/sparc/dev/if_ie.c
+++ b/sys/arch/sparc/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.16 2001/06/08 08:09:24 art Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.17 2001/06/23 22:03:03 fgsch Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $	*/
 
 /*-
@@ -163,10 +163,6 @@ vm_map_t ie_map; /* for obio */
 #define	IED_READFRAME	0x10
 #define	IED_ALL		0x1f
 
-#define	ETHER_MIN_LEN	64
-#define	ETHER_MAX_LEN	1518
-#define	ETHER_ADDR_LEN	6
-
 #define B_PER_F         3               /* recv buffers per frame */
 #define MXFRAMES        300             /* max number of recv frames */
 #define	MXRXBUF		(MXFRAMES*B_PER_F) /* number of buffers to allocate */
diff --git a/sys/dev/ic/dcreg.h b/sys/dev/ic/dcreg.h
index 53879f8fcac..2d0af2f004e 100644
--- a/sys/dev/ic/dcreg.h
+++ b/sys/dev/ic/dcreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcreg.h,v 1.13 2001/04/13 15:55:16 aaron Exp $ */
+/*	$OpenBSD: dcreg.h,v 1.14 2001/06/23 22:03:07 fgsch Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -992,10 +992,6 @@ struct dc_eblock_reset {
 #define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
 #endif
 
-#ifndef ETHER_CRC_LEN
-#define ETHER_CRC_LEN	4
-#endif
-
 extern void dc_attach	__P((struct dc_softc *));
 extern int dc_detach	__P((struct dc_softc *));
 extern int dc_intr	__P((void *));
diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h
index f149940b314..0b5c7a091ec 100644
--- a/sys/dev/ic/rtl81x9reg.h
+++ b/sys/dev/ic/rtl81x9reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9reg.h,v 1.2 2001/05/22 11:35:16 mickey Exp $	*/
+/*	$OpenBSD: rtl81x9reg.h,v 1.3 2001/06/23 22:03:08 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -473,13 +473,6 @@ struct rl_softc {
 #define RL_PME_EN		0x0010
 #define RL_PME_STATUS		0x8000
 
-/*
- * FreeBSDism
- */
-#ifndef	ETHER_CRC_LEN
-#define	ETHER_CRC_LEN		4
-#endif
-
 #ifdef __alpha__
 #undef vtophys
 #define vtophys(va)	alpha_XXX_dmamap((vm_offset_t)va)
diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c
index 1b44642d988..b4a01b473d7 100644
--- a/sys/dev/isa/if_hp.c
+++ b/sys/dev/isa/if_hp.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_hp.c,v 1.6 2001/02/20 19:39:41 mickey Exp $       */
+/*    $OpenBSD: if_hp.c,v 1.7 2001/06/23 22:03:09 fgsch Exp $       */
 /*    $NetBSD: if_hp.c,v 1.21 1995/12/24 02:31:31 mycroft Exp $       */
 
 /* XXX THIS DRIVER IS BROKEN.  IT WILL NOT EVEN COMPILE. */
@@ -102,7 +102,6 @@ struct isa_driver hpdriver =
 
 struct mbuf *hpget();
 
-#define ETHER_MIN_LEN 64
 #define ETHER_MAX_LEN 1536
 
 /*
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index 6e0af8525ba..f14874df114 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iy.c,v 1.11 2001/06/23 03:52:47 angelos Exp $	*/
+/*	$OpenBSD: if_iy.c,v 1.12 2001/06/23 22:03:10 fgsch Exp $	*/
 /*	$NetBSD: if_iy.c,v 1.4 1996/05/12 23:52:53 mycroft Exp $	*/
 /* #define IYDEBUG */
 /* #define IYMEMDEBUG */
@@ -82,9 +82,6 @@
 #include <dev/isa/isavar.h>
 #include <dev/ic/i82595reg.h>
 
-#define	ETHER_MIN_LEN	64
-#define	ETHER_MAX_LEN	1518
-
 /*
  * Ethernet status, per interface.
  */
diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h
index 06d7feddea7..d3e98c70935 100644
--- a/sys/dev/pci/if_skreg.h
+++ b/sys/dev/pci/if_skreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_skreg.h,v 1.5 2000/08/29 23:45:40 jason Exp $	*/
+/*	$OpenBSD: if_skreg.h,v 1.6 2001/06/23 22:03:12 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1226,10 +1226,3 @@ struct skc_attach_args {
 #define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
 #endif
 
-#ifndef ETHER_CRC_LEN
-#define ETHER_CRC_LEN	4
-#endif
-
-#ifndef ETHER_HDR_LEN
-#define ETHER_HDR_LEN	14
-#endif
diff --git a/sys/dev/pci/if_wbreg.h b/sys/dev/pci/if_wbreg.h
index d46f3d686c7..d0ce208078a 100644
--- a/sys/dev/pci/if_wbreg.h
+++ b/sys/dev/pci/if_wbreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wbreg.h,v 1.5 2001/02/03 05:37:18 mickey Exp $	*/
+/*	$OpenBSD: if_wbreg.h,v 1.6 2001/06/23 22:03:13 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -457,9 +457,6 @@ struct wb_softc {
 #define WB_PME_EN		0x0010
 #define WB_PME_STATUS		0x8000
 
-#ifndef ETHER_CRC_LEN
-#define	ETHER_CRC_LEN 4
-#endif
 #ifndef ETHER_ALIGN
 #define	ETHER_ALIGN 2
 #endif
-- 
cgit v1.2.3