From 33181681c79b24b08815f339efcd0eaa87960b35 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 20 Dec 2005 22:45:24 +0000 Subject: [PATCH] - Use PCIR_BAR() macro for the BAR for the aperture. - Axe macros used for walking PCI capabilities list. We now ask the PCI bus to find caps for us rather than doing it in the drm and agp drivers. --- sys/dev/agp/agpreg.h | 8 +------- sys/pci/agpreg.h | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/sys/dev/agp/agpreg.h b/sys/dev/agp/agpreg.h index 8e5365e952f..7786efe5fa5 100644 --- a/sys/dev/agp/agpreg.h +++ b/sys/dev/agp/agpreg.h @@ -32,18 +32,12 @@ /* * Offsets for various AGP configuration registers. */ -#define AGP_APBASE 0x10 -#define AGP_CAPPTR 0x34 +#define AGP_APBASE PCIR_BAR(0) /* * Offsets from the AGP Capability pointer. */ #define AGP_CAPID 0x0 -#define AGP_CAPID_GET_MAJOR(x) (((x) & 0x00f00000U) >> 20) -#define AGP_CAPID_GET_MINOR(x) (((x) & 0x000f0000U) >> 16) -#define AGP_CAPID_GET_NEXT_PTR(x) (((x) & 0x0000ff00U) >> 8) -#define AGP_CAPID_GET_CAP_ID(x) (((x) & 0x000000ffU) >> 0) - #define AGP_STATUS 0x4 #define AGP_COMMAND 0x8 #define AGP_STATUS_AGP3 0x0008 diff --git a/sys/pci/agpreg.h b/sys/pci/agpreg.h index 8e5365e952f..7786efe5fa5 100644 --- a/sys/pci/agpreg.h +++ b/sys/pci/agpreg.h @@ -32,18 +32,12 @@ /* * Offsets for various AGP configuration registers. */ -#define AGP_APBASE 0x10 -#define AGP_CAPPTR 0x34 +#define AGP_APBASE PCIR_BAR(0) /* * Offsets from the AGP Capability pointer. */ #define AGP_CAPID 0x0 -#define AGP_CAPID_GET_MAJOR(x) (((x) & 0x00f00000U) >> 20) -#define AGP_CAPID_GET_MINOR(x) (((x) & 0x000f0000U) >> 16) -#define AGP_CAPID_GET_NEXT_PTR(x) (((x) & 0x0000ff00U) >> 8) -#define AGP_CAPID_GET_CAP_ID(x) (((x) & 0x000000ffU) >> 0) - #define AGP_STATUS 0x4 #define AGP_COMMAND 0x8 #define AGP_STATUS_AGP3 0x0008