stlink: use common layout

[openocd.git] / src / jtag / stlink / stlink_layout.h

diff --git a/src/jtag/stlink/stlink_layout.h b/src/jtag/stlink/stlink_layout.h
index 46517a7896bd2bffd793a1fd8b03c32376ec4b43..8d2a98ac169c97da05e880c36c3fb21fc04ccd97 100644 (file)
--- a/src/jtag/stlink/stlink_layout.h
+++ b/src/jtag/stlink/stlink_layout.h
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef _STLINK_LAYOUT_H_
 #define _STLINK_LAYOUT_H_
 
@@ -25,7 +26,7 @@ struct stlink_interface_s;
 struct stlink_interface_param_s;
 
 /** */
-extern struct stlink_layout_api_s stlink_layout_api;
+extern struct stlink_layout_api_s stlink_usb_layout_api;
 
 /** */
 struct stlink_layout_api_s {
@@ -36,6 +37,8 @@ struct stlink_layout_api_s {
        /** */
        int (*reset) (void *fd);
        /** */
+       int (*assert_srst) (void *fd, int srst);
+       /** */
        int (*run) (void *fd);
        /** */
        int (*halt) (void *fd);
@@ -48,11 +51,19 @@ struct stlink_layout_api_s {
        /** */
        int (*write_reg) (void *fd, int num, uint32_t val);
        /** */
+       int (*read_mem8) (void *handle, uint32_t addr, uint16_t len,
+                          uint8_t *buffer);
+       /** */
+       int (*write_mem8) (void *handle, uint32_t addr, uint16_t len,
+                           const uint8_t *buffer);
+       /** */
        int (*read_mem32) (void *handle, uint32_t addr, uint16_t len,
-                          uint32_t *buffer);
+                          uint8_t *buffer);
        /** */
        int (*write_mem32) (void *handle, uint32_t addr, uint16_t len,
-                           uint32_t *buffer);
+                           const uint8_t *buffer);
+       /** */
+       int (*write_debug_reg) (void *handle, uint32_t addr, uint32_t val);
        /** */
        int (*idcode) (void *fd, uint32_t *idcode);
        /** */
@@ -64,8 +75,6 @@ struct stlink_layout {
        /** */
        char *name;
        /** */
-       int type;
-       /** */
        int (*open) (struct stlink_interface_s *stlink_if);
        /** */
        int (*close) (struct stlink_interface_s *stlink_if);