---
src/shared/bap.c | 54 +++++++++++++++++++++++++++++++++++-------------
1 file changed, 40 insertions(+), 14 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 71eadbdb68b1..6328ff35f3c3 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -2115,7 +2115,8 @@ static struct bt_bap_stream *bap_stream_new(struct bt_bap *bap,
stream = new0(struct bt_bap_stream, 1);
stream->bap = bap;
stream->ep = ep;
- ep->stream = stream;
+ if (ep != NULL)
+ ep->stream = stream;
stream->lpac = lpac;
stream->rpac = rpac;
stream->cc = util_iov_dup(data, 1);
@@ -2209,6 +2210,7 @@ static void bap_stream_set_io(void *data, void *user_data)
struct bt_bap_stream *stream = data;
int fd = PTR_TO_INT(user_data);
bool ret;
+ uint8_t state;
if (fd >= 0)
ret = bap_stream_io_attach(stream, fd, false);
@@ -2218,7 +2220,12 @@ static void bap_stream_set_io(void *data, void *user_data)
if (!ret)
return;
- switch (stream->ep->state) {
+ if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BCAST)
+ state = stream->state;
+ else
+ state = stream->ep->state;
+
+ switch (state) {
case BT_BAP_STREAM_STATE_ENABLING:
if (fd < 0)
bt_bap_stream_disable(stream, false, NULL, NULL);
@@ -5424,7 +5431,8 @@ uint8_t bt_bap_stream_get_state(struct bt_bap_stream *stream)
if (!stream)
return BT_BAP_STREAM_STATE_IDLE;
- if (stream->lpac->type != BT_BAP_BCAST_SOURCE)
+ if (stream->lpac->type != BT_BAP_BCAST_SOURCE &&
+ stream->lpac->type != BT_BAP_BCAST_SINK)
return stream->ep->state;
else
return stream->state;
@@ -5611,7 +5619,13 @@ uint8_t bt_bap_stream_get_dir(struct bt_bap_stream *stream)
if (!stream)
return 0x00;
- return stream->ep->dir;
+ if (stream->ep)
+ return stream->ep->dir;
+
+ if (bt_bap_pac_get_type(stream->lpac) == BT_BAP_BCAST_SINK)
+ return BT_BAP_BCAST_SOURCE;
+ else
+ return BT_BAP_BCAST_SINK;
}
uint32_t bt_bap_stream_get_location(struct bt_bap_stream *stream)
@@ -5623,15 +5637,17 @@ uint32_t bt_bap_stream_get_location(struct bt_bap_stream *stream)
pacs = stream->client ? stream->bap->rdb->pacs : stream->bap->ldb->pacs;
- if (stream->ep->dir == BT_BAP_SOURCE)
- return pacs->source_loc_value;
- else if (stream->ep->dir == BT_BAP_SINK)
- return pacs->sink_loc_value;
- else
- /* TO DO get the location values from metadata
- * for brodcast source and sink
- */
- return stream->bap->ldb->pacs->source_loc_value;
+ if (stream->ep) {
+ if (stream->ep->dir == BT_BAP_SOURCE)
+ return pacs->source_loc_value;
+ else if (stream->ep->dir == BT_BAP_SINK)
+ return pacs->sink_loc_value;
+ }
+
+ /* TO DO get the location values from metadata
+ * for brodcast source and sink
+ */
+ return stream->bap->ldb->pacs->source_loc_value;
}
struct iovec *bt_bap_stream_get_config(struct bt_bap_stream *stream)
@@ -5841,7 +5857,17 @@ uint8_t bt_bap_stream_io_dir(struct bt_bap_stream *stream)
if (!stream)
return 0x00;
- dir = stream->ep->dir;
+ if (stream->ep)
+ dir = stream->ep->dir;
+ else {
+ uint8_t pac_type = bt_bap_pac_get_type(stream->lpac);
+
+ if (pac_type == BT_BAP_BCAST_SINK)
+ dir = BT_BAP_BCAST_SOURCE;
+ else
+ dir = BT_BAP_BCAST_SINK;
+
+ }
if (stream->link)
dir |= stream->link->ep->dir;
--
2.40.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=846208
---Test result---
Test Summary:
CheckPatch PASS 2.49 seconds
GitLint PASS 1.56 seconds
BuildEll PASS 24.81 seconds
BluezMake PASS 1572.58 seconds
MakeCheck PASS 12.93 seconds
MakeDistcheck PASS 175.06 seconds
CheckValgrind PASS 245.01 seconds
CheckSmatch WARNING 348.03 seconds
bluezmakeextell PASS 121.49 seconds
IncrementalBuild PASS 7288.83 seconds
ScanBuild WARNING 973.23 seconds
Details
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
src/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible struct
uressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible s
tructuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:285:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structures
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
src/shared/bap.c:6512:22: warning: Value stored to 'match_data' during its initialization is never read
struct bt_ltv_match match_data = {0};
^~~~~~~~~~ ~~~
1 warning generated.
---
Regards,
Linux Bluetooth