g_free(port);
}
-struct bt_port *bt_port_from_private_port(
+struct bt_port *bt_port_from_private(
struct bt_private_port *private_port)
{
- return bt_get(bt_port_from_private(private_port));
+ return bt_get(bt_port_borrow_from_private(private_port));
}
BT_HIDDEN
struct bt_private_port *private_port)
{
return bt_private_connection_from_connection(bt_port_get_connection(
- bt_port_from_private(private_port)));
+ bt_port_borrow_from_private(private_port)));
}
struct bt_private_component *bt_private_port_get_private_component(
struct bt_private_port *private_port)
{
return bt_private_component_from_component(bt_port_get_component(
- bt_port_from_private(private_port)));
+ bt_port_borrow_from_private(private_port)));
}
BT_HIDDEN
port, bt_port_get_name(port), connection);
}
-int bt_private_port_remove_from_component(
+enum bt_port_status bt_private_port_remove_from_component(
struct bt_private_port *private_port)
{
- int ret = 0;
- struct bt_port *port = bt_port_from_private(private_port);
+ enum bt_port_status status = BT_PORT_STATUS_OK;
+ struct bt_port *port = bt_port_borrow_from_private(private_port);
struct bt_component *comp = NULL;
+ enum bt_component_status comp_status;
if (!port) {
BT_LOGW_STR("Invalid parameter: private port is NULL.");
- ret = -1;
+ status = BT_PORT_STATUS_INVALID;
goto end;
}
comp = (void *) bt_object_get_parent(port);
+ if (!comp) {
+ BT_LOGV("Port already removed from its component: "
+ "port-addr=%p, port-name=\"%s\", ",
+ port, bt_port_get_name(port));
+ goto end;
+ }
/* bt_component_remove_port() logs details */
- ret = bt_component_remove_port(comp, port);
+ comp_status = bt_component_remove_port(comp, port);
+ assert(comp_status != BT_COMPONENT_STATUS_INVALID);
+ if (comp_status < 0) {
+ status = BT_PORT_STATUS_ERROR;
+ goto end;
+ }
end:
bt_put(comp);
- return ret;
+ return status;
}
-int bt_port_disconnect(struct bt_port *port)
+enum bt_port_status bt_port_disconnect(struct bt_port *port)
{
- int ret = 0;
+ enum bt_port_status status = BT_PORT_STATUS_OK;
if (!port) {
BT_LOGW_STR("Invalid parameter: port is NULL.");
- ret = -1;
+ status = BT_PORT_STATUS_INVALID;
goto end;
}
if (port->connection) {
- bt_connection_disconnect_ports(port->connection);
+ bt_connection_end(port->connection, true);
BT_LOGV("Disconnected port: "
"port-addr=%p, port-name=\"%s\"",
port, bt_port_get_name(port));
}
end:
- return ret;
+ return status;
}
bt_bool bt_port_is_connected(struct bt_port *port)
struct bt_private_port *private_port)
{
return private_port ?
- bt_port_from_private(private_port)->user_data : NULL;
+ bt_port_borrow_from_private(private_port)->user_data : NULL;
}