d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from stable (which seems to have been spammed at some point in current):

Browse Source 
#ifdef the deltap pcic_set_memory_offset argument so that raylink
driver works.
This commit is contained in:
Warner Losh 2001-08-14 23:34:09 +00:00
parent a547ba9cce
commit dc2e861bdb
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/pccard/pcic.c
View File

@ -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));
}

6
sys/pccard/pcicvar.h
View File

@ -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);