Return-Path: MIME-Version: 1.0 In-Reply-To: <1412154099-28014-8-git-send-email-jakub.tyszkowski@tieto.com> References: <1412154099-28014-1-git-send-email-jakub.tyszkowski@tieto.com> <1412154099-28014-8-git-send-email-jakub.tyszkowski@tieto.com> Date: Wed, 1 Oct 2014 15:21:53 +0300 Message-ID: Subject: Re: [PATCHv3 07/17] android/tester: Make HDP tests use generic pdu struct From: Luiz Augusto von Dentz To: Jakub Tyszkowski Cc: "linux-bluetooth@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Jakub, On Wed, Oct 1, 2014 at 12:01 PM, Jakub Tyszkowski wrote: > --- > android/tester-hdp.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/android/tester-hdp.c b/android/tester-hdp.c > index 9ecef21..e81df71 100644 > --- a/android/tester-hdp.c > +++ b/android/tester-hdp.c > @@ -184,7 +184,8 @@ static void hdp_unregister_app_action(void) > schedule_action_verification(step); > } > > -static uint8_t hdp_rsp_pdu[] = { 0x07, /* PDU id */ > +static const struct pdu hdp_rsp_pdu = raw_pdu( > + 0x07, /* PDU id */ > 0x00, 0x00, /* Transaction id */ > 0x01, 0xc8, /* Response length */ > 0x01, 0xc5, /* Attributes length */ > @@ -239,7 +240,7 @@ static uint8_t hdp_rsp_pdu[] = { 0x07, /* PDU id */ > 0x63, 0x6f, 0x73, 0x65, 0x20, 0x4d, 0x65, 0x74, 0x65, > 0x72, 0x0d, 0x09, 0x03, 0x01, 0x08, 0x01, 0x09, 0x03, > 0x02, 0x08, 0x00, > - 0x00 }; > + 0x00); > > static void hdp_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data) > { > @@ -247,11 +248,11 @@ static void hdp_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data) > struct bthost *bthost = hciemu_client_get_host(t_data->hciemu); > struct emu_cid_data *cid_data = user_data; > > - hdp_rsp_pdu[1] = ((uint8_t *) data)[1]; > - hdp_rsp_pdu[2] = ((uint8_t *) data)[2]; > + hdp_rsp_pdu.data[1] = ((uint8_t *) data)[1]; > + hdp_rsp_pdu.data[2] = ((uint8_t *) data)[2]; I suppose we could use memcpy here, or in case of iovec you can actually send them separably them like this: struct iovec iov[2] iov[0].iov_base = data; iov[0].iov_len = 2; iov[1].iov_base = hdp_rsp_pdu.data + 2; iov[1].iov_len = hdp_rsp_pdu.size - 2; This way the variables can be const. > bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid, > - hdp_rsp_pdu, sizeof(hdp_rsp_pdu)); > + hdp_rsp_pdu.data, hdp_rsp_pdu.size); > } > > static void hdp_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data) > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Luiz Augusto von Dentz