From 222e933032c659704bfdfbee75e3af9b687a996e Mon Sep 17 00:00:00 2001 From: downsj Date: Fri, 7 Mar 1997 23:44:39 +0000 Subject: [PATCH] Support LAN cards with the REM bit set. --- sys/arch/hp300/dev/diodevs | 4 ++-- sys/arch/hp300/dev/diodevs.h | 5 ++++- sys/arch/hp300/dev/diodevs_data.h | 6 ++++-- sys/arch/hp300/dev/if_le.c | 5 +++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/arch/hp300/dev/diodevs b/sys/arch/hp300/dev/diodevs index 0d36aa512e0..85dd90fea46 100644 --- a/sys/arch/hp300/dev/diodevs +++ b/sys/arch/hp300/dev/diodevs @@ -1,5 +1,4 @@ -$OpenBSD: diodevs,v 1.2 1997/02/03 04:47:18 downsj Exp $ -$NetBSD: diodevs,v 1.2 1997/01/30 09:18:38 thorpej Exp $ +$OpenBSD: diodevs,v 1.3 1997/03/07 23:44:39 downsj Exp $ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -52,6 +51,7 @@ device DCM 0x05 1 98642A serial MUX device DCMREM 0x85 1 98642A serial MUX device LAN 0x15 1 98643A LAN +device LANREM 0x95 1 98643A LAN device FHPIB 0x08 1 98625A/98625B HP-IB device NHPIB 0x80 1 98624A HP-IB diff --git a/sys/arch/hp300/dev/diodevs.h b/sys/arch/hp300/dev/diodevs.h index 6f32981098c..1057324ecb6 100644 --- a/sys/arch/hp300/dev/diodevs.h +++ b/sys/arch/hp300/dev/diodevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: diodevs,v 1.2 1997/01/30 09:18:38 thorpej Exp + * OpenBSD: diodevs,v 1.2 1997/02/03 04:47:18 downsj Exp */ /*- @@ -65,6 +65,9 @@ #define DIO_DEVICE_ID_LAN 0x15 #define DIO_DEVICE_DESC_LAN "98643A LAN" +#define DIO_DEVICE_ID_LANREM 0x95 +#define DIO_DEVICE_DESC_LANREM "98643A LAN" + #define DIO_DEVICE_ID_FHPIB 0x08 #define DIO_DEVICE_DESC_FHPIB "98625A/98625B HP-IB" diff --git a/sys/arch/hp300/dev/diodevs_data.h b/sys/arch/hp300/dev/diodevs_data.h index af82b96aef9..a5eefb4a33c 100644 --- a/sys/arch/hp300/dev/diodevs_data.h +++ b/sys/arch/hp300/dev/diodevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: diodevs,v 1.2 1997/01/30 09:18:38 thorpej Exp + * OpenBSD: diodevs,v 1.2 1997/02/03 04:47:18 downsj Exp */ /*- @@ -41,7 +41,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define DIO_NDEVICES 45 +#define DIO_NDEVICES 46 struct dio_devdata dio_devdatas[] = { { 0x02, 0, 1 }, @@ -51,6 +51,7 @@ struct dio_devdata dio_devdatas[] = { { 0x05, 0, 1 }, { 0x85, 0, 1 }, { 0x15, 0, 1 }, + { 0x95, 0, 1 }, { 0x08, 0, 1 }, { 0x80, 0, 1 }, { 0x00, 0, 1 }, @@ -100,6 +101,7 @@ struct dio_devdesc dio_devdescs[] = { { 0x05, 0, DIO_DEVICE_DESC_DCM }, { 0x85, 0, DIO_DEVICE_DESC_DCMREM }, { 0x15, 0, DIO_DEVICE_DESC_LAN }, + { 0x95, 0, DIO_DEVICE_DESC_LANREM }, { 0x08, 0, DIO_DEVICE_DESC_FHPIB }, { 0x80, 0, DIO_DEVICE_DESC_NHPIB }, { 0x00, 0, DIO_DEVICE_DESC_IHPIB }, diff --git a/sys/arch/hp300/dev/if_le.c b/sys/arch/hp300/dev/if_le.c index 643a4fabc10..dc842554f08 100644 --- a/sys/arch/hp300/dev/if_le.c +++ b/sys/arch/hp300/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.7 1997/02/03 04:47:35 downsj Exp $ */ +/* $OpenBSD: if_le.c,v 1.8 1997/03/07 23:44:40 downsj Exp $ */ /* $NetBSD: if_le.c,v 1.37 1997/01/30 09:18:53 thorpej Exp $ */ /*- @@ -131,7 +131,8 @@ lematch(parent, match, aux) { struct dio_attach_args *da = aux; - if (da->da_id == DIO_DEVICE_ID_LAN) + if ((da->da_id == DIO_DEVICE_ID_LAN) || + (da->da_id == DIO_DEVICE_ID_LANREM)) return (1); return (0); } -- 2.20.1