diff options
| -rw-r--r-- | serial/manager.c | 66 | ||||
| -rw-r--r-- | serial/port.c | 63 | ||||
| -rw-r--r-- | serial/port.h | 6 |
3 files changed, 66 insertions, 69 deletions
diff --git a/serial/manager.c b/serial/manager.c index 6b60423d..bd0362df 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -57,6 +57,10 @@ #define BASE_UUID "00000000-0000-1000-8000-00805F9B34FB" +/* Waiting for udev to create the device node */ +#define MAX_OPEN_TRIES 5 +#define OPEN_WAIT 300 /* ms */ + struct pending_connect { DBusConnection *conn; DBusMessage *msg; @@ -89,6 +93,16 @@ static struct { { NULL } }; +typedef void (*open_notify_t) (int fd, int err, void *data); +typedef void (*udata_free_t) (void *data); +struct open_context { + char *dev; + open_notify_t notify; + udata_free_t ufree; + void *udata; + int ntries; +}; + static DBusConnection *connection = NULL; static GSList *pending_connects = NULL; static int rfcomm_ctl = -1; @@ -130,6 +144,58 @@ static struct pending_connect *find_pending_connect_by_pattern(const char *bda, return NULL; } +static gboolean open_continue(struct open_context *oc) +{ + int fd; + + fd = open(oc->dev, O_RDONLY | O_NOCTTY); + if (fd < 0) { + int err = errno; + error("Could not open %s: %s (%d)", + oc->dev, strerror(err), err); + if (++oc->ntries >= MAX_OPEN_TRIES) { + /* Reporting error */ + oc->notify(fd, err, oc->udata); + return FALSE; + } + return TRUE; + } + /* Connection succeeded */ + oc->notify(fd, 0, oc->udata); + return FALSE; +} + +static void open_context_free(void *data) +{ + struct open_context *oc = data; + + if (oc->ufree) + oc->ufree(oc->udata); + g_free(oc->dev); + g_free(oc); +} + +int port_open(const char *dev, open_notify_t notify, + void *udata, udata_free_t ufree) +{ + int fd; + + fd = open(dev, O_RDONLY | O_NOCTTY); + if (fd < 0) { + struct open_context *oc; + oc = g_new0(struct open_context, 1); + oc->dev = g_strdup(dev); + oc->notify = notify; + oc->ufree = ufree; + oc->udata = udata; + g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE, OPEN_WAIT, + (GSourceFunc) open_continue, oc, open_context_free); + return -EINPROGRESS; + } + + return fd; +} + static uint16_t str2class(const char *pattern) { int i; diff --git a/serial/port.c b/serial/port.c index 3866076a..3c6980ce 100644 --- a/serial/port.c +++ b/serial/port.c @@ -50,10 +50,6 @@ #define SERIAL_PORT_INTERFACE "org.bluez.serial.Port" -/* Waiting for udev to create the device node */ -#define MAX_OPEN_TRIES 5 -#define OPEN_WAIT 300 /* ms */ - struct rfcomm_node { int16_t id; /* RFCOMM device id */ bdaddr_t dst; /* Destination address */ @@ -64,14 +60,6 @@ struct rfcomm_node { guint io_id; /* IO Channel ID */ }; -struct open_context { - char *dev; - open_notify_t notify; - udata_free_t ufree; - void *udata; - int ntries; -}; - static GSList *connected_nodes = NULL; static GSList *bound_nodes = NULL; @@ -315,54 +303,3 @@ int port_unregister(const char *path) return 0; } - -static gboolean open_continue(struct open_context *oc) -{ - int fd; - - fd = open(oc->dev, O_RDONLY | O_NOCTTY); - if (fd < 0) { - int err = errno; - error("Could not open %s: %s (%d)", - oc->dev, strerror(err), err); - if (++oc->ntries >= MAX_OPEN_TRIES) { - /* Reporting error */ - oc->notify(fd, err, oc->udata); - return FALSE; - } - return TRUE; - } - /* Connection succeeded */ - oc->notify(fd, 0, oc->udata); - return FALSE; -} - -static void open_context_free(void *data) -{ - struct open_context *oc = data; - - if (oc->ufree) - oc->ufree(oc->udata); - g_free(oc->dev); - g_free(oc); -} - -int port_open(const char *dev, open_notify_t notify, void *udata, udata_free_t ufree) -{ - int fd; - - fd = open(dev, O_RDONLY | O_NOCTTY); - if (fd < 0) { - struct open_context *oc; - oc = g_new0(struct open_context, 1); - oc->dev = g_strdup(dev); - oc->notify = notify; - oc->ufree = ufree; - oc->udata = udata; - g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE, OPEN_WAIT, - (GSourceFunc) open_continue, oc, open_context_free); - return -EINPROGRESS; - } - - return fd; -} diff --git a/serial/port.h b/serial/port.h index 4e719363..026ba242 100644 --- a/serial/port.h +++ b/serial/port.h @@ -21,9 +21,6 @@ * */ -typedef void (*open_notify_t) (int fd, int err, void *data); -typedef void (*udata_free_t) (void *data); - int port_add_listener(DBusConnection *conn, int id, bdaddr_t *dst, int fd, const char *name, const char *owner); @@ -33,6 +30,3 @@ int port_register(DBusConnection *conn, int id, bdaddr_t *dst, const char *name, char *ppath); int port_unregister(const char *path); - -int port_open(const char *dev, open_notify_t notify, - void *data, udata_free_t ufree); |