Checkpoint of today's changes. We now get to the point where the pccard

layer is trying to access the now unexistant chip functions.
o Added DEVPRINTF which is like DPRINTF only calls device_printf.
o Made it possible to define PCICDEBUG
o Remove ph_parent and use the softc pointer sc instead in pcic_handle.
o Remove all references to dv_xname
o Add some debug messages.
o enable MI attach/detach calling for pccard.
o convert pcic_chip_socket_{en,dis}able to pcic_{dis,en}able_socket
  and connect them to the power_{enable,disbale}_socket.
o Remove pccard pointer from pcic_softc.
o GC some unused pccard functions.
o Convert pccard_chip_socket* to POWER_ENABLE_SOCKET
o kill pccard_attach_args.
o power_if.m updates.  More to come.

1 files changed, 3 insertions, 9 deletions

diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index e6ad7d3..b454296 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -172,11 +172,12 @@ struct pccard_softc {
 	pccard_chipset_tag_t pct;
 	pccard_chipset_handle_t pch;
 
+	device_t		dev;
+
 	/* this stuff is for the card */
 	struct pccard_card card;
 	void		*ih;
-	int		sc_enabled_count;	/* how many functions are
-						   enabled */
+	int		sc_enabled_count;	/* num functions enabled */
 
 	/*
 	 * These are passed down from the PCCARD chip, and exist only
@@ -198,13 +199,6 @@ struct pccard_cis_quirk {
 	struct pccard_config_entry *cfe;
 };
 
-struct pccard_attach_args {
-	int32_t manufacturer;
-	int32_t product;
-	struct pccard_card *card;
-	struct pccard_function *pf;
-};
-
 struct pccard_tuple {
 	unsigned int	code;
 	unsigned int	length;