X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Frtos%2Frtos.h;h=87aa5027d231ecb3f9260047796752e115e74dce;hp=a93daeef974fa85f014a281199f77f6d00fd1855;hb=19f8f58c0d4d9ee618969254a368e4396657b946;hpb=7b032df3aa63905c16c63f1ba4414a04687f3777

diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h
index a93daeef97..87aa5027d2 100644
--- a/src/rtos/rtos.h
+++ b/src/rtos/rtos.h
@@ -13,16 +13,13 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef RTOS_H
-#define RTOS_H
+#ifndef OPENOCD_RTOS_RTOS_H
+#define OPENOCD_RTOS_RTOS_H
 
 #include "server/server.h"
-#include <helper/types.h>
 #include <jim-nvp.h>
 
 typedef int64_t threadid_t;
@@ -34,15 +31,14 @@ struct reg;
  * Table should be terminated by an element with NULL in symbol_name
  */
 typedef struct symbol_table_elem_struct {
-	char *symbol_name;
+	const char *symbol_name;
 	symbol_address_t address;
-
+	bool optional;
 } symbol_table_elem_t;
 
 struct thread_detail {
 	threadid_t threadid;
 	bool exists;
-	char *display_str;
 	char *thread_name_str;
 	char *extra_info_str;
 };
@@ -57,13 +53,13 @@ struct rtos {
 	threadid_t current_thread;
 	struct thread_detail *thread_details;
 	int thread_count;
-	int (*gdb_thread_packet)(struct connection *connection, char *packet, int packet_size);
+	int (*gdb_thread_packet)(struct connection *connection, char const *packet, int packet_size);
 	void *rtos_specific_params;
 };
 
 struct rtos_type {
-	char *name;
-	int (*detect_rtos)(struct target *target);
+	const char *name;
+	bool (*detect_rtos)(struct target *target);
 	int (*create)(struct target *target);
 	int (*smp_init)(struct target *target);
 	int (*update_threads)(struct rtos *rtos);
@@ -84,7 +80,15 @@ struct rtos_register_stacking {
 	unsigned char stack_registers_size;
 	signed char stack_growth_direction;
 	unsigned char num_output_registers;
-	unsigned char stack_alignment;
+	/* Some targets require evaluating the stack to determine the
+	 * actual stack pointer for a process.  If this field is NULL,
+	 * just use stacking->stack_registers_size * stack_growth_direction
+	 * to calculate adjustment.
+	 */
+	int64_t (*calculate_process_stack)(struct target *target,
+		const uint8_t *stack_data,
+		const struct rtos_register_stacking *stacking,
+		int64_t stack_ptr);
 	const struct stack_register_offset *register_offsets;
 };
 
@@ -96,12 +100,12 @@ int rtos_generic_stack_read(struct target *target,
 		int64_t stack_ptr,
 		char **hex_reg_list);
 int rtos_try_next(struct target *target);
-int gdb_thread_packet(struct connection *connection, char *packet, int packet_size);
+int gdb_thread_packet(struct connection *connection, char const *packet, int packet_size);
 int rtos_get_gdb_reg_list(struct connection *connection);
 int rtos_update_threads(struct target *target);
+void rtos_free_threadlist(struct rtos *rtos);
 int rtos_smp_init(struct target *target);
 /*  function for handling symbol access */
-int rtos_qsymbol(struct connection *connection, char *packet, int packet_size);
-int str_to_hex(char *hex_dst, char *src);
+int rtos_qsymbol(struct connection *connection, char const *packet, int packet_size);
 
-#endif	/* RTOS_H */
+#endif /* OPENOCD_RTOS_RTOS_H */