From: Zach W. <zw...@us...> - 2009-11-28 22:05:01
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 01f93137c4c9d2aedd57a715be46d2809c316811 (commit) via cdfdcb28549174a2346fc91ec95a1c620c568cad (commit) from 070259cadbb0f142f6546c55f8044199c6aea9b9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 01f93137c4c9d2aedd57a715be46d2809c316811 Author: Zachary T Welch <zw...@su...> Date: Fri Nov 27 09:29:07 2009 -0800 add 'nonce' nand driver The nonce NAND driver provides a no-op implementation useful for testing the system independently of any driver side-effects. diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 8403230..94cc86e 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -44,6 +44,7 @@ NAND_SRCS = \ nand.c NAND_DEVICES_SRCS = \ + nonce_nand.c \ davinci_nand.c \ lpc3180_nand_controller.c \ mx3_nand.c \ diff --git a/src/flash/nand.c b/src/flash/nand.c index 895abe3..94cec8d 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -36,6 +36,7 @@ static int nand_write_page(struct nand_device *nand, uint32_t page, uint8_t *dat /* NAND flash controller */ +extern struct nand_flash_controller nonce_nand_controller; extern struct nand_flash_controller davinci_nand_controller; extern struct nand_flash_controller lpc3180_nand_controller; extern struct nand_flash_controller orion_nand_controller; @@ -49,6 +50,7 @@ extern struct nand_flash_controller imx31_nand_flash_controller; static struct nand_flash_controller *nand_flash_controllers[] = { + &nonce_nand_controller, &davinci_nand_controller, &lpc3180_nand_controller, &orion_nand_controller, diff --git a/src/flash/nonce_nand.c b/src/flash/nonce_nand.c new file mode 100644 index 0000000..dae62a7 --- /dev/null +++ b/src/flash/nonce_nand.c @@ -0,0 +1,80 @@ +/*************************************************************************** + * Copyright (C) 2009 Zachary T Welch <zw...@su...> * + * * + * This program is free software; you can redistribute it and/or modify * + * 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 * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * 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. * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include "nand.h" + + +static int nonce_nand_command(struct nand_device *nand, uint8_t command) +{ + return ERROR_OK; +} +static int nonce_nand_address(struct nand_device *nand, uint8_t address) +{ + return ERROR_OK; +} +static int nonce_nand_read(struct nand_device *nand, void *data) +{ + return ERROR_OK; +} +static int nonce_nand_write(struct nand_device *nand, uint16_t data) +{ + return ERROR_OK; +} +static int nonce_nand_fast_block_write(struct nand_device *nand, + uint8_t *data, int size) +{ + return ERROR_OK; +} + +static int nonce_nand_reset(struct nand_device *nand) +{ + return nonce_nand_command(nand, NAND_CMD_RESET); +} + +static int nonce_nand_controller_ready(struct nand_device *nand, int timeout) +{ + return true; +} + +NAND_DEVICE_COMMAND_HANDLER(nonce_nand_device_command) +{ + return ERROR_OK; +} + +static int nonce_nand_init(struct nand_device *nand) +{ + return ERROR_OK; +} + +struct nand_flash_controller nonce_nand_controller = +{ + .name = "nonce", + .nand_device_command = &nonce_nand_device_command, + .init = &nonce_nand_init, + .reset = &nonce_nand_reset, + .command = &nonce_nand_command, + .address = &nonce_nand_address, + .read_data = &nonce_nand_read, + .write_data = &nonce_nand_write, + .write_block_data = &nonce_nand_fast_block_write, + .controller_ready = &nonce_nand_controller_ready, +}; commit cdfdcb28549174a2346fc91ec95a1c620c568cad Author: Zachary T Welch <zw...@su...> Date: Wed Nov 25 16:57:12 2009 -0800 add more stub handlers to testee target Prevent everything from crashing when exercising various commands. diff --git a/src/target/testee.c b/src/target/testee.c index ca3d56e..f858232 100644 --- a/src/target/testee.c +++ b/src/target/testee.c @@ -40,9 +40,29 @@ static int testee_init(struct command_context *cmd_ctx, struct target *target) { return ERROR_OK; } - +static int testee_poll(struct target *target) +{ + return ERROR_OK; +} +static int testee_halt(struct target *target) +{ + return ERROR_OK; +} +static int testee_reset_assert(struct target *target) +{ + return ERROR_OK; +} +static int testee_reset_deassert(struct target *target) +{ + return ERROR_OK; +} struct target_type testee_target = { .name = "testee", - .init_target = &testee_init, .commands = testee_command_handlers, + + .init_target = &testee_init, + .poll = &testee_poll, + .halt = &testee_halt, + .assert_reset = &testee_reset_assert, + .deassert_reset = &testee_reset_deassert, }; ----------------------------------------------------------------------- Summary of changes: src/flash/Makefile.am | 1 + src/flash/nand.c | 2 + src/{target/testee.c => flash/nonce_nand.c} | 72 +++++++++++++++++++------- src/target/testee.c | 24 ++++++++- 4 files changed, 77 insertions(+), 22 deletions(-) copy src/{target/testee.c => flash/nonce_nand.c} (53%) hooks/post-receive -- Main OpenOCD repository |