* [PATCH v3 bluez 0/2] Add BT 3.0+HS definitions
@ 2011-11-03 0:36 Peter Krystad
2011-11-03 0:36 ` [PATCH v3 bluez 1/2] Add L2CAP Create/Move Channel definitions Peter Krystad
2011-11-03 0:36 ` [PATCH v3 bluez 2/2] Add A2MP definitions Peter Krystad
0 siblings, 2 replies; 6+ messages in thread
From: Peter Krystad @ 2011-11-03 0:36 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Peter Krystad
This patchset adds BT 3.0+HS signaling definitions
v3 - remove typedefs from lib/a2mp.h
Peter Krystad (2):
Add L2CAP Create/Move Channel definitions
Add A2MP definitions
lib/a2mp.h | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/l2cap.h | 44 +++++++++++++++++++
2 files changed, 181 insertions(+), 0 deletions(-)
create mode 100644 lib/a2mp.h
--
1.7.7
--
Peter Krystad
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 bluez 1/2] Add L2CAP Create/Move Channel definitions
2011-11-03 0:36 [PATCH v3 bluez 0/2] Add BT 3.0+HS definitions Peter Krystad
@ 2011-11-03 0:36 ` Peter Krystad
2011-11-03 0:36 ` [PATCH v3 bluez 2/2] Add A2MP definitions Peter Krystad
1 sibling, 0 replies; 6+ messages in thread
From: Peter Krystad @ 2011-11-03 0:36 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Peter Krystad
---
lib/l2cap.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/lib/l2cap.h b/lib/l2cap.h
index 68593d3..6cacc98 100644
--- a/lib/l2cap.h
+++ b/lib/l2cap.h
@@ -82,6 +82,12 @@ struct l2cap_conninfo {
#define L2CAP_ECHO_RSP 0x09
#define L2CAP_INFO_REQ 0x0a
#define L2CAP_INFO_RSP 0x0b
+#define L2CAP_CREATE_REQ 0x0c
+#define L2CAP_CREATE_RSP 0x0d
+#define L2CAP_MOVE_REQ 0x0e
+#define L2CAP_MOVE_RSP 0x0f
+#define L2CAP_MOVE_CFM 0x10
+#define L2CAP_MOVE_CFM_RSP 0x11
/* L2CAP extended feature mask */
#define L2CAP_FEAT_FLOWCTL 0x00000001
@@ -226,6 +232,44 @@ typedef struct {
#define L2CAP_IR_SUCCESS 0x0000
#define L2CAP_IR_NOTSUPP 0x0001
+typedef struct {
+ uint16_t psm;
+ uint16_t scid;
+ uint8_t id;
+} __attribute__ ((packed)) l2cap_create_req;
+#define L2CAP_CREATE_REQ_SIZE 5
+
+typedef struct {
+ uint16_t dcid;
+ uint16_t scid;
+ uint16_t result;
+ uint16_t status;
+} __attribute__ ((packed)) l2cap_create_rsp;
+#define L2CAP_CREATE_RSP_SIZE 8
+
+typedef struct {
+ uint16_t icid;
+ uint8_t id;
+} __attribute__ ((packed)) l2cap_move_req;
+#define L2CAP_MOVE_REQ_SIZE 3
+
+typedef struct {
+ uint16_t icid;
+ uint16_t result;
+} __attribute__ ((packed)) l2cap_move_rsp;
+#define L2CAP_MOVE_RSP_SIZE 4
+
+typedef struct {
+ uint16_t icid;
+ uint16_t result;
+} __attribute__ ((packed)) l2cap_move_cfm;
+#define L2CAP_MOVE_CFM_SIZE 4
+
+typedef struct {
+ uint16_t icid;
+} __attribute__ ((packed)) l2cap_move_cfm_rsp;
+#define L2CAP_MOVE_CFM_RSP_SIZE 2
+
#ifdef __cplusplus
}
#endif
--
1.7.7
--
Peter Krystad
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 bluez 2/2] Add A2MP definitions
2011-11-03 0:36 [PATCH v3 bluez 0/2] Add BT 3.0+HS definitions Peter Krystad
2011-11-03 0:36 ` [PATCH v3 bluez 1/2] Add L2CAP Create/Move Channel definitions Peter Krystad
@ 2011-11-03 0:36 ` Peter Krystad
2011-12-12 10:42 ` Johan Hedberg
1 sibling, 1 reply; 6+ messages in thread
From: Peter Krystad @ 2011-11-03 0:36 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Peter Krystad
---
lib/a2mp.h | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 137 insertions(+), 0 deletions(-)
create mode 100644 lib/a2mp.h
diff --git a/lib/a2mp.h b/lib/a2mp.h
new file mode 100644
index 0000000..ce4bf53
--- /dev/null
+++ b/lib/a2mp.h
@@ -0,0 +1,137 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2010-2011 Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __A2MP_H
+#define __A2MP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* A2MP Protocol */
+
+/* A2MP command codes */
+
+#define A2MP_COMMAND_REJ 0x01
+#define A2MP_DISCOVER_REQ 0x02
+#define A2MP_DISCOVER_RSP 0x03
+#define A2MP_CHANGE_NOTIFY 0x04
+#define A2MP_CHANGE_RSP 0x05
+#define A2MP_INFO_REQ 0x06
+#define A2MP_INFO_RSP 0x07
+#define A2MP_ASSOC_REQ 0x08
+#define A2MP_ASSOC_RSP 0x09
+#define A2MP_CREATE_REQ 0x0a
+#define A2MP_CREATE_RSP 0x0b
+#define A2MP_DISCONN_REQ 0x0c
+#define A2MP_DISCONN_RSP 0x0d
+
+struct a2mp_hdr {
+ uint8_t code;
+ uint8_t ident;
+ uint16_t len;
+} __attribute__ ((packed));
+#define A2MP_HDR_SIZE 4
+
+struct a2mp_command_rej {
+ uint16_t reason;
+} __attribute__ ((packed));
+
+struct a2mp_discover_req {
+ uint16_t mtu;
+ uint16_t mask;
+} __attribute__ ((packed));
+
+struct a2mp_ctrl {
+ uint8_t id;
+ uint8_t type;
+ uint8_t status;
+} __attribute__ ((packed));
+
+struct a2mp_discover_rsp {
+ uint16_t mtu;
+ uint16_t mask;
+ struct a2mp_ctrl ctrl_list[0];
+} __attribute__ ((packed));
+
+struct a2mp_info_req {
+ uint8_t id;
+} __attribute__ ((packed));
+
+struct a2mp_info_rsp {
+ uint8_t id;
+ uint8_t status;
+ uint32_t total_bw;
+ uint32_t max_bw;
+ uint32_t min_latency;
+ uint16_t pal_caps;
+ uint16_t assoc_size;
+} __attribute__ ((packed));
+
+struct a2mp_assoc_rsp {
+ uint8_t id;
+ uint8_t status;
+ uint8_t assoc_data[0];
+} __attribute__ ((packed));
+
+struct a2mp_create_req {
+ uint8_t local_id;
+ uint8_t remote_id;
+ uint8_t assoc_data[0];
+} __attribute__ ((packed));
+
+struct a2mp_create_rsp {
+ uint8_t local_id;
+ uint8_t remote_id;
+ uint8_t status;
+} __attribute__ ((packed));
+
+struct a2mp_disconn_req {
+ uint8_t local_id;
+ uint8_t remote_id;
+} __attribute__ ((packed));
+
+#define A2MP_COMMAND_NOT_RECOGNIZED 0x0000
+
+/* AMP controller type */
+#define AMP_CTRL_BR_EDR 0x00
+#define AMP_CTRL_802_11 0x01
+
+/* AMP controller status */
+#define AMP_CTRL_POWERED_DOWN 0x00
+#define AMP_CTRL_BLUETOOTH_ONLY 0x01
+#define AMP_CTRL_NO_CAPACITY 0x02
+#define AMP_CTRL_LOW_CAPACITY 0x03
+#define AMP_CTRL_MEDIUM_CAPACITY 0x04
+#define AMP_CTRL_HIGH_CAPACITY 0x05
+#define AMP_CTRL_FULL_CAPACITY 0x06
+
+/* A2MP response status */
+#define A2MP_STATUS_SUCCESS 0x00
+#define A2MP_STATUS_INVALID_CTRL_ID 0x01
+#define A2MP_STATUS_UNABLE_START_LINK_CREATION 0x02
+#define A2MP_STATUS_NO_PHYSICAL_LINK_EXISTS 0x02
+#define A2MP_STATUS_COLLISION_OCCURED 0x03
+#define A2MP_STATUS_DISCONN_REQ_RECVD 0x04
+#define A2MP_STATUS_PHYS_LINK_EXISTS 0x05
+#define A2MP_STATUS_SECURITY_VIOLATION 0x06
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __A2MP_H */
--
1.7.7
--
Peter Krystad
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 bluez 2/2] Add A2MP definitions
2011-11-03 0:36 ` [PATCH v3 bluez 2/2] Add A2MP definitions Peter Krystad
@ 2011-12-12 10:42 ` Johan Hedberg
2011-12-12 12:28 ` Andrei Emeltchenko
2011-12-13 1:01 ` Peter Krystad
0 siblings, 2 replies; 6+ messages in thread
From: Johan Hedberg @ 2011-12-12 10:42 UTC (permalink / raw)
To: Peter Krystad; +Cc: linux-bluetooth
Hi Peter,
On Wed, Nov 02, 2011, Peter Krystad wrote:
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
I'm still waiting for an update from you on this licensing detail issue.
As Marcel said we'd like to keep the license terms of all libbluetooth
(and also bluez user-space for that matter) consistent. Since you're
already contributing code under "GPL v2 or later" (for the existing .c
and .h files) would it be possible for you to use that for all parts of
your patches?
Johan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 bluez 2/2] Add A2MP definitions
2011-12-12 10:42 ` Johan Hedberg
@ 2011-12-12 12:28 ` Andrei Emeltchenko
2011-12-13 1:01 ` Peter Krystad
1 sibling, 0 replies; 6+ messages in thread
From: Andrei Emeltchenko @ 2011-12-12 12:28 UTC (permalink / raw)
To: Peter Krystad, linux-bluetooth
On Mon, Dec 12, 2011 at 12:42:57PM +0200, Johan Hedberg wrote:
> Hi Peter,
>
> On Wed, Nov 02, 2011, Peter Krystad wrote:
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 and
> > + * only version 2 as published by the Free Software Foundation.
>
> I'm still waiting for an update from you on this licensing detail issue.
> As Marcel said we'd like to keep the license terms of all libbluetooth
> (and also bluez user-space for that matter) consistent. Since you're
> already contributing code under "GPL v2 or later" (for the existing .c
> and .h files) would it be possible for you to use that for all parts of
> your patches?
The easy fix: do not create new header with license and move definitions
to the existing header.
Best regards
Andrei Emeltchenko
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH v3 bluez 2/2] Add A2MP definitions
2011-12-12 10:42 ` Johan Hedberg
2011-12-12 12:28 ` Andrei Emeltchenko
@ 2011-12-13 1:01 ` Peter Krystad
1 sibling, 0 replies; 6+ messages in thread
From: Peter Krystad @ 2011-12-13 1:01 UTC (permalink / raw)
To: 'Johan Hedberg'; +Cc: linux-bluetooth
Hi Johan (and Andrei),
Sorry for the delay, I had to wait for an answer to a question.
The answer is I really can only submit new files with the exact license text in my
original patchset.
Per Andrei's suggestion I will submit revised patchsets with all of the A2MP definitions
added to the existing l2cap.h.
Peter.
> -----Original Message-----
> From: linux-bluetooth-owner@vger.kernel.org [mailto:linux-bluetooth-owner@vger.kernel.org]
> On Behalf Of Johan Hedberg
> Hi Peter,
>
> On Wed, Nov 02, 2011, Peter Krystad wrote:
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 and
> > + * only version 2 as published by the Free Software Foundation.
>
> I'm still waiting for an update from you on this licensing detail issue.
> As Marcel said we'd like to keep the license terms of all libbluetooth
> (and also bluez user-space for that matter) consistent. Since you're
> already contributing code under "GPL v2 or later" (for the existing .c
> and .h files) would it be possible for you to use that for all parts of
> your patches?
>
> Johan
--Peter Krystad
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-12-13 1:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-03 0:36 [PATCH v3 bluez 0/2] Add BT 3.0+HS definitions Peter Krystad
2011-11-03 0:36 ` [PATCH v3 bluez 1/2] Add L2CAP Create/Move Channel definitions Peter Krystad
2011-11-03 0:36 ` [PATCH v3 bluez 2/2] Add A2MP definitions Peter Krystad
2011-12-12 10:42 ` Johan Hedberg
2011-12-12 12:28 ` Andrei Emeltchenko
2011-12-13 1:01 ` Peter Krystad
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).