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)

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c
index 2d951f02a24a..40cb7d8a0311 100644
--- a/sys/pccard/pccard_nbk.c
+++ b/sys/pccard/pccard_nbk.c
@@ -305,10 +305,10 @@ pccard_get_res_flags(device_t bus, device_t child, int restype, int rid,
 
 static int
 pccard_set_memory_offset(device_t bus, device_t child, int rid, 
-    u_int32_t offset)
+    u_int32_t offset, u_int32_t *deltap)
 {
 	return CARD_SET_MEMORY_OFFSET(device_get_parent(bus), child, rid,
-	    offset);
+	    offset, deltap);
 }
 
 static int