diff options
author | mdodd <mdodd@FreeBSD.org> | 2000-11-28 07:12:12 +0000 |
---|---|---|
committer | mdodd <mdodd@FreeBSD.org> | 2000-11-28 07:12:12 +0000 |
commit | 2237cef468cf9c99eb0c6c524f18cbfac9dd25ec (patch) | |
tree | ae581c9e5eb71fb22bf905c736f1f49e2ede5e2c /sys/pci/pci.c | |
parent | c18bb8265fc410ac05ce1f9a0a0cc5f344463f16 (diff) | |
download | FreeBSD-src-2237cef468cf9c99eb0c6c524f18cbfac9dd25ec.zip FreeBSD-src-2237cef468cf9c99eb0c6c524f18cbfac9dd25ec.tar.gz |
Reduce code duplication by using the GET_RESOURCE_LIST bus method and related
generic resource_list management functions.
I'll deal with the EISA bits later.
Not objected to by: new-bus
Diffstat (limited to 'sys/pci/pci.c')
-rw-r--r-- | sys/pci/pci.c | 63 |
1 files changed, 18 insertions, 45 deletions
diff --git a/sys/pci/pci.c b/sys/pci/pci.c index d35bc86..2e5b9c5 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -1327,51 +1327,22 @@ pci_alloc_resource(device_t dev, device_t child, int type, int *rid, start, end, count, flags); } -static int -pci_release_resource(device_t dev, device_t child, int type, int rid, - struct resource *r) -{ - struct pci_devinfo *dinfo = device_get_ivars(child); - struct resource_list *rl = &dinfo->resources; - - return resource_list_release(rl, dev, child, type, rid, r); -} - -static int -pci_set_resource(device_t dev, device_t child, int type, int rid, - u_long start, u_long count) +static void +pci_delete_resource(device_t dev, device_t child, int type, int rid) { - struct pci_devinfo *dinfo = device_get_ivars(child); - struct resource_list *rl = &dinfo->resources; - - resource_list_add(rl, type, rid, start, start + count - 1, count); - return 0; + printf("pci_delete_resource: PCI resources can not be deleted\n"); } -static int -pci_get_resource(device_t dev, device_t child, int type, int rid, - u_long *startp, u_long *countp) +static struct resource_list * +pci_get_resource_list (device_t dev, device_t child) { - struct pci_devinfo *dinfo = device_get_ivars(child); - struct resource_list *rl = &dinfo->resources; - struct resource_list_entry *rle; + struct pci_devinfo * dinfo = device_get_ivars(child); + struct resource_list * rl = &dinfo->resources; - rle = resource_list_find(rl, type, rid); - if (!rle) - return ENOENT; - - if (startp) - *startp = rle->start; - if (countp) - *countp = rle->count; - - return 0; -} + if (!rl) + return (NULL); -static void -pci_delete_resource(device_t dev, device_t child, int type, int rid) -{ - printf("pci_delete_resource: PCI resources can not be deleted\n"); + return (rl); } static u_int32_t @@ -1426,15 +1397,17 @@ static device_method_t pci_methods[] = { DEVMETHOD(bus_read_ivar, pci_read_ivar), DEVMETHOD(bus_write_ivar, pci_write_ivar), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - DEVMETHOD(bus_alloc_resource, pci_alloc_resource), - DEVMETHOD(bus_release_resource, pci_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - DEVMETHOD(bus_set_resource, pci_set_resource), - DEVMETHOD(bus_get_resource, pci_get_resource), + + DEVMETHOD(bus_get_resource_list,pci_get_resource_list), + DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), + DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_delete_resource, pci_delete_resource), + DEVMETHOD(bus_alloc_resource, pci_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), /* PCI interface */ DEVMETHOD(pci_read_config, pci_read_config_method), |