projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set TCP_NODELAY for local connections to jtag_vpi.
[fw/openocd]
/
src
/
flash
/
mflash.c
diff --git
a/src/flash/mflash.c
b/src/flash/mflash.c
index 6f4a988ece4de275fa5d5185a79072c45e646304..4c95d216caa1896f0deee458e9ea415f679b9316 100644
(file)
--- a/
src/flash/mflash.c
+++ b/
src/flash/mflash.c
@@
-12,9
+12,7
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* 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., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@
-261,11
+259,11
@@
static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var)
case mg_io_wait_rdy:
if (status & mg_io_rbit_status_ready)
return ERROR_OK;
case mg_io_wait_rdy:
if (status & mg_io_rbit_status_ready)
return ERROR_OK;
-
+ /* fallthrough */
case mg_io_wait_drq:
if (status & mg_io_rbit_status_data_req)
return ERROR_OK;
case mg_io_wait_drq:
if (status & mg_io_rbit_status_data_req)
return ERROR_OK;
-
+ /* fallthrough */
default:
break;
}
default:
break;
}
@@
-749,7
+747,7
@@
COMMAND_HANDLER(mg_write_cmd)
{
uint32_t address, cnt, res, i;
uint8_t *buffer;
{
uint32_t address, cnt, res, i;
uint8_t *buffer;
- struct fileio fileio;
+ struct fileio
*
fileio;
int ret;
if (CMD_ARGC != 3)
int ret;
if (CMD_ARGC != 3)
@@
-764,12
+762,12
@@
COMMAND_HANDLER(mg_write_cmd)
size_t filesize;
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
size_t filesize;
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
- fileio_close(
&
fileio);
+ fileio_close(fileio);
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- int retval = fileio_size(
&
fileio, &filesize);
+ int retval = fileio_size(fileio, &filesize);
if (retval != ERROR_OK) {
if (retval != ERROR_OK) {
- fileio_close(
&
fileio);
+ fileio_close(fileio);
free(buffer);
return retval;
}
free(buffer);
return retval;
}
@@
-782,7
+780,7
@@
COMMAND_HANDLER(mg_write_cmd)
size_t buf_cnt;
for (i = 0; i < cnt; i++) {
size_t buf_cnt;
for (i = 0; i < cnt; i++) {
- ret = fileio_read(
&
fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt);
+ ret = fileio_read(fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt);
if (ret != ERROR_OK)
goto mg_write_cmd_err;
ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK);
if (ret != ERROR_OK)
goto mg_write_cmd_err;
ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK);
@@
-792,7
+790,7
@@
COMMAND_HANDLER(mg_write_cmd)
}
if (res) {
}
if (res) {
- ret = fileio_read(
&
fileio, res, buffer, &buf_cnt);
+ ret = fileio_read(fileio, res, buffer, &buf_cnt);
if (ret != ERROR_OK)
goto mg_write_cmd_err;
ret = mg_mflash_write(address, buffer, res);
if (ret != ERROR_OK)
goto mg_write_cmd_err;
ret = mg_mflash_write(address, buffer, res);
@@
-807,13
+805,13
@@
COMMAND_HANDLER(mg_write_cmd)
}
free(buffer);
}
free(buffer);
- fileio_close(
&
fileio);
+ fileio_close(fileio);
return ERROR_OK;
mg_write_cmd_err:
free(buffer);
return ERROR_OK;
mg_write_cmd_err:
free(buffer);
- fileio_close(
&
fileio);
+ fileio_close(fileio);
return ret;
}
return ret;
}
@@
-822,7
+820,7
@@
COMMAND_HANDLER(mg_dump_cmd)
{
uint32_t address, size, cnt, res, i;
uint8_t *buffer;
{
uint32_t address, size, cnt, res, i;
uint8_t *buffer;
- struct fileio fileio;
+ struct fileio
*
fileio;
int ret;
if (CMD_ARGC != 4)
int ret;
if (CMD_ARGC != 4)
@@
-837,7
+835,7
@@
COMMAND_HANDLER(mg_dump_cmd)
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
- fileio_close(
&
fileio);
+ fileio_close(fileio);
return ERROR_FAIL;
}
return ERROR_FAIL;
}
@@
-852,7
+850,7
@@
COMMAND_HANDLER(mg_dump_cmd)
ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
- ret = fileio_write(
&
fileio, MG_FILEIO_CHUNK, buffer, &size_written);
+ ret = fileio_write(fileio, MG_FILEIO_CHUNK, buffer, &size_written);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
address += MG_FILEIO_CHUNK;
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
address += MG_FILEIO_CHUNK;
@@
-862,7
+860,7
@@
COMMAND_HANDLER(mg_dump_cmd)
ret = mg_mflash_read(address, buffer, res);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
ret = mg_mflash_read(address, buffer, res);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
- ret = fileio_write(
&
fileio, res, buffer, &size_written);
+ ret = fileio_write(fileio, res, buffer, &size_written);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
}
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
}
@@
-875,13
+873,13
@@
COMMAND_HANDLER(mg_dump_cmd)
}
free(buffer);
}
free(buffer);
- fileio_close(
&
fileio);
+ fileio_close(fileio);
return ERROR_OK;
mg_dump_cmd_err:
free(buffer);
return ERROR_OK;
mg_dump_cmd_err:
free(buffer);
- fileio_close(
&
fileio);
+ fileio_close(fileio);
return ret;
}
return ret;
}