* 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
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;
-
+ /* fallthrough */
default:
break;
}
{
uint32_t address, cnt, res, i;
uint8_t *buffer;
- struct fileio fileio;
+ struct fileio *fileio;
int ret;
if (CMD_ARGC != 3)
size_t filesize;
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
- fileio_close(&fileio);
+ fileio_close(fileio);
return ERROR_FAIL;
}
- int retval = fileio_size(&fileio, &filesize);
+ int retval = fileio_size(fileio, &filesize);
if (retval != ERROR_OK) {
- fileio_close(&fileio);
+ fileio_close(fileio);
free(buffer);
return retval;
}
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 (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);
}
free(buffer);
- fileio_close(&fileio);
+ fileio_close(fileio);
return ERROR_OK;
mg_write_cmd_err:
free(buffer);
- fileio_close(&fileio);
+ fileio_close(fileio);
return ret;
}
{
uint32_t address, size, cnt, res, i;
uint8_t *buffer;
- struct fileio fileio;
+ struct fileio *fileio;
int ret;
if (CMD_ARGC != 4)
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
- fileio_close(&fileio);
+ fileio_close(fileio);
return ERROR_FAIL;
}
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;
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;
}
}
free(buffer);
- fileio_close(&fileio);
+ fileio_close(fileio);
return ERROR_OK;
mg_dump_cmd_err:
free(buffer);
- fileio_close(&fileio);
+ fileio_close(fileio);
return ret;
}