cli/serial: 增加 --timeout 参数用于覆盖所有操作的超时设置

README.md

@@ -45,6 +45,11 @@ Serial burning options:
     verify all partitions after burning
   -n, --nand
     burn to NAND flash (CSK6 only)
+  --timeout <ms>
+    override timeout for each operation, acceptable values:
+    -1: no timeout
+     0: use default strategy
+    >0: timeout in milliseconds
 
 Advanced operations (serial only):
   --erase <addr:size>

cskburn/src/main.c

@@ -66,6 +66,7 @@ static struct option long_options[] = {
 		{"probe-timeout", required_argument, NULL, 0},
 		{"reset-attempts", required_argument, NULL, 0},
 		{"reset-delay", required_argument, NULL, 0},
+		{"timeout", required_argument, NULL, 0},
 		{"pass-delay", required_argument, NULL, 0},
 		{"fail-delay", required_argument, NULL, 0},
 		{"burner", required_argument, NULL, 0},
@@ -81,6 +82,7 @@ static const char option_string[] = {
 		"w"
 		"C:"
 		"n"
+		"t:"
 		"r"
 #ifndef WITHOUT_USB
 		"u:"
@@ -148,6 +150,7 @@ static struct {
 	uint32_t probe_timeout;
 	uint32_t reset_attempts;
 	uint32_t reset_delay;
+	int32_t timeout;
 	char *burner;
 	uint8_t *burner_buf;
 	uint32_t burner_len;
@@ -178,6 +181,7 @@ static struct {
 		.probe_timeout = DEFAULT_PROBE_TIMEOUT,
 		.reset_attempts = DEFAULT_RESET_ATTEMPTS,
 		.reset_delay = DEFAULT_RESET_DELAY,
+		.timeout = 0,
 		.burner = NULL,
 		.burner_len = 0,
 		.update_high = false,
@@ -248,6 +252,11 @@ print_help(const char *progname)
 	LOGI("    verify all partitions after burning");
 	LOGI("  -n, --nand");
 	LOGI("    burn to NAND flash (CSK6 only)");
+	LOGI("  --timeout <ms>");
+	LOGI("    override timeout for each operation, acceptable values:");
+	LOGI("    -1: no timeout");
+	LOGI("     0: use default strategy");
+	LOGI("    >0: timeout in milliseconds");
 	LOGI("");
 
 	LOGI("Advanced operations (serial only):");
@@ -324,6 +333,9 @@ main(int argc, char **argv)
 			case 'r':
 				options.target = TARGET_RAM;
 				break;
+			case 't':
+				sscanf(optarg, "%d", &options.timeout);
+				break;
 			case 0: { /* long-only options */
 				const char *name = long_options[long_index].name;
 				if (strcmp(name, "chip-id") == 0) {
@@ -802,7 +814,7 @@ serial_burn(cskburn_partition_t *parts, int parts_cnt)
 	}
 
 	cskburn_serial_device_t *dev = NULL;
-	if ((ret = cskburn_serial_open(&dev, options.serial, options.chip)) != 0) {
+	if ((ret = cskburn_serial_open(&dev, options.serial, options.chip, options.timeout)) != 0) {
 		LOGE_RET(ret, "ERROR: Failed opening device");
 		goto err_open;
 	}

libcskburn_serial/include/cskburn_serial.h

@@ -52,7 +52,8 @@ typedef enum {
  * @retval 0 if successful
  * @retval -errno on other errors from serial device
  */
-int cskburn_serial_open(cskburn_serial_device_t **dev, const char *path, uint32_t chip);
+int cskburn_serial_open(
+		cskburn_serial_device_t **dev, const char *path, uint32_t chip, int32_t timeout);
 
 /**
  * @brief Close CSK device

libcskburn_serial/src/cmd.c

@@ -126,6 +126,10 @@ command_send(cskburn_serial_device_t *dev, uint8_t op, uint8_t *req_buf, uint32_
 static ssize_t
 command_recv(cskburn_serial_device_t *dev, uint8_t op, uint8_t **res_buf, uint32_t timeout)
 {
+	if (dev->timeout > 0) {
+		timeout = dev->timeout;
+	}
+
 	uint64_t start = time_monotonic();
 	do {
 		ssize_t r = slip_read(dev->slip, dev->res_buf, MAX_RES_SLIP_LEN, timeout);
@@ -142,7 +146,7 @@ command_recv(cskburn_serial_device_t *dev, uint8_t op, uint8_t **res_buf, uint32
 			*res_buf = dev->res_buf;
 			return r;
 		}
-	} while (TIME_SINCE_MS(start) < timeout);
+	} while (dev->timeout == -1 || TIME_SINCE_MS(start) < timeout);
 
 	return -ETIMEDOUT;
 }

libcskburn_serial/src/core.c

@@ -34,7 +34,7 @@ cskburn_serial_init(int flags)
 }
 
 int
-cskburn_serial_open(cskburn_serial_device_t **dev, const char *path, uint32_t chip)
+cskburn_serial_open(cskburn_serial_device_t **dev, const char *path, uint32_t chip, int32_t timeout)
 {
 	int ret;
 
@@ -57,6 +57,7 @@ cskburn_serial_open(cskburn_serial_device_t **dev, const char *path, uint32_t ch
 	(*dev)->req_hdr = (*dev)->req_buf;
 	(*dev)->req_cmd = (*dev)->req_buf + sizeof(csk_command_t);
 	(*dev)->chip = chip;
+	(*dev)->timeout = timeout;
 
 	return 0;
 

libcskburn_serial/src/core.h

@@ -14,6 +14,7 @@ struct _cskburn_serial_device_t {
 	uint8_t *req_buf;
 	uint8_t *res_buf;
 	uint32_t chip;
+	int32_t timeout;
 };
 
 #endif  // __LIB_CSKBURN_SERIAL_CORE__