Fix CI USB PID check

tannewt · tannewt · commit 8f5c6920a9d4 · 2024-04-26T13:24:19.000-07:00
diff --git a/ports/litex/supervisor/internal_flash.c b/ports/litex/supervisor/internal_flash.c
@@ -310,7 +310,7 @@ mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t n
     uint32_t src = lba2addr(block);
     memcpy(dest, (uint8_t *)src, FILESYSTEM_BLOCK_SIZE * num_blocks);
 
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_DEVICE
     usb_background();
     #endif
 
@@ -347,7 +347,7 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
         src += count * FILESYSTEM_BLOCK_SIZE;
         num_blocks -= count;
 
-        #if CIRCUITPY_USB
+        #if CIRCUITPY_USB_DEVICE
         usb_background();
         #endif
     }
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -96,7 +96,8 @@ def check_vid_pid(files, clusterlist):
     """
 
     usb_pattern = re.compile(
-        r"^CIRCUITPY_USB\s*=\s*0$|^IDF_TARGET = (esp32|esp32c3|esp32c6|esp32h2)$", flags=re.M
+        r"^CIRCUITPY_USB_DEVICE\s*=\s*0$|^IDF_TARGET = (esp32|esp32c3|esp32c6|esp32h2)$",
+        flags=re.M,
     )
 
     usb_ids = defaultdict(set)

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ def check_vid_pid(files, clusterlist):`
`96`	`96`	`"""`
`97`	`97`
`98`	`98`	`usb_pattern = re.compile(`
`99`		`- r"^CIRCUITPY_USB\s=\s0$\|^IDF_TARGET = (esp32\|esp32c3\|esp32c6\|esp32h2)$", flags=re.M`
	`99`	`+ r"^CIRCUITPY_USB_DEVICE\s=\s0$\|^IDF_TARGET = (esp32\|esp32c3\|esp32c6\|esp32h2)$",`
	`100`	`+ flags=re.M,`
`100`	`101`	`)`
`101`	`102`
`102`	`103`	`usb_ids = defaultdict(set)`