Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci USE PCI_BAR[0-5]. Part of PR#48016.
details: https://anonhg.NetBSD.org/src/rev/b32682601954
branches: trunk
changeset: 326602:b32682601954
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Thu Feb 06 15:51:02 2014 +0000
description:
USE PCI_BAR[0-5]. Part of PR#48016.
diffstat:
sys/dev/pci/pucdata.c | 1628 ++++++++++++++++++++++++------------------------
1 files changed, 814 insertions(+), 814 deletions(-)
diffs (truncated from 3363 to 300 lines):
diff -r 8f340269f07b -r b32682601954 sys/dev/pci/pucdata.c
--- a/sys/dev/pci/pucdata.c Thu Feb 06 15:50:40 2014 +0000
+++ b/sys/dev/pci/pucdata.c Thu Feb 06 15:51:02 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.92 2014/01/26 10:20:20 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.93 2014/02/06 15:51:02 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.92 2014/01/26 10:20:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93 2014/02/06 15:51:02 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,8 @@
{ PCI_VENDOR_ADVANTECH, PCI_PRODUCT_ADVANTECH_PCI1604, 0, 0 },
{ 0xffff, 0xffff, 0x0, 0x0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR1, 0x00, COM_FREQ * 8 },
},
},
@@ -67,10 +67,10 @@
PCI_PRODUCT_ADVANTECH_PCI1610, 0x0 },
{ 0xffff, 0xffff, 0xffff, 0x0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 8 },
},
},
@@ -79,10 +79,10 @@
PCI_PRODUCT_ADVANTECH_PCI1612, 0x0 },
{ 0xffff, 0xffff, 0xffff, 0x0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 8 },
},
},
@@ -92,10 +92,10 @@
PCI_PRODUCT_ADVANTECH_PCI1620, 0x0 },
{ 0xffff, 0xffff, 0xffff, 0x0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 8 },
},
},
@@ -105,10 +105,10 @@
PCI_PRODUCT_ADVANTECH_PCI1620, 0x0 },
{ 0xffff, 0xffff, 0xffff, 0x0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 2 },
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 2 },
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 2 },
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 2 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 2 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 2 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 2 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 2 },
},
},
@@ -120,14 +120,14 @@
{ PCI_VENDOR_AMCIRCUITS, PCI_PRODUCT_AMCIRCUITS_ADDI7800, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x1c, 0x08, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x20, 0x08, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR1, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR1, 0x08, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x08, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR3, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR3, 0x08, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR4, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR4, 0x08, COM_FREQ },
},
},
@@ -136,8 +136,8 @@
{ PCI_VENDOR_AVLAB, PCI_PRODUCT_AVLAB_PCI2S, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR1, 0x00, COM_FREQ },
},
},
@@ -146,10 +146,10 @@
{ PCI_VENDOR_AVLAB, PCI_PRODUCT_AVLAB_LPPCI4S, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR1, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR3, 0x00, COM_FREQ },
},
},
@@ -158,10 +158,10 @@
{ PCI_VENDOR_AVLAB, PCI_PRODUCT_AVLAB_LPPCI4S_2, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
- { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR1, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x00, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR3, 0x00, COM_FREQ },
},
},
@@ -172,32 +172,32 @@
{ PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_2_PORT, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0000, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0200, COM_FREQ * 8 },
},
},
{ "BBELEC ISOLATED_4_PORT",
{ PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_4_PORT, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0000, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0200, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0400, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0600, COM_FREQ * 8 },
},
},
{ "BBELEC ISOLATED_8_PORT",
{ PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_8_PORT, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0800, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0a00, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0c00, COM_FREQ * 8 },
- { PUC_PORT_TYPE_COM, 0x10, 0x0e00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0000, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0200, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0400, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0600, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0800, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0a00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0c00, COM_FREQ * 8 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0e00, COM_FREQ * 8 },
},
},
@@ -209,10 +209,10 @@
0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 4},
},
},
{ "Comtrol RocketPort 550/8 RJ11 part B",
@@ -220,10 +220,10 @@
0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 4},
},
},
{ "Comtrol RocketPort 550/8 Octa part A",
@@ -231,10 +231,10 @@
0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 4},
},
},
{ "Comtrol RocketPort 550/8 Octa part B",
@@ -242,30 +242,30 @@
0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 4},
},
},
{ "Comtrol RocketPort 550/4 RJ45",
{ PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT5504, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 4},
},
},
{ "Comtrol RocketPort 550/Quad",
{ PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT550Q, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 4},
},
},
{ "Comtrol RocketPort 550/16 part A",
@@ -273,10 +273,10 @@
0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
- { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
- { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 4},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 4},
Home |
Main Index |
Thread Index |
Old Index