| Update types of callback functions for cam_periph_runccb. |
| |
| diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/cam/ata/ata_da.c freebsd-11.1/sys/cam/ata/ata_da.c |
| --- /usr/src/sys/cam/ata/ata_da.c 2017-07-21 07:42:02.000000000 +0800 |
| +++ freebsd-11.1/sys/cam/ata/ata_da.c 2019-12-20 17:23:51.014276414 +0800 |
| @@ -749,7 +749,7 @@ |
| static void adazonedone(struct cam_periph *periph, union ccb *ccb); |
| static void adadone(struct cam_periph *periph, |
| union ccb *done_ccb); |
| -static int adaerror(union ccb *ccb, u_int32_t cam_flags, |
| +static int adaerror(union ccb *ccb, cam_flags cam_flags, |
| u_int32_t sense_flags); |
| static void adagetparams(struct cam_periph *periph, |
| struct ccb_getdev *cgd); |
| @@ -3271,7 +3271,7 @@ |
| } |
| |
| static int |
| -adaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) |
| +adaerror(union ccb *ccb, cam_flags cam_flags, u_int32_t sense_flags) |
| { |
| #ifdef CAM_IO_STATS |
| struct ada_softc *softc; |
| diff -ru --exclude-from freebsd-src-diff-exclude-names /usr/src/sys/cam/scsi/scsi_da.c freebsd-11.1/sys/cam/scsi/scsi_da.c |
| --- /usr/src/sys/cam/scsi/scsi_da.c 2017-07-21 07:42:02.000000000 +0800 |
| +++ freebsd-11.1/sys/cam/scsi/scsi_da.c 2019-12-20 17:27:27.577675470 +0800 |
| @@ -1337,7 +1337,7 @@ |
| static void dazonedone(struct cam_periph *periph, union ccb *ccb); |
| static void dadone(struct cam_periph *periph, |
| union ccb *done_ccb); |
| -static int daerror(union ccb *ccb, u_int32_t cam_flags, |
| +static int daerror(union ccb *ccb, cam_flags cam_flags, |
| u_int32_t sense_flags); |
| static void daprevent(struct cam_periph *periph, int action); |
| static void dareprobe(struct cam_periph *periph); |
| @@ -5266,7 +5266,7 @@ |
| } |
| |
| static int |
| -daerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) |
| +daerror(union ccb *ccb, cam_flags cam_flags, u_int32_t sense_flags) |
| { |
| struct da_softc *softc; |
| struct cam_periph *periph; |