Skip to content

Commit

Permalink
nimble/host: Add Initial ISO implementation
Browse files Browse the repository at this point in the history
This commit provides initial implementation of ISO in host.
  • Loading branch information
rymanluk authored and KKopyscinski committed Oct 3, 2023
1 parent 080e6d3 commit 777e183
Show file tree
Hide file tree
Showing 16 changed files with 1,748 additions and 15 deletions.
1 change: 0 additions & 1 deletion nimble/controller/include/controller/ble_ll_iso.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
extern "C" {
#endif

int ble_ll_iso_read_tx_sync(const uint8_t *cmdbuf, uint8_t len);
int ble_ll_iso_set_cig_param(const uint8_t *cmdbuf, uint8_t len, uint8_t *rspbuf, uint8_t *rsplen);
int ble_ll_iso_set_cig_param_test(const uint8_t *cmdbuf, uint8_t len, uint8_t *rspbuf, uint8_t *rsplen);
int ble_ll_iso_create_cis(const uint8_t *cmdbuf, uint8_t len);
Expand Down
5 changes: 1 addition & 4 deletions nimble/controller/src/ble_ll_hci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1276,10 +1276,7 @@ ble_ll_hci_le_cmd_proc(const uint8_t *cmdbuf, uint8_t len, uint16_t ocf,
break;
#endif /* BLE_LL_ISO_BROADCASTER */
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_ISO)
case BLE_HCI_OCF_LE_READ_ISO_TX_SYNC:
rc = ble_ll_iso_read_tx_sync(cmdbuf, len);
break;
case BLE_HCI_OCF_LE_SET_CIG_PARAM:
case BLE_HCI_OCF_LE_SET_CIG_PARAMS:
rc = ble_ll_iso_set_cig_param(cmdbuf, len, rspbuf, rsplen);
break;
case BLE_HCI_OCF_LE_CREATE_CIS:
Expand Down
6 changes: 0 additions & 6 deletions nimble/controller/src/ble_ll_iso.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@

#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_ISO)

int
ble_ll_iso_read_tx_sync(const uint8_t *cmdbuf, uint8_t len)
{
return BLE_ERR_UNSUPPORTED;
}

int
ble_ll_iso_set_cig_param(const uint8_t *cmdbuf, uint8_t len,
uint8_t *rspbuf, uint8_t *rsplen)
Expand Down
131 changes: 131 additions & 0 deletions nimble/host/include/host/ble_iso.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

#ifndef H_BLE_ISO_
#define H_BLE_ISO_
#include "syscfg/syscfg.h"

#if MYNEWT_VAL(BLE_ISO)

#include <inttypes.h>

enum {
BLE_ISO_CONNECT_REQUEST_EVENT,
BLE_ISO_CIS_ESTABLISHED_EVENT,
BLE_ISO_CIS_DISCONNECTED_EVENT,
BLE_ISO_BIG_CREATE_COMPLETE_EVENT,
BLE_ISO_BIG_ESTABLISHED_EVENT,
BLE_ISO_BIG_TERMINATE_EVENT,
BLE_ISO_BIG_SYNC_LOST_EVENT,
BLE_ISO_DATA_EVENT,
};

struct ble_iso_event {

uint8_t type;

union {
/* BLE ISO CONNECT REQUEST */
struct {
uint16_t conn_handle;
uint16_t cis_handle;
} cis_connect_req;

/* BLE_ISO_CIS_ESTABLISHED_EVENT */
struct {
uint8_t status;
uint16_t cis_handle;
} cis_established;

/* BLE_ISO_CIS_DISCONNECTED_EVENT */
struct {
uint8_t status;
uint16_t cis_handle;
} cis_disconnected;

/* BLE_ISO_BIG_CREATE_COMPLETE_EVENT,
* BLE_ISO_BIG_ESTABLISHED_EVENT*/
struct {
uint8_t status;
uint8_t big_handle;
uint8_t bis_cnt;
uint16_t bis[0];
} big_complete;

/*BLE_ISO_BIG_SYNC_LOST_EVENT */
struct {
uint8_t big_handle;
uint8_t reason;
} big_terminate_lost;

/* BLE_ISO_DATA_EVENT - for both cis/bis_handles */
struct {
struct os_mbuf *om;
uint16_t handle;
} iso_data;
};
};

typedef int ble_iso_event_fn(struct ble_iso_event *event, void *arg);
int ble_iso_server_register_le_audio(ble_iso_event_fn *cb, void *cb_arg);

struct ble_iso_cig_params {
uint32_t sdu_c_to_p_itvl;
uint32_t sdu_p_to_c_itvl;
uint8_t sca;
uint8_t packing;
uint8_t framing;
uint8_t max_c_to_p_latency;
uint8_t max_p_to_c_latency;
#if MYNEWT_VAL(BLE_ISO_TEST)
uint8_t ft_c_to_p;
uint8_t ft_p_to_c;
uint16_t iso_itvl;
#endif
};

struct ble_iso_cis_params {
uint16_t max_sdu_c_to_p;
uint16_t max_sdu_p_to_c;
uint8_t phy_c_to_p;
uint8_t phy_p_to_c;
uint8_t rnt_c_to_p;
uint8_t rnt_p_to_c;
};

int ble_iso_client_create_cig(struct ble_iso_cig_params *cig_params,
uint8_t cis_cnt,
struct ble_iso_cis_params *cis_params,
uint8_t *cig, uint8_t *cis_handles);
int ble_iso_client_remove_group(uint8_t cig_id);
int ble_iso_client_create_cis(uint8_t cig, uint8_t cis_cnt,
struct ble_hci_le_create_cis_params *params,
ble_iso_event_fn *cb, void *cb_arg);

int ble_iso_create_big_sync(uint8_t *out_big_handle, uint16_t sync_handle,
bool encrypted, uint8_t *broadcast_code,
uint8_t mse, uint16_t sync_timeout,
uint8_t num_of_bis, uint8_t *bis,
ble_iso_event_fn *cb, void *cb_arg);
int ble_iso_terminate_big_sync(uint8_t big_handle);

int ble_iso_init(void);
int ble_iso_tx(uint8_t cig_id, struct os_mbuf *om);
#endif
#endif
9 changes: 8 additions & 1 deletion nimble/host/src/ble_gap.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "host/ble_hs_hci.h"
#include "ble_hs_priv.h"
#include "ble_gap_priv.h"
#include "ble_iso_priv.h"

#ifndef min
#define min(a, b) ((a) < (b) ? (a) : (b))
Expand Down Expand Up @@ -1206,7 +1207,10 @@ ble_gap_conn_broken(uint16_t conn_handle, int reason)

rc = ble_gap_find_snapshot(conn_handle, &snap);
if (rc != 0) {
#if MYNEWT_VAL(BLE_ISO)
/* No longer connected. */
ble_iso_disconnected_event(conn_handle, reason, false);
#endif
return;
}

Expand All @@ -1230,7 +1234,10 @@ ble_gap_conn_broken(uint16_t conn_handle, int reason)
ble_sm_connection_broken(conn_handle);
ble_gatts_connection_broken(conn_handle);
ble_gattc_connection_broken(conn_handle);
ble_hs_flow_connection_broken(conn_handle);;
ble_hs_flow_connection_broken(conn_handle);
#if MYNEWT_VAL(BLE_ISO)
ble_iso_disconnected_event(conn_handle, reason, true);
#endif

ble_hs_atomic_conn_delete(conn_handle);

Expand Down
44 changes: 41 additions & 3 deletions nimble/host/src/ble_hs.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ static struct ble_npl_callout ble_hs_timer;
static struct ble_npl_eventq *ble_hs_evq;

static struct ble_mqueue ble_hs_rx_q;
static struct ble_mqueue ble_hs_rx_iso_q;

static struct ble_npl_mutex ble_hs_mutex;

Expand Down Expand Up @@ -224,6 +225,16 @@ ble_hs_process_rx_data_queue(void)
}
}

void
ble_hs_process_rx_iso_data_queue(void)
{
struct os_mbuf *om;

while ((om = ble_mqueue_get(&ble_hs_rx_iso_q)) != NULL) {
ble_hs_hci_evt_iso_process(om);
}
}

static int
ble_hs_wakeup_tx_conn(struct ble_hs_conn *conn)
{
Expand Down Expand Up @@ -301,6 +312,10 @@ ble_hs_clear_rx_queue(void)
while ((om = ble_mqueue_get(&ble_hs_rx_q)) != NULL) {
os_mbuf_free_chain(om);
}

while ((om = ble_mqueue_get(&ble_hs_rx_iso_q)) != NULL) {
os_mbuf_free_chain(om);
}
}

int
Expand Down Expand Up @@ -511,6 +526,12 @@ ble_hs_event_rx_data(struct ble_npl_event *ev)
ble_hs_process_rx_data_queue();
}

static void
ble_hs_event_rx_iso_data(struct ble_npl_event *ev)
{
ble_hs_process_rx_iso_data_queue();
}

static void
ble_hs_event_reset(struct ble_npl_event *ev)
{
Expand Down Expand Up @@ -675,6 +696,24 @@ ble_hs_rx_data(struct os_mbuf *om, void *arg)
return 0;
}

static int
ble_hs_rx_iso(struct os_mbuf *om, void *arg)
{
int rc;

/* If flow control is enabled, mark this packet with its corresponding
* connection handle.
*/

rc = ble_mqueue_put(&ble_hs_rx_iso_q, ble_hs_evq, om);
if (rc != 0) {
os_mbuf_free_chain(om);
return BLE_HS_EOS;
}

return 0;
}

/**
* Enqueues an ACL data packet for transmission. This function consumes the
* supplied mbuf, regardless of the outcome.
Expand Down Expand Up @@ -755,6 +794,7 @@ ble_hs_init(void)
ble_hs_stop_init();

ble_mqueue_init(&ble_hs_rx_q, ble_hs_event_rx_data, NULL);
ble_mqueue_init(&ble_hs_rx_iso_q, ble_hs_event_rx_iso_data, NULL);

rc = stats_init_and_reg(
STATS_HDR(ble_hs_stats), STATS_SIZE_INIT_PARMS(ble_hs_stats,
Expand Down Expand Up @@ -805,9 +845,7 @@ ble_transport_to_hs_acl_impl(struct os_mbuf *om)
int
ble_transport_to_hs_iso_impl(struct os_mbuf *om)
{
os_mbuf_free_chain(om);

return 0;
return ble_hs_rx_iso(om, NULL);
}

void
Expand Down
Loading

0 comments on commit 777e183

Please sign in to comment.