From e9d96859cfcfe170c0025e427fd9934728395dc2 Mon Sep 17 00:00:00 2001 From: Leo C Date: Wed, 5 Sep 2018 13:24:31 +0200 Subject: [PATCH] z80_bus_request_or_exit() --- avr/cmd_boot.c | 24 ++++++------------------ avr/cmd_loadihex.c | 8 ++------ avr/cmd_sd.c | 8 ++------ avr/print-utils.c | 5 +++-- 4 files changed, 13 insertions(+), 32 deletions(-) diff --git a/avr/cmd_boot.c b/avr/cmd_boot.c index a1afe77..600bad3 100644 --- a/avr/cmd_boot.c +++ b/avr/cmd_boot.c @@ -60,16 +60,9 @@ static void z80_load_mem(int_fast8_t verbosity, command_ret_t do_loadf(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED) { - ERRNUM res = ESUCCESS; - - if (z80_bus_state() & ZST_RUNNING) { - res = ERUNNING; - } else if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) { - res = EBUSTO; - } - if (res != ESUCCESS) - cmd_error(CMD_RET_FAILURE, res, NULL); - + if (z80_bus_state() & ZST_RUNNING) + cmd_error(CMD_RET_FAILURE, ERUNNING, NULL); + z80_bus_request_or_exit(); z80_load_mem(2, hdrom, &hdrom_sections, hdrom_address, @@ -210,14 +203,9 @@ command_ret_t do_bootcf(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int a return CMD_RET_FAILURE; } - if (z80_bus_state() & ZST_RUNNING) { - res = ERUNNING; - } else if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) { - res = EBUSTO; - } - if (res != ESUCCESS) - cmd_error(CMD_RET_FAILURE, res, NULL); - + if (z80_bus_state() & ZST_RUNNING) + cmd_error(CMD_RET_FAILURE, ERUNNING, NULL); + z80_bus_request_or_exit(); z80_load_mem(verbosity, cfboot, &cfboot_sections, cfboot_address, diff --git a/avr/cmd_loadihex.c b/avr/cmd_loadihex.c index f8044d5..d55a63a 100644 --- a/avr/cmd_loadihex.c +++ b/avr/cmd_loadihex.c @@ -12,7 +12,7 @@ #include "debug.h" -uint32_t detect_ramsize(void) +static uint32_t detect_ramsize(void) { uint32_t addr; uint8_t save_addr, save_0; @@ -185,11 +185,7 @@ command_ret_t do_loadihex(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int if (rec.len > tmplen) rec.len = tmplen; - if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) { - cmd_error(CMD_RET_FAILURE, EBUSTO, NULL); - //my_puts_P(PSTR("Bus timeout\n")); - //return CMD_RET_FAILURE; - } + z80_bus_request_or_exit(); z80_write_block(rec.data, /* src */ addr, /* dest */ rec.len); /* len */ diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c index 7484855..344a197 100644 --- a/avr/cmd_sd.c +++ b/avr/cmd_sd.c @@ -204,9 +204,7 @@ command_ret_t do_read(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * cons for (nr = 0; nr < count;) { nr++; if ((res = disk_read(dev, buffer, sec, 1)) == RES_OK) { - if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) - cmd_error(CMD_RET_FAILURE, EBUSTO, NULL); - + z80_bus_request_or_exit(); z80_write_block(buffer, addr /*+ base*/, FF_MAX_SS); z80_bus_cmd(Release); sec++; addr += FF_MAX_SS; @@ -264,9 +262,7 @@ command_ret_t do_write(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * con for (nr = 0; nr < count;) { nr++; - if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) - cmd_error(CMD_RET_FAILURE, EBUSTO, NULL); - + z80_bus_request_or_exit(); z80_read_block(buffer, addr /*+ base*/, FF_MAX_SS); z80_bus_cmd(Release); diff --git a/avr/print-utils.c b/avr/print-utils.c index 69f4553..15f69f8 100644 --- a/avr/print-utils.c +++ b/avr/print-utils.c @@ -55,8 +55,9 @@ ERRNUM dump_mem(uint32_t address, uint32_t offset, uint32_t len, while (len) { if (len < 16) llen = len; - if (readfkt(buf, address, llen - pre) != 0) - return -EBUSTO; + ERRNUM err = readfkt(buf, address, llen - pre); + if (err != ESUCCESS) + return err; if (title) print_blanks(4); -- 2.39.2