Kill structs and ioctls that were never implemented.

ok oga@, miod@, deraadt@

2 files changed, 2 insertions, 68 deletions

diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 84d184f05bd..4411cbb6a57 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci.c,v 1.63 2009/06/29 19:19:17 kettenis Exp $	*/
+/*	$OpenBSD: pci.c,v 1.64 2009/07/14 18:20:02 kettenis Exp $	*/
 /*	$NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $	*/
 
 /*
@@ -815,10 +815,6 @@ pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 			   io->pi_sel.pc_func);
 
 	switch(cmd) {
-	case PCIOCGETCONF:
-		error = ENODEV;
-		break;
-
 	case PCIOCREAD:
 		switch(io->pi_width) {
 		case 4:
diff --git a/sys/sys/pciio.h b/sys/sys/pciio.h
index b5eec1a12c3..5cc5e5f2f8c 100644
--- a/sys/sys/pciio.h
+++ b/sys/sys/pciio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciio.h,v 1.2 2001/06/26 20:44:14 jason Exp $	*/
+/*	$OpenBSD: pciio.h,v 1.3 2009/07/14 18:20:02 kettenis Exp $	*/
 
 /*-
  * Copyright (c) 1997, Stefan Esser <se@FreeBSD.ORG>
@@ -35,72 +35,12 @@
 
 #include <sys/ioccom.h>
 
-#define PCI_MAXNAMELEN	16
-
-typedef enum {
-	PCI_GETCONF_LAST_DEVICE,
-	PCI_GETCONF_LIST_CHANGED,
-	PCI_GETCONF_MORE_DEVS,
-	PCI_GETCONF_ERROR
-} pci_getconf_status;
-
-typedef enum {
-	PCI_GETCONF_NO_MATCH		= 0x00,
-	PCI_GETCONF_MATCH_BUS		= 0x01,
-	PCI_GETCONF_MATCH_DEV		= 0x02,
-	PCI_GETCONF_MATCH_FUNC		= 0x04,
-	PCI_GETCONF_MATCH_NAME		= 0x08,
-	PCI_GETCONF_MATCH_UNIT		= 0x10,
-	PCI_GETCONF_MATCH_VENDOR	= 0x20,
-	PCI_GETCONF_MATCH_DEVICE	= 0x40,
-	PCI_GETCONF_MATCH_CLASS		= 0x80
-} pci_getconf_flags;
-
 struct pcisel {
 	u_int8_t	pc_bus;		/* bus number */
 	u_int8_t	pc_dev;		/* device on this bus */
 	u_int8_t	pc_func;	/* function on this device */
 };
 
-struct	pci_conf {
-	struct pcisel	pc_sel;		/* bus+slot+function */
-	u_int8_t	pc_hdr;		/* PCI header type */
-	u_int16_t	pc_subvendor;	/* card vendor ID */
-	u_int16_t	pc_subdevice;	/* card device ID, assigned by 
-					   card vendor */
-	u_int16_t	pc_vendor;	/* chip vendor ID */
-	u_int16_t	pc_device;	/* chip device ID, assigned by 
-					   chip vendor */
-	u_int8_t	pc_class;	/* chip PCI class */
-	u_int8_t	pc_subclass;	/* chip PCI subclass */
-	u_int8_t	pc_progif;	/* chip PCI programming interface */
-	u_int8_t	pc_revid;	/* chip revision ID */
-	char		pd_name[PCI_MAXNAMELEN + 1];  /* device name */
-	u_long		pd_unit;	/* device unit number */
-};
-
-struct pci_match_conf {
-	struct pcisel		pc_sel;		/* bus+slot+function */
-	char			pd_name[PCI_MAXNAMELEN + 1];  /* device name */
-	u_long			pd_unit;	/* Unit number */
-	u_int16_t		pc_vendor;	/* PCI Vendor ID */
-	u_int16_t		pc_device;	/* PCI Device ID */
-	u_int8_t		pc_class;	/* PCI class */
-	pci_getconf_flags	flags;		/* Matching expression */
-};
-
-struct	pci_conf_io {
-	u_int32_t		pat_buf_len;	/* pattern buffer length */
-	u_int32_t		num_patterns;	/* number of patterns */
-	struct pci_match_conf	*patterns;	/* pattern buffer */
-	u_int32_t		match_buf_len;	/* match buffer length */
-	u_int32_t		num_matches;	/* number of matches returned */
-	struct pci_conf		*matches;	/* match buffer */
-	u_int32_t		offset;		/* offset into device list */
-	u_int32_t		generation;	/* device list generation */
-	pci_getconf_status	status;		/* request status */
-};
-
 struct pci_io {
 	struct pcisel	pi_sel;		/* device to operate on */
 	int		pi_reg;		/* configuration register to examine */
@@ -109,9 +49,7 @@ struct pci_io {
 };
 	
 
-#define	PCIOCGETCONF	_IOWR('p', 1, struct pci_conf_io)
 #define	PCIOCREAD	_IOWR('p', 2, struct pci_io)
 #define	PCIOCWRITE	_IOWR('p', 3, struct pci_io)
-#define	PCIOCATTACHED	_IOWR('p', 4, struct pci_io)
 
 #endif /* !_SYS_PCIIO_H_ */