* device description.
*/
+#include <config.h>
#include <unistd.h>
#include <stdint.h>
#include <stdlib.h>
if (sbuf[0] == 0)
return rc;
- DBG("device interface descriptor: idx=%003d '%s'\n", idx, sbuf);
+ DBG("Device interface descriptor: idx=%003d '%s'\n", idx, sbuf);
j = strchr(sbuf, ':');
if (j > sbuf) {
sbuf[j - sbuf] = 0;
uint8_t idx;
int sub_inst;
- DBG("portname: '%s'\n", port->name);
+ DBG("Portname: '%s'\n", port->name);
if (!strncmp(port->name, DEV_CUA_PATH, strlen(DEV_CUA_PATH))) {
cua_sfx = port->name + strlen(DEV_CUA_PATH);
DBG("'%s': '%s'\n", DEV_CUA_PATH, cua_sfx);
} else {
- RETURN_ERROR(SP_ERR_ARG, "Device name not recognized.");
+ RETURN_ERROR(SP_ERR_ARG, "Device name not recognized");
}
/* Native UART enumeration. */
break;
libusb20_dev_open(dev, 0);
- DBG("device descriptor: '%s'\n", libusb20_dev_get_desc(dev));
+ DBG("Device descriptor: '%s'\n", libusb20_dev_get_desc(dev));
for (idx = 0; idx <= UINT8_MAX - 1; idx++) {
char *drv_name_str = NULL;
libusb20_be_free(be);
if (cua_dev_found == 0)
- DBG("WARN: found no match '%s' %s'\n", port->name, cua_sfx);
+ DBG("WARN: Found no match '%s' %s'\n", port->name, cua_sfx);
RETURN_OK();
}
SP_PRIV enum sp_return list_ports(struct sp_port ***list)
{
DIR *dir;
- struct dirent entry;
- struct dirent *result;
+ struct dirent *entry;
struct termios tios;
char name[PATH_MAX];
int fd, ret;
DEBUG("Enumerating tty devices");
if (!(dir = opendir("/dev")))
- RETURN_FAIL("could not open dir /dev");
+ RETURN_FAIL("Could not open dir /dev");
DEBUG("Iterating over results");
- while (!readdir_r(dir, &entry, &result) && result) {
+ while ((entry = readdir(dir))) {
ret = SP_OK;
- if (entry.d_type != DT_CHR)
+ if (entry->d_type != DT_CHR)
continue;
- if (strncmp(entry.d_name, "cuaU", 4) != 0)
- if (strncmp(entry.d_name, "cuau", 4) != 0)
- if (strncmp(entry.d_name, "cuad", 4) != 0)
+ if (strncmp(entry->d_name, "cuaU", 4) != 0)
+ if (strncmp(entry->d_name, "cuau", 4) != 0)
+ if (strncmp(entry->d_name, "cuad", 4) != 0)
continue;
- if (strend(entry.d_name, ".init"))
+ if (strend(entry->d_name, ".init"))
continue;
- if (strend(entry.d_name, ".lock"))
+ if (strend(entry->d_name, ".lock"))
continue;
- snprintf(name, sizeof(name), "/dev/%s", entry.d_name);
+ snprintf(name, sizeof(name), "/dev/%s", entry->d_name);
DEBUG_FMT("Found device %s", name);
/* Check that we can open tty/cua device in rw mode - we need that. */
if ((fd = open(name, O_RDWR | O_NONBLOCK | O_NOCTTY | O_TTY_INIT | O_CLOEXEC)) < 0) {
- DEBUG("open failed, skipping");
+ DEBUG("Open failed, skipping");
continue;
}
continue;
DEBUG_FMT("Found port %s", name);
- DBG("%s: %s\n", __func__, entry.d_name);
+ DBG("%s: %s\n", __func__, entry->d_name);
*list = list_append(*list, name);
- if (!list) {
- SET_ERROR(ret, SP_ERR_MEM, "list append failed");
+ if (!*list) {
+ SET_ERROR(ret, SP_ERR_MEM, "List append failed");
break;
}
}