From 74bccae1f55546bca4ab63a426ad840797c5108f Mon Sep 17 00:00:00 2001 From: kato Date: Tue, 15 Dec 1998 15:56:37 +0000 Subject: Oops, I forgot to commit two diffs to fe driver. --- sys/conf/files.pc98 | 4 ++-- sys/dev/fe/if_fereg.h | 16 +--------------- sys/i386/isa/if_fereg.h | 16 +--------------- sys/pc98/conf/files.pc98 | 4 ++-- 4 files changed, 6 insertions(+), 34 deletions(-) (limited to 'sys') diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 7fef608..5e3a69b 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $Id: files.pc98,v 1.72 1998/10/11 15:02:49 kato Exp $ +# $Id: files.pc98,v 1.73 1998/12/02 08:15:17 kato Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -129,7 +129,7 @@ i386/isa/if_eg.c optional eg device-driver i386/isa/if_el.c optional el device-driver i386/isa/if_ep.c optional ep device-driver i386/isa/if_ex.c optional ex device-driver -pc98/pc98/if_fe.c optional fe device-driver +i386/isa/if_fe.c optional fe device-driver i386/isa/if_ie.c optional ie device-driver i386/isa/if_le.c optional le device-driver i386/isa/if_lnc.c optional lnc device-driver diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h index 2a26cbe..d9b943c 100644 --- a/sys/dev/fe/if_fereg.h +++ b/sys/dev/fe/if_fereg.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $Id$ */ +/* $Id: if_fereg.h,v 1.5 1997/02/22 09:36:28 peter Exp $ */ /* * Registers on FMV-180 series' ISA bus interface ASIC. @@ -116,17 +116,3 @@ /* IRQ configuration. */ #define FE_RE1000_IRQCONF 0x10 -#define FE_RE1000_IRQCONF_IRQ 0xf0 -#define FE_RE1000_IRQCONF_IRQSHIFT 4 - -/* MAC (station) address. */ -#define FE_RE1000_MAC0 0x11 -#define FE_RE1000_MAC1 0x13 -#define FE_RE1000_MAC2 0x15 -#define FE_RE1000_MAC3 0x17 -#define FE_RE1000_MAC4 0x19 -#define FE_RE1000_MAC5 0x1B - -/* "Check sum" -- an xor of MAC0 through MAC5 */ -#define FE_RE1000_MACCHK 0x1D - diff --git a/sys/i386/isa/if_fereg.h b/sys/i386/isa/if_fereg.h index 2a26cbe..d9b943c 100644 --- a/sys/i386/isa/if_fereg.h +++ b/sys/i386/isa/if_fereg.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $Id$ */ +/* $Id: if_fereg.h,v 1.5 1997/02/22 09:36:28 peter Exp $ */ /* * Registers on FMV-180 series' ISA bus interface ASIC. @@ -116,17 +116,3 @@ /* IRQ configuration. */ #define FE_RE1000_IRQCONF 0x10 -#define FE_RE1000_IRQCONF_IRQ 0xf0 -#define FE_RE1000_IRQCONF_IRQSHIFT 4 - -/* MAC (station) address. */ -#define FE_RE1000_MAC0 0x11 -#define FE_RE1000_MAC1 0x13 -#define FE_RE1000_MAC2 0x15 -#define FE_RE1000_MAC3 0x17 -#define FE_RE1000_MAC4 0x19 -#define FE_RE1000_MAC5 0x1B - -/* "Check sum" -- an xor of MAC0 through MAC5 */ -#define FE_RE1000_MACCHK 0x1D - diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98 index 7fef608..5e3a69b 100644 --- a/sys/pc98/conf/files.pc98 +++ b/sys/pc98/conf/files.pc98 @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $Id: files.pc98,v 1.72 1998/10/11 15:02:49 kato Exp $ +# $Id: files.pc98,v 1.73 1998/12/02 08:15:17 kato Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -129,7 +129,7 @@ i386/isa/if_eg.c optional eg device-driver i386/isa/if_el.c optional el device-driver i386/isa/if_ep.c optional ep device-driver i386/isa/if_ex.c optional ex device-driver -pc98/pc98/if_fe.c optional fe device-driver +i386/isa/if_fe.c optional fe device-driver i386/isa/if_ie.c optional ie device-driver i386/isa/if_le.c optional le device-driver i386/isa/if_lnc.c optional lnc device-driver -- cgit v1.1