diff options
| author | Warner Losh <imp@FreeBSD.org> | 2001-01-07 16:31:09 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2001-01-07 16:31:09 +0000 |
| commit | 486d464d74f6eae01b67011ee8b84c1e3b652c1b (patch) | |
| tree | 4a06bb96014471074a2810a29a5ac795a71c6f95 /sys/pccard | |
| parent | 568ffd8885481391ba86d3dab36e772ea2caef4a (diff) | |
Notes
Diffstat (limited to 'sys/pccard')
| -rw-r--r-- | sys/pccard/pccard_nbk.c | 4 | ||||
| -rw-r--r-- | sys/pccard/pcic.c | 7 |
2 files changed, 7 insertions, 4 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 diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index 8b5c9344421a..4cc58cb33427 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -83,6 +83,7 @@ static struct pcic_slot { static struct slot_ctrl cinfo; static struct isa_pnp_id pcic_ids[] = { + {0x65374d24, NULL}, /* IBM3765 */ {PCIC_PNP_82365, NULL}, /* PNP0E00 */ {PCIC_PNP_CL_PD6720, NULL}, /* PNP0E01 */ {PCIC_PNP_VLSI_82C146, NULL}, /* PNP0E02 */ @@ -977,13 +978,15 @@ pcic_get_res_flags(device_t bus, device_t child, int restype, int rid, } static int -pcic_set_memory_offset(device_t bus, device_t child, int rid, u_int32_t offset) +pcic_set_memory_offset(device_t bus, device_t child, int rid, u_int32_t offset, + u_int32_t *deltap) { struct pccard_devinfo *devi = device_get_ivars(child); struct mem_desc *mp = &devi->slt->mem[rid]; mp->card = offset; - + if (deltap) + *deltap = 0; /* XXX BAD XXX */ return (pcic_memory(devi->slt, rid)); } |
