More debug command cleanup to save space

(saves another 1.5KB)

BUG=none
TEST=(run the commands)

Change-Id: Id3ca58528fa68a4cec606edf2b98b9af38ac228f
Signed-off-by: Randall Spangler <rspangler@chromium.org>

3 files changed, 32 insertions, 64 deletions

diff --git a/chip/lm4/i2c.c b/chip/lm4/i2c.c
index 1ebab481e8..0d3f2ecf2b 100644
--- a/chip/lm4/i2c.c
+++ b/chip/lm4/i2c.c
@@ -349,27 +349,20 @@ static int command_i2cread(int argc, char **argv)
 
 	for (i = 0; i < I2C_PORTS_USED && port != i2c_ports[i].port; i++)
 		;
-	if (i >= I2C_PORTS_USED) {
-		ccputs("Unsupported port\n");
-		return EC_ERROR_UNKNOWN;
-	}
+	if (i >= I2C_PORTS_USED)
+		return EC_ERROR_INVAL;
 
 	addr = strtoi(argv[2], &e, 0);
-	if (*e || (addr & 0x01)) {
-		ccputs("Invalid addr; try 'i2cscan' command\n");
+	if (*e || (addr & 0x01))
 		return EC_ERROR_INVAL;
-	}
 
 	if (argc > 3) {
 		count = strtoi(argv[3], &e, 0);
-		if (*e) {
-			ccputs("Invalid count\n");
+		if (*e)
 			return EC_ERROR_INVAL;
-		}
 	}
 
-	ccprintf("Reading %d bytes from I2C device %d:0x%02x...\n",
-		 count, port, addr);
+	ccprintf("Reading %d bytes from %d:0x%02x:", count, port, addr);
 	mutex_lock(port_mutex + port);
 	LM4_I2C_MSA(port) = addr | 0x01;
 	for (i = 0; i < count; i++) {
@@ -383,7 +376,7 @@ static int command_i2cread(int argc, char **argv)
 			return rv;
 		}
 		d = LM4_I2C_MDR(port) & 0xff;
-		ccprintf("0x%02x ", d);
+		ccprintf(" 0x%02x", d);
 	}
 	mutex_unlock(port_mutex + port);
 	ccputs("\n");
@@ -398,7 +391,6 @@ static int command_scan(int argc, char **argv)
 
 	for (i = 0; i < I2C_PORTS_USED; i++)
 		scan_bus(i2c_ports[i].port, i2c_ports[i].name);
-	ccputs("done.\n");
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(i2cscan, command_scan);
diff --git a/chip/lm4/power_button.c b/chip/lm4/power_button.c
index e74899070d..45ef06cde9 100644
--- a/chip/lm4/power_button.c
+++ b/chip/lm4/power_button.c
@@ -551,11 +551,8 @@ static int command_powerbtn(int argc, char **argv)
 
 	if (argc > 1) {
 		ms = strtoi(argv[1], &e, 0);
-		if (*e) {
-			ccputs("Invalid duration.\n"
-			       "Usage: powerbtn [duration_ms]\n");
+		if (*e)
 			return EC_ERROR_INVAL;
-		}
 	}
 
 	ccprintf("Simulating %d ms power button press.\n", ms);
diff --git a/chip/lm4/pwm.c b/chip/lm4/pwm.c
index c0da3a2da8..1c1f5fcb59 100644
--- a/chip/lm4/pwm.c
+++ b/chip/lm4/pwm.c
@@ -154,16 +154,16 @@ void pwm_task(void)
 
 static int command_fan_info(int argc, char **argv)
 {
-	ccprintf("Fan actual speed: %4d rpm\n", pwm_get_fan_rpm());
-	ccprintf("    target speed: %4d rpm\n",
+	ccprintf("Actual: %4d rpm\n", pwm_get_fan_rpm());
+	ccprintf("Target: %4d rpm\n",
 		 (LM4_FAN_FANCMD(FAN_CH_CPU) & MAX_RPM) * CPU_FAN_SCALE);
-	ccprintf("    duty cycle:   %d%%\n",
+	ccprintf("Duty:   %d%%\n",
 		 ((LM4_FAN_FANCMD(FAN_CH_CPU) >> 16)) * 100 / MAX_PWM);
-	ccprintf("    status:       %d\n",
+	ccprintf("Status: %d\n",
 		 (LM4_FAN_FANSTS >> (2 * FAN_CH_CPU)) & 0x03);
-	ccprintf("    enabled:      %s\n",
+	ccprintf("Enable: %s\n",
 		 LM4_FAN_FANCTL & (1 << FAN_CH_CPU) ? "yes" : "no");
-	ccprintf("    powered:      %s\n",
+	ccprintf("Power:  %s\n",
 		 gpio_get_level(GPIO_PGOOD_5VALW) ? "yes" : "no");
 
 	return EC_SUCCESS;
@@ -175,20 +175,13 @@ static int command_fan_set(int argc, char **argv)
 {
 	int rpm = 0;
 	char *e;
-	int rv;
 
-	if (argc < 2) {
-		ccputs("Usage: fanset <rpm>\n");
-		return EC_ERROR_UNKNOWN;
-	}
+	if (argc < 2)
+		return EC_ERROR_INVAL;
 
 	rpm = strtoi(argv[1], &e, 0);
-	if (*e) {
-		ccputs("Invalid speed\n");
-		return EC_ERROR_UNKNOWN;
-	}
-
-	ccprintf("Setting fan speed to %d rpm...\n", rpm);
+	if (*e)
+		return EC_ERROR_INVAL;
 
         /* Move the fan to automatic control */
         if (LM4_FAN_FANCH(FAN_CH_CPU) & 0x0001) {
@@ -203,30 +196,24 @@ static int command_fan_set(int argc, char **argv)
 	thermal_toggle_auto_fan_ctrl(0);
 #endif
 
-	rv = pwm_set_fan_target_rpm(rpm);
-	if (rv == EC_SUCCESS)
-		ccprintf("Done.\n");
-
-	return rv;
+	return pwm_set_fan_target_rpm(rpm);
 }
 DECLARE_CONSOLE_COMMAND(fanset, command_fan_set);
 
 
+#ifdef CONSOLE_COMMAND_FANDUTY
 /* TODO: this is a temporary command for debugging tach issues */
 static int command_fan_duty(int argc, char **argv)
 {
   int d = 0, pwm;
 	char *e;
 
-	if (argc < 2) {
-		ccputs("Usage: fanduty <percent>\n");
-		return EC_ERROR_UNKNOWN;
-	}
+	if (argc < 2)
+		return EC_ERROR_INVAL;
 
 	d = strtoi(argv[1], &e, 0);
 	if (*e) {
-		ccputs("Invalid duty cycle\n");
-		return EC_ERROR_UNKNOWN;
+		return EC_ERROR_INVAL;
 	}
 
         pwm = (MAX_PWM * d) / 100;
@@ -251,30 +238,22 @@ static int command_fan_duty(int argc, char **argv)
 	return EC_SUCCESS;
 }
 DECLARE_CONSOLE_COMMAND(fanduty, command_fan_duty);
+#endif
 
 
 static int command_kblight(int argc, char **argv)
 {
-	char *e;
-	int rv;
-	int i;
-
-	if (argc < 2) {
-		ccprintf("Keyboard backlight is at %d%%\n",
-			 pwm_get_keyboard_backlight());
-		return EC_SUCCESS;
-	}
-
-	i = strtoi(argv[1], &e, 0);
-	if (*e) {
-		ccputs("Invalid percent\n");
-		return EC_ERROR_UNKNOWN;
+	int rv = EC_SUCCESS;
+
+	if (argc >= 2) {
+		char *e;
+		int i = strtoi(argv[1], &e, 0);
+		if (*e)
+			return EC_ERROR_INVAL;
+		rv = pwm_set_keyboard_backlight(i);
 	}
 
-	ccprintf("Setting keyboard backlight to %d%%...\n", i);
-	rv = pwm_set_keyboard_backlight(i);
-	if (rv == EC_SUCCESS)
-		ccprintf("Done.\n");
+	ccprintf("Keyboard backlight: %d%%\n", pwm_get_keyboard_backlight());
 	return rv;
 }
 DECLARE_CONSOLE_COMMAND(kblight, command_kblight);