My fix to NEWCARD for getting the function type broke oldcard due to

a name conflict.

Pointed out by: markm

# I had to login to freefall to make this commit, so something maybe up
This commit is contained in:
imp 2001-04-21 14:10:32 +00:00
parent 60fe15c90d
commit 0e21a77975

View File

@ -319,7 +319,7 @@ pccard_get_memory_offset(device_t bus, device_t child, int rid,
}
static int
pccard_get_function(device_t bus, device_t child, int *function)
pccard_get_function_num(device_t bus, device_t child, int *function)
{
*function = 0;
return (0);
@ -373,7 +373,7 @@ static device_method_t pccard_methods[] = {
DEVMETHOD(card_get_res_flags, pccard_get_res_flags),
DEVMETHOD(card_set_memory_offset, pccard_set_memory_offset),
DEVMETHOD(card_get_memory_offset, pccard_get_memory_offset),
DEVMETHOD(card_get_function, pccard_get_function),
DEVMETHOD(card_get_function, pccard_get_function_num),
DEVMETHOD(card_activate_function, pccard_activate_function),
DEVMETHOD(card_deactivate_function, pccard_deactivate_function),
DEVMETHOD(card_compat_do_probe, pccard_compat_do_probe),