xx commands: measure cpu freq, test bus cycles

[z180-stamp.git] / avr / cmd_sd.c

diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c
index b1922159c5a1dc00eac6acad56e4b080551593aa..344a19793e4d7ee9ecc22d3367f55e1d82785cae 100644 (file)
--- a/avr/cmd_sd.c
+++ b/avr/cmd_sd.c
@@ -11,7 +11,6 @@
 #include "eval_arg.h"
 #include "print-utils.h"
 #include "z80-if.h"
-#include "errnum.h"
 
 
 /*
@@ -205,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;
@@ -265,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);