reg_t -> struct reg

[fw/openocd] / src / target / register.c

diff --git a/src/target/register.c b/src/target/register.c
index 7b98cfcf83fde84bd22998b67a2a520945f785c0..f26835bdea0815e9b5beb0ae4eb39a0745f2242c 100644 (file)
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -17,21 +20,22 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "register.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#include "register.h"
 #include "log.h"
-#include "command.h"
 
-#include <string.h>
-#include <stdlib.h>
 
-reg_arch_type_t *reg_arch_types = NULL;
+struct reg_arch_type *reg_arch_types = NULL;
 
-reg_t* register_get_by_name(reg_cache_t *first, char *name, int search_all)
+struct reg* register_get_by_name(struct reg_cache *first,
+               const char *name, bool search_all)
 {
        int i;
-       reg_cache_t *cache = first;
-       
+       struct reg_cache *cache = first;
+
        while (cache)
        {
                for (i = 0; i < cache->num_regs; i++)
@@ -39,34 +43,34 @@ reg_t* register_get_by_name(reg_cache_t *first, char *name, int search_all)
                        if (strcmp(cache->reg_list[i].name, name) == 0)
                                return &(cache->reg_list[i]);
                }
-               
+
                if (search_all)
                        cache = cache->next;
                else
                        break;
        }
-       
+
        return NULL;
 }
 
-reg_cache_t** register_get_last_cache_p(reg_cache_t **first)
+struct reg_cache** register_get_last_cache_p(struct reg_cache **first)
 {
-       reg_cache_t **cache_p = first;
-       
+       struct reg_cache **cache_p = first;
+
        if (*cache_p)
                while (*cache_p)
                        cache_p = &((*cache_p)->next);
        else
                return first;
-       
+
        return cache_p;
 }
 
-int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, u32 value))
+int register_reg_arch_type(int (*get)(struct reg *reg), int (*set)(struct reg *reg, uint8_t *buf))
 {
-       reg_arch_type_t** arch_type_p = &reg_arch_types;
+       struct reg_arch_type** arch_type_p = &reg_arch_types;
        int id = 0;
-       
+
        if (*arch_type_p)
        {
                while (*arch_type_p)
@@ -75,26 +79,49 @@ int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, u32 va
                        arch_type_p = &((*arch_type_p)->next);
                }
        }
-       
-       (*arch_type_p) = malloc(sizeof(reg_arch_type_t));
+
+       (*arch_type_p) = malloc(sizeof(struct reg_arch_type));
        (*arch_type_p)->id = id + 1;
        (*arch_type_p)->set = set;
        (*arch_type_p)->get = get;
        (*arch_type_p)->next = NULL;
-                       
+
        return id + 1;
 }
 
-reg_arch_type_t* register_get_arch_type(int id)
+struct reg_arch_type* register_get_arch_type(int id)
 {
-       reg_arch_type_t *arch_type = reg_arch_types;
-       
+       struct reg_arch_type *arch_type = reg_arch_types;
+
        while (arch_type)
        {
                if (arch_type->id == id)
                        return arch_type;
                arch_type = arch_type->next;
        }
-       
+       LOG_ERROR("BUG: encountered unregistered arch type 0x%08x", id);
+       exit(-1);
        return NULL;
 }
+
+static int register_get_dummy_core_reg(struct reg *reg)
+{
+       return ERROR_OK;
+}
+
+static int register_set_dummy_core_reg(struct reg *reg, uint8_t *buf)
+{
+       reg->dirty = 1;
+       reg->valid = 1;
+
+       return ERROR_OK;
+}
+
+void register_init_dummy(struct reg *reg)
+{
+       static int dummy_arch_type = -1;
+       if (dummy_arch_type == -1)
+               dummy_arch_type = register_reg_arch_type(register_get_dummy_core_reg, register_set_dummy_core_reg);
+
+       reg->arch_type = dummy_arch_type;
+}