breakpoints: simplify the test to find a breakpoint

[openocd] / src / target / arm11_dbgtap.c

diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index fd8d2540a048977adcd6ddad5213040a1ca2f56f..2232b3ef6df99c384b6d65f2a716f7dc73adb1e6 100644 (file)
--- 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;
@@ -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();