/* Description limited to 127 char,
anything longer would not be user friendly anyway */
char description[128];
- int bus, address, vid, pid = -1;
+ int bus, address;
+ unsigned int vid, pid;
char manufacturer[128], product[128], serial[128];
char baddr[32];
const char dir_name[] = "/sys/class/tty/%s/device/%s%s";
int i, count;
if (strncmp(port->name, "/dev/", 5))
- RETURN_ERROR(SP_ERR_ARG, "Device name not recognized (%s)", port->name);
+ RETURN_ERROR(SP_ERR_ARG, "Device name not recognized.");
snprintf(file_name, sizeof(file_name), "/sys/class/tty/%s", dev);
count = readlink(file_name, file_name, sizeof(file_name));
if (count <= 0 || count >= (int) sizeof(file_name)-1)
- RETURN_ERROR(SP_ERR_ARG, "Device not found (%s)", port->name);
+ RETURN_ERROR(SP_ERR_ARG, "Device not found.");
file_name[count] = 0;
if (strstr(file_name, "bluetooth"))
port->transport = SP_TRANSPORT_BLUETOOTH;
fclose(file);
}
+ /* If present, add serial to description for better identification. */
+ if (port->usb_serial && strlen(port->usb_serial)) {
+ snprintf(description, sizeof(description),
+ "%s - %s", port->description, port->usb_serial);
+ if (port->description)
+ free(port->description);
+ port->description = strdup(description);
+ }
+
break;
}
} else {
{
char name[PATH_MAX], target[PATH_MAX];
struct dirent entry, *result;
+#ifdef HAVE_SERIAL_STRUCT
struct serial_struct serial_info;
-#ifndef HAVE_READLINKAT
- char buf[sizeof(entry.d_name) + 16];
+ int ioctl_result;
#endif
- int len, fd, ioctl_result;
+ char buf[sizeof(entry.d_name) + 16];
+ int len, fd;
DIR *dir;
int ret = SP_OK;
DEBUG("Iterating over results");
while (!readdir_r(dir, &entry, &result) && result) {
-#ifdef HAVE_READLINKAT
- len = readlinkat(dirfd(dir), entry.d_name, target, sizeof(target));
-#else
snprintf(buf, sizeof(buf), "/sys/class/tty/%s", entry.d_name);
len = readlink(buf, target, sizeof(target));
-#endif
if (len <= 0 || len >= (int) sizeof(target)-1)
continue;
target[len] = 0;
if (strstr(target, "virtual"))
continue;
snprintf(name, sizeof(name), "/dev/%s", entry.d_name);
- DEBUG("Found device %s", name);
+ DEBUG_FMT("Found device %s", name);
if (strstr(target, "serial8250")) {
/* The serial8250 driver has a hardcoded number of ports.
* The only way to tell which actually exist on a given system
DEBUG("open failed, skipping");
continue;
}
+#ifdef HAVE_SERIAL_STRUCT
ioctl_result = ioctl(fd, TIOCGSERIAL, &serial_info);
+#endif
close(fd);
+#ifdef HAVE_SERIAL_STRUCT
if (ioctl_result != 0) {
DEBUG("ioctl failed, skipping");
continue;
DEBUG("port type is unknown, skipping");
continue;
}
+#endif
}
- DEBUG("Found port %s", name);
+ DEBUG_FMT("Found port %s", name);
*list = list_append(*list, name);
if (!list) {
SET_ERROR(ret, SP_ERR_MEM, "list append failed");