diff options
| author | mav <mav@FreeBSD.org> | 2009-02-18 22:17:48 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2009-02-18 22:17:48 +0000 |
| commit | f10246717a6419e9755a0fbdd0a21da8b769c8f9 (patch) | |
| tree | c51d12167c13be63889b1950e54f936d14b2ba41 /sys/dev/ata/ata-pci.h | |
| parent | bf75b4612ae760eeef7dbe0b2544c2532419caac (diff) | |
| download | FreeBSD-src-f10246717a6419e9755a0fbdd0a21da8b769c8f9.zip FreeBSD-src-f10246717a6419e9755a0fbdd0a21da8b769c8f9.tar.gz | |
As soon as they called in only same one place (ata_pcichannel_attach()),
join allocate() and dmainit() atapci subdriver's channel initialization
methods into single ch_attach() method.
As opposite to ch_attach() add new ch_detach() method to deallocate/disable
channel.
Diffstat (limited to 'sys/dev/ata/ata-pci.h')
| -rw-r--r-- | sys/dev/ata/ata-pci.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h index bd5104f..0ed0169 100644 --- a/sys/dev/ata/ata-pci.h +++ b/sys/dev/ata/ata-pci.h @@ -55,10 +55,10 @@ struct ata_pci_controller { int (*chipinit)(device_t); int (*suspend)(device_t); int (*resume)(device_t); - int (*allocate)(device_t); + int (*ch_attach)(device_t); + int (*ch_detach)(device_t); int (*locking)(device_t, int); void (*reset)(device_t); - void (*dmainit)(device_t); void (*setmode)(device_t, int); struct { void (*function)(void *); @@ -409,7 +409,7 @@ struct resource * ata_pci_alloc_resource(device_t dev, device_t child, int type, int ata_pci_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r); int ata_pci_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filter, driver_intr_t *function, void *argument, void **cookiep); int ata_pci_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie); -int ata_pci_allocate(device_t dev); +int ata_pci_ch_attach(device_t dev); int ata_pci_status(device_t dev); void ata_pci_hw(device_t dev); void ata_pci_dmainit(device_t dev); @@ -434,7 +434,7 @@ void ata_pm_identify(device_t dev); /* global prototypes from chipsets/ata-*.c */ int ata_ahci_chipinit(device_t); -int ata_ahci_allocate(device_t dev); +int ata_ahci_ch_attach(device_t dev); void ata_ahci_reset(device_t dev); void ata_ahci_dmainit(device_t dev); int ata_marvell_edma_chipinit(device_t); |
