Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60c5f5fb authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Add skeleton functions for debugfs creation 



The debugfs file creation has been part of the core initialization
handling of controllers. With the introduction of Bluetooth 4.2 core
specification, the number of debugfs files is increasing even further.

To avoid cluttering the core controller handling, create a separate
file hci_debugfs.c to centralize all debugfs file creation. For now
leave the current files in the core, but in the future all debugfs
file creation will be moved.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 50b5b952

net/bluetooth/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,6 +13,6 @@ bluetooth_6lowpan-y := 6lowpan.o 




bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \

bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \

	hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \

	hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \

	a2mp.o amp.o ecc.o hci_request.o

	a2mp.o amp.o ecc.o hci_request.o hci_debugfs.o





subdir-ccflags-y += -D__CHECK_ENDIAN__
 
subdir-ccflags-y += -D__CHECK_ENDIAN__

net/bluetooth/hci_core.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <net/bluetooth/mgmt.h>

#include <net/bluetooth/mgmt.h>





#include "hci_request.h"

#include "hci_request.h"

#include "hci_debugfs.h"

#include "smp.h"

#include "smp.h"





static void hci_rx_work(struct work_struct *work);

static void hci_rx_work(struct work_struct *work);
@@ -1865,6 +1866,8 @@ static int __hci_init(struct hci_dev *hdev) 
	debugfs_create_file("conn_info_max_age", 0644, hdev->debugfs, hdev,

	debugfs_create_file("conn_info_max_age", 0644, hdev->debugfs, hdev,

			    &conn_info_max_age_fops);

			    &conn_info_max_age_fops);





	hci_debugfs_create_common(hdev);



	if (lmp_bredr_capable(hdev)) {

	if (lmp_bredr_capable(hdev)) {

		debugfs_create_file("inquiry_cache", 0444, hdev->debugfs,

		debugfs_create_file("inquiry_cache", 0444, hdev->debugfs,

				    hdev, &inquiry_cache_fops);

				    hdev, &inquiry_cache_fops);
@@ -1874,6 +1877,8 @@ static int __hci_init(struct hci_dev *hdev) 
				    hdev, &dev_class_fops);

				    hdev, &dev_class_fops);

		debugfs_create_file("voice_setting", 0444, hdev->debugfs,

		debugfs_create_file("voice_setting", 0444, hdev->debugfs,

				    hdev, &voice_setting_fops);

				    hdev, &voice_setting_fops);



		hci_debugfs_create_bredr(hdev);

	}

	}





	if (lmp_ssp_capable(hdev)) {

	if (lmp_ssp_capable(hdev)) {
@@ -1944,6 +1949,8 @@ static int __hci_init(struct hci_dev *hdev) 
				   hdev->debugfs,

				   hdev->debugfs,

				   &hdev->discov_interleaved_timeout);

				   &hdev->discov_interleaved_timeout);





		hci_debugfs_create_le(hdev);



		smp_register(hdev);

		smp_register(hdev);

	}

	}

net/bluetooth/hci_debugfs.c

0 → 100644
+41 −0
Original line number Original line Diff line number Diff line 
/*

   BlueZ - Bluetooth protocol stack for Linux



   Copyright (C) 2014 Intel Corporation



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License version 2 as

   published by the Free Software Foundation;



   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.

   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY

   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES

   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,

   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS

   SOFTWARE IS DISCLAIMED.

*/



#include <linux/debugfs.h>



#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#include "hci_debugfs.h"



void hci_debugfs_create_common(struct hci_dev *hdev)

{

}



void hci_debugfs_create_bredr(struct hci_dev *hdev)

{

}



void hci_debugfs_create_le(struct hci_dev *hdev)

{

}

net/bluetooth/hci_debugfs.h

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
/*

   BlueZ - Bluetooth protocol stack for Linux

   Copyright (C) 2014 Intel Corporation



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License version 2 as

   published by the Free Software Foundation;



   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.

   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY

   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES

   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,

   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS

   SOFTWARE IS DISCLAIMED.

*/



void hci_debugfs_create_common(struct hci_dev *hdev);

void hci_debugfs_create_bredr(struct hci_dev *hdev);

void hci_debugfs_create_le(struct hci_dev *hdev);