From f7e2fcddd73ecb22c8757619bbd58ef38e718f15 Mon Sep 17 00:00:00 2001 From: serxoz Date: Wed, 12 Jul 2023 18:44:30 +0200 Subject: [PATCH] =?UTF-8?q?non=20consigo=20chegar=20=C3=B3=20'block'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mpfm.c | 140 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 98 insertions(+), 42 deletions(-) diff --git a/mpfm.c b/mpfm.c index d6c41f8..9ac7664 100644 --- a/mpfm.c +++ b/mpfm.c @@ -7,15 +7,13 @@ static int count = 0; -void get_partition(uint16_t idVendor, uint16_t idProduct) { - struct udev *udev = udev_new(); - if (!udev) { - printf("Error: Failed to initialize udev.\n"); - return; - } - +static struct udev_device* get_child(struct udev* udev, struct udev_device* parent, const char* subsystem) +{ + struct udev_device* child = NULL; struct udev_enumerate *enumerate = udev_enumerate_new(udev); - udev_enumerate_add_match_subsystem(enumerate, "block"); + + udev_enumerate_add_match_parent(enumerate, parent); + udev_enumerate_add_match_subsystem(enumerate, subsystem); udev_enumerate_scan_devices(enumerate); struct udev_list_entry *devices = udev_enumerate_get_list_entry(enumerate); @@ -23,43 +21,99 @@ void get_partition(uint16_t idVendor, uint16_t idProduct) { udev_list_entry_foreach(entry, devices) { const char *path = udev_list_entry_get_name(entry); - struct udev_device *dev = udev_device_new_from_syspath(udev, path); + printf("%s\n", path); // DEBUG + child = udev_device_new_from_syspath(udev, path); + break; + } - // Obtén el idVendor e idProduct del dispositivo USB actual - const char *vendor_id_str = udev_device_get_sysattr_value(dev, "idVendor"); - const char *product_id_str = udev_device_get_sysattr_value(dev, "idProduct"); - printf(vendor_id_str); + udev_enumerate_unref(enumerate); + return child; +} - if (vendor_id_str && product_id_str) { - uint16_t vendor_id = strtol(vendor_id_str, NULL, 16); - uint16_t product_id = strtol(product_id_str, NULL, 16); +void get_partition(uint16_t idVendor, uint16_t idProduct) +{ + struct udev *udev = udev_new(); + if (!udev) { + printf("Error: Failed to initialize udev.\n"); + return; + } - if (vendor_id == idVendor && product_id == idProduct) { - const char *partition = udev_device_get_devnode(dev); - if (partition) { - // Extraer el nombre de la partición - const char *partition_name = strrchr(partition, '/'); - if (partition_name) { - printf("Partition: %s\n", partition_name + 1); - } else { - printf("Partition: %s\n", partition); - } - } else { - printf("Error: Failed to get partition.\n"); - } - break; - } - } + struct udev_enumerate *enumerate = udev_enumerate_new(udev); - udev_device_unref(dev); + udev_enumerate_add_match_subsystem(enumerate, "scsi"); + /* udev_enumerate_add_match_property(enumerate, "DEVTYPE", "scsi_target"); */ + udev_enumerate_scan_devices(enumerate); + + struct udev_list_entry *devices = udev_enumerate_get_list_entry(enumerate); + struct udev_list_entry *entry; + + udev_list_entry_foreach(entry, devices) { + const char *path = udev_list_entry_get_name(entry); + printf("%s\n", path); // DEBUG + struct udev_device* scsi = udev_device_new_from_syspath(udev, path); + + struct udev_device* block = get_child(udev, scsi, "block"); + struct udev_device* scsi_disk = get_child(udev, scsi, "scsi_disk"); + + struct udev_device* usb + = udev_device_get_parent_with_subsystem_devtype( + scsi, "usb", "usb_device"); + + /* if (block && scsi_disk && usb) { */ + printf("block = %s, usb = %s:%s, scsi = %s\n", + udev_device_get_devnode(block), + udev_device_get_sysattr_value(usb, "idVendor"), + udev_device_get_sysattr_value(usb, "idProduct"), + udev_device_get_sysattr_value(scsi, "vendor")); + printf(" %s\n %s\n", + udev_device_get_sysattr_value(usb,"manufacturer"), + udev_device_get_sysattr_value(usb,"product")); + printf(" serial: %s\n", + udev_device_get_sysattr_value(usb, "serial")); + /* } */ + + if (block) + udev_device_unref(block); + + if (scsi_disk) + udev_device_unref(scsi_disk); + + /* // Obtén el idVendor e idProduct del dispositivo USB actual */ + /* const char *vendor_id_str = udev_device_get_sysattr_value(dev, "idVendor"); */ + /* const char *product_id_str = udev_device_get_sysattr_value(dev, "idProduct"); */ + + /* if (vendor_id_str && product_id_str) { */ + /* uint16_t vendor_id = strtol(vendor_id_str, NULL, 16); */ + /* uint16_t product_id = strtol(product_id_str, NULL, 16); */ + /* */ + /* if (vendor_id == idVendor && product_id == idProduct) { */ + /* const char *partition = udev_device_get_devnode(dev); */ + /* if (partition) { */ + /* // Extraer el nombre de la partición */ + /* const char *partition_name = strrchr(partition, '/'); */ + /* if (partition_name) { */ + /* printf("Partition: %s\n", partition_name + 1); */ + /* } else { */ + /* printf("Partition: %s\n", partition); */ + /* } */ + /* } else { */ + /* printf("Error: Failed to get partition.\n"); */ + /* } */ + /* break; */ + /* } */ + /* } */ + + udev_device_unref(scsi); } udev_enumerate_unref(enumerate); udev_unref(udev); } -int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev, - libusb_hotplug_event event, void *user_data) { + int +hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev, + libusb_hotplug_event event, void *user_data) +{ static libusb_device_handle *dev_handle = NULL; struct libusb_device_descriptor desc; int rc; @@ -67,14 +121,14 @@ int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev, (void)libusb_get_device_descriptor(dev, &desc); printf("%04x:%04x (bus %d, device %d)\n", - desc.idVendor, desc.idProduct, - libusb_get_bus_number(dev), libusb_get_device_address(dev)); + desc.idVendor, desc.idProduct, + libusb_get_bus_number(dev), libusb_get_device_address(dev)); if (LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED == event) { - rc = libusb_open(dev, &dev_handle); - if (LIBUSB_SUCCESS != rc) { - printf("Could not open USB device\n"); - } + /* rc = libusb_open(dev, &dev_handle); */ + /* if (LIBUSB_SUCCESS != rc) { */ + /* printf("Could not open USB device\n"); */ + /* } */ // Obtén la partición del dispositivo get_partition(desc.idVendor, desc.idProduct); @@ -92,7 +146,9 @@ int hotplug_callback(struct libusb_context *ctx, struct libusb_device *dev, return 0; } -int main (void) { + int +main (void) +{ libusb_hotplug_callback_handle callback_handle; int rc;