diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c index 9a8465b812c..4b44f239b44 100644 --- a/arch/arm/src/efm32/efm32_i2c.c +++ b/arch/arm/src/efm32/efm32_i2c.c @@ -205,7 +205,7 @@ struct efm32_trace_s uint32_t i2c_reg_state; /* I2C register I2Cx_STATES */ uint32_t i2c_reg_if; /* I2C register I2Cx_IF */ uint32_t count; /* Interrupt count when status change */ - systime_t time; /* First of event or first status */ + clock_t time; /* First of event or first status */ int dcnt; /* Interrupt count when status change */ }; @@ -254,7 +254,7 @@ struct efm32_i2c_priv_s #ifdef CONFIG_I2C_TRACE int tndx; /* Trace array index */ - systime_t start_time; /* Time when the trace was started */ + clock_t start_time; /* Time when the trace was started */ /* The actual trace data */ @@ -610,9 +610,9 @@ static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv) #else static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; /* Get the timeout value */ diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c index 8c1866a7977..f87638abd28 100644 --- a/arch/arm/src/efm32/efm32_usbhost.c +++ b/arch/arm/src/efm32/efm32_usbhost.c @@ -1681,8 +1681,8 @@ static int efm32_ctrl_sendsetup(FAR struct efm32_usbhost_s *priv, FAR const struct usb_ctrlreq_s *req) { FAR struct efm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int ret; /* Loop while the device reports NAK (and a timeout is not exceeded */ @@ -1911,8 +1911,8 @@ static ssize_t efm32_in_transfer(FAR struct efm32_usbhost_s *priv, int chidx, FAR uint8_t *buffer, size_t buflen) { FAR struct efm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int ret; /* Loop until the transfer completes (i.e., buflen is decremented to zero) @@ -2170,8 +2170,8 @@ static ssize_t efm32_out_transfer(FAR struct efm32_usbhost_s *priv, int chidx, FAR uint8_t *buffer, size_t buflen) { FAR struct efm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; size_t xfrlen; ssize_t xfrd; int ret; @@ -4380,8 +4380,8 @@ static int efm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; FAR struct efm32_ctrlinfo_s *ep0info = (FAR struct efm32_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; @@ -4465,8 +4465,8 @@ static int efm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; FAR struct efm32_ctrlinfo_s *ep0info = (FAR struct efm32_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index bec804cbb54..30d8e7e315a 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -1744,9 +1744,9 @@ static int kinetis_attach(FAR struct sdio_dev_s *dev) static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; uint32_t regval; uint32_t cmdidx; @@ -2066,9 +2066,9 @@ static int kinetis_cancel(FAR struct sdio_dev_s *dev) static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; uint32_t errors; int ret = OK; diff --git a/arch/arm/src/lc823450/lc823450_i2c.c b/arch/arm/src/lc823450/lc823450_i2c.c index 6e6b1fe01fa..517280f7f3c 100644 --- a/arch/arm/src/lc823450/lc823450_i2c.c +++ b/arch/arm/src/lc823450/lc823450_i2c.c @@ -352,8 +352,8 @@ static inline int lc823450_i2c_sem_waitdone(FAR struct lc823450_i2c_priv_s *priv static inline int lc823450_i2c_sem_waitdone(FAR struct lc823450_i2c_priv_s *priv) { uint32_t timeout; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int ret; /* Get the timeout value */ diff --git a/arch/arm/src/lc823450/lc823450_sddrv_dep.c b/arch/arm/src/lc823450/lc823450_sddrv_dep.c index 531ba74490b..fd4ce5dcfa4 100644 --- a/arch/arm/src/lc823450/lc823450_sddrv_dep.c +++ b/arch/arm/src/lc823450/lc823450_sddrv_dep.c @@ -373,12 +373,12 @@ uint64_t sddep_set_timeout(uint64_t t) SINT_T sddep_wait_status(UI_32 req_status, UI_32 *status, struct SdDrCfg_s *cfg) { - systime_t tick0 = clock_systimer(); + clock_t tick0 = clock_systimer(); int ret = 0; while (1) { - systime_t tick1 = clock_systimer(); + clock_t tick1 = clock_systimer(); *status = sdif_get_status(cfg->regbase); if (req_status & (*status)) { diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c index 684b4192e9b..9e2454c278d 100644 --- a/arch/arm/src/stm32/stm32_i2c.c +++ b/arch/arm/src/stm32/stm32_i2c.c @@ -217,7 +217,7 @@ struct stm32_trace_s uint32_t count; /* Interrupt count when status change */ enum stm32_intstate_e event; /* Last event that occurred with this status */ uint32_t parm; /* Parameter associated with the event */ - systime_t time; /* First of event or first status */ + clock_t time; /* First of event or first status */ }; /* I2C Device hardware configuration */ @@ -259,7 +259,7 @@ struct stm32_i2c_priv_s #ifdef CONFIG_I2C_TRACE int tndx; /* Trace array index */ - systime_t start_time; /* Time when the trace was started */ + clock_t start_time; /* Time when the trace was started */ /* The actual trace data */ @@ -646,9 +646,9 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) #else static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; int ret; /* Get the timeout value */ @@ -705,9 +705,9 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv) { - systime_t start; - systime_t elapsed; - systime_t timeout; + clock_t start; + clock_t elapsed; + clock_t timeout; uint32_t cr1; uint32_t sr1; diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c index a2cd2156ec0..26e154522a1 100644 --- a/arch/arm/src/stm32/stm32_i2c_alt.c +++ b/arch/arm/src/stm32/stm32_i2c_alt.c @@ -245,7 +245,7 @@ struct stm32_trace_s uint32_t count; /* Interrupt count when status change */ uint32_t event; /* Last event that occurred with this status */ uint32_t parm; /* Parameter associated with the event */ - systime_t time; /* First of event or first status */ + clock_t time; /* First of event or first status */ }; /* I2C Device hardware configuration */ @@ -289,7 +289,7 @@ struct stm32_i2c_priv_s #ifdef CONFIG_I2C_TRACE int tndx; /* Trace array index */ - systime_t start_time; /* Time when the trace was started */ + clock_t start_time; /* Time when the trace was started */ /* The actual trace data */ @@ -655,9 +655,9 @@ static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) #else static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; int ret; /* Get the timeout value */ @@ -714,9 +714,9 @@ static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv) { - systime_t start; - systime_t elapsed; - systime_t timeout; + clock_t start; + clock_t elapsed; + clock_t timeout; uint32_t cr1; uint32_t sr1; diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c index 1b29ae09e5e..bebb3258610 100644 --- a/arch/arm/src/stm32/stm32_otgfshost.c +++ b/arch/arm/src/stm32/stm32_otgfshost.c @@ -1607,8 +1607,8 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, FAR const struct usb_ctrlreq_s *req) { FAR struct stm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int ret; /* Loop while the device reports NAK (and a timeout is not exceeded */ @@ -1837,7 +1837,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx, FAR uint8_t *buffer, size_t buflen) { FAR struct stm32_chan_s *chan; - systime_t start; + clock_t start; ssize_t xfrd; int ret; @@ -1909,7 +1909,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx, * if not then try again. */ - systime_t elapsed = clock_systimer() - start; + clock_t elapsed = clock_systimer() - start; if (elapsed >= STM32_DATANAK_DELAY) { /* Timeout out... break out returning the NAK as @@ -2195,8 +2195,8 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx, FAR uint8_t *buffer, size_t buflen) { FAR struct stm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; size_t xfrlen; ssize_t xfrd; int ret; @@ -4410,8 +4410,8 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; @@ -4495,8 +4495,8 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c index c276742ab7e..76e4f1b7ded 100644 --- a/arch/arm/src/stm32/stm32_otghshost.c +++ b/arch/arm/src/stm32/stm32_otghshost.c @@ -1612,8 +1612,8 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, FAR const struct usb_ctrlreq_s *req) { FAR struct stm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int ret; /* Loop while the device reports NAK (and a timeout is not exceeded */ @@ -1842,7 +1842,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx, FAR uint8_t *buffer, size_t buflen) { FAR struct stm32_chan_s *chan; - systime_t start; + clock_t start; ssize_t xfrd; int ret; @@ -1914,7 +1914,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx, * if not then try again. */ - systime_t elapsed = clock_systimer() - start; + clock_t elapsed = clock_systimer() - start; if (elapsed >= STM32_DATANAK_DELAY) { /* Timeout out... break out returning the NAK as @@ -2200,8 +2200,8 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx, FAR uint8_t *buffer, size_t buflen) { FAR struct stm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; size_t xfrlen; ssize_t xfrd; int ret; @@ -4415,8 +4415,8 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; @@ -4500,8 +4500,8 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; diff --git a/arch/arm/src/stm32/stm32f30xxx_i2c.c b/arch/arm/src/stm32/stm32f30xxx_i2c.c index 8778c6ca000..2f51c81bbac 100644 --- a/arch/arm/src/stm32/stm32f30xxx_i2c.c +++ b/arch/arm/src/stm32/stm32f30xxx_i2c.c @@ -209,7 +209,7 @@ struct stm32_trace_s uint32_t count; /* Interrupt count when status change */ enum stm32_intstate_e event; /* Last event that occurred with this status */ uint32_t parm; /* Parameter associated with the event */ - systime_t time; /* First of event or first status */ + clock_t time; /* First of event or first status */ }; /* I2C Device hardware configuration */ @@ -252,7 +252,7 @@ struct stm32_i2c_priv_s #ifdef CONFIG_I2C_TRACE int tndx; /* Trace array index */ - systime_t start_time; /* Time when the trace was started */ + clock_t start_time; /* Time when the trace was started */ /* The actual trace data */ @@ -680,9 +680,9 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) #else static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; int ret; /* Get the timeout value */ @@ -820,9 +820,9 @@ stm32_i2c_disable_autoend(FAR struct stm32_i2c_priv_s *priv) static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv) { - systime_t start; - systime_t elapsed; - systime_t timeout; + clock_t start; + clock_t elapsed; + clock_t timeout; uint32_t cr; uint32_t sr; diff --git a/arch/arm/src/stm32/stm32f40xxx_i2c.c b/arch/arm/src/stm32/stm32f40xxx_i2c.c index ac3c85adc00..fcef4d3b798 100644 --- a/arch/arm/src/stm32/stm32f40xxx_i2c.c +++ b/arch/arm/src/stm32/stm32f40xxx_i2c.c @@ -232,7 +232,7 @@ struct stm32_trace_s uint32_t count; /* Interrupt count when status change */ enum stm32_intstate_e event; /* Last event that occurred with this status */ uint32_t parm; /* Parameter associated with the event */ - systime_t time; /* First of event or first status */ + clock_t time; /* First of event or first status */ }; /* I2C Device hardware configuration */ @@ -275,7 +275,7 @@ struct stm32_i2c_priv_s #ifdef CONFIG_I2C_TRACE int tndx; /* Trace array index */ - systime_t start_time; /* Time when the trace was started */ + clock_t start_time; /* Time when the trace was started */ /* The actual trace data */ @@ -701,9 +701,9 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) #else static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; int ret; /* Get the timeout value */ @@ -760,9 +760,9 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv) { - systime_t start; - systime_t elapsed; - systime_t timeout; + clock_t start; + clock_t elapsed; + clock_t timeout; uint32_t cr1; uint32_t sr1; diff --git a/arch/arm/src/stm32f0/stm32f0_i2c.c b/arch/arm/src/stm32f0/stm32f0_i2c.c index 09993e32611..32b4842b8a0 100644 --- a/arch/arm/src/stm32f0/stm32f0_i2c.c +++ b/arch/arm/src/stm32f0/stm32f0_i2c.c @@ -199,11 +199,11 @@ enum stm32f0_trace_e struct stm32f0_trace_s { - uint32_t status; /* I2C 32-bit SR2|SR1 status */ - uint32_t count; /* Interrupt count when status change */ + uint32_t status; /* I2C 32-bit SR2|SR1 status */ + uint32_t count; /* Interrupt count when status change */ enum stm32f0_intstate_e event; /* Last event that occurred with this status */ - uint32_t parm; /* Parameter associated with the event */ - systime_t time; /* First of event or first status */ + uint32_t parm; /* Parameter associated with the event */ + clock_t time; /* First of event or first status */ }; /* I2C Device hardware configuration */ @@ -245,7 +245,7 @@ struct stm32f0_i2c_priv_s #ifdef CONFIG_I2C_TRACE int tndx; /* Trace array index */ - systime_t start_time; /* Time when the trace was started */ + clock_t start_time; /* Time when the trace was started */ /* The actual trace data */ @@ -622,9 +622,9 @@ static inline int stm32f0_i2c_sem_waitdone(FAR struct stm32f0_i2c_priv_s *priv) #else static inline int stm32f0_i2c_sem_waitdone(FAR struct stm32f0_i2c_priv_s *priv) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; int ret; /* Get the timeout value */ @@ -762,9 +762,9 @@ stm32f0_i2c_disable_autoend(FAR struct stm32f0_i2c_priv_s *priv) static inline void stm32f0_i2c_sem_waitstop(FAR struct stm32f0_i2c_priv_s *priv) { - systime_t start; - systime_t elapsed; - systime_t timeout; + clock_t start; + clock_t elapsed; + clock_t timeout; uint32_t cr; uint32_t sr; diff --git a/arch/arm/src/stm32f7/stm32_otghost.c b/arch/arm/src/stm32f7/stm32_otghost.c index 1a9b8c1feac..c17ab621018 100644 --- a/arch/arm/src/stm32f7/stm32_otghost.c +++ b/arch/arm/src/stm32f7/stm32_otghost.c @@ -1607,8 +1607,8 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, FAR const struct usb_ctrlreq_s *req) { FAR struct stm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int ret; /* Loop while the device reports NAK (and a timeout is not exceeded */ @@ -1837,7 +1837,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx, FAR uint8_t *buffer, size_t buflen) { FAR struct stm32_chan_s *chan; - systime_t start; + clock_t start; ssize_t xfrd; int ret; @@ -1909,7 +1909,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx, * if not then try again. */ - systime_t elapsed = clock_systimer() - start; + clock_t elapsed = clock_systimer() - start; if (elapsed >= STM32_DATANAK_DELAY) { /* Timeout out... break out returning the NAK as @@ -2195,8 +2195,8 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx, FAR uint8_t *buffer, size_t buflen) { FAR struct stm32_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; size_t xfrlen; ssize_t xfrd; int ret; @@ -4409,8 +4409,8 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; @@ -4494,8 +4494,8 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c index e676d9504f2..3ad28612a80 100644 --- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c +++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c @@ -1610,8 +1610,8 @@ static int stm32l4_ctrl_sendsetup(FAR struct stm32l4_usbhost_s *priv, FAR const struct usb_ctrlreq_s *req) { FAR struct stm32l4_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int ret; /* Loop while the device reports NAK (and a timeout is not exceeded */ @@ -1841,7 +1841,7 @@ static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv, size_t buflen) { FAR struct stm32l4_chan_s *chan; - systime_t start; + clock_t start; ssize_t xfrd; int ret; @@ -1913,7 +1913,7 @@ static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv, * if not then try again. */ - systime_t elapsed = clock_systimer() - start; + clock_t elapsed = clock_systimer() - start; if (elapsed >= STM32L4_DATANAK_DELAY) { /* Timeout out... break out returning the NAK as @@ -2200,8 +2200,8 @@ static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv, size_t buflen) { FAR struct stm32l4_chan_s *chan; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; size_t xfrlen; ssize_t xfrd; int ret; @@ -4415,8 +4415,8 @@ static int stm32l4_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr; FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; @@ -4500,8 +4500,8 @@ static int stm32l4_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr; FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0; uint16_t buflen; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int retries; int ret; diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/tiva_i2c.c index aee4501051d..608506e4fe6 100644 --- a/arch/arm/src/tiva/tiva_i2c.c +++ b/arch/arm/src/tiva/tiva_i2c.c @@ -178,7 +178,7 @@ struct tiva_trace_s uint32_t count; /* Interrupt count when status change */ enum tiva_trace_e event; /* Last event that occurred with this status */ uint32_t parm; /* Parameter associated with the event */ - systime_t time; /* First of event or first status */ + clock_t time; /* First of event or first status */ }; /* I2C Device hardware configuration */ @@ -235,7 +235,7 @@ struct tiva_i2c_priv_s int tndx; /* Trace array index */ int tcount; /* Number of events with this status */ - systime_t ttime; /* Time when the trace was started */ + clock_t ttime; /* Time when the trace was started */ uint32_t tstatus; /* Last status read */ /* The actual trace data */ @@ -786,9 +786,9 @@ static inline int tiva_i2c_sem_waitdone(struct tiva_i2c_priv_s *priv) #else static inline int tiva_i2c_sem_waitdone(struct tiva_i2c_priv_s *priv) { - systime_t timeout; - systime_t start; - systime_t elapsed; + clock_t timeout; + clock_t start; + clock_t elapsed; uint32_t status; int ret; diff --git a/arch/sim/src/up_oneshot.c b/arch/sim/src/up_oneshot.c index e41f10fa89a..2d36f821f7a 100644 --- a/arch/sim/src/up_oneshot.c +++ b/arch/sim/src/up_oneshot.c @@ -203,7 +203,7 @@ static int sim_start(FAR struct oneshot_lowerhalf_s *lower, { FAR struct sim_oneshot_lowerhalf_s *priv = (FAR struct sim_oneshot_lowerhalf_s *)lower; - systime_t ticks; + clock_t ticks; int64_t nsec; DEBUGASSERT(priv != NULL && callback != NULL && ts != NULL); @@ -212,7 +212,7 @@ static int sim_start(FAR struct oneshot_lowerhalf_s *lower, nsec = (int64_t)ts->tv_sec * NSEC_PER_SEC + (int64_t)ts->tv_nsec; - ticks = (systime_t)((nsec + NSEC_PER_TICK - 1) / NSEC_PER_TICK); + ticks = (clock_t)((nsec + NSEC_PER_TICK - 1) / NSEC_PER_TICK); /* Save the callback information and start the timer */ diff --git a/drivers/lcd/ft80x.c b/drivers/lcd/ft80x.c index 2a16b05c87d..cbc6c6076df 100644 --- a/drivers/lcd/ft80x.c +++ b/drivers/lcd/ft80x.c @@ -169,8 +169,8 @@ static const struct file_operations g_ft80x_fops = static int ft80x_fade(FAR struct ft80x_dev_s *priv, FAR const struct ft80x_fade_s *fade) { - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int32_t delay; int32_t duty; int16_t endduty; diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c index 9cb491feb7d..93dc1f41dd9 100644 --- a/drivers/mmcsd/mmcsd_sdio.c +++ b/drivers/mmcsd/mmcsd_sdio.c @@ -1126,8 +1126,8 @@ static int mmcsd_eventwait(FAR struct mmcsd_state_s *priv, static int mmcsd_transferready(FAR struct mmcsd_state_s *priv) { - systime_t starttime; - systime_t elapsed; + clock_t starttime; + clock_t elapsed; uint32_t r1; int ret; @@ -2767,9 +2767,9 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv) { uint32_t response; uint32_t sdcapacity = MMCSD_ACMD41_STDCAPACITY; - systime_t start; - systime_t elapsed; - int ret; + clock_t start; + clock_t elapsed; + int ret; /* Assume failure to identify the card */ diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c index d59b868149d..5d56a24992b 100644 --- a/drivers/mmcsd/mmcsd_spi.c +++ b/drivers/mmcsd/mmcsd_spi.c @@ -426,8 +426,8 @@ static int mmcsd_waitready(FAR struct mmcsd_slot_s *slot) { FAR struct spi_dev_s *spi = slot->spi; uint8_t response; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; /* Wait until the card is no longer busy (up to 500MS) */ @@ -531,8 +531,8 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot, case MMCSD_CMDRESP_R1B: { uint32_t busy = 0; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; start = START_TIME; do @@ -944,8 +944,8 @@ static int mmcsd_recvblock(FAR struct mmcsd_slot_s *slot, uint8_t *buffer, int nbytes) { FAR struct spi_dev_s *spi = slot->spi; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; uint8_t token; /* Wait up to the maximum to receive a valid data token. taccess is the @@ -1560,8 +1560,8 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) FAR struct spi_dev_s *spi = slot->spi; uint8_t csd[16]; uint32_t result = MMCSD_SPIR1_IDLESTATE; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; int i; int j; diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c index ad57d42405a..43debd5aab5 100644 --- a/drivers/mtd/sst39vf.c +++ b/drivers/mtd/sst39vf.c @@ -418,8 +418,8 @@ static int sst39vf_chiperase(FAR struct sst39vf_dev_s *priv) { #if 0 struct sst39vf_wrinfo_s wrinfo; - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; #endif /* Send the sequence to erase the chip */ @@ -489,8 +489,8 @@ static int sst39vf_sectorerase(FAR struct sst39vf_dev_s *priv, { struct sst39vf_wrinfo_s wrinfo; #if 0 - systime_t start; - systime_t elapsed; + clock_t start; + clock_t elapsed; #endif /* Set up the sector address */ diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index c526d12d878..90625644585 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -745,9 +745,9 @@ static void enc_wrbreg(FAR struct enc_driver_s *priv, uint8_t ctrlreg, static int enc_waitbreg(FAR struct enc_driver_s *priv, uint8_t ctrlreg, uint8_t bits, uint8_t value) { - systime_t start = clock_systimer(); - systime_t elapsed; - uint8_t rddata; + clock_t start = clock_systimer(); + clock_t elapsed; + uint8_t rddata; /* Loop until the exit condition is met */ diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index 5b94365652e..a950929b7f8 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -640,8 +640,8 @@ static void enc_wrreg(FAR struct enc_driver_s *priv, uint16_t ctrlreg, static int enc_waitreg(FAR struct enc_driver_s *priv, uint16_t ctrlreg, uint16_t bits, uint16_t value) { - systime_t start = clock_systimer(); - systime_t elapsed; + clock_t start = clock_systimer(); + clock_t elapsed; uint16_t rddata; /* Loop until the exit condition is met */ diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 6d882a416e8..8102535c45e 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -433,8 +433,8 @@ static void slip_txtask(int argc, FAR char *argv[]) { FAR struct slip_driver_s *priv; unsigned int index = *(argv[1]) - '0'; - systime_t start_ticks; - systime_t now_ticks; + clock_t start_ticks; + clock_t now_ticks; unsigned int hsec; nerr("index: %d\n", index); diff --git a/drivers/power/pm.h b/drivers/power/pm.h index 1e677b9fa88..b597fc4747a 100644 --- a/drivers/power/pm.h +++ b/drivers/power/pm.h @@ -138,7 +138,7 @@ struct pm_domain_s /* stime - The time (in ticks) at the start of the current time slice */ - systime_t stime; + clock_t stime; }; /* This structure encapsulates all of the global data used by the PM module */ diff --git a/drivers/power/pm_activity.c b/drivers/power/pm_activity.c index bdc38afb599..ea76bacd906 100644 --- a/drivers/power/pm_activity.c +++ b/drivers/power/pm_activity.c @@ -84,7 +84,7 @@ void pm_activity(int domain, int priority) { FAR struct pm_domain_s *pdom; - systime_t now; + clock_t now; uint32_t accum; irqstate_t flags; diff --git a/drivers/power/pm_checkstate.c b/drivers/power/pm_checkstate.c index fc7f0a87167..d08884165bc 100644 --- a/drivers/power/pm_checkstate.c +++ b/drivers/power/pm_checkstate.c @@ -87,7 +87,7 @@ enum pm_state_e pm_checkstate(int domain) { FAR struct pm_domain_s *pdom; - systime_t now; + clock_t now; irqstate_t flags; /* Get a convenience pointer to minimize all of the indexing */ diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 3b62d1f3420..dc3efb73bb2 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -110,7 +110,7 @@ static void uart_pollnotify(FAR uart_dev_t *dev, pollevent_t eventset); static int uart_putxmitchar(FAR uart_dev_t *dev, int ch, bool oktoblock); static inline ssize_t uart_irqwrite(FAR uart_dev_t *dev, FAR const char *buffer, size_t buflen); -static int uart_tcdrain(FAR uart_dev_t *dev, systime_t timeout); +static int uart_tcdrain(FAR uart_dev_t *dev, clock_t timeout); /* Character driver methods */ @@ -397,7 +397,7 @@ static inline ssize_t uart_irqwrite(FAR uart_dev_t *dev, FAR const char *buffer, * ************************************************************************************/ -static int uart_tcdrain(FAR uart_dev_t *dev, systime_t timeout) +static int uart_tcdrain(FAR uart_dev_t *dev, clock_t timeout) { int ret; @@ -412,7 +412,7 @@ static int uart_tcdrain(FAR uart_dev_t *dev, systime_t timeout) if (ret >= 0) { irqstate_t flags; - systime_t start; + clock_t start; /* Trigger emission to flush the contents of the tx buffer */ @@ -487,7 +487,7 @@ static int uart_tcdrain(FAR uart_dev_t *dev, systime_t timeout) { while (!uart_txempty(dev)) { - systime_t elapsed; + clock_t elapsed; #ifndef CONFIG_DISABLE_SIGNALS nxsig_usleep(POLL_DELAY_USEC); diff --git a/drivers/wireless/spirit/lib/spirit_spi.c b/drivers/wireless/spirit/lib/spirit_spi.c index fca9f880cea..3d923434857 100644 --- a/drivers/wireless/spirit/lib/spirit_spi.c +++ b/drivers/wireless/spirit/lib/spirit_spi.c @@ -640,9 +640,9 @@ int spirit_update_status(FAR struct spirit_library_s *spirit) int spirit_waitstatus(FAR struct spirit_library_s *spirit, enum spirit_state_e state, unsigned int msec) { - systime_t start; - systime_t ticks; - systime_t elapsed; + clock_t start; + clock_t ticks; + clock_t elapsed; int ret; #ifdef CONFIG_DEBUG_SPI_INFO @@ -664,7 +664,7 @@ int spirit_waitstatus(FAR struct spirit_library_s *spirit, #if (MSEC_PER_TICK * USEC_PER_MSEC) == USEC_PER_TICK ticks = (msec + (MSEC_PER_TICK - 1)) / MSEC_PER_TICK; #else - ticks = ((systime_t)msec * USEC_PER_MSEC + (USEC_PER_TICK - 1)) / + ticks = ((clock_t)msec * USEC_PER_MSEC + (USEC_PER_TICK - 1)) / USEC_PER_TICK; #endif diff --git a/fs/procfs/fs_procfsuptime.c b/fs/procfs/fs_procfsuptime.c index 4e836e7e5db..83cf091d422 100644 --- a/fs/procfs/fs_procfsuptime.c +++ b/fs/procfs/fs_procfsuptime.c @@ -208,7 +208,7 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer, size_t linesize; off_t offset; ssize_t ret; - systime_t ticktime; + clock_t ticktime; #if defined(CONFIG_HAVE_DOUBLE) && defined(CONFIG_LIBC_FLOATINGPOINT) double now; diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c index d6b32974b4f..eb8d3ec9b38 100644 --- a/fs/vfs/fs_poll.c +++ b/fs/vfs/fs_poll.c @@ -408,7 +408,7 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout) } else if (timeout > 0) { - systime_t ticks; + clock_t ticks; /* "Implementations may place limitations on the granularity of * timeout intervals. If the requested timeout interval requires diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h index efaa65cfd73..19ddabdf0bf 100644 --- a/include/nuttx/clock.h +++ b/include/nuttx/clock.h @@ -43,8 +43,10 @@ #include +#include #include #include + #include /**************************************************************************** @@ -215,6 +217,7 @@ /**************************************************************************** * Public Types ****************************************************************************/ + /* This structure is used to report CPU usage for a particular thread */ #ifdef CONFIG_SCHED_CPULOAD @@ -225,20 +228,15 @@ struct cpuload_s }; #endif -/* This type is the natural with of the system timer */ +/* This non-standard type used to hold relative clock ticks that may take + * negative values. Because of its non-portable nature the type sclock_t + * should be used only within the OS proper and not by portable applications. + */ #ifdef CONFIG_SYSTEM_TIME64 -typedef uint64_t systime_t; +typedef int64_t sclock_t; #else -typedef uint32_t systime_t; -#endif - -/* This type used to hold relative ticks that may have negative value */ - -#ifdef CONFIG_SYSTEM_TIME64 -typedef int64_t ssystime_t; -#else -typedef int32_t ssystime_t; +typedef int32_t sclock_t; #endif /**************************************************************************** @@ -261,7 +259,7 @@ extern "C" */ #ifdef __HAVE_KERNEL_GLOBALS -EXTERN volatile systime_t g_system_timer; +EXTERN volatile clock_t g_system_timer; #ifndef CONFIG_SYSTEM_TIME64 # define clock_systimer() g_system_timer @@ -361,7 +359,7 @@ void clock_resynchronize(FAR struct timespec *rtc_diff); ****************************************************************************/ #if !defined(__HAVE_KERNEL_GLOBALS) || defined(CONFIG_SYSTEM_TIME64) -systime_t clock_systimer(void); +clock_t clock_systimer(void); #endif /**************************************************************************** diff --git a/include/nuttx/net/sixlowpan.h b/include/nuttx/net/sixlowpan.h index de272839e88..3c8ed784358 100644 --- a/include/nuttx/net/sixlowpan.h +++ b/include/nuttx/net/sixlowpan.h @@ -439,7 +439,7 @@ struct sixlowpan_reassbuf_s * be cancelled. */ - systime_t rb_time; + clock_t rb_time; }; /**************************************************************************** diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h index f915e320104..507aa9804f0 100644 --- a/include/nuttx/sched.h +++ b/include/nuttx/sched.h @@ -326,7 +326,7 @@ struct sporadic_s uint8_t nrepls; /* Number of active replenishments */ uint32_t repl_period; /* Sporadic replenishment period */ uint32_t budget; /* Sporadic execution budget period */ - systime_t eventtime; /* Time thread suspended or [re-]started */ + clock_t eventtime; /* Time thread suspended or [re-]started */ /* This is the last interval timer activated */ diff --git a/include/nuttx/semaphore.h b/include/nuttx/semaphore.h index 53620fbdae5..0f653042493 100644 --- a/include/nuttx/semaphore.h +++ b/include/nuttx/semaphore.h @@ -321,7 +321,7 @@ int nxsem_timedwait(FAR sem_t *sem, FAR const struct timespec *abstime); * ****************************************************************************/ -int nxsem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay); +int nxsem_tickwait(FAR sem_t *sem, clock_t start, uint32_t delay); /**************************************************************************** * Name: nxsem_post diff --git a/include/nuttx/wqueue.h b/include/nuttx/wqueue.h index 80d65be6f5e..a3cd7b24935 100644 --- a/include/nuttx/wqueue.h +++ b/include/nuttx/wqueue.h @@ -292,8 +292,8 @@ struct work_s struct dq_entry_s dq; /* Implements a doubly linked list */ worker_t worker; /* Work callback */ FAR void *arg; /* Callback argument */ - systime_t qtime; /* Time work queued */ - systime_t delay; /* Delay until work performed */ + clock_t qtime; /* Time work queued */ + clock_t delay; /* Delay until work performed */ }; /**************************************************************************** @@ -361,7 +361,7 @@ int work_usrstart(void); ****************************************************************************/ int work_queue(int qid, FAR struct work_s *work, worker_t worker, - FAR void *arg, systime_t delay); + FAR void *arg, clock_t delay); /**************************************************************************** * Name: work_cancel diff --git a/include/sys/types.h b/include/sys/types.h index 64dd844e700..8b4cb29c20e 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -231,7 +231,12 @@ typedef int16_t blksize_t; typedef unsigned int socklen_t; typedef uint16_t sa_family_t; -/* Used for system times in clock ticks (equivalent to systime_t) */ +/* Used for system times in clock ticks. This type is the natural width of + * the system timer. + * + * NOTE: The signed-ness of clock_t is not specified at OpenGroup.org. An + * unsigned type is used to support the full range of the internal clock. + */ #ifdef CONFIG_SYSTEM_TIME64 typedef uint64_t clock_t; diff --git a/libs/libc/wqueue/work_queue.c b/libs/libc/wqueue/work_queue.c index 2e1e3d1fe03..fb7995ff7f4 100644 --- a/libs/libc/wqueue/work_queue.c +++ b/libs/libc/wqueue/work_queue.c @@ -87,7 +87,7 @@ static int work_qqueue(FAR struct usr_wqueue_s *wqueue, FAR struct work_s *work, worker_t worker, - FAR void *arg, systime_t delay) + FAR void *arg, clock_t delay) { DEBUGASSERT(work != NULL); @@ -157,7 +157,7 @@ static int work_qqueue(FAR struct usr_wqueue_s *wqueue, ****************************************************************************/ int work_queue(int qid, FAR struct work_s *work, worker_t worker, - FAR void *arg, systime_t delay) + FAR void *arg, clock_t delay) { if (qid == USRWORK) { diff --git a/libs/libc/wqueue/work_usrthread.c b/libs/libc/wqueue/work_usrthread.c index c373600def8..08c00ba7fbd 100644 --- a/libs/libc/wqueue/work_usrthread.c +++ b/libs/libc/wqueue/work_usrthread.c @@ -119,11 +119,11 @@ void work_process(FAR struct usr_wqueue_s *wqueue) volatile FAR struct work_s *work; worker_t worker; FAR void *arg; - systime_t elapsed; - systime_t remaining; - systime_t stick; - systime_t ctick; - systime_t next; + clock_t elapsed; + clock_t remaining; + clock_t stick; + clock_t ctick; + clock_t next; int ret; /* Then process queued work. Lock the work queue while we process items diff --git a/net/devif/devif.h b/net/devif/devif.h index ae15637b3ad..c53288ac630 100644 --- a/net/devif/devif.h +++ b/net/devif/devif.h @@ -297,7 +297,7 @@ EXTERN uint8_t g_reassembly_timer; /* Time of last poll */ -EXTERN systime_t g_polltime; +EXTERN clock_t g_polltime; /**************************************************************************** * Public Function Prototypes diff --git a/net/devif/devif_poll.c b/net/devif/devif_poll.c index dd3810e0fa6..0d636dcdcc4 100644 --- a/net/devif/devif_poll.c +++ b/net/devif/devif_poll.c @@ -82,7 +82,7 @@ enum devif_packet_type /* Time of last poll */ -systime_t g_polltime; +clock_t g_polltime; /**************************************************************************** * Private Functions @@ -708,8 +708,8 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback) int devif_timer(FAR struct net_driver_s *dev, devif_poll_callback_t callback) { - systime_t now; - systime_t elapsed; + clock_t now; + clock_t elapsed; int bstop = false; /* Get the elapsed time since the last poll in units of half seconds @@ -733,7 +733,7 @@ int devif_timer(FAR struct net_driver_s *dev, devif_poll_callback_t callback) * boundary to avoid error build-up). */ - g_polltime += (TICK_PER_HSEC * (systime_t)hsec); + g_polltime += (TICK_PER_HSEC * (clock_t)hsec); /* Perform periodic activitives that depend on hsec > 0 */ diff --git a/net/icmp/icmp_recvfrom.c b/net/icmp/icmp_recvfrom.c index fc84b16cd38..870f15f2713 100644 --- a/net/icmp/icmp_recvfrom.c +++ b/net/icmp/icmp_recvfrom.c @@ -71,7 +71,7 @@ struct icmp_recvfrom_s FAR struct devif_callback_s *recv_cb; /* Reference to callback instance */ FAR struct socket *recv_sock; /* IPPROTO_ICMP socket structure */ sem_t recv_sem; /* Use to manage the wait for the response */ - systime_t recv_time; /* Start time for determining timeouts */ + clock_t recv_time; /* Start time for determining timeouts */ in_addr_t recv_from; /* The peer we received the request from */ FAR uint8_t *recv_buf; /* Location to return the response */ uint16_t recv_buflen; /* Size of the response */ diff --git a/net/icmp/icmp_sendto.c b/net/icmp/icmp_sendto.c index 5cef2794b31..e4fbe0d156f 100644 --- a/net/icmp/icmp_sendto.c +++ b/net/icmp/icmp_sendto.c @@ -89,7 +89,7 @@ struct icmp_sendto_s FAR struct devif_callback_s *snd_cb; /* Reference to callback instance */ FAR struct socket *snd_sock; /* IPPROTO_ICMP socket structure */ sem_t snd_sem; /* Use to manage the wait for send complete */ - systime_t snd_time; /* Start time for determining timeouts */ + clock_t snd_time; /* Start time for determining timeouts */ in_addr_t snd_toaddr; /* The peer to send the request to */ FAR const uint8_t *snd_buf; /* ICMP header + data payload */ uint16_t snd_buflen; /* Size of the ICMP header + data payload */ diff --git a/net/icmpv6/icmpv6_recvfrom.c b/net/icmpv6/icmpv6_recvfrom.c index f817643c1d0..11c90dea7be 100644 --- a/net/icmpv6/icmpv6_recvfrom.c +++ b/net/icmpv6/icmpv6_recvfrom.c @@ -74,7 +74,7 @@ struct icmpv6_recvfrom_s FAR struct devif_callback_s *recv_cb; /* Reference to callback instance */ FAR struct socket *recv_sock; /* IPPROTO_ICMP6 socket structure */ sem_t recv_sem; /* Use to manage the wait for the response */ - systime_t recv_time; /* Start time for determining timeouts */ + clock_t recv_time; /* Start time for determining timeouts */ struct in6_addr recv_from; /* The peer we received the request from */ FAR uint8_t *recv_buf; /* Location to return the response */ uint16_t recv_buflen; /* Size of the response */ diff --git a/net/icmpv6/icmpv6_sendto.c b/net/icmpv6/icmpv6_sendto.c index 6f7c4d28751..e179e3d434b 100644 --- a/net/icmpv6/icmpv6_sendto.c +++ b/net/icmpv6/icmpv6_sendto.c @@ -89,7 +89,7 @@ struct icmpv6_sendto_s FAR struct devif_callback_s *snd_cb; /* Reference to callback instance */ FAR struct socket *snd_sock; /* IPPROTO_ICMP6 socket structure */ sem_t snd_sem; /* Use to manage the wait for send complete */ - systime_t snd_time; /* Start time for determining timeouts */ + clock_t snd_time; /* Start time for determining timeouts */ struct in6_addr snd_toaddr; /* The peer to send the request to */ FAR const uint8_t *snd_buf; /* ICMPv6 header + data payload */ uint16_t snd_buflen; /* Size of the ICMPv6 header + data payload */ diff --git a/net/inet/inet_close.c b/net/inet/inet_close.c index a5b88aa1536..a11bff7db9f 100644 --- a/net/inet/inet_close.c +++ b/net/inet/inet_close.c @@ -82,7 +82,7 @@ struct tcp_close_s FAR struct socket *cl_psock; /* Reference to the TCP socket */ sem_t cl_sem; /* Signals disconnect completion */ int cl_result; /* The result of the close */ - systime_t cl_start; /* Time close started (in ticks) */ + clock_t cl_start; /* Time close started (in ticks) */ #endif }; #endif diff --git a/net/inet/inet_recvfrom.c b/net/inet/inet_recvfrom.c index 805acb44ef2..d9233c5203f 100644 --- a/net/inet/inet_recvfrom.c +++ b/net/inet/inet_recvfrom.c @@ -93,7 +93,7 @@ struct inet_recvfrom_s { FAR struct socket *ir_sock; /* The parent socket structure */ #ifdef CONFIG_NET_SOCKOPTS - systime_t ir_starttime; /* rcv start time for determining timeout */ + clock_t ir_starttime; /* rcv start time for determining timeout */ #endif FAR struct devif_callback_s *ir_cb; /* Reference to callback instance */ sem_t ir_sem; /* Semaphore signals recv completion */ diff --git a/net/sixlowpan/sixlowpan_reassbuf.c b/net/sixlowpan/sixlowpan_reassbuf.c index 13b57fa0b9e..a2a9936e6f5 100644 --- a/net/sixlowpan/sixlowpan_reassbuf.c +++ b/net/sixlowpan/sixlowpan_reassbuf.c @@ -136,7 +136,7 @@ static void sixlowpan_reass_expire(void) { FAR struct sixlowpan_reassbuf_s *reass; FAR struct sixlowpan_reassbuf_s *next; - systime_t elapsed; + clock_t elapsed; /* If reassembly timed out, cancel it */ diff --git a/net/sixlowpan/sixlowpan_send.c b/net/sixlowpan/sixlowpan_send.c index 3deb9d5b1cd..92706a98c89 100644 --- a/net/sixlowpan/sixlowpan_send.c +++ b/net/sixlowpan/sixlowpan_send.c @@ -82,7 +82,7 @@ struct sixlowpan_send_s sem_t s_waitsem; /* Supports waiting for driver events */ int s_result; /* The result of the transfer */ uint16_t s_timeout; /* Send timeout in deciseconds */ - systime_t s_time; /* Last send time for determining timeout */ + clock_t s_time; /* Last send time for determining timeout */ FAR const struct ipv6_hdr_s *s_ipv6hdr; /* IPv6 header, followed by UDP or ICMP header. */ FAR const struct netdev_varaddr_s *s_destmac; /* Destination MAC address */ FAR const void *s_buf; /* Data to send */ @@ -120,8 +120,8 @@ static inline bool send_timeout(FAR struct sixlowpan_send_s *sinfo) { /* Check if the configured timeout has elapsed */ - systime_t timeo_ticks = DSEC2TICK(sinfo->s_timeout); - systime_t elapsed = clock_systimer() - sinfo->s_time; + clock_t timeo_ticks = DSEC2TICK(sinfo->s_timeout); + clock_t elapsed = clock_systimer() - sinfo->s_time; if (elapsed >= timeo_ticks) { diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c index 191fbbc811e..45d1b52b171 100644 --- a/net/sixlowpan/sixlowpan_tcpsend.c +++ b/net/sixlowpan/sixlowpan_tcpsend.c @@ -95,7 +95,7 @@ struct sixlowpan_send_s sem_t s_waitsem; /* Supports waiting for driver events */ int s_result; /* The result of the transfer */ uint16_t s_timeout; /* Send timeout in deciseconds */ - systime_t s_time; /* Last send time for determining timeout */ + clock_t s_time; /* Last send time for determining timeout */ FAR const struct netdev_varaddr_s *s_destmac; /* Destination MAC address */ FAR const uint8_t *s_buf; /* Data to send */ size_t s_buflen; /* Length of data in buf */ @@ -307,8 +307,8 @@ static inline bool send_timeout(FAR struct sixlowpan_send_s *sinfo) { /* Check if the configured timeout has elapsed */ - systime_t timeo_ticks = DSEC2TICK(sinfo->s_timeout); - systime_t elapsed = clock_systimer() - sinfo->s_time; + clock_t timeo_ticks = DSEC2TICK(sinfo->s_timeout); + clock_t elapsed = clock_systimer() - sinfo->s_time; if (elapsed >= timeo_ticks) { diff --git a/net/socket/net_timeo.c b/net/socket/net_timeo.c index 4909f4a30e0..f82e5a9eeb2 100644 --- a/net/socket/net_timeo.c +++ b/net/socket/net_timeo.c @@ -69,10 +69,10 @@ * ****************************************************************************/ -int net_timeo(systime_t start_time, socktimeo_t timeo) +int net_timeo(clock_t start_time, socktimeo_t timeo) { - systime_t timeo_ticks = DSEC2TICK(timeo); - systime_t elapsed = clock_systimer() - start_time; + clock_t timeo_ticks = DSEC2TICK(timeo); + clock_t elapsed = clock_systimer() - start_time; if (elapsed >= timeo_ticks) { diff --git a/net/socket/socket.h b/net/socket/socket.h index a546660dd33..4da61bd5547 100644 --- a/net/socket/socket.h +++ b/net/socket/socket.h @@ -253,7 +253,7 @@ FAR const struct sock_intf_s * ****************************************************************************/ #ifdef CONFIG_NET_SOCKOPTS -int net_timeo(systime_t start_time, socktimeo_t timeo); +int net_timeo(clock_t start_time, socktimeo_t timeo); #endif /**************************************************************************** diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h index 6a4796f07e1..e183277ec2b 100644 --- a/net/tcp/tcp.h +++ b/net/tcp/tcp.h @@ -205,7 +205,7 @@ struct tcp_conn_s * system clock tick. */ - systime_t keeptime; /* Last time that the TCP socket was known to be + clock_t keeptime; /* Last time that the TCP socket was known to be * alive (ACK or data received) OR time that the * last probe was sent. */ uint16_t keepidle; /* Elapsed idle time before first probe sent (dsec) */ diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 13eefcbfff3..ddcd2a1eb01 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -107,7 +107,7 @@ struct send_s uint32_t snd_isn; /* Initial sequence number */ uint32_t snd_acked; /* The number of bytes acked */ #ifdef CONFIG_NET_SOCKOPTS - systime_t snd_time; /* Last send time for determining timeout */ + clock_t snd_time; /* Last send time for determining timeout */ #endif #if defined(CONFIG_NET_TCP_SPLIT) bool snd_odd; /* True: Odd packet in pair transaction */ diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c index dfbe6ae3fd4..16c7e9d6228 100644 --- a/net/tcp/tcp_sendfile.c +++ b/net/tcp/tcp_sendfile.c @@ -106,7 +106,7 @@ struct sendfile_s uint32_t snd_isn; /* Initial sequence number */ uint32_t snd_acked; /* The number of bytes acked */ #ifdef CONFIG_NET_SOCKOPTS - systime_t snd_time; /* Last send time for determining timeout */ + clock_t snd_time; /* Last send time for determining timeout */ #endif }; diff --git a/net/udp/udp.h b/net/udp/udp.h index ec4c3be1906..632c91eda54 100644 --- a/net/udp/udp.h +++ b/net/udp/udp.h @@ -148,7 +148,7 @@ struct udp_wrbuffer_s sq_entry_t wb_node; /* Supports a singly linked list */ struct sockaddr_storage wb_dest; /* Destination address */ #ifdef CONFIG_NET_SOCKOPTS - systime_t wb_start; /* Start time for timeout calculation */ + clock_t wb_start; /* Start time for timeout calculation */ #endif struct iob_s *wb_iob; /* Head of the I/O buffer chain */ }; diff --git a/net/udp/udp_psock_sendto_unbuffered.c b/net/udp/udp_psock_sendto_unbuffered.c index cbb41d24543..af0b1e2ee9c 100644 --- a/net/udp/udp_psock_sendto_unbuffered.c +++ b/net/udp/udp_psock_sendto_unbuffered.c @@ -81,7 +81,7 @@ struct sendto_s FAR struct socket *st_sock; /* Points to the parent socket structure */ #endif #ifdef CONFIG_NET_SOCKOPTS - systime_t st_time; /* Last send time for determining timeout */ + clock_t st_time; /* Last send time for determining timeout */ #endif FAR struct devif_callback_s *st_cb; /* Reference to callback instance */ sem_t st_sem; /* Semaphore signals sendto completion */ diff --git a/sched/clock/clock.h b/sched/clock/clock.h index 7e6a1c09333..8fe983534be 100644 --- a/sched/clock/clock.h +++ b/sched/clock/clock.h @@ -98,10 +98,10 @@ void weak_function clock_timer(void); int clock_abstime2ticks(clockid_t clockid, FAR const struct timespec *abstime, - FAR ssystime_t *ticks); + FAR sclock_t *ticks); int clock_time2ticks(FAR const struct timespec *reltime, - FAR ssystime_t *ticks); -int clock_ticks2time(ssystime_t ticks, FAR struct timespec *reltime); + FAR sclock_t *ticks); +int clock_ticks2time(sclock_t ticks, FAR struct timespec *reltime); void clock_timespec_add(FAR const struct timespec *ts1, FAR const struct timespec *ts2, FAR struct timespec *ts3); diff --git a/sched/clock/clock_abstime2ticks.c b/sched/clock/clock_abstime2ticks.c index c9765ffe278..18bc3ef3d5a 100644 --- a/sched/clock/clock_abstime2ticks.c +++ b/sched/clock/clock_abstime2ticks.c @@ -99,7 +99,7 @@ static long compare_timespec(FAR const struct timespec *a, ****************************************************************************/ int clock_abstime2ticks(clockid_t clockid, FAR const struct timespec *abstime, - FAR ssystime_t *ticks) + FAR sclock_t *ticks) { struct timespec currtime; struct timespec reltime; diff --git a/sched/clock/clock_initialize.c b/sched/clock/clock_initialize.c index 5d3ac3aa27b..fea25eef813 100644 --- a/sched/clock/clock_initialize.c +++ b/sched/clock/clock_initialize.c @@ -188,7 +188,7 @@ static void clock_inittime(void) { struct timespec ts; - (void)clock_ticks2time((ssystime_t)g_system_timer, &ts); + (void)clock_ticks2time((sclock_t)g_system_timer, &ts); /* Adjust base time to hide initial timer ticks. */ diff --git a/sched/clock/clock_systimer.c b/sched/clock/clock_systimer.c index 2426fe4b3d3..1c21ab45dcb 100644 --- a/sched/clock/clock_systimer.c +++ b/sched/clock/clock_systimer.c @@ -88,7 +88,7 @@ * ****************************************************************************/ -systime_t clock_systimer(void) +clock_t clock_systimer(void) { #ifdef CONFIG_SCHED_TICKLESS # ifdef CONFIG_SYSTEM_TIME64 @@ -123,14 +123,14 @@ systime_t clock_systimer(void) /* Convert to a 64- then a 32-bit value */ tmp = USEC2TICK(1000000 * (uint64_t)ts.tv_sec + (uint64_t)ts.tv_nsec / 1000); - return (systime_t)(tmp & TIMER_MASK32); + return (clock_t)(tmp & TIMER_MASK32); # endif /* CONFIG_SYSTEM_TIME64 */ #else /* CONFIG_SCHED_TICKLESS */ # ifdef CONFIG_SYSTEM_TIME64 - systime_t sample; - systime_t verify; + clock_t sample; + clock_t verify; /* 64-bit accesses are not atomic on most architectures. The following * loop samples the 64-bit timer twice and loops in the rare event that diff --git a/sched/clock/clock_systimespec.c b/sched/clock/clock_systimespec.c index 5b4496312ca..b203aa3744b 100644 --- a/sched/clock/clock_systimespec.c +++ b/sched/clock/clock_systimespec.c @@ -173,9 +173,9 @@ int clock_systimespec(FAR struct timespec *ts) uint64_t secs; uint64_t nsecs; #else - systime_t msecs; - systime_t secs; - systime_t nsecs; + clock_t msecs; + clock_t secs; + clock_t nsecs; #endif /* Get the time since power-on in seconds and milliseconds */ diff --git a/sched/clock/clock_ticks2time.c b/sched/clock/clock_ticks2time.c index ee6518c676f..70c34bd8fc3 100644 --- a/sched/clock/clock_ticks2time.c +++ b/sched/clock/clock_ticks2time.c @@ -63,9 +63,9 @@ * ****************************************************************************/ -int clock_ticks2time(ssystime_t ticks, FAR struct timespec *reltime) +int clock_ticks2time(sclock_t ticks, FAR struct timespec *reltime) { - ssystime_t remainder; + sclock_t remainder; reltime->tv_sec = ticks / TICK_PER_SEC; remainder = ticks - TICK_PER_SEC * reltime->tv_sec; diff --git a/sched/clock/clock_time2ticks.c b/sched/clock/clock_time2ticks.c index 4841cb50635..f07161d2110 100644 --- a/sched/clock/clock_time2ticks.c +++ b/sched/clock/clock_time2ticks.c @@ -68,7 +68,7 @@ ****************************************************************************/ int clock_time2ticks(FAR const struct timespec *reltime, - FAR ssystime_t *ticks) + FAR sclock_t *ticks) { #ifdef CONFIG_HAVE_LONG_LONG int64_t relnsec; @@ -84,7 +84,7 @@ int clock_time2ticks(FAR const struct timespec *reltime, * that is greater than or equal to the exact number of tick. */ - *ticks = (ssystime_t)((relnsec + NSEC_PER_TICK - 1) / NSEC_PER_TICK); + *ticks = (sclock_t)((relnsec + NSEC_PER_TICK - 1) / NSEC_PER_TICK); return OK; #else int32_t relusec; @@ -111,7 +111,7 @@ int clock_time2ticks(FAR const struct timespec *reltime, * that is greater than or equal to the exact number of tick. */ - *ticks = (ssystime_t)((relusec + USEC_PER_TICK - 1) / USEC_PER_TICK); + *ticks = (sclock_t)((relusec + USEC_PER_TICK - 1) / USEC_PER_TICK); return OK; #endif } diff --git a/sched/irq/irq.h b/sched/irq/irq.h index a51455f1750..8c9a8c818f9 100644 --- a/sched/irq/irq.h +++ b/sched/irq/irq.h @@ -75,7 +75,7 @@ struct irq_info_s xcpt_t handler; /* Address of the interrupt handler */ FAR void *arg; /* The argument provided to the interrupt handler. */ #ifdef CONFIG_SCHED_IRQMONITOR - systime_t start; /* Time interrupt attached */ + clock_t start; /* Time interrupt attached */ #ifdef CONFIG_HAVE_LONG_LONG uint64_t count; /* Number of interrupts on this IRQ */ #else diff --git a/sched/irq/irq_procfs.c b/sched/irq/irq_procfs.c index 1c20b0e4aa8..68933e7ac8c 100644 --- a/sched/irq/irq_procfs.c +++ b/sched/irq/irq_procfs.c @@ -157,8 +157,8 @@ static int irq_callback(int irq, FAR struct irq_info_s *info, FAR struct irq_file_s *irqfile = (FAR struct irq_file_s *)arg; struct irq_info_s copy; irqstate_t flags; - systime_t elapsed; - systime_t now; + clock_t elapsed; + clock_t now; size_t linesize; size_t copysize; unsigned long intpart; diff --git a/sched/mqueue/mq_timedreceive.c b/sched/mqueue/mq_timedreceive.c index af95097e899..27221067f70 100644 --- a/sched/mqueue/mq_timedreceive.c +++ b/sched/mqueue/mq_timedreceive.c @@ -207,7 +207,7 @@ ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen, if (mqdes->msgq->msglist.head == NULL) { - ssystime_t ticks; + sclock_t ticks; /* Convert the timespec to clock ticks. We must have interrupts * disabled here so that this time stays valid until the wait begins. diff --git a/sched/mqueue/mq_timedsend.c b/sched/mqueue/mq_timedsend.c index 66682e68f7d..2bb50c05a17 100644 --- a/sched/mqueue/mq_timedsend.c +++ b/sched/mqueue/mq_timedsend.c @@ -164,7 +164,7 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, int prio, FAR struct mqueue_inode_s *msgq; FAR struct mqueue_msg_s *mqmsg = NULL; irqstate_t flags; - ssystime_t ticks; + sclock_t ticks; int result; int ret; diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c index e6fe07b62a8..e54c9d9a337 100644 --- a/sched/paging/pg_worker.c +++ b/sched/paging/pg_worker.c @@ -109,7 +109,7 @@ static int g_fillresult; */ #ifdef CONFIG_PAGING_TIMEOUT_TICKS -static systime_t g_starttime; +static clock_t g_starttime; #endif #endif diff --git a/sched/pthread/pthread_condtimedwait.c b/sched/pthread/pthread_condtimedwait.c index c2f910aaee4..e95b8907d50 100644 --- a/sched/pthread/pthread_condtimedwait.c +++ b/sched/pthread/pthread_condtimedwait.c @@ -169,7 +169,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex, { FAR struct tcb_s *rtcb = this_task(); irqstate_t flags; - ssystime_t ticks; + sclock_t ticks; int mypid = (int)getpid(); int ret = OK; int status; diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c index 332720c8e2c..df03248fd2e 100644 --- a/sched/pthread/pthread_create.c +++ b/sched/pthread/pthread_create.c @@ -360,8 +360,8 @@ int pthread_create(FAR pthread_t *thread, FAR const pthread_attr_t *attr, if (policy == SCHED_SPORADIC) { FAR struct sporadic_s *sporadic; - ssystime_t repl_ticks; - ssystime_t budget_ticks; + sclock_t repl_ticks; + sclock_t budget_ticks; /* Convert timespec values to system clock ticks */ diff --git a/sched/sched/sched_getparam.c b/sched/sched/sched_getparam.c index c1668d00c5d..0b70c3b848c 100644 --- a/sched/sched/sched_getparam.c +++ b/sched/sched/sched_getparam.c @@ -134,9 +134,9 @@ int nxsched_getparam (pid_t pid, FAR struct sched_param *param) param->sched_ss_low_priority = (int)sporadic->low_priority; param->sched_ss_max_repl = (int)sporadic->max_repl; - clock_ticks2time((ssystime_t)sporadic->repl_period, + clock_ticks2time((sclock_t)sporadic->repl_period, ¶m->sched_ss_repl_period); - clock_ticks2time((ssystime_t)sporadic->budget, + clock_ticks2time((sclock_t)sporadic->budget, ¶m->sched_ss_init_budget); } else diff --git a/sched/sched/sched_setparam.c b/sched/sched/sched_setparam.c index 9a36299d7b7..be35f4c7f71 100644 --- a/sched/sched/sched_setparam.c +++ b/sched/sched/sched_setparam.c @@ -138,8 +138,8 @@ int nxsched_setparam(pid_t pid, FAR const struct sched_param *param) { FAR struct sporadic_s *sporadic; irqstate_t flags; - ssystime_t repl_ticks; - ssystime_t budget_ticks; + sclock_t repl_ticks; + sclock_t budget_ticks; if (param->sched_ss_max_repl < 1 || param->sched_ss_max_repl > CONFIG_SCHED_SPORADIC_MAXREPL) diff --git a/sched/sched/sched_setscheduler.c b/sched/sched/sched_setscheduler.c index 2147ea82175..204c28f944a 100644 --- a/sched/sched/sched_setscheduler.c +++ b/sched/sched/sched_setscheduler.c @@ -185,8 +185,8 @@ int nxsched_setscheduler(pid_t pid, int policy, case SCHED_SPORADIC: { FAR struct sporadic_s *sporadic; - ssystime_t repl_ticks; - ssystime_t budget_ticks; + sclock_t repl_ticks; + sclock_t budget_ticks; if (param->sched_ss_max_repl < 1 || param->sched_ss_max_repl > CONFIG_SCHED_SPORADIC_MAXREPL) diff --git a/sched/sched/sched_sporadic.c b/sched/sched/sched_sporadic.c index d78faaa031d..4ead1a0e2a1 100644 --- a/sched/sched/sched_sporadic.c +++ b/sched/sched/sched_sporadic.c @@ -998,7 +998,7 @@ int sched_sporadic_resume(FAR struct tcb_s *tcb) { FAR struct sporadic_s *sporadic; FAR struct replenishment_s *repl; - systime_t now; + clock_t now; uint32_t unrealized; uint32_t last; diff --git a/sched/semaphore/sem_tickwait.c b/sched/semaphore/sem_tickwait.c index 40a6c1db9c6..d69680396da 100644 --- a/sched/semaphore/sem_tickwait.c +++ b/sched/semaphore/sem_tickwait.c @@ -84,11 +84,11 @@ * ****************************************************************************/ -int nxsem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay) +int nxsem_tickwait(FAR sem_t *sem, clock_t start, uint32_t delay) { FAR struct tcb_s *rtcb = this_task(); irqstate_t flags; - systime_t elapsed; + clock_t elapsed; int ret; DEBUGASSERT(sem != NULL && up_interrupt_context() == false && diff --git a/sched/semaphore/sem_timedwait.c b/sched/semaphore/sem_timedwait.c index 8fc6b276f4b..0365af79b69 100644 --- a/sched/semaphore/sem_timedwait.c +++ b/sched/semaphore/sem_timedwait.c @@ -107,7 +107,7 @@ int nxsem_timedwait(FAR sem_t *sem, FAR const struct timespec *abstime) { FAR struct tcb_s *rtcb = this_task(); irqstate_t flags; - ssystime_t ticks; + sclock_t ticks; int status; int ret = ERROR; diff --git a/sched/signal/sig_nanosleep.c b/sched/signal/sig_nanosleep.c index bd2b63c8497..81f4014c5f6 100644 --- a/sched/signal/sig_nanosleep.c +++ b/sched/signal/sig_nanosleep.c @@ -107,7 +107,7 @@ int nxsig_nanosleep(FAR const struct timespec *rqtp, FAR struct timespec *rmtp) { irqstate_t flags; - systime_t starttick; + clock_t starttick; sigset_t set; int ret; @@ -158,9 +158,9 @@ int nxsig_nanosleep(FAR const struct timespec *rqtp, if (rmtp) { - systime_t elapsed; - systime_t remaining; - ssystime_t ticks; + clock_t elapsed; + clock_t remaining; + sclock_t ticks; /* REVISIT: The conversion from time to ticks and back could * be avoided. clock_timespec_subtract() would be used instead @@ -182,16 +182,16 @@ int nxsig_nanosleep(FAR const struct timespec *rqtp, * amount of time that we failed to wait. */ - if (elapsed >= (systime_t)ticks) + if (elapsed >= (clock_t)ticks) { remaining = 0; } else { - remaining = (systime_t)ticks - elapsed; + remaining = (clock_t)ticks - elapsed; } - (void)clock_ticks2time((ssystime_t)remaining, rmtp); + (void)clock_ticks2time((sclock_t)remaining, rmtp); } leave_critical_section(flags); diff --git a/sched/timer/timer_gettime.c b/sched/timer/timer_gettime.c index 1fb43081204..14133a5f16c 100644 --- a/sched/timer/timer_gettime.c +++ b/sched/timer/timer_gettime.c @@ -86,7 +86,7 @@ int timer_gettime(timer_t timerid, FAR struct itimerspec *value) { FAR struct posix_timer_s *timer = (FAR struct posix_timer_s *)timerid; - ssystime_t ticks; + sclock_t ticks; if (!timer || !value) { diff --git a/sched/timer/timer_settime.c b/sched/timer/timer_settime.c index 73c20dc9b19..50a818301d0 100644 --- a/sched/timer/timer_settime.c +++ b/sched/timer/timer_settime.c @@ -305,7 +305,7 @@ int timer_settime(timer_t timerid, int flags, { FAR struct posix_timer_s *timer = (FAR struct posix_timer_s *)timerid; irqstate_t intflags; - ssystime_t delay; + sclock_t delay; int ret = OK; /* Some sanity checks */ @@ -335,7 +335,7 @@ int timer_settime(timer_t timerid, int flags, { (void)clock_time2ticks(&value->it_interval, &delay); - /* REVISIT: Should pt_delay be ssystime_t? */ + /* REVISIT: Should pt_delay be sclock_t? */ timer->pt_delay = (int)delay; } @@ -384,8 +384,8 @@ int timer_settime(timer_t timerid, int flags, if (delay > 0) { - /* REVISIT: Should pt_last be ssystime_t? Should wd_start delay be - * ssystime_t? + /* REVISIT: Should pt_last be sclock_t? Should wd_start delay be + * sclock_t? */ timer->pt_last = delay; diff --git a/sched/wqueue/kwork_process.c b/sched/wqueue/kwork_process.c index 2266949f5f7..5d678ce320a 100644 --- a/sched/wqueue/kwork_process.c +++ b/sched/wqueue/kwork_process.c @@ -93,17 +93,17 @@ * ****************************************************************************/ -void work_process(FAR struct kwork_wqueue_s *wqueue, systime_t period, int wndx) +void work_process(FAR struct kwork_wqueue_s *wqueue, clock_t period, int wndx) { volatile FAR struct work_s *work; worker_t worker; irqstate_t flags; FAR void *arg; - systime_t elapsed; - systime_t remaining; - systime_t stick; - systime_t ctick; - systime_t next; + clock_t elapsed; + clock_t remaining; + clock_t stick; + clock_t ctick; + clock_t next; /* Then process queued work. We need to keep interrupts disabled while * we process items in the work list. diff --git a/sched/wqueue/kwork_queue.c b/sched/wqueue/kwork_queue.c index 483a7e55af3..79bf5ca92cc 100644 --- a/sched/wqueue/kwork_queue.c +++ b/sched/wqueue/kwork_queue.c @@ -88,7 +88,7 @@ static void work_qqueue(FAR struct kwork_wqueue_s *wqueue, FAR struct work_s *work, worker_t worker, - FAR void *arg, systime_t delay) + FAR void *arg, clock_t delay) { irqstate_t flags; @@ -160,7 +160,7 @@ static void work_qqueue(FAR struct kwork_wqueue_s *wqueue, ****************************************************************************/ int work_queue(int qid, FAR struct work_s *work, worker_t worker, - FAR void *arg, systime_t delay) + FAR void *arg, clock_t delay) { /* Queue the new work */ diff --git a/sched/wqueue/wqueue.h b/sched/wqueue/wqueue.h index 7e7942ef02a..e67976a11a7 100644 --- a/sched/wqueue/wqueue.h +++ b/sched/wqueue/wqueue.h @@ -74,7 +74,7 @@ struct kworker_s struct kwork_wqueue_s { - systime_t delay; /* Delay between polling cycles (ticks) */ + clock_t delay; /* Delay between polling cycles (ticks) */ struct dq_queue_s q; /* The queue of pending work */ struct kworker_s worker[1]; /* Describes a worker thread */ }; @@ -86,7 +86,7 @@ struct kwork_wqueue_s #ifdef CONFIG_SCHED_HPWORK struct hp_wqueue_s { - systime_t delay; /* Delay between polling cycles (ticks) */ + clock_t delay; /* Delay between polling cycles (ticks) */ struct dq_queue_s q; /* The queue of pending work */ struct kworker_s worker[1]; /* Describes the single high priority worker */ }; @@ -99,7 +99,7 @@ struct hp_wqueue_s #ifdef CONFIG_SCHED_LPWORK struct lp_wqueue_s { - systime_t delay; /* Delay between polling cycles (ticks) */ + clock_t delay; /* Delay between polling cycles (ticks) */ struct dq_queue_s q; /* The queue of pending work */ /* Describes each thread in the low priority queue's thread pool */ @@ -185,7 +185,7 @@ int work_lpstart(void); * ****************************************************************************/ -void work_process(FAR struct kwork_wqueue_s *wqueue, systime_t period, int wndx); +void work_process(FAR struct kwork_wqueue_s *wqueue, clock_t period, int wndx); #endif /* CONFIG_SCHED_WORKQUEUE */ #endif /* __SCHED_WQUEUE_WQUEUE_H */ diff --git a/syscall/syscall.csv b/syscall/syscall.csv index f7330684f86..186a3993d1b 100644 --- a/syscall/syscall.csv +++ b/syscall/syscall.csv @@ -13,7 +13,7 @@ "clock_gettime","time.h","","int","clockid_t","struct timespec*" "clock_nanosleep","time.h","!defined(CONFIG_DISABLE_SIGNALS)","int","clockid_t","int","FAR const struct timespec *", "FAR struct timespec*" "clock_settime","time.h","","int","clockid_t","const struct timespec*" -"clock_systimer","nuttx/clock.h","!defined(__HAVE_KERNEL_GLOBALS)","systime_t" +"clock_systimer","nuttx/clock.h","!defined(__HAVE_KERNEL_GLOBALS)","clock_t" "close","unistd.h","CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0","int","int" "closedir","dirent.h","CONFIG_NFILE_DESCRIPTORS > 0","int","FAR DIR*" "connect","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","FAR const struct sockaddr*","socklen_t" diff --git a/syscall/syscall_clock_systimer.c b/syscall/syscall_clock_systimer.c index 3473cc673dd..c0d13132d0d 100644 --- a/syscall/syscall_clock_systimer.c +++ b/syscall/syscall_clock_systimer.c @@ -74,7 +74,7 @@ * ****************************************************************************/ -systime_t syscall_clock_systimer(void) +clock_t syscall_clock_systimer(void) { return clock_systimer(); } diff --git a/syscall/syscall_funclookup.c b/syscall/syscall_funclookup.c index 8e7009b90ed..ab8ccf49275 100644 --- a/syscall/syscall_funclookup.c +++ b/syscall/syscall_funclookup.c @@ -100,7 +100,7 @@ * have an address that can be included in the g_funclookup[] table. */ -systime_t syscall_clock_systimer(void); +clock_t syscall_clock_systimer(void); /**************************************************************************** * Pre-processor Definitions