Reorganize the attachement point for pcic (it was unattached and

floating before).  Attach pccard devices to pcic, one per slot
(although this may change to one per pcic).  pcic is now attached to
isa (to act as a bridge) and pccard is attached to pcic, cbb and
pc98ic (the last two are card bus bridge and the pc98ic version of
pcic, neither of which are in the tree yet).  Move pccard compat code
into pccard/pccard_compat.c.

THIS REQUIRES A CONFIG FILE CHANGE.  You must change your pcic/card
entries to be:
# PCCARD (PCMCIA) support
controller	pcic0	at isa?
controller	pcic1	at isa?
controller	card0

The old system was upside down and this corrects that problem.  It
will make it easier to add support for YENTA pccard/card bus bridges.

Much more cleanup needs to happen before newbus devices can have
pccard attachments.  My previous commit's comments were premature.

1 files changed, 0 insertions, 1 deletions

diff --git a/sys/pccard/driver.h b/sys/pccard/driver.h
index 31711d5..4f1ae15 100644
--- a/sys/pccard/driver.h
+++ b/sys/pccard/driver.h
@@ -17,7 +17,6 @@ int	pccard_alloc_intr __P((u_int imask, ointhand2_t *hand, int unit,
 			       u_int *maskp, u_int *pcic_imask));
 #endif
 void	pccard_remove_driver __P((struct pccard_device *));
-int	pcic_probe __P((void));	/* XXX should be linker set */
 
 enum beepstate { BEEP_ON, BEEP_OFF };