X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fquark_x10xx.c;h=525d39a02567502b68e21b84a19a22f29404cdaa;hp=05818b7c109e9b329f3f278a5808347bd8e00db5;hb=a851b91c4c1db76dd1e26a7d1a99124ad456b020;hpb=1338cf60b91c582fa4b27d5226ab4374117be415 diff --git a/src/target/quark_x10xx.c b/src/target/quark_x10xx.c index 05818b7c10..525d39a025 100644 --- a/src/target/quark_x10xx.c +++ b/src/target/quark_x10xx.c @@ -1,5 +1,5 @@ /* - * Copyright(c) 2013 Intel Corporation. + * Copyright(c) 2013-2016 Intel Corporation. * * Adrian Burns (adrian.burns@intel.com) * Thomas Faust (thomas.faust@intel.com) @@ -8,8 +8,9 @@ * Jeffrey Maxwell (jeffrey.r.maxwell@intel.com) * * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,8 +18,7 @@ * 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., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + * along with this program. If not, see . * * Contact Information: * Intel Corporation @@ -51,47 +51,47 @@ #include "lakemont.h" #include "x86_32_common.h" -int quark_x10xx_target_create(struct target *t, Jim_Interp *interp) +static int quark_x10xx_target_create(struct target *t, Jim_Interp *interp) { - struct x86_32_common *x86_32 = calloc(1, sizeof(struct x86_32_common)); - if (x86_32 == NULL) { - LOG_ERROR("%s out of memory", __func__); + struct x86_32_common *x86_32 = calloc(1, sizeof(*x86_32)); + + if (!x86_32) return ERROR_FAIL; - } + x86_32_common_init_arch_info(t, x86_32); lakemont_init_arch_info(t, x86_32); - return ERROR_OK; -} + x86_32->core_type = LMT1; -int quark_x10xx_init_target(struct command_context *cmd_ctx, struct target *t) -{ - return lakemont_init_target(cmd_ctx, t); + return ERROR_OK; } struct target_type quark_x10xx_target = { - .name = "quark_x10xx", + .name = "quark_x10xx", + /* Quark X1000 SoC */ - .target_create = quark_x10xx_target_create, - .init_target = quark_x10xx_init_target, + .target_create = quark_x10xx_target_create, + /* lakemont probemode specific code */ - .poll = lakemont_poll, - .arch_state = lakemont_arch_state, - .halt = lakemont_halt, - .resume = lakemont_resume, - .step = lakemont_step, - .assert_reset = lakemont_reset_assert, - .deassert_reset = lakemont_reset_deassert, + .arch_state = lakemont_arch_state, + .assert_reset = lakemont_reset_assert, + .deassert_reset = lakemont_reset_deassert, + .halt = lakemont_halt, + .init_target = lakemont_init_target, + .poll = lakemont_poll, + .resume = lakemont_resume, + .step = lakemont_step, + /* common x86 code */ - .commands = x86_32_command_handlers, - .get_gdb_reg_list = x86_32_get_gdb_reg_list, - .read_memory = x86_32_common_read_memory, - .write_memory = x86_32_common_write_memory, - .add_breakpoint = x86_32_common_add_breakpoint, - .remove_breakpoint = x86_32_common_remove_breakpoint, - .add_watchpoint = x86_32_common_add_watchpoint, - .remove_watchpoint = x86_32_common_remove_watchpoint, - .virt2phys = x86_32_common_virt2phys, - .read_phys_memory = x86_32_common_read_phys_mem, - .write_phys_memory = x86_32_common_write_phys_mem, - .mmu = x86_32_common_mmu, + .add_breakpoint = x86_32_common_add_breakpoint, + .add_watchpoint = x86_32_common_add_watchpoint, + .commands = x86_32_command_handlers, + .get_gdb_reg_list = x86_32_get_gdb_reg_list, + .mmu = x86_32_common_mmu, + .read_memory = x86_32_common_read_memory, + .read_phys_memory = x86_32_common_read_phys_mem, + .remove_breakpoint = x86_32_common_remove_breakpoint, + .remove_watchpoint = x86_32_common_remove_watchpoint, + .virt2phys = x86_32_common_virt2phys, + .write_memory = x86_32_common_write_memory, + .write_phys_memory = x86_32_common_write_phys_mem, };