o Get rid of static array of slots in pccard layer. Move this to the

  softc.
o Store pointers to softc in dev_t in si_drv1.
o Change 'kludge version' to 'classic version' since things are getting less
  kludgy.
o Minor code shuffling so that we probe and attach the pccard slots.
o Minor style(9) changes.

1 files changed, 6 insertions, 1 deletions

diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h
index 0b95444..c8034e5 100644
--- a/sys/pccard/slot.h
+++ b/sys/pccard/slot.h
@@ -120,11 +120,16 @@ struct slot {
 	struct slot_ctrl *ctrl;		/* Per-controller data */
 	void		*cdata;		/* Controller specific data */
 	int		pwr_off_pending;/* Power status of slot */
+	device_t	dev;		/* Config system device. */
+	dev_t		d;		/* fs device */
 };
 
+#define PCCARD_DEVICE2SOFTC(d)	((struct slot *) device_get_softc(d))
+#define PCCARD_DEV2SOFTC(d)	((struct slot *) (d)->si_drv1)
+
 enum card_event { card_removed, card_inserted };
 
-struct slot	*pccard_alloc_slot(struct slot_ctrl *);
+struct slot	*pccard_init_slot(device_t, struct slot_ctrl *);
 void		 pccard_event(struct slot *, enum card_event);
 int		 pccard_suspend(device_t);
 int		 pccard_resume(device_t);