flash/nor/stm32f1x: remove write alignment code

[fw/openocd] / src / helper / time_support.c

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index c5978b423f634fea0d2dddb58d49e392f35a12f7..861889ec695fb54228166db3c01d7b0423c4ea75 100644 (file)
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -19,9 +19,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -64,6 +62,21 @@ int timeval_add_time(struct timeval *result, long sec, long usec)
        return 0;
 }
 
+/* compare two timevals and return -1/0/+1 accordingly */
+int timeval_compare(const struct timeval *x, const struct timeval *y)
+{
+       if (x->tv_sec < y->tv_sec)
+               return -1;
+       else if (x->tv_sec > y->tv_sec)
+               return 1;
+       else if (x->tv_usec < y->tv_usec)
+               return -1;
+       else if (x->tv_usec > y->tv_usec)
+               return 1;
+       else
+               return 0;
+}
+
 int duration_start(struct duration *duration)
 {
        return gettimeofday(&duration->start, NULL);
@@ -73,19 +86,19 @@ int duration_measure(struct duration *duration)
 {
        struct timeval end;
        int retval = gettimeofday(&end, NULL);
-       if (0 == retval)
+       if (retval == 0)
                timeval_subtract(&duration->elapsed, &end, &duration->start);
        return retval;
 }
 
-float duration_elapsed(struct duration *duration)
+float duration_elapsed(const struct duration *duration)
 {
        float t = duration->elapsed.tv_sec;
        t += (float)duration->elapsed.tv_usec / 1000000.0;
        return t;
 }
 
-float duration_kbps(struct duration *duration, size_t count)
+float duration_kbps(const struct duration *duration, size_t count)
 {
        return count / (1024.0 * duration_elapsed(duration));
 }