X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm11_dbgtap.c;h=2232b3ef6df99c384b6d65f2a716f7dc73adb1e6;hp=d7cd020f58808f281c84aa0d7ef2ef3393ea25ad;hb=fa765f137460181fd84529df82309a12c376e71a;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee

diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index d7cd020f58..2232b3ef6d 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -15,9 +15,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
@@ -410,7 +408,7 @@ int arm11_run_instr_no_data(struct arm11_common *arm11,
 			if (flag)
 				break;
 
-			long long then = 0;
+			int64_t then = 0;
 
 			if (i == 1000)
 				then = timeval_ms();
@@ -493,7 +491,7 @@ int arm11_run_instr_data_to_core(struct arm11_common *arm11,
 
 			JTAG_DEBUG("DTR  Ready %d  nRetry %d", Ready, nRetry);
 
-			long long then = 0;
+			int64_t then = 0;
 
 			if (i == 1000)
 				then = timeval_ms();
@@ -525,7 +523,7 @@ int arm11_run_instr_data_to_core(struct arm11_common *arm11,
 		JTAG_DEBUG("DTR  Data %08x  Ready %d  nRetry %d",
 			(unsigned) Data, Ready, nRetry);
 
-		long long then = 0;
+		int64_t then = 0;
 
 		if (i == 1000)
 			then = timeval_ms();
@@ -591,7 +589,7 @@ int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
 	unsigned readiesNum = count;
 	unsigned bytes = sizeof(*Readies)*readiesNum;
 
-	Readies = (uint8_t *) malloc(bytes);
+	Readies = malloc(bytes);
 	if (Readies == NULL) {
 		LOG_ERROR("Out of memory allocating %u bytes", bytes);
 		return ERROR_FAIL;
@@ -599,7 +597,7 @@ int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
 
 	uint8_t *ReadyPos                        = Readies;
 	while (count--) {
-		chain5_fields[0].out_value      = (void *)(data++);
+		chain5_fields[0].out_value      = (uint8_t *)(data++);
 		chain5_fields[1].in_value       = ReadyPos++;
 
 		if (count > 0) {
@@ -789,7 +787,7 @@ int arm11_run_instr_data_from_core(struct arm11_common *arm11,
 			JTAG_DEBUG("DTR  Data %08x  Ready %d  nRetry %d",
 				(unsigned) Data, Ready, nRetry);
 
-			long long then = 0;
+			int64_t then = 0;
 
 			if (i == 1000)
 				then = timeval_ms();
@@ -924,7 +922,7 @@ int arm11_sc7_run(struct arm11_common *arm11, struct arm11_sc7_action *actions,
 			if (Ready)
 				break;
 
-			long long then = 0;
+			int64_t then = 0;
 
 			if (i_n == 1000)
 				then = timeval_ms();