From 9164a6d33592fb73740bd44701dba104ed0698af Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 5 May 2017 20:55:21 +0200
Subject: [PATCH] qmod: Disable various console commands on ST34

A number of commands related to the USB hub and the EEPROM are only
available on ST12, but not on ST34.  Let's remove them if not
applicable.
---
 firmware/libboard/qmod/source/board_qmod.c | 95 +++++++++++++---------
 1 file changed, 55 insertions(+), 40 deletions(-)

diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c
index 039b5502..0d30ede3 100644
--- a/firmware/libboard/qmod/source/board_qmod.c
+++ b/firmware/libboard/qmod/source/board_qmod.c
@@ -121,14 +121,16 @@ void board_exec_dbg_cmd(int ch)
 	switch (ch) {
 	case '?':
 		printf("\t?\thelp\n\r");
-		printf("\tE\tprogram EEPROM\n\r");
 		printf("\tR\treset SAM3\n\r");
-		printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
-		printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
-		printf("\tH\tRelease HUB RESET (high)\n\r");
-		printf("\th\tAssert HUB RESET (low)\n\r");
-		printf("\tw\tWrite single byte in EEPROM\n\r");
-		printf("\tr\tRead single byte from EEPROM\n\r");
+		if (qmod_sam3_is_12()) {
+			printf("\tE\tprogram EEPROM\n\r");
+			printf("\tO\tEnable PRTPWR_OVERRIDE\n\r");
+			printf("\to\tDisable PRTPWR_OVERRIDE\n\r");
+			printf("\tH\tRelease HUB RESET (high)\n\r");
+			printf("\th\tAssert HUB RESET (low)\n\r");
+			printf("\tw\tWrite single byte in EEPROM\n\r");
+			printf("\tr\tRead single byte from EEPROM\n\r");
+		}
 		printf("\tX\tRelease peer SAM3 from reset\n\r");
 		printf("\tx\tAssert peer SAM3 reset\n\r");
 		printf("\tY\tRelease peer SAM3 ERASE signal\n\r");
@@ -137,14 +139,57 @@ void board_exec_dbg_cmd(int ch)
 		printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");
 		printf("\t2\tGenerate 1ms reset pulse on WWAN2\n\r");
 		break;
-	case 'E':
-		write_hub_eeprom();
-		break;
 	case 'R':
 		printf("Asking NVIC to reset us\n\r");
 		USBD_Disconnect();
 		NVIC_SystemReset();
 		break;
+	case 'X':
+		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r");
+		PIO_Clear(&pin_peer_rst);
+		break;
+	case 'x':
+		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
+		PIO_Set(&pin_peer_rst);
+		break;
+	case 'Y':
+		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
+		PIO_Clear(&pin_peer_erase);
+		break;
+	case 'y':
+		printf("Seetting SIMTRACExx_ERASE (active)\n\r");
+		PIO_Set(&pin_peer_erase);
+		break;
+	case '1':
+		printf("Resetting Modem 1 (of this SAM3)\n\r");
+		wwan_perst_do_reset(1);
+		break;
+	case '2':
+		printf("Resetting Modem 2 (of this SAM3)\n\r");
+		wwan_perst_do_reset(2);
+		break;
+	case '!':
+		qmod_use_physical_sim(1, 0);
+		break;
+	case '@':
+		qmod_use_physical_sim(2, 0);
+		break;
+	default:
+		if (!qmod_sam3_is_12()) {
+			printf("Unknown command '%c'\n\r", ch);
+			return;
+		}
+		break;
+	}
+
+	/* functions below only work on primary (ST12) */
+	if (!qmod_sam3_is_12())
+		return;
+
+	switch (ch) {
+	case 'E':
+		write_hub_eeprom();
+		break;
 	case 'O':
 		printf("Setting PRTPWR_OVERRIDE\n\r");
 		PIO_Set(&pin_hubpwr_override);
@@ -177,36 +222,6 @@ void board_exec_dbg_cmd(int ch)
 		UART_GetIntegerMinMax(&addr, 0, 255);
 		printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr));
 		break;
-	case 'X':
-		printf("Clearing _SIMTRACExx_RST -> SIMTRACExx_RST high (inactive)\n\r");
-		PIO_Clear(&pin_peer_rst);
-		break;
-	case 'x':
-		printf("Setting _SIMTRACExx_RST -> SIMTRACExx_RST low (active)\n\r");
-		PIO_Set(&pin_peer_rst);
-		break;
-	case 'Y':
-		printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");
-		PIO_Clear(&pin_peer_erase);
-		break;
-	case 'y':
-		printf("Seetting SIMTRACExx_ERASE (active)\n\r");
-		PIO_Set(&pin_peer_erase);
-		break;
-	case '1':
-		printf("Resetting Modem 1 (of this SAM3)\n\r");
-		wwan_perst_do_reset(1);
-		break;
-	case '2':
-		printf("Resetting Modem 2 (of this SAM3)\n\r");
-		wwan_perst_do_reset(2);
-		break;
-	case '!':
-		qmod_use_physical_sim(1, 0);
-		break;
-	case '@':
-		qmod_use_physical_sim(2, 0);
-		break;
 	default:
 		printf("Unknown command '%c'\n\r", ch);
 		break;