Deleted Added
full compact
ata-pci.h (224270) ata-pci.h (226680)
1/*-
2 * Copyright (c) 2003 - 2008 S�ren Schmidt <sos@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2003 - 2008 S�ren Schmidt <sos@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/ata/ata-pci.h 224270 2011-07-22 16:37:04Z mav $
26 * $FreeBSD: head/sys/dev/ata/ata-pci.h 226680 2011-10-24 08:47:23Z mav $
27 */
28
29/* structure holding chipset config info */
30struct ata_chip_id {
31 u_int32_t chipid;
32 u_int8_t chiprev;
33 int cfg1;
34 int cfg2;

--- 509 unchanged lines hidden (view full) ---

544int ata_pci_detach(device_t dev);
545int ata_pci_suspend(device_t dev);
546int ata_pci_resume(device_t dev);
547int ata_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result);
548int ata_pci_write_ivar(device_t dev, device_t child, int which, uintptr_t value);
549uint32_t ata_pci_read_config(device_t dev, device_t child, int reg, int width);
550void ata_pci_write_config(device_t dev, device_t child, int reg,
551 uint32_t val, int width);
27 */
28
29/* structure holding chipset config info */
30struct ata_chip_id {
31 u_int32_t chipid;
32 u_int8_t chiprev;
33 int cfg1;
34 int cfg2;

--- 509 unchanged lines hidden (view full) ---

544int ata_pci_detach(device_t dev);
545int ata_pci_suspend(device_t dev);
546int ata_pci_resume(device_t dev);
547int ata_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result);
548int ata_pci_write_ivar(device_t dev, device_t child, int which, uintptr_t value);
549uint32_t ata_pci_read_config(device_t dev, device_t child, int reg, int width);
550void ata_pci_write_config(device_t dev, device_t child, int reg,
551 uint32_t val, int width);
552int ata_pci_print_child(device_t dev, device_t child);
552int ata_pci_child_location_str(device_t dev, device_t child, char *buf,
553 size_t buflen);
554struct resource * ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
555int ata_pci_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r);
556int 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);
557 int ata_pci_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie);
558int ata_pci_ch_attach(device_t dev);
559int ata_pci_ch_detach(device_t dev);

--- 36 unchanged lines hidden (view full) ---

596 DEVMETHOD(bus_alloc_resource, ata_pci_alloc_resource), \
597 DEVMETHOD(bus_release_resource, ata_pci_release_resource), \
598 DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), \
599 DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), \
600 DEVMETHOD(bus_setup_intr, ata_pci_setup_intr), \
601 DEVMETHOD(bus_teardown_intr, ata_pci_teardown_intr), \
602 DEVMETHOD(pci_read_config, ata_pci_read_config), \
603 DEVMETHOD(pci_write_config, ata_pci_write_config), \
553int ata_pci_child_location_str(device_t dev, device_t child, char *buf,
554 size_t buflen);
555struct resource * ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
556int ata_pci_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r);
557int 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);
558 int ata_pci_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie);
559int ata_pci_ch_attach(device_t dev);
560int ata_pci_ch_detach(device_t dev);

--- 36 unchanged lines hidden (view full) ---

597 DEVMETHOD(bus_alloc_resource, ata_pci_alloc_resource), \
598 DEVMETHOD(bus_release_resource, ata_pci_release_resource), \
599 DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), \
600 DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), \
601 DEVMETHOD(bus_setup_intr, ata_pci_setup_intr), \
602 DEVMETHOD(bus_teardown_intr, ata_pci_teardown_intr), \
603 DEVMETHOD(pci_read_config, ata_pci_read_config), \
604 DEVMETHOD(pci_write_config, ata_pci_write_config), \
605 DEVMETHOD(bus_print_child, ata_pci_print_child), \
604 DEVMETHOD(bus_child_location_str, ata_pci_child_location_str), \
605 { 0, 0 } \
606}; \
607static driver_t __CONCAT(dname,_driver) = { \
608 "atapci", \
609 __CONCAT(dname,_methods), \
610 sizeof(struct ata_pci_controller) \
611}; \
612DRIVER_MODULE(dname, pci, __CONCAT(dname,_driver), ata_pci_devclass, 0, 0); \
613MODULE_VERSION(dname, 1); \
614MODULE_DEPEND(dname, ata, 1, 1, 1); \
615MODULE_DEPEND(dname, atapci, 1, 1, 1);
616
606 DEVMETHOD(bus_child_location_str, ata_pci_child_location_str), \
607 { 0, 0 } \
608}; \
609static driver_t __CONCAT(dname,_driver) = { \
610 "atapci", \
611 __CONCAT(dname,_methods), \
612 sizeof(struct ata_pci_controller) \
613}; \
614DRIVER_MODULE(dname, pci, __CONCAT(dname,_driver), ata_pci_devclass, 0, 0); \
615MODULE_VERSION(dname, 1); \
616MODULE_DEPEND(dname, ata, 1, 1, 1); \
617MODULE_DEPEND(dname, atapci, 1, 1, 1);
618