X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fregister.c;h=f26835bdea0815e9b5beb0ae4eb39a0745f2242c;hb=2280ddeea5fd82554696f1caa97f7a485a035da4;hp=7d120ad279ab0e732609507bd6dc7b1eb57d28f9;hpb=6bc51d71352aa19ea59d0dcc92f2ad28e3fdf038;p=openocd.git diff --git a/src/target/register.c b/src/target/register.c index 7d120ad279..f26835bdea 100644 --- a/src/target/register.c +++ b/src/target/register.c @@ -2,7 +2,7 @@ * Copyright (C) 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 * @@ -25,19 +25,16 @@ #endif #include "register.h" - #include "log.h" -#include "command.h" -#include -#include -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) { @@ -56,9 +53,9 @@ reg_t* register_get_by_name(reg_cache_t *first, char *name, int search_all) 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) @@ -69,9 +66,9 @@ reg_cache_t** register_get_last_cache_p(reg_cache_t **first) return cache_p; } -int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, u8 *buf)) +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 = ®_arch_types; + struct reg_arch_type** arch_type_p = ®_arch_types; int id = 0; if (*arch_type_p) @@ -83,7 +80,7 @@ int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, u8 *bu } } - (*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; @@ -92,9 +89,9 @@ int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, u8 *bu 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) { @@ -107,14 +104,12 @@ reg_arch_type_t* register_get_arch_type(int id) return NULL; } - - -static int register_get_dummy_core_reg(reg_t *reg) +static int register_get_dummy_core_reg(struct reg *reg) { return ERROR_OK; } -static int register_set_dummy_core_reg(reg_t *reg, u8 *buf) +static int register_set_dummy_core_reg(struct reg *reg, uint8_t *buf) { reg->dirty = 1; reg->valid = 1; @@ -122,10 +117,10 @@ static int register_set_dummy_core_reg(reg_t *reg, u8 *buf) return ERROR_OK; } -void register_init_dummy(reg_t *reg) +void register_init_dummy(struct reg *reg) { static int dummy_arch_type = -1; - if (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;