Updates to the initial scanchain validation code:

[openocd.git] / src / helper / binarybuffer.h

diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index d07a15a148c619d1df3bd23d4fb92c48a5233e3a..eef4057ab17cb419262209c69f9b5a899812b4d7 100644 (file)
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -2,7 +2,7 @@
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -41,8 +41,8 @@ static inline void buf_set_u32(uint8_t* buffer, unsigned int first, unsigned int
        } else
        {
                unsigned int i;
-               
-               for (i=first; i<first+num; i++)
+
+               for (i = first; i < first + num; i++)
                {
                        if (((value >> (i-first))&1) == 1)
                                buffer[i/8] |= 1 << (i%8);
@@ -55,18 +55,18 @@ static inline uint32_t buf_get_u32(const uint8_t* buffer, unsigned int first, un
 {
        if ((num == 32) && (first == 0))
        {
-               return (((uint32_t)buffer[3]) << 24)|(((uint32_t)buffer[2]) << 16)|(((uint32_t)buffer[1]) << 8)|(((uint32_t)buffer[0]) << 0);
+               return (((uint32_t)buffer[3]) << 24) | (((uint32_t)buffer[2]) << 16) | (((uint32_t)buffer[1]) << 8) | (((uint32_t)buffer[0]) << 0);
        } else
        {
                uint32_t result = 0;
                unsigned int i;
-               
-               for (i=first; i<first+num; i++)
+
+               for (i = first; i < first + num; i++)
                {
                        if (((buffer[i/8]>>(i%8))&1) == 1)
                                result |= 1 << (i-first);
                }
-       
+
                return result;
        }
 }
@@ -86,7 +86,7 @@ extern char* buf_to_str(const uint8_t *buf, int size, int radix);
 struct scan_field_s;
 extern int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field_s *field);
 
-#define CEIL(m, n)     ((m + n - 1) / n)
+#define CEIL(m, n)     (((m) + (n) - 1) / (n))
 
 /* read a uint32_t from a buffer in target memory endianness */
 static inline uint32_t fast_target_buffer_get_u32(const uint8_t *buffer, int little)