1 files changed, 1 insertions, 64 deletions

diff --git a/sys/dev/pci/vga_pcivar.h b/sys/dev/pci/vga_pcivar.h
index 493bbb227b0..44aad8df68a 100644
--- a/sys/dev/pci/vga_pcivar.h
+++ b/sys/dev/pci/vga_pcivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_pcivar.h,v 1.8 2007/11/03 10:09:03 martin Exp $ */
+/* $OpenBSD: vga_pcivar.h,v 1.9 2007/11/25 17:11:12 oga Exp $ */
 /* $NetBSD: vga_pcivar.h,v 1.1 1998/03/22 15:16:19 drochner Exp $ */
 
 /*
@@ -37,29 +37,6 @@
 	     (PCI_CLASS(class) == PCI_CLASS_PREHISTORIC &&		\
 	      PCI_SUBCLASS(class) == PCI_SUBCLASS_PREHISTORIC_VGA)) ? 1 : 0)
 
-enum agp_acquire_state {
-	AGP_ACQUIRE_FREE,
-	AGP_ACQUIRE_USER,
-	AGP_ACQUIRE_KERNEL
-};
-
-/*
- * Data structure to describe an AGP memory allocation.
- */
-TAILQ_HEAD(agp_memory_list, agp_memory);
-struct agp_memory {
-	TAILQ_ENTRY(agp_memory) am_link;	/* wiring for the tailq */
-	int		am_id;			/* unique id for block */
-	vsize_t		am_size;		/* number of bytes allocated */
-	int		am_type;		/* chipset specific type */
-	off_t		am_offset;		/* page offset if bound */
-	int		am_is_bound;		/* non-zero if bound */
-	bus_addr_t	am_physical;
-	caddr_t		am_virtual;
-	bus_dmamap_t	am_dmamap;
-	int		am_nseg;
-	bus_dma_segment_t *am_dmaseg;
-};
 
 struct vga_pci_softc {
 	struct device sc_dev;
@@ -81,48 +58,8 @@ struct vga_pci_softc {
 	u_char sc_cmap_blue[256];
 
 #endif
-#ifdef PCIAGP
-	/* agp stuff */
-	bus_space_tag_t sc_bt, sc_memt;
-	bus_space_handle_t sc_bh;
-	bus_addr_t sc_apaddr;
-	bus_size_t sc_apsize;
-	bus_dma_tag_t sc_dmat;
-	struct lock sc_lock;		/* lock for access to GATT */
-	pcitag_t sc_pcitag;		/* PCI tag, in case we need it. */
-	pcireg_t sc_id;
-	pci_chipset_tag_t sc_pc;
-
-	struct agp_methods *sc_methods;
-	void	*sc_chipc;		/* chipset-dependent state */
-
-	int sc_opened;
-	int sc_capoff;			
-	int sc_apflags;
-	int sc_nextid;	/* next memory block id */
-
-	u_int32_t		sc_maxmem;	/* allocation upper bound */
-	u_int32_t		sc_allocated;	/* amount allocated */
-	enum agp_acquire_state	sc_state;
-	struct agp_memory_list	sc_memory;	/* list of allocated memory */
-#endif
 };
 
-#ifdef PCIAGP
-struct agp_product {
-	int	ap_vendor;
-	int	ap_product;
-	int	(*ap_attach)(struct vga_pci_softc *,
-		     struct pci_attach_args *, struct pci_attach_args *);
-};
-/* MD-defined */
-extern const struct agp_product agp_products[];
-
-void agp_attach(struct device *, struct device *, void *);
-paddr_t agp_mmap(void *, off_t, int);
-int agp_ioctl(void *, u_long, caddr_t, int, struct proc *);
-#endif /* PCIAGP */
-
 int vga_pci_cnattach(bus_space_tag_t, bus_space_tag_t,
 			  pci_chipset_tag_t, int, int, int);