- concretize JTAG state transition rules (previously implied behaviour is now documented)

[openocd.git] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 4d6ffe3d47378b748c77d1d2a7ff6b48ee1a6dca..ce2d08564307bee2d72b4ba2472f231c943aeb48 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -84,6 +84,7 @@ extern target_type_t arm9tdmi_target;
 extern target_type_t arm920t_target;
 extern target_type_t arm966e_target;
 extern target_type_t arm926ejs_target;
+extern target_type_t feroceon_target;
 extern target_type_t xscale_target;
 extern target_type_t cortexm3_target;
 
@@ -95,6 +96,7 @@ target_type_t *target_types[] =
        &arm720t_target,
        &arm966e_target,
        &arm926ejs_target,
+       &feroceon_target,
        &xscale_target,
        &cortexm3_target,
        NULL,
@@ -224,7 +226,7 @@ int target_init_handler(struct target_s *target, enum target_event event, void *
        {
                target_unregister_event_callback(target_init_handler, priv);
 
-               script = fopen(target->reset_script, "r");
+               script = open_file_from_path(cmd_ctx, target->reset_script, "r");
                if (!script)
                {
                        ERROR("couldn't open script file %s", target->reset_script);
@@ -770,6 +772,9 @@ int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buff
        {
                int unaligned = 4 - (address % 4);
                
+               if (unaligned > size)
+                       unaligned = size;
+
                if ((retval = target->type->write_memory(target, address, 1, unaligned, buffer)) != ERROR_OK)
                        return retval;
                
@@ -831,6 +836,9 @@ int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffe
        {
                int unaligned = 4 - (address % 4);
                
+               if (unaligned > size)
+                       unaligned = size;
+
                if ((retval = target->type->read_memory(target, address, 1, unaligned, buffer)) != ERROR_OK)
                        return retval;