[prev in list] [next in list] [prev in thread] [next in thread]
List: openocd-development
Subject: [OpenOCD-devel] [PATCH]: bede48a Next patch style changes
From: gerrit () openocd ! zylin ! com
Date: 2014-03-29 20:23:16
Message-ID: 20140329202316.C89DC242D4 () openocd ! zylin ! com
[Download RAW message or body]
This is an automated email from Gerrit.
Ladislav B?bel (LadaBabel@seznam.cz) just uploaded a new patch set to Gerrit, which \
you can find at http://openocd.zylin.com/2074
-- gerrit
commit bede48a5c7e504d1b5423450a1dfa3378ed5d185
Author: Ladislav Bábel <LadaBabel@seznam.cz>
Date: Sat Mar 29 21:20:06 2014 +0100
Next patch style changes
Change-Id: Ie56d4433a83e8ad1fd071c13d2c43362b0124bf9
Signed-off-by: Ladislav Bábel <LadaBabel@seznam.cz>
diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
old mode 100755
new mode 100644
diff --git a/src/flash/nor/drivers.c b/src/flash/nor/drivers.c
old mode 100755
new mode 100644
diff --git a/src/flash/nor/sim3x.c b/src/flash/nor/sim3x.c
old mode 100755
new mode 100644
index 63e3f98..85618f4
--- a/src/flash/nor/sim3x.c
+++ b/src/flash/nor/sim3x.c
@@ -120,11 +120,10 @@ static int sim3x_flash_lock_check(struct flash_bank *bank)
return ret;
}
- if(lock_word == 0xFFFFFFFF) {
+ if (lock_word == 0xFFFFFFFF)
lock_word = 0; /* Unlocked */
- } else {
+ else
lock_word = 1; /* Locked */
- }
((struct sim3x_info *) bank->driver_priv)->flash_locked = lock_word;
@@ -135,7 +134,7 @@ static int sim3x_read_info(struct flash_bank *bank)
{
int ret;
uint32_t cpuid = 0;
- struct sim3x_info * sim3x_info;
+ struct sim3x_info *sim3x_info;
#ifdef DEVICE_AUTO_DETECTION
uint32_t device_id;
@@ -168,7 +167,7 @@ static int sim3x_read_info(struct flash_bank *bank)
/* According to the documentation DEVICEID2 must by 0x00004D33 (..M3),
* but in my case it is 0x4DF79C9D
*/
- if(device_id != 0x00004D33) {
+ if (device_id != 0x00004D33) {
LOG_ERROR("Unsupported MCU");
return ERROR_FAIL;
}
@@ -239,7 +238,7 @@ static int sim3x_read_info(struct flash_bank *bank)
/* flash bank sim3x 0 0 0 0 <target#> */
FLASH_BANK_COMMAND_HANDLER(sim3x_flash_bank_command)
{
- struct sim3x_info * sim3x_info;
+ struct sim3x_info *sim3x_info;
if (CMD_ARGC < 6)
return ERROR_COMMAND_SYNTAX_ERROR;
@@ -255,11 +254,11 @@ static int sim3x_erase_page(struct flash_bank *bank, uint32_t \
addr) {
int ret, i;
uint32_t temp;
- struct target * target;
+ struct target *target;
target = bank->target;
- for(i = 0; i < FLASH_BUSY_TIMEOUT; i++) {
+ for (i = 0; i < FLASH_BUSY_TIMEOUT; i++) {
ret = target_read_u32(target, (uint32_t) &FLASHCTRL0_CONFIG->all, &temp);
if (ERROR_OK != ret)
return ret;
@@ -459,7 +458,7 @@ static int sim3x_write_block(struct flash_bank *bank, const \
uint8_t *buf, static int sim3x_flash_write(struct flash_bank *bank, const uint8_t * \
buffer, uint32_t offset, uint32_t count) {
int ret;
- struct target * target;
+ struct target *target;
uint8_t *new_buffer = NULL;
target = bank->target;
@@ -504,8 +503,8 @@ static int sim3x_flash_protect(struct flash_bank *bank, int set, \
int first, int {
int ret;
uint32_t lock_word_number;
- struct sim3x_info * sim3x_info;
- struct target * target;
+ struct sim3x_info *sim3x_info;
+ struct target *target;
target = bank->target;
if (target->state != TARGET_HALTED) {
@@ -532,7 +531,7 @@ static int sim3x_flash_protect(struct flash_bank *bank, int set, \
int first, int static int sim3x_set_debug_mode(struct flash_bank *bank)
{
int ret;
- struct target * target;
+ struct target *target;
target = bank->target;
@@ -598,7 +597,7 @@ static int sim3x_device_probe(struct flash_bank *bank)
return ret;
#ifdef DEVICE_AUTO_DETECTION
- switch(sim3x_info->part_family) {
+ switch (sim3x_info->part_family) {
case 'c':
case 'C':
LOG_INFO("SiM3Cx detected");
@@ -665,7 +664,7 @@ static int sim3x_auto_probe(struct flash_bank *bank)
static int sim3x_flash_protect_check(struct flash_bank *bank)
{
int ret, i;
- struct sim3x_info * sim3x_info;
+ struct sim3x_info *sim3x_info;
if (bank->target->state != TARGET_HALTED) {
LOG_ERROR("Target not halted");
@@ -689,7 +688,7 @@ static int sim3x_flash_info(struct flash_bank *bank, char *buf, \
int buf_size) int ret;
int printed = 0;
#ifdef DEVICE_AUTO_DETECTION
- struct sim3x_info * sim3x_info;
+ struct sim3x_info *sim3x_info;
#endif
ret = sim3x_read_info(bank);
@@ -704,16 +703,16 @@ static int sim3x_flash_info(struct flash_bank *bank, char *buf, \
int buf_size) buf += printed;
buf_size -= printed;
- if(buf_size <= 0)
+ if (buf_size <= 0)
return ERROR_BUF_TOO_SMALL;
/* Revision */
- if(sim3x_info->device_revision <= 'Z' - 'A') {
+ if (sim3x_info->device_revision <= 'Z' - 'A') {
printed = snprintf(buf, buf_size, "-%c", sim3x_info->device_revision + 'A');
buf += printed;
buf_size -= printed;
- if(buf_size <= 0)
+ if (buf_size <= 0)
return ERROR_BUF_TOO_SMALL;
}
@@ -722,7 +721,7 @@ static int sim3x_flash_info(struct flash_bank *bank, char *buf, \
int buf_size) buf += printed;
buf_size -= printed;
- if(buf_size <= 0)
+ if (buf_size <= 0)
return ERROR_BUF_TOO_SMALL;
#else
@@ -730,7 +729,7 @@ static int sim3x_flash_info(struct flash_bank *bank, char *buf, \
int buf_size) buf += printed;
buf_size -= printed;
- if(buf_size <= 0)
+ if (buf_size <= 0)
return ERROR_BUF_TOO_SMALL;
#endif
diff --git a/tcl/target/sim3x_stlink.cfg b/tcl/target/sim3x_stlink.cfg
old mode 100755
new mode 100644
index de662c7..0142b8e
--- a/tcl/target/sim3x_stlink.cfg
+++ b/tcl/target/sim3x_stlink.cfg
@@ -21,7 +21,7 @@ hla newtap $_CHIPNAME cpu -expected-id $_CPUTAPID
set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME hla_target -chain-position $_TARGETNAME
-$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE \
-work-area-backup 0 +$_TARGETNAME configure -work-area-phys 0x20000000 \
-work-area-size $_WORKAREASIZE -work-area-backup 0
set _FLASHNAME $_CHIPNAME.flash
flash bank $_FLASHNAME sim3x 0 $_CPUROMSIZE 0 0 $_TARGETNAME
--
------------------------------------------------------------------------------
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic