X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/04f849375f8277203eddbeac2bfbfbfc433bbacf..8a500c7f3634212263ab1291c139d9c6a8967b8b:/avr/cmd_sd.c

diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c
index 1612a6f..344a197 100644
--- a/avr/cmd_sd.c
+++ b/avr/cmd_sd.c
@@ -52,10 +52,8 @@ command_ret_t do_init(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * cons
 
 	dev = (BYTE) eval_arg(argv[1], NULL);
 
-	if (disk_status(dev) & STA_NODISK) {
-		printf_P(PSTR("No Disk\n"));
-		return CMD_RET_FAILURE;
-	}
+	if (disk_status(dev) & STA_NODISK)
+		cmd_error(CMD_RET_FAILURE, 0, PSTR("No disk"));
 
 	res = disk_initialize(dev);
 	printf_P(PSTR("rc=%.2x\n"), res);
@@ -154,10 +152,8 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * cons
 	for ( ; count; count--, sec++) {
 		res = disk_read(dev, buffer, sec, 1);
 
-		if (res) {
-			printf_P(PSTR("rc=%.2x\n"), res);
-			return CMD_RET_FAILURE;
-		}
+		if (res)
+			cmd_error(CMD_RET_FAILURE, 0, PSTR("rc=%.2x"), res);
 
 		sprintf_P(header, PSTR("Sector: %lu"), sec);
 		dump_ram(buffer, 0, FF_MAX_SS, header);
@@ -208,10 +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)) {
-				my_puts_P(PSTR("Bus timeout\n"));
-				return  CMD_RET_FAILURE;
-			}
+			z80_bus_request_or_exit();
 			z80_write_block(buffer, addr /*+ base*/, FF_MAX_SS);
 			z80_bus_cmd(Release);
 			sec++; addr += FF_MAX_SS;
@@ -269,10 +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)) {
-			my_puts_P(PSTR("Bus timeout\n"));
-			return  CMD_RET_FAILURE;
-		}
+		z80_bus_request_or_exit();
 		z80_read_block(buffer, addr /*+ base*/, FF_MAX_SS);
 		z80_bus_cmd(Release);