o Now that I've had time to test the new interface, reintegrate it back in.

o Fix OLDCARD to use the new interface.
o Rename the offsetp argument to deltap to more closely reflect what it
  is returning (it returns the delta from the requested value to the actual
  value).
o Remove duplicate $FreeBSD$ in pccbb.c
o Allow deltap to be NULL.
o Convert new isa pcic driver and add XXX comments that this function isn't
  actually implemented there (which means that NEWCARD pccard stuff won't
  work there until it is).
o Revert attempts to make old inferface work in NEWCARD.

Subitted by: peter (Parts of the new version code)

2 files changed, 5 insertions, 3 deletions

diff --git a/sys/dev/pcic/i82365.c b/sys/dev/pcic/i82365.c
index 8d8219d..eeb0304 100644
--- a/sys/dev/pcic/i82365.c
+++ b/sys/dev/pcic/i82365.c
@@ -1471,9 +1471,11 @@ pcic_set_res_flags(device_t dev, device_t child, int type, int rid,
 }
 
 int
-pcic_set_memory_offset(device_t dev, device_t child, int rid, u_int32_t offset)
+pcic_set_memory_offset(device_t dev, device_t child, int rid, u_int32_t offset,
+    u_int32_t *deltap)
 {
-	return 0;
+	/* XXX BAD XXX */
+	return EIO;
 }
 
 static void
diff --git a/sys/dev/pcic/i82365var.h b/sys/dev/pcic/i82365var.h
index b87f958..1d6ce09 100644
--- a/sys/dev/pcic/i82365var.h
+++ b/sys/dev/pcic/i82365var.h
@@ -163,6 +163,6 @@ int pcic_disable_socket(device_t dev, device_t child);
 int pcic_set_res_flags(device_t dev, device_t child, int type, int rid, 
     u_int32_t flags);
 int pcic_set_memory_offset(device_t dev, device_t child, int rid,
-    u_int32_t offset);
+    u_int32_t offset, u_int32_t *deltap);
 
 #define PCIC_SOFTC(d) (struct pcic_softc *) device_get_softc(d)