mips: mips32_pracc_exec error propagation fixes

[fw/openocd] / src / target / dsp563xx.h

diff --git a/src/target/dsp563xx.h b/src/target/dsp563xx.h
index 73050b6d3aed6319b747dee574676c9377729d24..67ff8d501e8f9a8173cbfbd4b1f0de0b96ed5b63 100644 (file)
--- a/src/target/dsp563xx.h
+++ b/src/target/dsp563xx.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Mathias Kuester                                 *
+ *   Copyright (C) 2009-2011 by Mathias Kuester                            *
  *   mkdorg@users.sourceforge.net                                          *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,29 +21,22 @@
 #define DSP563XX_H
 
 #include <jtag/jtag.h>
+#include <target/dsp563xx_once.h>
 
-#define DSP563XX_NUMCOREREGS   44
+#define DSP563XX_NUMCOREREGS   54
+#define DSP563XX_NUMONCEREGS   25
 
 struct mcu_jtag
 {
        struct jtag_tap *tap;
 };
 
-struct dsp563xx_pipeline_context
-{
-       /* PIL Register */
-       uint32_t once_opilr;
-       /* PDB Register */
-       uint32_t once_opdbr;
-};
-
 struct dsp563xx_common
 {
        struct mcu_jtag jtag_info;
        struct reg_cache *core_cache;
        uint32_t core_regs[DSP563XX_NUMCOREREGS];
-
-       struct dsp563xx_pipeline_context pipeline_context;
+       struct once_reg once_regs[DSP563XX_NUMONCEREGS];
 
        /* register cache to processor synchronization */
        int (*read_core_reg) (struct target * target, int num);
@@ -53,10 +46,10 @@ struct dsp563xx_common
 struct dsp563xx_core_reg
 {
        uint32_t num;
-       char *name;
+       const char *name;
        uint32_t size;
-       uint32_t r_cmd;
-       uint32_t w_cmd;
+       uint8_t eame;
+       uint32_t instr_mask;
        struct target *target;
        struct dsp563xx_common *dsp563xx_common;
 };
@@ -66,23 +59,4 @@ static inline struct dsp563xx_common *target_to_dsp563xx(struct target *target)
        return target->arch_info;
 }
 
-int dsp563xx_write_ir(struct jtag_tap *tap, uint8_t * ir_in, uint8_t * ir_out,
-                     int ir_len, int rti);
-int dsp563xx_write_dr(struct jtag_tap *tap, uint8_t * dr_in, uint8_t * dr_out,
-                     int dr_len, int rti);
-int dsp563xx_write_ir_u8(struct jtag_tap *tap, uint8_t * ir_in, uint8_t ir_out,
-                        int ir_len, int rti);
-int dsp563xx_write_dr_u8(struct jtag_tap *tap, uint8_t * ir_in, uint8_t ir_out,
-                        int dr_len, int rti);
-int dsp563xx_write_ir_u16(struct jtag_tap *tap, uint16_t * ir_in, uint16_t ir_out,
-                         int ir_len, int rti);
-int dsp563xx_write_dr_u16(struct jtag_tap *tap, uint16_t * ir_in, uint16_t ir_out,
-                         int dr_len, int rti);
-int dsp563xx_write_ir_u32(struct jtag_tap *tap, uint32_t * ir_in, uint32_t ir_out,
-                         int ir_len, int rti);
-int dsp563xx_write_dr_u32(struct jtag_tap *tap, uint32_t * ir_in, uint32_t ir_out,
-                         int dr_len, int rti);
-
-int dsp563xx_execute_queue(void);
-
 #endif /* DSP563XX_H */