Skip to contentSkip to conversation

Bluetooth: Move amp.h header file into net/bluetooth/

PATCH In review Marcel Holtmann 2 participants 2 messages Oct 10, 2013

Subsystems (2)
lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH 1/3 Bluetooth: Move amp.h header file into net/bluetooth/

The amp.h header file is only used internally by the bluetooth.ko module and is not a public API. So make it local to the core Bluetooth module.

---
 include/net/bluetooth/amp.h | 54 ---------------------------------------------
 net/bluetooth/a2mp.c        |  3 ++-
 net/bluetooth/amp.c         |  3 ++-
 net/bluetooth/amp.h         | 54 +++++++++++++++++++++++++++++++++++++++++++++
 net/bluetooth/hci_event.c   |  3 ++-
 net/bluetooth/l2cap_core.c  |  3 ++-
 6 files changed, 62 insertions(+), 58 deletions(-)
 delete mode 100644 include/net/bluetooth/amp.h
 create mode 100644 net/bluetooth/amp.h
include/net/bluetooth/amp.h deleted +0 -54
deleted file mode 100644
index 7ea3db7..0000000
@@ -1,54 +0,0 @@
-/*
-   Copyright (c) 2011,2012 Intel Corp.
-
-   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 __AMP_H
-#define __AMP_H
-
-struct amp_ctrl {
-	struct list_head	list;
-	struct kref		kref;
-	__u8			id;
-	__u16			assoc_len_so_far;
-	__u16			assoc_rem_len;
-	__u16			assoc_len;
-	__u8			*assoc;
-};
-
-int amp_ctrl_put(struct amp_ctrl *ctrl);
-void amp_ctrl_get(struct amp_ctrl *ctrl);
-struct amp_ctrl *amp_ctrl_add(struct amp_mgr *mgr, u8 id);
-struct amp_ctrl *amp_ctrl_lookup(struct amp_mgr *mgr, u8 id);
-void amp_ctrl_list_flush(struct amp_mgr *mgr);
-
-struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr,
-			     u8 remote_id, bool out);
-
-int phylink_gen_key(struct hci_conn *hcon, u8 *data, u8 *len, u8 *type);
-
-void amp_read_loc_info(struct hci_dev *hdev, struct amp_mgr *mgr);
-void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle);
-void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr);
-void amp_read_loc_assoc_final_data(struct hci_dev *hdev,
-				   struct hci_conn *hcon);
-void amp_create_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,
-			struct hci_conn *hcon);
-void amp_accept_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,
-			struct hci_conn *hcon);
-void amp_write_remote_assoc(struct hci_dev *hdev, u8 handle);
-void amp_write_rem_assoc_continue(struct hci_dev *hdev, u8 handle);
-void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon);
-void amp_create_logical_link(struct l2cap_chan *chan);
-void amp_disconnect_logical_link(struct hci_chan *hchan);
-void amp_destroy_logical_link(struct hci_chan *hchan, u8 reason);
-
-#endif /* __AMP_H */
net/bluetooth/a2mp.c +2 -1
index b38d074..9ae32ce 100644
@@ -16,7 +16,8 @@
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/l2cap.h>
 #include <net/bluetooth/a2mp.h>
-#include <net/bluetooth/amp.h>
+
+#include "amp.h"
 
 /* Global AMP Manager list */
 LIST_HEAD(amp_mgr_list);
net/bluetooth/amp.c +2 -1
index d459ed4..b7b8f4e 100644
@@ -15,9 +15,10 @@
 #include <net/bluetooth/hci.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/a2mp.h>
-#include <net/bluetooth/amp.h>
 #include <crypto/hash.h>
 
+#include "amp.h"
+
 /* Remote AMP Controllers interface */
 void amp_ctrl_get(struct amp_ctrl *ctrl)
 {
net/bluetooth/amp.h new file +54 -0

54 lines not on this page · raw message

net/bluetooth/hci_event.c +2 -1
index ada3bf4..67316b3 100644
@@ -30,7 +30,8 @@
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/mgmt.h>
 #include <net/bluetooth/a2mp.h>
-#include <net/bluetooth/amp.h>
+
+#include "amp.h"
 
 /* Handle HCI Event packets */
 
net/bluetooth/l2cap_core.c +2 -1
index 06e7173..09f6f61 100644
@@ -38,7 +38,8 @@
 #include <net/bluetooth/l2cap.h>
 #include <net/bluetooth/smp.h>
 #include <net/bluetooth/a2mp.h>
-#include <net/bluetooth/amp.h>
+
+#include "amp.h"
 
 bool disable_ertm;
 
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Marcel,

Quoted 5 lines · Marcel Holtmann

The amp.h header file is only used internally by the bluetooth.ko module and is not a public API. So make it local to the core Bluetooth module.

Quoted 10 lines
---
 include/net/bluetooth/amp.h | 54 ---------------------------------------------
 net/bluetooth/a2mp.c        |  3 ++-
 net/bluetooth/amp.c         |  3 ++-
 net/bluetooth/amp.h         | 54 +++++++++++++++++++++++++++++++++++++++++++++
 net/bluetooth/hci_event.c   |  3 ++-
 net/bluetooth/l2cap_core.c  |  3 ++-
 6 files changed, 62 insertions(+), 58 deletions(-)
 delete mode 100644 include/net/bluetooth/amp.h
 create mode 100644 net/bluetooth/amp.h

All three patches in this set have been applied to bluetooth-next.

Johan