diff options
| author | imp <imp@FreeBSD.org> | 2000-10-07 05:48:51 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2000-10-07 05:48:51 +0000 |
| commit | fec7b6855326595cba2825f4cadf0ca5de3f6048 (patch) | |
| tree | 362fd892ae0eab30fd58c188c3b814239ab8e916 /sys | |
| parent | 6830d0499df990ae08469ceac484d33526212d09 (diff) | |
| download | FreeBSD-src-fec7b6855326595cba2825f4cadf0ca5de3f6048.zip FreeBSD-src-fec7b6855326595cba2825f4cadf0ca5de3f6048.tar.gz | |
o Implement get_ivars so matching routines will work (this causes
compat probe routines to work).
o Have a null driver_added routines. We need to be careful about probing
until after we know we have a card. For the moment, we do nothing
(which is safe). This fixes a panic when a driver is loaded w/o a
card in the slot.
XXX still need to fix the resource list code. It is totally busted and
XXX causes a panic in the child printing routine after the probe has
XXX succeeded.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pccard/pccard.c | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 4b71b16..20d9254 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -160,7 +160,6 @@ pccard_attach_card(device_t dev) * */ device_printf(dev, "Starting to attach....\n"); - /* XXX Need ivars XXXimpXXX */ ivar = malloc(sizeof(struct pccard_ivar), M_DEVBUF, M_WAITOK); child = device_add_child(dev, NULL, -1); device_set_ivars(child, ivar); @@ -739,10 +738,46 @@ pccard_set_memory_offset(device_t dev, device_t child, int rid, static int pccard_read_ivar(device_t bus, device_t child, int which, u_char *result) { + struct pccard_ivar *devi = (struct pccard_ivar *) device_get_ivars(child); + struct pccard_function *func = devi->fcn; + struct pccard_softc *sc = PCCARD_SOFTC(bus); + /* PCCARD_IVAR_ETHADDR unhandled from oldcard */ - return ENOENT; + switch (which) { + default: + case PCCARD_IVAR_ETHADDR: + return (ENOENT); + break; + case PCCARD_IVAR_VENDOR: + *(u_int32_t *) result = sc->card.manufacturer; + break; + case PCCARD_IVAR_PRODUCT: + *(u_int32_t *) result = sc->card.product; + break; + case PCCARD_IVAR_FUNCTION_NUMBER: + /* XXX imp XXX */ + /* *(u_int32_t *) result = func->number; */ + *(u_int32_t *) result = 0; + break; + case PCCARD_IVAR_VENDOR_STR: + *(char **) result = sc->card.cis1_info[0]; + break; + case PCCARD_IVAR_PRODUCT_STR: + *(char **) result = sc->card.cis1_info[1]; + break; + case PCCARD_IVAR_CIS3_STR: + *(char **) result = sc->card.cis1_info[2]; + break; + } + return (0); } +static void +pccard_driver_added(device_t dev, driver_t *driver) +{ + /* XXX eventually we need to attach stuff when we know we */ + /* XXX have kids. */ +} static device_method_t pccard_methods[] = { /* Device interface */ @@ -755,7 +790,7 @@ static device_method_t pccard_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, pccard_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), + DEVMETHOD(bus_driver_added, pccard_driver_added), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), |
