Next step on the road to pci: power taming.

Work through the various power commands and convert them from a "is
this a foo controller or a foo' controller or a foo''' controller" to
a cabability based scheme.  We have bits in the softc that tell us
what kind of power control scheme the controller uses, rather than
relying on being able to enumerate them all.  Cardbus bridges are
numerous, but nearly all implement the i82365sl-DF scheme (well, a few
implement cirrus CL-PD67xx, but those were made by Cirrus Logic!).

Add a pointer back to the softc in each pcic_slot so we can access
these flags.

Add comments that talk about the issues here.  Also note in passing
that there are two differ Vpp schemes in use and that we may need to
adjust the code to deal with both of them.  Note why it usually works
now.

We have 5 power management modes right now: KING, AB, DF, PD and VG.
AB is for the i82365 stpes A, B and C.  DF is for step DF.  PD is the
cirrus logic extensions for 3.3V while VG is the VADEM extensions for
3.3V.  KING is for the IBM KING controller found on some old cards.
# I'm looking for one of those old cards or a laptop that has the KING
# bridge in it.

We have to still cheat and treat the AB parts like the DF parts
because pci isn't here yet.  As far as I can tell, this is harmless
for actual old parts and necessary to work with 3.3V cards in some
laptops.

This almost eliminates all tests for controller in the code.  There
are still a few unrelated to power that need taming as well.

1 files changed, 8 insertions, 2 deletions

diff --git a/sys/pccard/pcicvar.h b/sys/pccard/pcicvar.h
index 2f46014..1f2329d 100644
--- a/sys/pccard/pcicvar.h
+++ b/sys/pccard/pcicvar.h
@@ -34,6 +34,7 @@ struct pcic_slot {
 	char controller;		/* Device type */
 	char revision;			/* Device Revision */
 	struct slot *slt;		/* Back ptr to slot */
+	struct pcic_softc *sc;		/* Back pointer to softc */
 	u_char (*getb)(struct pcic_slot *, int);
 	void   (*putb)(struct pcic_slot *, int, u_char);
 	u_char	*regs;			/* Pointer to regs in mem */
@@ -43,8 +44,13 @@ struct pcic_softc
 {
 	u_int32_t		slotmask;	/* Mask of valid slots */
 	u_int32_t		flags;		/* Interesting flags */
-#define PCIC_IO_MAPPED	0x00000001
-#define PCIC_MEM_MAPPED	0x00000002
+#define PCIC_IO_MAPPED	0x00000001	/* ExCA registers are io mapped */
+#define PCIC_MEM_MAPPED	0x00000002	/* ExCA registers mem mapped */
+#define	PCIC_VG_POWER	0x00000004	/* Uses VG power regs */
+#define PCIC_DF_POWER	0x00000008	/* Uses DF step regs  */
+#define PCIC_PD_POWER	0x00000010	/* Uses CL-PD regs  */
+#define PCIC_KING_POWER	0x00000020	/* Uses IBM KING regs  */
+#define PCIC_AB_POWER	0x00000040	/* Use old A/B step power */
 	int			iorid;		/* Rid of I/O region */
 	struct resource 	*iores;		/* resource for I/O region */
 	int			memrid;