Skip to content

Commit

Permalink
HID: hid debug from hid-debug.h to hid layer
Browse files Browse the repository at this point in the history
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: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Jiri Kosina committed Feb 5, 2007
1 parent 20eb127 commit c080d89
Show file tree
Hide file tree
Showing 8 changed files with 809 additions and 747 deletions.
14 changes: 14 additions & 0 deletions drivers/hid/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

8 changes: 6 additions & 2 deletions drivers/hid/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion drivers/hid/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit c080d89

Please sign in to comment.