From c64a2be70fb083f28ff734c23b53a9d6d264e808 Mon Sep 17 00:00:00 2001 From: imp Date: Sun, 7 Jan 2001 16:31:09 +0000 Subject: 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) --- sys/dev/ray/if_ray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/ray') diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c index e81cd43..7f35cb2 100644 --- a/sys/dev/ray/if_ray.c +++ b/sys/dev/ray/if_ray.c @@ -3366,7 +3366,7 @@ ray_res_alloc_am(struct ray_softc *sc) RAY_PRINTF(sc, "fixing up AM card address from 0x%x to 0x0", offset); error = CARD_SET_MEMORY_OFFSET(device_get_parent(sc->dev), - sc->dev, sc->am_rid, 0); + sc->dev, sc->am_rid, 0, NULL); if (error) { RAY_PRINTF(sc, "CARD_SET_MEMORY_OFFSET returned 0x%0x", error); @@ -3454,7 +3454,7 @@ ray_res_alloc_cm(struct ray_softc *sc) RAY_PRINTF(sc, "fixing up CM card address from 0x%x to 0x0", offset); error = CARD_SET_MEMORY_OFFSET(device_get_parent(sc->dev), - sc->dev, sc->cm_rid, 0); + sc->dev, sc->cm_rid, 0, NULL); if (error) { RAY_PRINTF(sc, "CARD_SET_MEMORY_OFFSET returned 0x%0x", error); -- cgit v1.1