From 1d44678038e923a47bdec1aea2135776aa421595 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Thu, 13 Mar 2003 09:36:07 +0000 Subject: [PATCH] 2003-03-13 Marcel Telka * include/part.h: Renamed types part to part_t, parts to parts_t, tap_register to tap_register_t. * include/register.h: Renamed tap_register type to tap_register_t. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@391 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 6 ++++++ jtag/include/part.h | 36 +++++++++++++++++++----------------- jtag/include/register.h | 25 +++++++++++++------------ 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index e6f9f89b..5b15750d 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,9 @@ +2003-03-13 Marcel Telka + + * include/part.h: Renamed types part to part_t, parts to parts_t, + tap_register to tap_register_t. + * include/register.h: Renamed tap_register type to tap_register_t. + 2003-03-11 Marcel Telka * configure.ac: Improved openwince include package detection. diff --git a/jtag/include/part.h b/jtag/include/part.h index 87cc5792..674b0680 100644 --- a/jtag/include/part.h +++ b/jtag/include/part.h @@ -36,7 +36,8 @@ #define MAXLEN_PART 20 #define MAXLEN_STEPPING 8 -typedef struct part part; +#define part_t part +typedef struct part part_t; struct part { char manufacturer[MAXLEN_MANUFACTURER + 1]; @@ -52,17 +53,18 @@ struct part { }; part *part_alloc( void ); -void part_free( part *p ); -part *read_part( FILE *f, tap_register *idr ); -instruction *part_find_instruction( part *p, const char *iname ); -data_register *part_find_data_register( part *p, const char *drname ); -void part_set_instruction( part *p, const char *iname ); -void part_shift_instruction( part *p, int exit ); -void part_shift_data_register( part *p, int exit ); -void part_set_signal( part *p, const char *pname, int out, int val ); -int part_get_signal( part *p, const char *pname ); +void part_free( part_t *p ); +part *read_part( FILE *f, tap_register_t *idr ); +instruction *part_find_instruction( part_t *p, const char *iname ); +data_register *part_find_data_register( part_t *p, const char *drname ); +void part_set_instruction( part_t *p, const char *iname ); +void part_shift_instruction( part_t *p, int exit ); +void part_shift_data_register( part_t *p, int exit ); +void part_set_signal( part_t *p, const char *pname, int out, int val ); +int part_get_signal( part_t *p, const char *pname ); -typedef struct parts parts; +#define parts_t parts +typedef struct parts parts_t; struct parts { int len; @@ -70,11 +72,11 @@ struct parts { }; parts *parts_alloc( void ); -void parts_free( parts *ps ); -int parts_add_part( parts *ps, part *p ); -void parts_set_instruction( parts *ps, const char *iname ); -void parts_shift_instructions( parts *ps ); -void parts_shift_data_registers( parts *ps ); -void parts_print( parts *ps, int header ); +void parts_free( parts_t *ps ); +int parts_add_part( parts_t *ps, part_t *p ); +void parts_set_instruction( parts_t *ps, const char *iname ); +void parts_shift_instructions( parts_t *ps ); +void parts_shift_data_registers( parts_t *ps ); +void parts_print( parts_t *ps, int header ); #endif /* PART_H */ diff --git a/jtag/include/register.h b/jtag/include/register.h index 8594c117..1a392cfa 100644 --- a/jtag/include/register.h +++ b/jtag/include/register.h @@ -25,23 +25,24 @@ #ifndef REGISTER_H #define REGISTER_H +#define tap_register_t tap_register typedef struct tap_register { char *data; /* (public, r/w) register data */ int len; /* (public, r/o) register length */ char *string; /* (private) string representation of register data */ -} tap_register; +} tap_register_t; tap_register *register_alloc( int len ); -tap_register *register_duplicate( const tap_register *tr ); -void register_free( tap_register *tr ); -tap_register *register_fill( tap_register *tr, int val ); -const char *register_get_string( const tap_register *tr ); -tap_register *register_init( tap_register *tr, const char *value ); -int register_compare( const tap_register *tr, const tap_register *tr2 ); -int register_match( const tap_register *tr, const char *expr ); -tap_register *register_inc( tap_register *tr ); -tap_register *register_dec( tap_register *tr ); -tap_register *register_shift_right( tap_register *tr, int shift ); -tap_register *register_shift_left( tap_register *tr, int shift ); +tap_register *register_duplicate( const tap_register_t *tr ); +void register_free( tap_register_t *tr ); +tap_register *register_fill( tap_register_t *tr, int val ); +const char *register_get_string( const tap_register_t *tr ); +tap_register *register_init( tap_register_t *tr, const char *value ); +int register_compare( const tap_register_t *tr, const tap_register_t *tr2 ); +int register_match( const tap_register_t *tr, const char *expr ); +tap_register *register_inc( tap_register_t *tr ); +tap_register *register_dec( tap_register_t *tr ); +tap_register *register_shift_right( tap_register_t *tr, int shift ); +tap_register *register_shift_left( tap_register_t *tr, int shift ); #endif /* REGISTER_H */