Commit c080d89a authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: hid debug from hid-debug.h to hid layer 



hid-debug.h contains a lot of code, and should not therefore
be a header.

This patch moves the code to generic hid layer as .c source, and
introduces CONFIG_HID_DEBUG to conditionally compile it, instead
of playing with #define DEBUG and including hid-debug.h.

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 20eb1279

drivers/hid/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -22,5 +22,19 @@ config HID 


	  If unsure, say Y



config HID_DEBUG

	bool "HID debugging support"

	depends on HID

	---help---

	This option lets the HID layer output diagnostics about its internal

	state, resolve HID usages, dump HID fields, etc. Individual HID drivers

	use this debugging facility to output information about individual HID

	devices, etc.



	This feature is useful for those who are either debugging the HID parser

	or any HID hardware device.



	If unsure, say N



endmenu

drivers/hid/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -6,10 +6,14 @@ 
hid-objs	:= hid-core.o hid-input.o



# Optional parts of multipart objects.



obj-$(CONFIG_HID)		+= hid.o

ifeq ($(CONFIG_HID_DEBUG),y)

hid-objs	+= hid-debug.o

endif



ifeq ($(CONFIG_INPUT_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

endif





obj-$(CONFIG_HID)		+= hid.o

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ 
#include <linux/input.h>

#include <linux/wait.h>



#undef DEBUG

#undef DEBUG_DATA



#include <linux/hid.h>

#include <linux/hiddev.h>

#include <linux/hid-debug.h>



/*

 * Version Information

drivers/hid/hid-debug.c

0 → 100644
+765 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/hid/hid-input.c

+4 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#undef DEBUG



#include <linux/hid.h>

#include <linux/hid-debug.h>



static int hid_pb_fnmode = 1;

module_param_named(pb_fnmode, hid_pb_fnmode, int, 0644);
@@ -254,7 +255,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 


#ifdef DEBUG

	printk(KERN_DEBUG "Mapping: ");

	resolv_usage(usage->hid);

	hid_resolv_usage(usage->hid);

	printk(" ---> ");

#endif
@@ -682,8 +683,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
			field->dpad = usage->code;

	}



#ifdef DEBUG

	resolv_event(usage->type, usage->code);

	hid_resolv_event(usage->type, usage->code);

#ifdef CONFIG_HID_DEBUG

	printk("\n");

#endif

	return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE