pciutils: headers diff between 2.2.10 and 3.0.0 versions

	config.h	config.h
	#define PCI_ARCH_I386	#define PCI_ARCH_I386
	#define PCI_OS_LINUX	#define PCI_OS_LINUX
	#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_USE_DNS
	#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/2.	#define PCI_PATH_IDS_DIR "/home/andrey/upstream-tracker/testing/pciutils/3.
	2.10/share"	0.0/share"
	#define PCILIB_VERSION "2.2.10"	#define PCI_USE_DNS
		#define PCI_ID_DOMAIN "pci.id.ucw.cz"
		#define PCILIB_VERSION "3.0.0"

End of changes. 2 change blocks.
	0 lines changed or deleted	1 lines changed or added

	pci.h	pci.h
	/*	/*
	* The PCI Library	* The PCI Library
	*	*

	* Copyright (c) 1997--2006 Martin Mares <mj@ucw.cz>	* Copyright (c) 1997--2008 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

	#include "config.h"	#include "config.h"
	#include "header.h"	#include "header.h"
	#include "types.h"	#include "types.h"


	#define PCI_LIB_VERSION 0x020204	#define PCI_LIB_VERSION 0x030000

		#ifndef PCI_ABI
		#define PCI_ABI
		#endif

	/*	/*
	* PCI Access Structure	* PCI Access Structure
	*/	*/

	struct pci_methods;	struct pci_methods;

	enum pci_access_type {	enum pci_access_type {
	/* Known access methods, remember to update access.c as well */	/* Known access methods, remember to update access.c as well */

	PCI_ACCESS_AUTO, /* Autodetection (params: none) */	PCI_ACCESS_AUTO, /* Autodetection */
	PCI_ACCESS_SYS_BUS_PCI, /* Linux /sys/bus/pci (params: path)	PCI_ACCESS_SYS_BUS_PCI, /* Linux /sys/bus/pci */
	*/	PCI_ACCESS_PROC_BUS_PCI, /* Linux /proc/bus/pci */
	PCI_ACCESS_PROC_BUS_PCI, /* Linux /proc/bus/pci (params: path	PCI_ACCESS_I386_TYPE1, /* i386 ports, type 1 */
	) */	PCI_ACCESS_I386_TYPE2, /* i386 ports, type 2 */
	PCI_ACCESS_I386_TYPE1, /* i386 ports, type 1 (params: none)	PCI_ACCESS_FBSD_DEVICE, /* FreeBSD /dev/pci */
	*/
	PCI_ACCESS_I386_TYPE2, /* i386 ports, type 2 (params: none)
	*/
	PCI_ACCESS_FBSD_DEVICE, /* FreeBSD /dev/pci (params: path) *
	/
	PCI_ACCESS_AIX_DEVICE, /* /dev/pci0, /dev/bus0, etc. */	PCI_ACCESS_AIX_DEVICE, /* /dev/pci0, /dev/bus0, etc. */
	PCI_ACCESS_NBSD_LIBPCI, /* NetBSD libpci */	PCI_ACCESS_NBSD_LIBPCI, /* NetBSD libpci */
	PCI_ACCESS_OBSD_DEVICE, /* OpenBSD /dev/pci */	PCI_ACCESS_OBSD_DEVICE, /* OpenBSD /dev/pci */

	PCI_ACCESS_DUMP, /* Dump file (params: filename) */	PCI_ACCESS_DUMP, /* Dump file */
	PCI_ACCESS_MAX	PCI_ACCESS_MAX
	};	};

	struct pci_access {	struct pci_access {
	/* Options you can change: */	/* Options you can change: */
	unsigned int method; /* Access method */	unsigned int method; /* Access method */

	char method_params[PCI_ACCESS_MAX]; / Parameters for the methods */
	int writeable; /* Open in read/write mode */	int writeable; /* Open in read/write mode */
	int buscentric; /* Bus-centric view of the world */	int buscentric; /* Bus-centric view of the world */

	char id_file_name; / Name of ID list file */
		char id_file_name; / Name of ID list file (use pci_set
		_name_list_path()) */
	int free_id_name; /* Set if id_file_name is malloced * /	int free_id_name; /* Set if id_file_name is malloced * /
	int numeric_ids; /* Enforce PCI_LOOKUP_NUMERIC (>1 => PCI_LOOKUP_MIXED) */	int numeric_ids; /* Enforce PCI_LOOKUP_NUMERIC (>1 => PCI_LOOKUP_MIXED) */


		unsigned int id_lookup_mode; /* pci_lookup_mode flags which are s
		et automatically */
		/* Default: PCI_LOOKUP_CACHE */

	int debugging; /* Turn on debugging messages */	int debugging; /* Turn on debugging messages */

	/* Functions you can override: */	/* Functions you can override: */

	void (error)(char msg, ...); /* Write error message and quit */	void (error)(char msg, ...) PCI_PRINTF(1,2); /* Write error messa
	void (warning)(char msg, ...); /* Write a warning message */	ge and quit */
	void (debug)(char msg, ...); /* Write a debugging message */	void (warning)(char msg, ...) PCI_PRINTF(1,2); /* Write a warning m
		essage */
		void (debug)(char msg, ...) PCI_PRINTF(1,2); /* Write a debugging
		message */

	struct pci_dev devices; / Devices found on this bus */	struct pci_dev devices; / Devices found on this bus */

	/* Fields used internally: */	/* Fields used internally: */
	struct pci_methods *methods;	struct pci_methods *methods;

		struct pci_param *params;
	struct id_entry *id_hash; / names.c */	struct id_entry *id_hash; / names.c */
	struct id_bucket *current_id_bucket;	struct id_bucket *current_id_bucket;

	int hash_load_failed;	int id_load_failed;
		int id_cache_status; /* 0=not read, 1=read, 2=dirty */
	int fd; /* proc: fd */	int fd; /* proc: fd */
	int fd_rw; /* proc: fd opened read-write */	int fd_rw; /* proc: fd opened read-write */
	struct pci_dev cached_dev; / proc: device the fd is for */	struct pci_dev cached_dev; / proc: device the fd is for */
	int fd_pos; /* proc: current position */	int fd_pos; /* proc: current position */
	};	};

	/* Initialize PCI access */	/* Initialize PCI access */

	struct pci_access *pci_alloc(void);	struct pci_access *pci_alloc(void) PCI_ABI;
	void pci_init(struct pci_access *);	void pci_init(struct pci_access *) PCI_ABI;
	void pci_cleanup(struct pci_access *);	void pci_cleanup(struct pci_access *) PCI_ABI;

	/* Scanning of devices */	/* Scanning of devices */

	void pci_scan_bus(struct pci_access *acc);	void pci_scan_bus(struct pci_access *acc) PCI_ABI;
	struct pci_dev pci_get_dev(struct pci_access acc, int domain, int bus, in	struct pci_dev pci_get_dev(struct pci_access acc, int domain, int bus, in
	t dev, int func); /* Raw access to specified device */	t dev, int func) PCI_ABI; /* Raw access to specified device */
	void pci_free_dev(struct pci_dev *);	void pci_free_dev(struct pci_dev *) PCI_ABI;

		/* Names of access methods */
		int pci_lookup_method(char name) PCI_ABI; / Returns -1 if not found *
		/
		char pci_get_method_name(int index) PCI_ABI; / Returns "" if unavailable
		, NULL if index out of range */

		/*
		* Named parameters
		*/

		struct pci_param {
		struct pci_param next; / Please use pci_walk_params() for
		traversing the list */
		char param; / Name of the parameter */
		char value; / Value of the parameter */
		int value_malloced; /* used internally */
		char help; / Explanation of the parameter */
		};

		char pci_get_param(struct pci_access acc, char *param) PCI_ABI;
		int pci_set_param(struct pci_access acc, char param, char *value) PCI_ABI
		; /* 0 on success, -1 if no such parameter */
		/* To traverse the list, call pci_walk_params repeatedly, first with prev=N
		ULL, and do not modify the parameters during traversal. */
		struct pci_param pci_walk_params(struct pci_access acc, struct pci_param
		*prev) PCI_ABI;

	/*	/*
	* Devices	* Devices
	*/	*/

	struct pci_dev {	struct pci_dev {
	struct pci_dev next; / Next device in the chain */	struct pci_dev next; / Next device in the chain */
	u16 domain; /* PCI domain (host bridge) */	u16 domain; /* PCI domain (host bridge) */
	u8 bus, dev, func; /* Bus inside domain, device and fun ction */	u8 bus, dev, func; /* Bus inside domain, device and fun ction */


	skipping to change at line 109	skipping to change at line 140
	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 */
	};	};

	#define PCI_ADDR_IO_MASK (~(pciaddr_t) 0x3)	#define PCI_ADDR_IO_MASK (~(pciaddr_t) 0x3)
	#define PCI_ADDR_MEM_MASK (~(pciaddr_t) 0xf)	#define PCI_ADDR_MEM_MASK (~(pciaddr_t) 0xf)


	u8 pci_read_byte(struct pci_dev , int pos); / Access to configuration spa	u8 pci_read_byte(struct pci_dev , int pos) PCI_ABI; / Access to configura
	ce */	tion space */
	u16 pci_read_word(struct pci_dev *, int pos);	u16 pci_read_word(struct pci_dev *, int pos) PCI_ABI;
	u32 pci_read_long(struct pci_dev *, int pos);	u32 pci_read_long(struct pci_dev *, int pos) PCI_ABI;
	int pci_read_block(struct pci_dev , int pos, u8 buf, int len);	int pci_read_block(struct pci_dev , int pos, u8 buf, int len) PCI_ABI;
	int pci_write_byte(struct pci_dev *, int pos, u8 data);	int pci_write_byte(struct pci_dev *, int pos, u8 data) PCI_ABI;
	int pci_write_word(struct pci_dev *, int pos, u16 data);	int pci_write_word(struct pci_dev *, int pos, u16 data) PCI_ABI;
	int pci_write_long(struct pci_dev *, int pos, u32 data);	int pci_write_long(struct pci_dev *, int pos, u32 data) PCI_ABI;
	int pci_write_block(struct pci_dev , int pos, u8 buf, int len);	int pci_write_block(struct pci_dev , int pos, u8 buf, int len) PCI_ABI;


	int pci_fill_info(struct pci_dev , int flags); / Fill in device informati on */	int pci_fill_info(struct pci_dev , int flags) PCI_ABI; / Fill in device i nformation */

	#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_RESCAN 0x10000	#define PCI_FILL_RESCAN 0x10000


	void pci_setup_cache(struct pci_dev , u8 cache, int len);	void pci_setup_cache(struct pci_dev , u8 cache, int len) PCI_ABI;

	/*	/*
	* Filters	* Filters
	*/	*/

	struct pci_filter {	struct pci_filter {
	int domain, bus, slot, func; /* -1 = ANY */	int domain, bus, slot, func; /* -1 = ANY */
	int vendor, device;	int vendor, device;
	};	};


	void pci_filter_init(struct pci_access , struct pci_filter );	void pci_filter_init(struct pci_access , struct pci_filter ) PCI_ABI;
	char pci_filter_parse_slot(struct pci_filter , char *);	char pci_filter_parse_slot(struct pci_filter , char *) PCI_ABI;
	char pci_filter_parse_id(struct pci_filter , char *);	char pci_filter_parse_id(struct pci_filter , char *) PCI_ABI;
	int pci_filter_match(struct pci_filter , struct pci_dev );	int pci_filter_match(struct pci_filter , struct pci_dev ) PCI_ABI;

	/*	/*
	* Conversion of PCI ID's to names (according to the pci.ids file)	* Conversion of PCI ID's to names (according to the pci.ids file)
	*	*
	* Call pci_lookup_name() to identify different types of ID's:	* Call pci_lookup_name() to identify different types of ID's:
	*	*
	* VENDOR (vendorID) -> vendor	* VENDOR (vendorID) -> vendor
	* DEVICE (vendorID, deviceID) -> device	* DEVICE (vendorID, deviceID) -> device
	* VENDOR \| DEVICE (vendorID, deviceID) -> combined ven dor and device	* VENDOR \| DEVICE (vendorID, deviceID) -> combined ven dor and device
	* SUBSYSTEM \| VENDOR (subvendorID) -> subsystem vendor	* SUBSYSTEM \| VENDOR (subvendorID) -> subsystem vendor
	* SUBSYSTEM \| DEVICE (vendorID, deviceID, subvendorID, su bdevID) -> subsystem device	* SUBSYSTEM \| DEVICE (vendorID, deviceID, subvendorID, su bdevID) -> subsystem device
	* SUBSYSTEM \| VENDOR \| DEVICE (vendorID, deviceID, subvendorID, su bdevID) -> combined subsystem v+d	* SUBSYSTEM \| VENDOR \| DEVICE (vendorID, deviceID, subvendorID, su bdevID) -> combined subsystem v+d
	* SUBSYSTEM \| ... (-1, -1, subvendorID, subdevID) -> g eneric subsystem	* SUBSYSTEM \| ... (-1, -1, subvendorID, subdevID) -> g eneric subsystem
	* CLASS (classID) -> class	* CLASS (classID) -> class
	* PROGIF (classID, progif) -> programming int erface	* PROGIF (classID, progif) -> programming int erface
	*/	*/


	char pci_lookup_name(struct pci_access a, char *buf, int size, int flags, ...);	char pci_lookup_name(struct pci_access a, char *buf, int size, int flags, ...) PCI_ABI;


	int pci_load_name_list(struct pci_access a); / Called automatically by p	int pci_load_name_list(struct pci_access a) PCI_ABI; / Called automatica
	ci_lookup_() when needed; returns success /	lly by pci_lookup_() when needed; returns success /
	void pci_free_name_list(struct pci_access a); / Called automatically by p	void pci_free_name_list(struct pci_access a) PCI_ABI; / Called automatica
	ci_cleanup() */	lly by pci_cleanup() */
	void pci_set_name_list_path(struct pci_access a, char name, int to_be_fre	void pci_set_name_list_path(struct pci_access a, char name, int to_be_fre
	ed);	ed) PCI_ABI;
		void pci_id_cache_flush(struct pci_access *a) PCI_ABI;

	enum pci_lookup_mode {	enum pci_lookup_mode {
	PCI_LOOKUP_VENDOR = 1, /* Vendor name (args: vendorID) */	PCI_LOOKUP_VENDOR = 1, /* Vendor name (args: vendorID) */
	PCI_LOOKUP_DEVICE = 2, /* Device name (args: vendorID, devi ceID) */	PCI_LOOKUP_DEVICE = 2, /* Device name (args: vendorID, devi ceID) */
	PCI_LOOKUP_CLASS = 4, /* Device class (args: class ID) */	PCI_LOOKUP_CLASS = 4, /* Device class (args: class ID) */
	PCI_LOOKUP_SUBSYSTEM = 8,	PCI_LOOKUP_SUBSYSTEM = 8,
	PCI_LOOKUP_PROGIF = 16, /* Programming interface (args: clas sID, prog_if) */	PCI_LOOKUP_PROGIF = 16, /* Programming interface (args: clas sID, prog_if) */
	PCI_LOOKUP_NUMERIC = 0x10000, /* Want only formatted numbe rs; default if access->numeric_ids is set */	PCI_LOOKUP_NUMERIC = 0x10000, /* Want only formatted numbe rs; default if access->numeric_ids is set */
	PCI_LOOKUP_NO_NUMBERS = 0x20000, /* Return NULL if not found in the d atabase; default is to print numerically */	PCI_LOOKUP_NO_NUMBERS = 0x20000, /* Return NULL if not found in the d atabase; default is to print numerically */
	PCI_LOOKUP_MIXED = 0x40000, /* Include both numbers and names */	PCI_LOOKUP_MIXED = 0x40000, /* Include both numbers and names */

		PCI_LOOKUP_NETWORK = 0x80000, /* Try to resolve unknown ID
		's by DNS */
		PCI_LOOKUP_SKIP_LOCAL = 0x100000, /* Do not consult local database */
		PCI_LOOKUP_CACHE = 0x200000, /* Consult the local cache before us
		ing DNS */
		PCI_LOOKUP_REFRESH_CACHE = 0x400000, /* Forget all previously cached entr
		ies, but still allow updating the cache */
	};	};

	#endif	#endif

End of changes. 19 change blocks.
	49 lines changed or deleted	94 lines changed or added

	types.h	types.h
	/*	/*
	* The PCI Library -- Types and Format Strings	* The PCI Library -- Types and Format Strings
	*	*

	* Copyright (c) 1997--2007 Martin Mares <mj@ucw.cz>	* Copyright (c) 1997--2008 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.
	*/	*/

	#include <sys/types.h>	#include <sys/types.h>

	#ifndef PCI_HAVE_Uxx_TYPES	#ifndef PCI_HAVE_Uxx_TYPES

	#ifdef PCI_OS_WINDOWS	#ifdef PCI_OS_WINDOWS
	#include <windef.h>	#include <windef.h>
	typedef BYTE u8;	typedef BYTE u8;
	typedef WORD u16;	typedef WORD u16;
	typedef DWORD u32;	typedef DWORD u32;

	#elif defined(PCI_HAVE_STDINT_H)	#elif defined(PCI_HAVE_STDINT_H) \|\| (defined(__STDC_VERSION__) && __STDC_VE RSION__ >= 199901L)
	#include <stdint.h>	#include <stdint.h>
	typedef uint8_t u8;	typedef uint8_t u8;
	typedef uint16_t u16;	typedef uint16_t u16;
	typedef uint32_t u32;	typedef uint32_t u32;
	#else	#else
	typedef u_int8_t u8;	typedef u_int8_t u8;
	typedef u_int16_t u16;	typedef u_int16_t u16;
	typedef u_int32_t u32;	typedef u_int32_t u32;
	#endif	#endif


	skipping to change at line 60	skipping to change at line 60
	#endif	#endif

	#ifdef PCI_ARCH_SPARC64	#ifdef PCI_ARCH_SPARC64
	/* On sparc64 Linux the kernel reports remapped port addresses and IRQ numb ers */	/* On sparc64 Linux the kernel reports remapped port addresses and IRQ numb ers */
	#undef PCIADDR_PORT_FMT	#undef PCIADDR_PORT_FMT
	#define PCIADDR_PORT_FMT PCIADDR_T_FMT	#define PCIADDR_PORT_FMT PCIADDR_T_FMT
	#define PCIIRQ_FMT "%08x"	#define PCIIRQ_FMT "%08x"
	#else	#else
	#define PCIIRQ_FMT "%d"	#define PCIIRQ_FMT "%d"
	#endif	#endif


		#ifdef __GNUC__
		#define PCI_PRINTF(x,y) __attribute__((format(printf, x, y)))
		#else
		#define PCI_PRINTF(x,y)
		#endif

End of changes. 3 change blocks.
	2 lines changed or deleted	2 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/