treewide: Remove redefinitions of SEC_PER_HOUR and SEC_PER_DAY

These macros are now provided by Zephyr (in sys_clock.h). As these macros for mesh were defined with `unsigned long long` type and now they are `unsigned long`, casting was added where needed to avoid overflows. Signed-off-by: Andrzej Głąbek <[email protected]>
nrfconnect · Jan 15, 2025 · 43ff66f · 43ff66f
1 parent c45f4a1
commit 43ff66f
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 11 deletions.
diff --git a/applications/serial_lte_modem/src/gnss/slm_at_gnss.c b/applications/serial_lte_modem/src/gnss/slm_at_gnss.c
@@ -53,8 +53,6 @@ static struct modem_pipe *gnss_pipe;
 
 #define LOCATION_REPORT_MS 5000
 
-#define SEC_PER_HOUR	(MIN_PER_HOUR * SEC_PER_MIN)
-#define SEC_PER_DAY	(HOUR_PER_DAY * SEC_PER_HOUR)
 /* (6.1.1980 UTC - 1.1.1970 UTC) */
 #define GPS_TO_UNIX_UTC_OFFSET_SECONDS	(315964800UL)
 /* UTC/GPS time offset as of 1st of January 2017. */

diff --git a/samples/cellular/gnss/src/assistance_minimal.c b/samples/cellular/gnss/src/assistance_minimal.c
@@ -25,8 +25,6 @@ LOG_MODULE_DECLARE(gnss_sample, CONFIG_GNSS_SAMPLE_LOG_LEVEL);
 #define GPS_TO_UNIX_UTC_OFFSET_SECONDS	(315964800UL)
 /* UTC/GPS time offset as of 1st of January 2017. */
 #define GPS_TO_UTC_LEAP_SECONDS		(18UL)
-#define SEC_PER_HOUR			(MIN_PER_HOUR * SEC_PER_MIN)
-#define SEC_PER_DAY			(HOUR_PER_DAY * SEC_PER_HOUR)
 #define DAYS_PER_WEEK			(7UL)
 #define PLMN_STR_MAX_LEN		8 /* MCC + MNC + quotes */
 

diff --git a/subsys/bluetooth/mesh/time_util.c b/subsys/bluetooth/mesh/time_util.c
@@ -41,7 +41,7 @@ int ts_to_tai(struct bt_mesh_time_tai *tai, const struct tm *timeptr)
 
 	days += timeptr->tm_mday - 1;
 
-	tai->sec = (days * SEC_PER_DAY);
+	tai->sec = ((uint64_t)days * SEC_PER_DAY);
 	tai->sec += ((uint64_t)timeptr->tm_hour * SEC_PER_HOUR);
 	tai->sec += ((uint64_t)timeptr->tm_min * SEC_PER_MIN);
 	tai->sec += (uint64_t)timeptr->tm_sec;

diff --git a/subsys/bluetooth/mesh/time_util.h b/subsys/bluetooth/mesh/time_util.h
@@ -20,8 +20,6 @@ extern "C" {
 
 #define DAYS_YEAR 365ULL
 #define DAYS_LEAP_YEAR 366ULL
-#define SEC_PER_HOUR (60ULL * SEC_PER_MIN)
-#define SEC_PER_DAY (24ULL * SEC_PER_HOUR)
 
 #define SEC_PER_YEAR (DAYS_YEAR * SEC_PER_DAY)
 #define SEC_PER_LEAP_YEAR (DAYS_LEAP_YEAR * SEC_PER_DAY)

diff --git a/subsys/bluetooth/services/cgms/cgms.c b/subsys/bluetooth/services/cgms/cgms.c
@@ -23,8 +23,6 @@
 
 LOG_MODULE_REGISTER(cgms, CONFIG_BT_CGMS_LOG_LEVEL);
 
-#define SEC_PER_DAY                86400
-
 #define CGMS_SVC_MEAS_ATTR_IDX     1
 #define CGMS_SVC_RACP_ATTR_IDX     12
 #define CGMS_SVC_SOCP_ATTR_IDX     15

diff --git a/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_utils.h b/subsys/net/lib/nrf_cloud/include/nrf_cloud_pgps_utils.h
@@ -17,8 +17,6 @@ extern "C" {
 /* (6.1.1980 UTC - 1.1.1970 UTC) */
 #define GPS_TO_UNIX_UTC_OFFSET_SECONDS	(315964800UL)
 #define GPS_TO_UTC_LEAP_SECONDS		(18UL)
-#define SEC_PER_HOUR			(MIN_PER_HOUR * SEC_PER_MIN)
-#define SEC_PER_DAY			(HOUR_PER_DAY * SEC_PER_HOUR)
 #define DAYS_PER_WEEK			(7UL)
 #define SECONDS_PER_WEEK		(SEC_PER_DAY * DAYS_PER_WEEK)