summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Lo <kevlo@cvs.openbsd.org>2003-11-26 02:21:54 +0000
committerKevin Lo <kevlo@cvs.openbsd.org>2003-11-26 02:21:54 +0000
commit20a6c641a5921a4dff38ec61b6a2e46beb4670e7 (patch)
tree4372ec2ab5e3bc2e11fcb813640be8bbcd098655
parent861db4204cb578bfff23c9f1fa9977cae8a628d1 (diff)
The geodesc works great for SC1201 as well. ok markus@
-rw-r--r--share/man/man4/man4.i386/geodesc.410
-rw-r--r--sys/arch/i386/pci/geodesc.c5
2 files changed, 8 insertions, 7 deletions
diff --git a/share/man/man4/man4.i386/geodesc.4 b/share/man/man4/man4.i386/geodesc.4
index 882c70246e5..202e12487cf 100644
--- a/share/man/man4/man4.i386/geodesc.4
+++ b/share/man/man4/man4.i386/geodesc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: geodesc.4,v 1.2 2003/08/07 10:26:57 jmc Exp $
+.\" $OpenBSD: geodesc.4,v 1.3 2003/11/26 02:21:49 kevlo Exp $
.\"
.\"Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
.\"
@@ -20,7 +20,7 @@
.Os
.Sh NAME
.Nm geodesc
-.Nd Geode SC1100 IAOC driver
+.Nd Geode SC1100/SCx200 IAOC driver
.Sh SYNOPSIS
.Cd "geodesc* at pci? dev ? function ?"
.Sh DESCRIPTION
@@ -28,9 +28,9 @@ The
.Nm
driver supports the watchdog timer of the Geode SC1100.
.Pp
-The Geode SC1100 is a member of the National
-Semiconductor Information Appliance On a Chip (IAOC)
-family of fully integrated x86 system chips.
+The Geode SC1100/SCx200 is a member of the AMD
+Information Appliance On a Chip (IAOC) family
+of fully integrated x86 system chips.
.Pp
The watchdog timer may be configured via
.Xr sysctl 8 .
diff --git a/sys/arch/i386/pci/geodesc.c b/sys/arch/i386/pci/geodesc.c
index ef70b184e15..f722d1ba7c5 100644
--- a/sys/arch/i386/pci/geodesc.c
+++ b/sys/arch/i386/pci/geodesc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: geodesc.c,v 1.2 2003/08/07 16:59:37 mickey Exp $ */
+/* $OpenBSD: geodesc.c,v 1.3 2003/11/26 02:21:53 kevlo Exp $ */
/*
* Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
@@ -57,7 +57,8 @@ geodesc_match(struct device *parent, void *match, void *aux)
struct pci_attach_args *pa = aux;
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_NS &&
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_NS_SC1100_XBUS)
+ (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_NS_SC1100_XBUS ||
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_NS_SCx200_XBUS))
return (1);
return (0);
}