X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fregister.h;h=57342ba395d1322bbf80dc8fe584eb7c6de82b30;hp=60ac8e5450d86a0558ae66cc15e93e95e5e3078e;hb=93459582fd340e4f63efed0fab9abd49a2cb6373;hpb=0cba0d4df3fe120f08945703506f8405760325c9

diff --git a/src/target/register.h b/src/target/register.h
index 60ac8e5450..57342ba395 100644
--- a/src/target/register.h
+++ b/src/target/register.h
@@ -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  *
@@ -24,49 +24,52 @@
 #define REGISTER_H
 
 #include "types.h"
-#include "target.h"
 
 struct target_s;
 
-typedef struct bitfield_desc_s
+struct bitfield_desc
 {
 	char *name;
 	int num_bits;
-} bitfield_desc_t;
+};
 
 typedef struct reg_s
 {
 	char *name;
-	u8 *value;
+	void *value;
 	int dirty;
 	int valid;
-	int size;
-	bitfield_desc_t *bitfield_desc;
+	uint32_t size;
+	struct bitfield_desc *bitfield_desc;
 	int num_bitfields;
 	void *arch_info;
 	int arch_type;
 } reg_t;
 
-typedef struct reg_cache_s
+struct reg_cache
 {
 	char *name;
-	struct reg_cache_s *next;
+	struct reg_cache *next;
 	reg_t *reg_list;
 	int num_regs;
-} reg_cache_t;
+};
 
-typedef struct reg_arch_type_s
+struct reg_arch_type
 {
 	int id;
 	int (*get)(reg_t *reg);
-	int (*set)(reg_t *reg, u8 *buf);
-	struct reg_arch_type_s *next;
-} reg_arch_type_t;
+	int (*set)(reg_t *reg, uint8_t *buf);
+	struct reg_arch_type *next;
+};
 
-extern reg_t* register_get_by_name(reg_cache_t *first, char *name, int search_all);
-extern reg_cache_t** register_get_last_cache_p(reg_cache_t **first);
-extern int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, u8 *buf));
-extern reg_arch_type_t* register_get_arch_type(int id);
-extern void register_init_dummy(reg_t *reg);
+reg_t* register_get_by_name(struct reg_cache *first,
+		const char *name, bool search_all);
+struct reg_cache** register_get_last_cache_p(struct reg_cache **first);
+
+int register_reg_arch_type(int (*get)(reg_t *reg),
+		int (*set)(reg_t *reg, uint8_t *buf));
+struct reg_arch_type* register_get_arch_type(int id);
+
+void register_init_dummy(reg_t *reg);
 
 #endif /* REGISTER_H */