target/armv4_5_cache: change prototype of armv4_5_handle_cache_info_command()

[openocd.git] / src / target / armv4_5_cache.c

diff --git a/src/target/armv4_5_cache.c b/src/target/armv4_5_cache.c
index f45878a697557a65f2577e0d1c07dd3fae3a2cb9..6a169253e7f6b3e798da1104d877d69a94bf42e5 100644 (file)
--- a/src/target/armv4_5_cache.c
+++ b/src/target/armv4_5_cache.c
@@ -13,18 +13,17 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "armv4_5_cache.h"
-#include "log.h"
+#include <helper/log.h>
 
-int armv4_5_identify_cache(uint32_t cache_type_reg, armv4_5_cache_common_t *cache)
+int armv4_5_identify_cache(uint32_t cache_type_reg, struct armv4_5_cache_common *cache)
 {
        int size, assoc, M, len, multiplier;
 
@@ -37,16 +36,13 @@ int armv4_5_identify_cache(uint32_t cache_type_reg, armv4_5_cache_common_t *cach
        len = (cache_type_reg & 0x3000) >> 12;
        multiplier = 2 + M;
 
-       if ((assoc != 0) || (M != 1)) /* assoc 0 and M 1 means cache absent */
-       {
+       if ((assoc != 0) || (M != 1)) /* assoc 0 and M 1 means cache absent */ {
                /* cache is present */
                cache->d_u_size.linelen = 1 << (len + 3);
                cache->d_u_size.associativity = multiplier << (assoc - 1);
                cache->d_u_size.nsets = 1 << (size + 6 - assoc - len);
                cache->d_u_size.cachesize = multiplier << (size + 8);
-       }
-       else
-       {
+       } else {
                /* cache is absent */
                cache->d_u_size.linelen = -1;
                cache->d_u_size.associativity = -1;
@@ -54,57 +50,49 @@ int armv4_5_identify_cache(uint32_t cache_type_reg, armv4_5_cache_common_t *cach
                cache->d_u_size.cachesize = -1;
        }
 
-       if (cache->separate)
-       {
+       if (cache->separate) {
                size = (cache_type_reg & 0x1c0) >> 6;
                assoc = (cache_type_reg & 0x38) >> 3;
                M = (cache_type_reg & 0x4) >> 2;
                len = (cache_type_reg & 0x3);
                multiplier = 2 + M;
 
-               if ((assoc != 0) || (M != 1)) /* assoc 0 and M 1 means cache absent */
-               {
+               if ((assoc != 0) || (M != 1)) /* assoc 0 and M 1 means cache absent */ {
                        /* cache is present */
                        cache->i_size.linelen = 1 << (len + 3);
                        cache->i_size.associativity = multiplier << (assoc - 1);
                        cache->i_size.nsets = 1 << (size + 6 - assoc - len);
                        cache->i_size.cachesize = multiplier << (size + 8);
-               }
-               else
-               {
+               } else {
                        /* cache is absent */
                        cache->i_size.linelen = -1;
                        cache->i_size.associativity = -1;
                        cache->i_size.nsets = -1;
                        cache->i_size.cachesize = -1;
                }
-       }
-       else
-       {
+       } else
                cache->i_size = cache->d_u_size;
-       }
 
        return ERROR_OK;
 }
 
-int armv4_5_handle_cache_info_command(struct command_context_s *cmd_ctx, armv4_5_cache_common_t *armv4_5_cache)
+int armv4_5_handle_cache_info_command(struct command_invocation *cmd, struct armv4_5_cache_common *armv4_5_cache)
 {
-       if (armv4_5_cache->ctype == -1)
-       {
-               command_print(cmd_ctx, "cache not yet identified");
+       if (armv4_5_cache->ctype == -1) {
+               command_print(cmd->ctx, "cache not yet identified");
                return ERROR_OK;
        }
 
-       command_print(cmd_ctx, "cache type: 0x%1.1x, %s", armv4_5_cache->ctype,
+       command_print(cmd->ctx, "cache type: 0x%1.1x, %s", armv4_5_cache->ctype,
                (armv4_5_cache->separate) ? "separate caches" : "unified cache");
 
-       command_print(cmd_ctx, "D-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
+       command_print(cmd->ctx, "D-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
                armv4_5_cache->d_u_size.linelen,
                armv4_5_cache->d_u_size.associativity,
                armv4_5_cache->d_u_size.nsets,
                armv4_5_cache->d_u_size.cachesize);
 
-       command_print(cmd_ctx, "I-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
+       command_print(cmd->ctx, "I-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
                armv4_5_cache->i_size.linelen,
                armv4_5_cache->i_size.associativity,
                armv4_5_cache->i_size.nsets,