This constifies the method tables used by the atascsi framework and
the ahci(4) and sili(4) drivers.
ok?
diff 9939c0709df17eb9b8160ad1561241ed2c4b8922
83fd09f48cb0df5e29a782b651c4210e90f90b00
blob - 46c681203e8e39e25167f98907a2ecc848e9d1a4
blob + 19f61480e83314afe9d58d24b52e1b1d7e64ea93
--- sys/dev/ata/atascsi.c
+++ sys/dev/ata/atascsi.c
@@ -42,7 +42,7 @@ struct atascsi {
struct atascsi_host_port **as_host_ports;
- struct atascsi_methods *as_methods;
+ const struct atascsi_methods *as_methods;
struct scsi_adapter as_switch;
struct scsibus_softc *as_scsibus;
blob - a992001e82c39dbc9305141c08264956e890348b
blob + bf39ea0667b241a5cfc1118ed3890d2d6cf967f6
--- sys/dev/ata/atascsi.h
+++ sys/dev/ata/atascsi.h
@@ -374,7 +374,7 @@ struct atascsi_methods {
struct atascsi_attach_args {
void *aaa_cookie;
- struct atascsi_methods *aaa_methods;
+ const struct atascsi_methods *aaa_methods;
void (*aaa_minphys)(struct buf *,
struct scsi_link *);
int aaa_nports;
blob - 571b29c29c4bd1113fca3314b6cf50f95db89bd0
blob + 46bf2f4526aa772461a011abe35a837c0d8ef300
--- sys/dev/ic/ahci.c
+++ sys/dev/ic/ahci.c
@@ -160,7 +160,7 @@ struct ata_xfer * ahci_ata_get_xfer(void *, int);
void ahci_ata_put_xfer(struct ata_xfer *);
void ahci_ata_cmd(struct ata_xfer *);
-struct atascsi_methods ahci_atascsi_methods = {
+const struct atascsi_methods ahci_atascsi_methods = {
ahci_ata_probe,
ahci_ata_free,
ahci_ata_get_xfer,
blob - b2df117d41b126204e110facccb6dc7050dea347
blob + fecd665bfe4f985c244fc281e861cf62ebef615b
--- sys/dev/ic/sili.c
+++ sys/dev/ic/sili.c
@@ -202,7 +202,7 @@ void sili_simulate_error(struct
sili_ccb *ccb,
int *need_restart, int *err_port);
#endif
-struct atascsi_methods sili_atascsi_methods = {
+const struct atascsi_methods sili_atascsi_methods = {
sili_ata_probe,
sili_ata_free,
sili_ata_get_xfer,
--
Christian "naddy" Weisgerber [email protected]
