From ed1e9d6abdece4fbf6251a11f0eca3c921221048 Mon Sep 17 00:00:00 2001 From: mifi Date: Mon, 17 Dec 2007 22:12:57 +0000 Subject: [PATCH] - only some cosmetic changes, convert \r\n to unix git-svn-id: svn://svn.berlios.de/openocd/trunk@239 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/cfi.c | 6 +++--- src/flash/flash.c | 6 +++--- src/helper/replacements.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/flash/cfi.c b/src/flash/cfi.c index ddaaee7d..cc5a69e1 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -1014,15 +1014,15 @@ int cfi_intel_write_block(struct flash_bank_s *bank, u8 *buffer, u32 address, u3 armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; - + armv4_5_info.core_state = ARMV4_5_STATE_ARM; + /* If we are setting up the write_algorith, we need target_code_src */ /* if not we only need target_code_size. */ /* */ /* However, we don't want to create multiple code paths, so we */ /* do the unecessary evaluation of target_code_src, which the */ /* compiler will probably nicely optimize away if not needed */ - + /* prepare algorithm code for target endian */ switch (bank->bus_width) { diff --git a/src/flash/flash.c b/src/flash/flash.c index 4b18bc35..653a7ab2 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -176,8 +176,8 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char c->base = strtoul(args[1], NULL, 0); c->size = strtoul(args[2], NULL, 0); c->chip_width = strtoul(args[3], NULL, 0); - c->bus_width = strtoul(args[4], NULL, 0); - c->num_sectors = 0; + c->bus_width = strtoul(args[4], NULL, 0); + c->num_sectors = 0; c->sectors = NULL; c->next = NULL; @@ -563,7 +563,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm } image.start_address_set = 0; - + retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL); if (retval != ERROR_OK) { diff --git a/src/helper/replacements.c b/src/helper/replacements.c index 5804b197..49f12d78 100644 --- a/src/helper/replacements.c +++ b/src/helper/replacements.c @@ -19,16 +19,16 @@ ***************************************************************************/ #ifdef HAVE_CONFIG_H #include "config.h" -#endif - +#endif + /* DANGER!!!! These must be defined *BEFORE* replacements.h and the malloc() macro!!!! */ #include #include -/* - * clear_malloc - * - * will alloc memory and clear it +/* + * clear_malloc + * + * will alloc memory and clear it */ void *clear_malloc(size_t size) { -- 2.39.2