update(class/msc/usbh_msc): add retry macro

sakumisu · sakumisu · commit 6c3b828e7711 · 2025-01-16T16:49:58.000+08:00
Signed-off-by: sakumisu &lt;1203593632@qq.com&gt;
diff --git a/class/msc/usbh_msc.c b/class/msc/usbh_msc.c
@@ -13,6 +13,10 @@
 
 #define DEV_FORMAT "/dev/sd%c"
 
+#ifndef CONFIG_USBHOST_MSC_READY_CHECK_TIMES
+#define CONFIG_USBHOST_MSC_READY_CHECK_TIMES 10
+#endif
+
 USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_msc_cbw_csw[CONFIG_USBHOST_MAX_MSC_CLASS][USB_ALIGN_UP(64, CONFIG_USB_ALIGN_SIZE)];
 USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_msc_buf[CONFIG_USBHOST_MAX_MSC_CLASS][USB_ALIGN_UP(64, CONFIG_USB_ALIGN_SIZE)];
 
@@ -323,7 +327,7 @@ static int usbh_msc_connect(struct usbh_hubport *hport, uint8_t intf)
             USB_LOG_ERR("Fail to scsi_testunitready\r\n");
         }
         cnt++;
-        if (cnt > 10) {
+        if (cnt > CONFIG_USBHOST_MSC_READY_CHECK_TIMES) {
             return -USB_ERR_BUSY;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@`
`13`	`13`
`14`	`14`	`#define DEV_FORMAT "/dev/sd%c"`
`15`	`15`
	`16`	`+#ifndef CONFIG_USBHOST_MSC_READY_CHECK_TIMES`
	`17`	`+#define CONFIG_USBHOST_MSC_READY_CHECK_TIMES 10`
	`18`	`+#endif`
	`19`	`+`
`16`	`20`	`USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_msc_cbw_csw[CONFIG_USBHOST_MAX_MSC_CLASS][USB_ALIGN_UP(64, CONFIG_USB_ALIGN_SIZE)];`
`17`	`21`	`USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_msc_buf[CONFIG_USBHOST_MAX_MSC_CLASS][USB_ALIGN_UP(64, CONFIG_USB_ALIGN_SIZE)];`
`18`	`22`
`@@ -323,7 +327,7 @@ static int usbh_msc_connect(struct usbh_hubport *hport, uint8_t intf)`
`323`	`327`	`USB_LOG_ERR("Fail to scsi_testunitready\r\n");`
`324`	`328`	`}`
`325`	`329`	`cnt++;`
`326`		`- if (cnt > 10) {`
	`330`	`+ if (cnt > CONFIG_USBHOST_MSC_READY_CHECK_TIMES) {`
`327`	`331`	`return -USB_ERR_BUSY;`
`328`	`332`	`}`
`329`	`333`	`}`