===================================================================
RCS file: /cvs/sys/arch/arm/sa11x0/sa11x1_pcic.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sys/arch/arm/sa11x0/sa11x1_pcic.c	2008/03/04 16:05:17	1.1.1.1
+++ sys/arch/arm/sa11x0/sa11x1_pcic.c	2008/05/11 10:26:11	1.2
@@ -37,7 +37,6 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x1_pcic.c,v 1.16 2007/10/17 19:53:43 garbled Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,6 +47,7 @@
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 
 #include <machine/bus.h>
 
@@ -56,15 +56,23 @@
 #include <arm/sa11x0/sa11x0_reg.h>
 #include <arm/sa11x0/sa11x0_var.h>
 #include <arm/sa11x0/sa1111_reg.h>
-#include <arm/sa11x0/sa1111_var.h>
+#include <arm/sa11x0/sa11x1_var.h>
 #include <arm/sa11x0/sa11x1_pcicreg.h>
 #include <arm/sa11x0/sa11xx_pcicvar.h>
 #include <arm/sa11x0/sa11x1_pcicvar.h>
+#include <arm/sa11x0/sa1111_intr.h>
 
-#include "sacpcic.h"
+//#include "sacpcic.h"
 
 static int	sacpcic_print(void *, const char *);
 
+struct cfdriver	sacpcic_cd = {
+	NULL,
+	"sacpcic",
+	DV_DULL
+};
+
+
 void
 sacpcic_attach_common(struct sacc_softc *psc, struct sacpcic_softc *sc,
     void *aux, void (* socket_setup_hook)(struct sapcic_socket *))
@@ -72,9 +80,9 @@
 	int i;
 	struct pcmciabus_attach_args paa;
 
-	printf("\n");
+	printf(": SA-11x1 CF/PCMCIA controller\n");
 
-	sc->sc_pc.sc_iot = psc->sc_iot;
+	sc->sc_pc.sc_iot = psc->sc_bust;
 	sc->sc_ioh = psc->sc_ioh;
 
 	for (i = 0; i < 2; i++) {
@@ -82,7 +90,7 @@
 		sc->sc_socket[i].socket = i;
 		sc->sc_socket[i].pcictag_cookie = psc;
 		sc->sc_socket[i].pcictag = NULL;
-		sc->sc_socket[i].event_thread = NULL;
+//		sc->sc_socket[i].event_thread = NULL;
 		sc->sc_socket[i].event = 0;
 		sc->sc_socket[i].laststatus = SAPCIC_CARD_INVALID;
 		sc->sc_socket[i].shutdown = 0;
@@ -96,13 +104,10 @@
 		paa.iosize = 0x4000000;
 
 		sc->sc_socket[i].pcmcia =
-		    config_found_ia(&sc->sc_pc.sc_dev, "pcmciabus", &paa,
+		    config_found(&sc->sc_pc.sc_dev, &paa,
 				    sacpcic_print);
 
-		sacc_intr_establish((sacc_chipset_tag_t)psc,
-				    i ? IRQ_S1_CDVALID : IRQ_S0_CDVALID,
-				    IST_EDGE_RAISE, IPL_BIO, sapcic_intr,
-				    &sc->sc_socket[i]);
+//		sa11x1_intr_establish(i ? IRQ_S1_CDVALID : IRQ_S0_CDVALID, IST_EDGE_RISING, sapcic_intr, &sc->sc_socket[i], "sapcicsock");
 
 		/* create kthread */
 		sapcic_kthread_create(&sc->sc_socket[i]);
@@ -218,12 +223,12 @@
 	int irq;
 
 	irq = so->socket ? IRQ_S1_READY : IRQ_S0_READY;
-	return sacc_intr_establish((sacc_chipset_tag_t)so->pcictag_cookie, irq,
-				    IST_EDGE_FALL, level, ih_fun, ih_arg);
+//	return sa11x1_intr_establish(irq, IST_EDGE_FALLING, ih_fun, ih_arg, "sapcicchil");
+	return NULL;
 }
 
 void
 sacpcic_intr_disestablish(struct sapcic_socket *so, void *ih)
 {
-	sacc_intr_disestablish((sacc_chipset_tag_t)so->pcictag_cookie, ih);
+	sa11x1_intr_disestablish(ih);
 }