diff --git a/docs/RELEASE.txt b/docs/RELEASE.txt index 0d41a308..e61ffe4e 100644 --- a/docs/RELEASE.txt +++ b/docs/RELEASE.txt @@ -219,6 +219,19 @@ Modification Log for R6-10 File modified: OmsSrc/drvMAXv.cc +8) Changed axis names from 'char *' to 'const char*' to avoid compiler warnings. + (Assigning literal string to char* is deprecated). + This affects driver_table.axis_names and driver_table.sendmsg used in + every motor driver. + *** THIS CHANGE BREAKS BACKWARD COMPATIBILITY! *** + All external motor drivers need to change their send_mess() function + to use 'const char*' as the last argument: + RTN_STATUS send_mess(int, const char *, const char *); + + Files modified: motorApp/MotorSrc/motordrvCom.h + motorApp/MotorSrc/motordrvCom.cc + motorApp/*Src/drv*.cc + Modification Log for R6-9 ========================= diff --git a/modules/motorAcs b/modules/motorAcs index 577fbcb7..ba3193b3 160000 --- a/modules/motorAcs +++ b/modules/motorAcs @@ -1 +1 @@ -Subproject commit 577fbcb73e4ba3736a2e7cf88c0df388dfc9dea5 +Subproject commit ba3193b340085a016ecc12e57e0a78736d20955a diff --git a/modules/motorAcsTech80 b/modules/motorAcsTech80 index c00e9414..f409282b 160000 --- a/modules/motorAcsTech80 +++ b/modules/motorAcsTech80 @@ -1 +1 @@ -Subproject commit c00e94140330148e49d8b84eefd62c3f998f57f3 +Subproject commit f409282bba942564d891e83a46e486940e3e353e diff --git a/modules/motorAerotech b/modules/motorAerotech index d3f02c5f..1b8e4c00 160000 --- a/modules/motorAerotech +++ b/modules/motorAerotech @@ -1 +1 @@ -Subproject commit d3f02c5f9a914e9566d1be20511951b98001826e +Subproject commit 1b8e4c00235b02ce904f30c0cf0e16b7ac55b2ce diff --git a/modules/motorFaulhaber b/modules/motorFaulhaber index f7b01882..e028325b 160000 --- a/modules/motorFaulhaber +++ b/modules/motorFaulhaber @@ -1 +1 @@ -Subproject commit f7b018822ea7e3ccb7207cd5b75025bea8d7c4ae +Subproject commit e028325b50901c9da01955a84541ace0768a6882 diff --git a/modules/motorIms b/modules/motorIms index 3f95ae51..10c502c8 160000 --- a/modules/motorIms +++ b/modules/motorIms @@ -1 +1 @@ -Subproject commit 3f95ae51a382e05938105c42962eb1e41514d816 +Subproject commit 10c502c8dc118591f63cc4c9cdc41127883ff1f5 diff --git a/modules/motorKohzu b/modules/motorKohzu index 5b72942e..d4f694d5 160000 --- a/modules/motorKohzu +++ b/modules/motorKohzu @@ -1 +1 @@ -Subproject commit 5b72942e168d0109e82d332ef3e81a74d7db5194 +Subproject commit d4f694d586a43c6c664c70e48ee54a30e38f0bef diff --git a/modules/motorMclennan b/modules/motorMclennan index 89fe35d1..f4f17084 160000 --- a/modules/motorMclennan +++ b/modules/motorMclennan @@ -1 +1 @@ -Subproject commit 89fe35d107c3946089493c1b8d11311ba0122e42 +Subproject commit f4f170849731d0c5ef84a05315a1dcffe802b881 diff --git a/modules/motorMicos b/modules/motorMicos index 1f341b27..e92135f3 160000 --- a/modules/motorMicos +++ b/modules/motorMicos @@ -1 +1 @@ -Subproject commit 1f341b271d29d6711457c27c0ebb4449d43eac48 +Subproject commit e92135f37c5367b12a9d762e409fb86f3555fd5b diff --git a/modules/motorMicroMo b/modules/motorMicroMo index ba3e575a..04331b5c 160000 --- a/modules/motorMicroMo +++ b/modules/motorMicroMo @@ -1 +1 @@ -Subproject commit ba3e575aec69ca764b436f8a0b86449bc56920af +Subproject commit 04331b5cfa223a530591a6f2273b414531d8d151 diff --git a/modules/motorNewFocus b/modules/motorNewFocus index 1ec6839b..9b5dc615 160000 --- a/modules/motorNewFocus +++ b/modules/motorNewFocus @@ -1 +1 @@ -Subproject commit 1ec6839b0eb100f1e071cbf75585d7b35cf38a77 +Subproject commit 9b5dc61554a2748db776ad71cda5b1acdf712084 diff --git a/modules/motorNewport b/modules/motorNewport index 374a9370..6201b857 160000 --- a/modules/motorNewport +++ b/modules/motorNewport @@ -1 +1 @@ -Subproject commit 374a93708602ba25ad2716f2fc009dff73dfb4a6 +Subproject commit 6201b85711edb3437343487f3dcd96149473cbba diff --git a/modules/motorOms b/modules/motorOms index 49c7fce5..ee078b39 160000 --- a/modules/motorOms +++ b/modules/motorOms @@ -1 +1 @@ -Subproject commit 49c7fce59bec4198129fa794183d5fc061649bf6 +Subproject commit ee078b399c77135f88cbd672da72bc2ae9e0669e diff --git a/modules/motorOriel b/modules/motorOriel index 6f151eab..e325636d 160000 --- a/modules/motorOriel +++ b/modules/motorOriel @@ -1 +1 @@ -Subproject commit 6f151eabf53e9e5f9f0c51dff662147524beb5e2 +Subproject commit e325636dbb06ed5c425fdc81a84bbd7b4ce00740 diff --git a/modules/motorPI b/modules/motorPI index 13c2b1c7..3e8d6cc3 160000 --- a/modules/motorPI +++ b/modules/motorPI @@ -1 +1 @@ -Subproject commit 13c2b1c75b3f49090bcc718c04e2c364c650ee44 +Subproject commit 3e8d6cc3fca4c38abdbc6404b2f772adc1bafbaf diff --git a/modules/motorParker b/modules/motorParker index 1f978b4f..efe069c2 160000 --- a/modules/motorParker +++ b/modules/motorParker @@ -1 +1 @@ -Subproject commit 1f978b4fd8ae50608c6b2d71ecb8f06c78d98d81 +Subproject commit efe069c2c2bfaed292a6b687290e789df114d88d diff --git a/modules/motorPiJena b/modules/motorPiJena index b1c58607..1dd01ea9 160000 --- a/modules/motorPiJena +++ b/modules/motorPiJena @@ -1 +1 @@ -Subproject commit b1c586075f31cdce13085c7fcabadedcc22a95c1 +Subproject commit 1dd01ea908e0baac3e6e2929595fb7da4f6d40b2 diff --git a/modules/motorSmartMotor b/modules/motorSmartMotor index ee30ba9c..23eb223b 160000 --- a/modules/motorSmartMotor +++ b/modules/motorSmartMotor @@ -1 +1 @@ -Subproject commit ee30ba9cc44761a0cd28e22c9b48903368417096 +Subproject commit 23eb223b1dd36ca4a79734d678fc3d9f36e1f214 diff --git a/modules/motorThorLabs b/modules/motorThorLabs index 0a9ec8f1..11365b26 160000 --- a/modules/motorThorLabs +++ b/modules/motorThorLabs @@ -1 +1 @@ -Subproject commit 0a9ec8f1184f0b37e12f79b2746303f9fbbbe9c2 +Subproject commit 11365b26a6a63d474dc3e95b53e1213bfa01b6a2 diff --git a/motorApp/MotorSrc/motordrvCom.cc b/motorApp/MotorSrc/motordrvCom.cc index b0323825..a5c3eb85 100644 --- a/motorApp/MotorSrc/motordrvCom.cc +++ b/motorApp/MotorSrc/motordrvCom.cc @@ -312,7 +312,7 @@ static void process_messages(struct driver_table *tabptr, epicsTime tick, struct mess_info *motor_info; struct controller *brdptr; char inbuf[MAX_MSG_SIZE]; - char *axis_name; + const char *axis_name; if (tabptr->axis_names == NULL) axis_name = (char *) NULL; diff --git a/motorApp/MotorSrc/motordrvCom.h b/motorApp/MotorSrc/motordrvCom.h index c2351f5c..98e736af 100644 --- a/motorApp/MotorSrc/motordrvCom.h +++ b/motorApp/MotorSrc/motordrvCom.h @@ -196,13 +196,13 @@ struct driver_table struct controller ***card_array; int *cardcnt_ptr; int *any_inmotion_ptr; - RTN_STATUS (*sendmsg) (int, char const *, char *); + RTN_STATUS (*sendmsg) (int, const char *, const char *); int (*getmsg) (int, char *, int); int (*setstat) (int, int); void (*query_done) (int, int, struct mess_node *); void (*strtstat) (int); /* Optional; start status function or NULL. */ const bool *const init_indicator; /* Driver initialized indicator. */ - char **axis_names; /* Axis name array or NULL. */ + const char **axis_names; /* Axis name array or NULL. */ };