Merge pull request hathach#1597 from kasjer/kasjer/dfu-coexistence

hathach · web-flow · commit 8a28e7cd75b6 · 2022-08-10T12:45:22.000+07:00
dfu: Allow DFU coexistence with other interfaces (BTH, RNDIS, future one)
diff --git a/src/class/dfu/dfu_device.c b/src/class/dfu/dfu_device.c
@@ -167,6 +167,8 @@ uint16_t dfu_moded_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc,
   uint8_t alt_count = 0;
 
   uint16_t drv_len = 0;
+  TU_VERIFY(itf_desc->bInterfaceSubClass == TUD_DFU_APP_SUBCLASS && itf_desc->bInterfaceProtocol == DFU_PROTOCOL_DFU, 0);
+
   while(itf_desc->bInterfaceSubClass == TUD_DFU_APP_SUBCLASS && itf_desc->bInterfaceProtocol == DFU_PROTOCOL_DFU)
   {
     TU_ASSERT(max_len > drv_len, 0);

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,8 @@ uint16_t dfu_moded_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc,`
`167`	`167`	`uint8_t alt_count = 0;`
`168`	`168`
`169`	`169`	`uint16_t drv_len = 0;`
	`170`	`+ TU_VERIFY(itf_desc->bInterfaceSubClass == TUD_DFU_APP_SUBCLASS && itf_desc->bInterfaceProtocol == DFU_PROTOCOL_DFU, 0);`
	`171`	`+`
`170`	`172`	`while(itf_desc->bInterfaceSubClass == TUD_DFU_APP_SUBCLASS && itf_desc->bInterfaceProtocol == DFU_PROTOCOL_DFU)`
`171`	`173`	`{`
`172`	`174`	`TU_ASSERT(max_len > drv_len, 0);`