Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/sys/dev/pci Pull up revisions 1.11-1.18 (requested by s...
details: https://anonhg.NetBSD.org/src/rev/01961983a0c1
branches: netbsd-1-5
changeset: 490939:01961983a0c1
user: he <he%NetBSD.org@localhost>
date: Thu Mar 22 01:53:32 2001 +0000
description:
Pull up revisions 1.11-1.18 (requested by sommerfeld):
Add support for NetMos NM9835, Titan PCI-800H, Lava 8-port,
Actiontec 56K PCI Master. This also adds a ``flags'' member
to two structs in this driver.
diffstat:
sys/dev/pci/pucdata.c | 295 +++++++++++++++++++++++++++++++------------------
1 files changed, 188 insertions(+), 107 deletions(-)
diffs (truncated from 631 to 300 lines):
diff -r d6d5cd3c545f -r 01961983a0c1 sys/dev/pci/pucdata.c
--- a/sys/dev/pci/pucdata.c Thu Mar 22 01:53:00 2001 +0000
+++ b/sys/dev/pci/pucdata.c Thu Mar 22 01:53:32 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.9.4.1 2000/09/06 16:54:28 bouyer Exp $ */
+/* $NetBSD: pucdata.c,v 1.9.4.2 2001/03/22 01:53:32 he Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -42,6 +42,7 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pucvar.h>
+#include <dev/ic/comreg.h>
const struct puc_device_description puc_devices[] = {
/*
@@ -59,8 +60,8 @@
{ 0x10b5, 0x9050, 0xd84d, 0x6810 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
- { PUC_PORT_TYPE_LPT, 0x20, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x24, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x24, 0x00, 0x00 },
},
},
@@ -79,8 +80,8 @@
{ 0x10b5, 0x9050, 0xd84d, 0x6808 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
},
},
@@ -109,7 +110,7 @@
{ 0x131f, 0x1000, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
},
},
@@ -118,7 +119,7 @@
{ 0x131f, 0x1001, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
},
},
@@ -127,7 +128,7 @@
{ 0x131f, 0x1002, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
},
},
@@ -136,8 +137,8 @@
{ 0x131f, 0x1010, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 },
},
},
@@ -146,8 +147,8 @@
{ 0x131f, 0x1011, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 },
},
},
@@ -156,8 +157,8 @@
{ 0x131f, 0x1012, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 },
},
},
@@ -166,7 +167,7 @@
{ 0x131f, 0x1020, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_LPT, 0x18, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 },
},
},
@@ -175,8 +176,8 @@
{ 0x131f, 0x1021, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_LPT, 0x18, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x20, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 },
},
},
@@ -185,8 +186,8 @@
{ 0x131f, 0x1030, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
},
},
@@ -195,8 +196,8 @@
{ 0x131f, 0x1031, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
},
},
@@ -205,8 +206,8 @@
{ 0x131f, 0x1032, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
},
},
@@ -215,9 +216,9 @@
{ 0x131f, 0x1034, 0, 0 }, /* XXX really? */
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x20, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 },
},
},
@@ -226,9 +227,9 @@
{ 0x131f, 0x1035, 0, 0 }, /* XXX really? */
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x20, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 },
},
},
@@ -237,9 +238,9 @@
{ 0x131f, 0x1036, 0, 0 }, /* XXX really? */
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x20, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 },
},
},
@@ -248,10 +249,10 @@
{ 0x131f, 0x1050, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
- { PUC_PORT_TYPE_COM, 0x20, 0x00 },
- { PUC_PORT_TYPE_COM, 0x24, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ },
},
},
@@ -260,10 +261,10 @@
{ 0x131f, 0x1051, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
- { PUC_PORT_TYPE_COM, 0x20, 0x00 },
- { PUC_PORT_TYPE_COM, 0x24, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ },
},
},
@@ -272,10 +273,10 @@
{ 0x131f, 0x1052, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x18, 0x00 },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00 },
- { PUC_PORT_TYPE_COM, 0x20, 0x00 },
- { PUC_PORT_TYPE_COM, 0x24, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ },
},
},
@@ -288,7 +289,7 @@
{ 0x131f, 0x2020, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_LPT, 0x10, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
},
},
@@ -297,8 +298,8 @@
{ 0x131f, 0x2021, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_LPT, 0x10, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x18, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 },
},
},
@@ -307,9 +308,9 @@
{ 0x131f, 0x2040, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x14, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 },
},
},
@@ -318,9 +319,9 @@
{ 0x131f, 0x2041, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x14, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 },
},
},
@@ -329,9 +330,9 @@
{ 0x131f, 0x2042, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x14, 0x00 },
- { PUC_PORT_TYPE_LPT, 0x1c, 0x00 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
+ { PUC_PORT_TYPE_LPT, 0x1c, 0x00, 0x00 },
},
},
@@ -340,7 +341,7 @@
{ 0x131f, 0x2000, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00 },
Home |
Main Index |
Thread Index |
Old Index