Hi,
On Fri, Aug 22, 2014 at 1:25 PM, Luiz Augusto von Dentz
<luiz.dentz@xxxxxxxxx> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
>
> ---
> monitor/l2cap.h | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 109 insertions(+), 9 deletions(-)
>
> diff --git a/monitor/l2cap.h b/monitor/l2cap.h
> index a0f844b..645e3ef 100644
> --- a/monitor/l2cap.h
> +++ b/monitor/l2cap.h
> @@ -40,15 +40,115 @@ struct l2cap_frame {
> static inline void l2cap_frame_pull(struct l2cap_frame *frame,
> const struct l2cap_frame *source, uint16_t len)
> {
> - frame->index = source->index;
> - frame->in = source->in;
> - frame->handle = source->handle;
> - frame->cid = source->cid;
> - frame->psm = source->psm;
> - frame->chan = source->chan;
> - frame->mode = source->mode;
> - frame->data = source->data + len;
> - frame->size = source->size - len;
> + if (frame != source) {
> + frame->index = source->index;
> + frame->in = source->in;
> + frame->handle = source->handle;
> + frame->cid = source->cid;
> + frame->psm = source->psm;
> + frame->chan = source->chan;
> + frame->mode = source->mode;
> + }
> +
> + frame->data = source->data + len;
> + frame->size = source->size - len;
> +}
> +
> +static inline int l2cap_frame_get_u8(struct l2cap_frame *frame, uint8_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = *((uint8_t *) frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_be16(struct l2cap_frame *frame,
> + uint16_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_be16(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_le16(struct l2cap_frame *frame,
> + uint16_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_le16(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_be32(struct l2cap_frame *frame,
> + uint32_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_be32(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_le32(struct l2cap_frame *frame,
> + uint32_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_le32(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_be64(struct l2cap_frame *frame,
> + uint64_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_be64(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_le64(struct l2cap_frame *frame,
> + uint64_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_le64(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> }
>
> void l2cap_packet(uint16_t index, bool in, uint16_t handle, uint8_t flags,
> --
> 1.9.3
Pushed.
--
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
