X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fdsrec.c;h=162fc6477c0abf5855c24ca23c94b48521496d9e;hb=2dd4d4224afba558be14b39e2886ba47b2132678;hp=9ea23c0aec23cbf1b7b9347a87bb3a79fd625d8f;hpb=f5656eadf4383cc733b96ff49ba8efbea6922ad3;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/dsrec.c b/gdb/dsrec.c
index 9ea23c0aec..162fc6477c 100644
--- a/gdb/dsrec.c
+++ b/gdb/dsrec.c
@@ -1,6 +1,5 @@
 /* S-record download support for GDB, the GNU debugger.
-   Copyright (C) 1995-1997, 1999-2001, 2003-2004, 2007-2012 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,13 +19,12 @@
 #include "defs.h"
 #include "serial.h"
 #include "srec.h"
+#include <sys/time.h>
 #include <time.h>
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "gdb_bfd.h"
 
-extern void report_transfer_performance (unsigned long, time_t, time_t);
-
 extern int remote_debug;
 
 static int make_srec (char *srec, CORE_ADDR targ_addr, bfd * abfd,
@@ -55,7 +53,7 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
   char *srec;
   int i;
   int reclen;
-  time_t start_time, end_time;
+  struct timeval start_time, end_time;
   unsigned long data_count = 0;
   struct cleanup *cleanup;
 
@@ -76,7 +74,7 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
       return;
     }
 
-  start_time = time (NULL);
+  gettimeofday (&start_time, NULL);
 
   /* Write a type 0 header record. no data for a type 0, and there
      is no data, so len is 0.  */
@@ -151,7 +149,7 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
   if (hashmark)
     putchar_unfiltered ('\n');
 
-  end_time = time (NULL);
+  gettimeofday (&end_time, NULL);
 
   /* Write a terminator record.  */
 
@@ -173,7 +171,8 @@ load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
 
   serial_flush_input (desc);
 
-  report_transfer_performance (data_count, start_time, end_time);
+  print_transfer_performance (gdb_stdout, data_count, 0,
+			      &start_time, &end_time);
   do_cleanups (cleanup);
 }
 
@@ -227,10 +226,10 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect,
 {
   unsigned char checksum;
   int tmp;
-  const static char hextab[] = "0123456789ABCDEF";
-  const static char data_code_table[] = "123";
-  const static char term_code_table[] = "987";
-  const static char header_code_table[] = "000";
+  static const char hextab[] = "0123456789ABCDEF";
+  static const char data_code_table[] = "123";
+  static const char term_code_table[] = "987";
+  static const char header_code_table[] = "000";
   char const *code_table;
   int addr_size;
   int payload_size;