- Fixes '&&' whitespace
- Replace ')\(&&\)(' with ') \1 ('.
- Replace '\(\w\)\(&&\)(' with '\1 \2 ('.
- Replace '\(\w\)\(&&\)\(\w\)' with '\1 \2 \3'.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2366 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
@@ -1397,7 +1397,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target,
|
||||
else if (type == 4) /* access watchpoint */
|
||||
wp_type = WPT_ACCESS;
|
||||
|
||||
if (gdb_breakpoint_override&&((bp_type==BKPT_SOFT)||(bp_type==BKPT_HARD)))
|
||||
if (gdb_breakpoint_override && ((bp_type==BKPT_SOFT)||(bp_type==BKPT_HARD)))
|
||||
{
|
||||
bp_type=gdb_breakpoint_override_type;
|
||||
}
|
||||
@@ -1654,7 +1654,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
|
||||
|
||||
xml_printf(&retval, &buffer, &pos, &size,
|
||||
"PacketSize=%x;qXfer:memory-map:read%c;qXfer:features:read-;QStartNoAckMode+",
|
||||
(GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1)&&(flash_get_bank_count()>0)) ? '+' : '-');
|
||||
(GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1) && (flash_get_bank_count()>0)) ? '+' : '-');
|
||||
|
||||
if (retval != ERROR_OK)
|
||||
{
|
||||
@@ -1667,7 +1667,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
else if (strstr(packet, "qXfer:memory-map:read::")&&(flash_get_bank_count()>0))
|
||||
else if (strstr(packet, "qXfer:memory-map:read::") && (flash_get_bank_count()>0))
|
||||
{
|
||||
/* We get away with only specifying flash here. Regions that are not
|
||||
* specified are treated as if we provided no memory map(if not we
|
||||
|
||||
Reference in New Issue
Block a user