From a76b1b8773467a2c6f5d831155825c8b3909465c Mon Sep 17 00:00:00 2001 From: stefanrueger Date: Mon, 27 Oct 2025 11:20:01 +0100 Subject: [PATCH] Rename bus:device to busdir:devicefile for micronucleus.c --- src/micronucleus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/micronucleus.c b/src/micronucleus.c index e3186aaa..4d34de8d 100644 --- a/src/micronucleus.c +++ b/src/micronucleus.c @@ -586,11 +586,11 @@ static int micronucleus_open(PROGRAMMER *pgm, const char *port) { const char *bus_name = NULL, *dev_name = NULL; if(!str_starts(port, "usb:") && !str_eq(port, "usb")) { - pmsg_error("invalid -P %s; drop this option or use -P usb::\n", port); + pmsg_error("invalid -P %s; drop this option or use -P usb::\n", port); return -1; } - // Calculate bus and device names from -P usb:: option if present + // Calculate bus and device names from -P usb:: option if present if(str_starts(port, "usb:")) { bus_name = port + 4; if((dev_name = strchr(bus_name, ':'))) @@ -644,10 +644,10 @@ static int micronucleus_open(PROGRAMMER *pgm, const char *port) { continue; } - pmsg_notice("found device with Micronucleus V%d.%d, bus:device = %s:%s\n", + pmsg_notice("found device with Micronucleus V%d.%d, busdir:devicefile = %s:%s\n", pdata->major_version, pdata->minor_version, bus->dirname, device->filename); - // If -P usb:: was given, skip non-matching bus:device + // If -P usb:: was given, skip non-matching busdir:devicefile if(bus_name && dev_name) if(!str_busdev_eq(bus->dirname, bus_name) || !str_busdev_eq(device->filename, dev_name)) continue; @@ -688,7 +688,7 @@ static int micronucleus_open(PROGRAMMER *pgm, const char *port) { } if(bus_name && !dev_name) { // Delayed error message, so found devices are printed with -P usb:xyz - pmsg_error("invalid -P %s; use -P usb:: or -P usb\n", port); + pmsg_error("invalid -P %s; drop -P option or use -P usb::\n", port); return -1; }