Actually add the files for reg_dumper.
This commit is contained in:
parent
1f5d1666c8
commit
d5df52be59
|
|
@ -0,0 +1 @@
|
|||
intel_reg_dumper
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
noinst_PROGRAMS = intel_reg_dumper
|
||||
|
||||
intel_reg_dumper_SOURCES = \
|
||||
main.c \
|
||||
reg_dumper.h \
|
||||
xprintf.c \
|
||||
../i830_debug.c
|
||||
|
||||
intel_reg_dumper_LDADD = $(PCIACCESS_LIBS)
|
||||
|
||||
intel_reg_dumper_CFLAGS = $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \
|
||||
-I$(srcdir)/.. -DREG_DUMPER
|
||||
|
|
@ -0,0 +1,105 @@
|
|||
/*
|
||||
* Copyright © 2007 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Authors:
|
||||
* Eric Anholt <eric@anholt.net>
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <pciaccess.h>
|
||||
#include <err.h>
|
||||
|
||||
#include "reg_dumper.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
struct pci_device *dev;
|
||||
I830Rec i830;
|
||||
ScrnInfoRec scrn;
|
||||
int err, mmio_bar;
|
||||
|
||||
err = pci_system_init();
|
||||
if (err != 0) {
|
||||
fprintf(stderr, "Couldn't initialize PCI system: %s\n", strerror(err));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* Grab the graphics card */
|
||||
dev = pci_device_find_by_slot(0, 0, 2, 0);
|
||||
if (dev == NULL)
|
||||
errx(1, "Couldn't find graphics card");
|
||||
|
||||
if (dev->vendor_id != 0x8086)
|
||||
errx(1, "Graphics card is non-intel");
|
||||
|
||||
err = pci_device_probe(dev);
|
||||
if (err != 0) {
|
||||
fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
i830.PciInfo = &i830.pci_info_rec;
|
||||
i830.PciInfo->chipType = dev->device_id;
|
||||
|
||||
i830.pci_dev = dev;
|
||||
|
||||
mmio_bar = IS_I9XX((&i830)) ? 0 : 1;
|
||||
|
||||
err = pci_device_map_region(dev, mmio_bar, 1);
|
||||
if (err != 0) {
|
||||
fprintf(stderr, "Couldn't map MMIO region: %s\n", strerror(err));
|
||||
exit(1);
|
||||
}
|
||||
i830.mmio = i830.pci_dev->regions[mmio_bar].memory;
|
||||
|
||||
scrn.scrnIndex = 0;
|
||||
scrn.pI830 = &i830;
|
||||
|
||||
i830DumpRegs(&scrn);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void xf86DrvMsg(int scrnIndex, int severity, const char *format, ...)
|
||||
{
|
||||
va_list va;
|
||||
|
||||
switch (severity) {
|
||||
case X_INFO:
|
||||
printf("(II): ");
|
||||
break;
|
||||
case X_WARNING:
|
||||
printf("(WW): ");
|
||||
break;
|
||||
case X_ERROR:
|
||||
printf("(EE): ");
|
||||
break;
|
||||
}
|
||||
|
||||
va_start(va, format);
|
||||
vprintf(format, va);
|
||||
va_end(va);
|
||||
}
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
/*
|
||||
* Copyright © 2007 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Authors:
|
||||
* Eric Anholt <eric@anholt.net>
|
||||
*
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include "common.h"
|
||||
|
||||
/** @file
|
||||
* This file defines the typedefs and stub structures necessary for us to
|
||||
* use i830_debug.c mostly unmodified.
|
||||
*/
|
||||
|
||||
typedef uint32_t CARD32;
|
||||
typedef char Bool;
|
||||
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
|
||||
#define X_INFO 0
|
||||
#define X_WARNING 1
|
||||
#define X_ERROR 2
|
||||
|
||||
struct pci_info_rec {
|
||||
uint16_t chipType;
|
||||
};
|
||||
|
||||
typedef struct _i830 {
|
||||
/* Fields in common with the real pI830 */
|
||||
struct pci_info_rec *PciInfo;
|
||||
|
||||
/* Fields used for setting up reg_dumper */
|
||||
struct pci_device *pci_dev;
|
||||
struct pci_info_rec pci_info_rec;
|
||||
volatile unsigned char *mmio;
|
||||
} I830Rec, *I830Ptr;
|
||||
|
||||
typedef struct _scrn {
|
||||
/* Fields in common with the real pScrn */
|
||||
int scrnIndex;
|
||||
|
||||
/* Fields used for setting up reg_dumper */
|
||||
I830Ptr pI830;
|
||||
} ScrnInfoRec, *ScrnInfoPtr;
|
||||
|
||||
#define I830PTR(pScrn) (pScrn->pI830)
|
||||
|
||||
#define INREG8(reg) (*(volatile uint8_t *)((pI830)->mmio + (reg)))
|
||||
#define INREG16(reg) (*(volatile uint16_t *)((pI830)->mmio + (reg)))
|
||||
#define INREG(reg) (*(volatile uint32_t *)((pI830)->mmio + (reg)))
|
||||
#define OUTREG8(reg, val) \
|
||||
*(volatile uint8_t *)((pI830)->mmio + (reg)) = (val)
|
||||
#define OUTREG16(reg, val) \
|
||||
*(volatile uint16_t *)((pI830)->mmio + (reg)) = (val)
|
||||
#define OUTREG(reg, val) \
|
||||
*(volatile uint32_t *)((pI830)->mmio + (reg)) = (val)
|
||||
|
||||
#define xalloc malloc
|
||||
#define xfree free
|
||||
#define ErrorF printf
|
||||
|
||||
char *XNFprintf(const char *format, ...);
|
||||
void xf86DrvMsg(int scrnIndex, int severity, const char *format, ...);
|
||||
void i830DumpRegs(ScrnInfoPtr pScrn);
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
/*
|
||||
* Copyright (c) 2004 Alexander Gottwald
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the name(s) of the above copyright
|
||||
* holders shall not be used in advertising or otherwise to promote the sale,
|
||||
* use or other dealings in this Software without prior written authorization.
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include "reg_dumper.h"
|
||||
|
||||
static char *
|
||||
XNFvprintf(const char *format, va_list va)
|
||||
{
|
||||
char *ret;
|
||||
int size;
|
||||
va_list va2;
|
||||
|
||||
va_copy(va2, va);
|
||||
size = vsnprintf(NULL, 0, format, va2);
|
||||
va_end(va2);
|
||||
|
||||
ret = (char *)malloc(size + 1);
|
||||
if (ret == NULL)
|
||||
return NULL;
|
||||
|
||||
vsnprintf(ret, size + 1, format, va);
|
||||
ret[size] = 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
char *
|
||||
XNFprintf(const char *format, ...)
|
||||
{
|
||||
char *ret;
|
||||
va_list va;
|
||||
va_start(va, format);
|
||||
ret = XNFvprintf(format, va);
|
||||
va_end(va);
|
||||
return ret;
|
||||
}
|
||||
Loading…
Reference in New Issue