diff options
| author | marius <marius@FreeBSD.org> | 2012-03-21 16:59:39 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2012-03-21 16:59:39 +0000 |
| commit | cc444f6cf55f23db4d16615150883d872ffb5bd2 (patch) | |
| tree | ecf4732c0a19395313044e11b9f3ed72b03a4eea /sys/dev/ata/ata-pci.h | |
| parent | 20d817657d8db6ea88d3c8f0ab6ea12ee1a7934d (diff) | |
| download | FreeBSD-src-cc444f6cf55f23db4d16615150883d872ffb5bd2.zip FreeBSD-src-cc444f6cf55f23db4d16615150883d872ffb5bd2.tar.gz | |
- First pass at const'ifying ata(4) as appropriate.
- Use DEVMETHOD_END.
- Use NULL instead of 0 for pointers
MFC after: 1 week
Diffstat (limited to 'sys/dev/ata/ata-pci.h')
| -rw-r--r-- | sys/dev/ata/ata-pci.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h index 81aee6a..16f86cb 100644 --- a/sys/dev/ata/ata-pci.h +++ b/sys/dev/ata/ata-pci.h @@ -33,7 +33,7 @@ struct ata_chip_id { int cfg1; int cfg2; u_int8_t max_dma; - char *text; + const char *text; }; #define ATA_PCI_MAX_CH 8 @@ -50,7 +50,7 @@ struct ata_pci_controller { int r_irq_rid; struct resource *r_irq; void *handle; - struct ata_chip_id *chip; + const struct ata_chip_id *chip; int legacy; int channels; int ichannels; @@ -569,15 +569,15 @@ int ata_pci_status(device_t dev); void ata_pci_hw(device_t dev); void ata_pci_dmainit(device_t dev); void ata_pci_dmafini(device_t dev); -char *ata_pcivendor2str(device_t dev); +const char *ata_pcivendor2str(device_t dev); int ata_legacy(device_t); void ata_generic_intr(void *data); int ata_generic_chipinit(device_t dev); int ata_generic_setmode(device_t dev, int target, int mode); int ata_setup_interrupt(device_t dev, void *intr_func); void ata_set_desc(device_t dev); -struct ata_chip_id *ata_match_chip(device_t dev, struct ata_chip_id *index); -struct ata_chip_id *ata_find_chip(device_t dev, struct ata_chip_id *index, int slot); +const struct ata_chip_id *ata_match_chip(device_t dev, const struct ata_chip_id *index); +const struct ata_chip_id *ata_find_chip(device_t dev, const struct ata_chip_id *index, int slot); int ata_mode2idx(int mode); /* global prototypes from chipsets/ata-*.c */ @@ -611,15 +611,14 @@ static device_method_t __CONCAT(dname,_methods)[] = { \ DEVMETHOD(pci_write_config, ata_pci_write_config), \ DEVMETHOD(bus_print_child, ata_pci_print_child), \ DEVMETHOD(bus_child_location_str, ata_pci_child_location_str), \ - { 0, 0 } \ + DEVMETHOD_END \ }; \ static driver_t __CONCAT(dname,_driver) = { \ "atapci", \ __CONCAT(dname,_methods), \ sizeof(struct ata_pci_controller) \ }; \ -DRIVER_MODULE(dname, pci, __CONCAT(dname,_driver), ata_pci_devclass, 0, 0); \ +DRIVER_MODULE(dname, pci, __CONCAT(dname,_driver), ata_pci_devclass, NULL, NULL); \ MODULE_VERSION(dname, 1); \ MODULE_DEPEND(dname, ata, 1, 1, 1); \ MODULE_DEPEND(dname, atapci, 1, 1, 1); - |
