diff options
| -rw-r--r-- | sys/pccard/pcic.c | 9 | ||||
| -rw-r--r-- | sys/pccard/pcicvar.h | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index f4ba817..6208bd7 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -887,15 +887,20 @@ pcic_get_res_flags(device_t bus, device_t child, int restype, int rid, } int -pcic_set_memory_offset(device_t bus, device_t child, int rid, u_int32_t offset, - u_int32_t *deltap) +pcic_set_memory_offset(device_t bus, device_t child, int rid, u_int32_t offset +#if __FreeBSD_version >= 500000 + ,u_int32_t *deltap +#endif + ) { struct pccard_devinfo *devi = device_get_ivars(child); struct mem_desc *mp = &devi->slt->mem[rid]; mp->card = offset; +#if __FreeBSD_version >= 500000 if (deltap) *deltap = 0; /* XXX BAD XXX */ +#endif return (pcic_memory(devi->slt, rid)); } diff --git a/sys/pccard/pcicvar.h b/sys/pccard/pcicvar.h index bd591e7..185e9a7 100644 --- a/sys/pccard/pcicvar.h +++ b/sys/pccard/pcicvar.h @@ -92,7 +92,11 @@ driver_intr_t pcic_isa_intr; int pcic_isa_intr1(void *); void pcic_putb_io(struct pcic_slot *sp, int reg, unsigned char val); int pcic_set_memory_offset(device_t bus, device_t child, int rid, - u_int32_t offset, u_int32_t *deltap); + u_int32_t offset +#if __FreeBSD_version >= 500000 + , u_int32_t *deltap +#endif + ); int pcic_set_res_flags(device_t bus, device_t child, int restype, int rid, u_long value); void pcic_setb(struct pcic_slot *sp, int reg, unsigned char mask); |
