diff options
| author | imp <imp@FreeBSD.org> | 2001-01-07 16:31:09 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-01-07 16:31:09 +0000 |
| commit | c64a2be70fb083f28ff734c23b53a9d6d264e808 (patch) | |
| tree | bde7ab282a3b36cdf8309a3774fdb016367fb677 /sys/dev/pccard | |
| parent | eef51d569a6dd444550e78d6c2ae6c04a585ce03 (diff) | |
| download | FreeBSD-src-c64a2be70fb083f28ff734c23b53a9d6d264e808.zip FreeBSD-src-c64a2be70fb083f28ff734c23b53a9d6d264e808.tar.gz | |
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)
Diffstat (limited to 'sys/dev/pccard')
| -rw-r--r-- | sys/dev/pccard/card_if.m | 1 | ||||
| -rw-r--r-- | sys/dev/pccard/pccard.c | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m index 7952b86..621a041 100644 --- a/sys/dev/pccard/card_if.m +++ b/sys/dev/pccard/card_if.m @@ -64,6 +64,7 @@ METHOD int set_memory_offset { device_t child; int rid; u_int32_t cardaddr; + u_int32_t *deltap; } METHOD int get_memory_offset { diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index efa170e..2de5db0 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -391,7 +391,6 @@ pccard_function_enable(struct pccard_function *pf) struct pccard_function *tmp; int reg; device_t dev = pf->sc->dev; - uint32_t addr; if (pf->cfe == NULL) { DEVPRVERBOSE((dev, "No config entry could be allocated.\n")); @@ -450,10 +449,7 @@ pccard_function_enable(struct pccard_function *pf) CARD_SET_RES_FLAGS(device_get_parent(dev), dev, SYS_RES_MEMORY, pf->ccr_rid, PCCARD_A_MEM_ATTR); CARD_SET_MEMORY_OFFSET(device_get_parent(dev), dev, - pf->ccr_rid, pf->ccr_base); - CARD_GET_MEMORY_OFFSET(device_get_parent(dev), dev, - pf->ccr_rid, &addr); - pf->pf_ccr_offset = pf->ccr_base - addr; + pf->ccr_rid, pf->ccr_base, &pf->pf_ccr_offset); pf->pf_ccrt = rman_get_bustag(pf->ccr_res); pf->pf_ccrh = rman_get_bushandle(pf->ccr_res); pf->pf_ccr_realsize = 1; @@ -841,11 +837,11 @@ pccard_set_res_flags(device_t dev, device_t child, int type, int rid, static int pccard_set_memory_offset(device_t dev, 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(dev), child, rid, - offset); + offset, deltap); } static int |
