config.h   config.h 
skipping to change at line 14 skipping to change at line 14
#define PCI_HAVE_PM_LINUX_SYSFS #define PCI_HAVE_PM_LINUX_SYSFS
#define PCI_HAVE_PM_LINUX_PROC #define PCI_HAVE_PM_LINUX_PROC
#define PCI_HAVE_LINUX_BYTEORDER_H #define PCI_HAVE_LINUX_BYTEORDER_H
#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci" #define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci" #define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
#define PCI_HAVE_PM_INTEL_CONF #define PCI_HAVE_PM_INTEL_CONF
#define PCI_HAVE_64BIT_ADDRESS #define PCI_HAVE_64BIT_ADDRESS
#define PCI_HAVE_PM_DUMP #define PCI_HAVE_PM_DUMP
#define PCI_COMPRESSED_IDS #define PCI_COMPRESSED_IDS
#define PCI_IDS "pci.ids.gz" #define PCI_IDS "pci.ids.gz"
#define PCI_PATH_IDS_DIR "/home/andrey/upstream-tracker/testing/pciutils/3. 1.10/share" #define PCI_PATH_IDS_DIR "/usr/local/share"
#define PCI_USE_DNS #define PCI_USE_DNS
#define PCI_ID_DOMAIN "pci.id.ucw.cz" #define PCI_ID_DOMAIN "pci.id.ucw.cz"
#define PCI_SHARED_LIB #define PCI_USE_LIBKMOD
#define PCILIB_VERSION "3.1.10" #define PCILIB_VERSION "3.2.0"
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 pci.h   pci.h 
/* /*
* The PCI Library * The PCI Library
* *
* Copyright (c) 1997--2009 Martin Mares <mj@ucw.cz> * Copyright (c) 1997--2013 Martin Mares <mj@ucw.cz>
* *
* Can be freely distributed and used under the terms of the GNU GPL. * Can be freely distributed and used under the terms of the GNU GPL.
*/ */
#ifndef _PCI_LIB_H #ifndef _PCI_LIB_H
#define _PCI_LIB_H #define _PCI_LIB_H
#ifndef PCI_CONFIG_H #ifndef PCI_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include "header.h" #include "header.h"
#include "types.h" #include "types.h"
#define PCI_LIB_VERSION 0x030100 #define PCI_LIB_VERSION 0x030200
#ifndef PCI_ABI #ifndef PCI_ABI
#define PCI_ABI #define PCI_ABI
#endif #endif
/* /*
* PCI Access Structure * PCI Access Structure
*/ */
struct pci_methods; struct pci_methods;
skipping to change at line 133 skipping to change at line 133
int known_fields; /* Set of info fields already known */ int known_fields; /* Set of info fields already known */
u16 vendor_id, device_id; /* Identity of the device */ u16 vendor_id, device_id; /* Identity of the device */
u16 device_class; /* PCI device class */ u16 device_class; /* PCI device class */
int irq; /* IRQ number */ int irq; /* IRQ number */
pciaddr_t base_addr[6]; /* Base addresses including flags in lower bits */ pciaddr_t base_addr[6]; /* Base addresses including flags in lower bits */
pciaddr_t size[6]; /* Region sizes */ pciaddr_t size[6]; /* Region sizes */
pciaddr_t rom_base_addr; /* Expansion ROM base address */ pciaddr_t rom_base_addr; /* Expansion ROM base address */
pciaddr_t rom_size; /* Expansion ROM size */ pciaddr_t rom_size; /* Expansion ROM size */
struct pci_cap *first_cap; /* List of capabilities */ struct pci_cap *first_cap; /* List of capabilities */
char *phy_slot; /* Physical slot */ char *phy_slot; /* Physical slot */
char *module_alias; /* Linux kernel module alias */
/* Fields used internally: */ /* Fields used internally: */
struct pci_access *access; struct pci_access *access;
struct pci_methods *methods; struct pci_methods *methods;
u8 *cache; /* Cached config registers */ u8 *cache; /* Cached config registers */
int cache_len; int cache_len;
int hdrtype; /* Cached low 7 bits of header type, -1 if unknown */ int hdrtype; /* Cached low 7 bits of header type, -1 if unknown */
void *aux; /* Auxillary data */ void *aux; /* Auxillary data */
}; };
skipping to change at line 168 skipping to change at line 169
#define PCI_FILL_IDENT 1 #define PCI_FILL_IDENT 1
#define PCI_FILL_IRQ 2 #define PCI_FILL_IRQ 2
#define PCI_FILL_BASES 4 #define PCI_FILL_BASES 4
#define PCI_FILL_ROM_BASE 8 #define PCI_FILL_ROM_BASE 8
#define PCI_FILL_SIZES 16 #define PCI_FILL_SIZES 16
#define PCI_FILL_CLASS 32 #define PCI_FILL_CLASS 32
#define PCI_FILL_CAPS 64 #define PCI_FILL_CAPS 64
#define PCI_FILL_EXT_CAPS 128 #define PCI_FILL_EXT_CAPS 128
#define PCI_FILL_PHYS_SLOT 256 #define PCI_FILL_PHYS_SLOT 256
#define PCI_FILL_MODULE_ALIAS 512
#define PCI_FILL_RESCAN 0x10000 #define PCI_FILL_RESCAN 0x10000
void pci_setup_cache(struct pci_dev *, u8 *cache, int len) PCI_ABI; void pci_setup_cache(struct pci_dev *, u8 *cache, int len) PCI_ABI;
/* /*
* Capabilities * Capabilities
*/ */
struct pci_cap { struct pci_cap {
struct pci_cap *next; struct pci_cap *next;
 End of changes. 4 change blocks. 
2 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/