X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/bf5870430d2d1903b6dcdf1431d80b261f9a5d45..aea51b6c4c93c56715f50e64d424e1181c6d0242:/avr/cmd_loadihex.c

diff --git a/avr/cmd_loadihex.c b/avr/cmd_loadihex.c
index 18d5331..a7c9238 100644
--- a/avr/cmd_loadihex.c
+++ b/avr/cmd_loadihex.c
@@ -1,48 +1,17 @@
 /*
  * (C) Copyright 2015 Leo C. <erbl259-lmu@yahoo.de>
  *
- * SPDX-License-Identifier:	GPL-2.0+
+ * SPDX-License-Identifier:	GPL-2.0
  */
 
-#include "common.h"
-#include <stdlib.h>
+#include "cmd_loadihex.h"
 #include <ctype.h>
-#include <stdbool.h>
 
-#include "command.h"
 #include "con-utils.h"
 #include "z80-if.h"
 #include "debug.h"
 
 
-uint32_t detect_ramsize(void)
-{
-	uint32_t addr;
-	uint8_t save_addr, save_0;
-	const uint8_t PATTERN_1	= 0x55;
-	const uint8_t PATTERN_2	= ~PATTERN_1;
-
-	if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-		my_puts_P(PSTR("Bus timeout\n"));
-		return  0;
-	}
-
-	save_0 = z80_read(0);
-	z80_write(0, PATTERN_1);
-
-	for (addr=1; addr < CONFIG_SYS_RAMSIZE_MAX; addr <<= 1) {
-		save_addr = z80_read(addr);
-		z80_write(addr, PATTERN_2);
-		if (z80_read(0) != PATTERN_1 || z80_read(addr) != PATTERN_2)
-			break;
-		z80_write(addr, save_addr);
-	}
-	z80_write(0, save_0);
-	z80_bus_cmd(Release);
-
-	return addr;
-}
-
 typedef enum {
 	IHX_OK,
 	IHX_BROKEN,
@@ -58,9 +27,8 @@ typedef struct {
 } ihex_t;
 
 
-static
-int get_hexdigit(void) {
-
+static int get_hexdigit(void)
+{
 	int c;
 	c = toupper(my_getchar(1));
 	if (isxdigit(c)) {
@@ -72,9 +40,8 @@ int get_hexdigit(void) {
 		return -1;
 }
 
-static
-int get_hexbyte(void) {
-
+static int get_hexbyte(void)
+{
 	uint8_t i,j;
 
 	if ((i = (uint8_t) get_hexdigit()) < 0x10)
@@ -86,9 +53,8 @@ int get_hexbyte(void) {
 }
 
 
-static
-int ihex_get_record(ihex_t *rec) {
-
+static int ihex_get_record(ihex_t *rec)
+{
 	int c;
 	uint8_t sum;
 
@@ -151,24 +117,27 @@ int ihex_get_record(ihex_t *rec) {
 }
 
 
-command_ret_t do_loadihex(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_loadihex(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
 	long offset = 0;
 	uint32_t base_address = 0;
-	uint32_t address_max = detect_ramsize();
 	uint32_t address_high = 0;
-	uint32_t address_low = address_max;
-	command_ret_t rcode = CMD_RET_FAILURE;
-	ihex_t rec;
+	uint32_t address_max;
+	uint32_t address_low;
 	bool firstrec = true;
-
-	(void) cmdtp; (void) flag;
-
+	ihex_t rec;
 
 	if (argc > 1)
 		offset = strtol(argv[1], NULL, 16);
 
-	printf_P(PSTR("Waiting for Intel Hex Records...\n"));
+	int32_t ram = z80_memsize_detect();
+	if (ram < 0)
+		cmd_error(CMD_RET_FAILURE, (ERRNUM) -ram, NULL);
+
+	address_max = ram;
+	address_low = address_max;
+
+	my_puts_P(PSTR("Waiting for Intel Hex Records...\n"));
 
 	while (ihex_get_record(&rec) > 0 &&
 				rec.status == IHX_OK &&
@@ -177,7 +146,7 @@ command_ret_t do_loadihex(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg
 		switch (rec.type) {
 		case 0: /* Data record */
 			if (firstrec) {
-				printf_P(PSTR("Loading: 0x....."));
+				my_puts_P(PSTR("Loading: 0x....."));
 				firstrec = false;
 			}
 			if (rec.len) {
@@ -195,10 +164,7 @@ command_ret_t do_loadihex(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg
 					if (rec.len > tmplen)
 						rec.len = tmplen;
 
-					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(rec.data,		/* src */
 							addr,					/* dest */
 							rec.len);				/* len */
@@ -226,17 +192,8 @@ command_ret_t do_loadihex(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg
 		}
 	}
 
-	switch (rec.status) {
-	case IHX_OK:
-		rcode = CMD_RET_SUCCESS;
-		break;
-
-	case IHX_BROKEN:
-	case IHX_CHKSUMERR:
-		printf_P(PSTR("Broken Hex Record or loading interrupted!\n"));
-		break;
-	}
-
+	if (rec.status != IHX_OK)
+		my_puts_P(PSTR("Broken Hex Record or loading interrupted!\n"));
 
 	for (uint_fast8_t i=0; i<100; ++i) {
 		/* flush input buffer */
@@ -245,10 +202,9 @@ command_ret_t do_loadihex(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg
 		udelay(1000);
 	}
 
-
-	printf_P(PSTR("\nData loaded: "));
+	my_puts_P(PSTR("\nData loaded: "));
 	if (address_low >= MIN(address_high, address_max))
-		printf_P(PSTR("None.\n"));
+		my_puts_P(PSTR("None.\n"));
 	else
 		printf_P(PSTR("low: 0x%.5lX high: 0x%.5lX\n"), address_low,
 				MIN(address_high, address_max) - 1);
@@ -257,5 +213,5 @@ command_ret_t do_loadihex(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg
 		printf_P(PSTR("Data above highest RAM address "
 			"(in range 0x%.5lX - 0x%.5lX) ignored!\n"), address_max, address_high - 1);
 
-	return rcode;
+	return rec.status == IHX_OK ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 }