commit d4afefde24b00b653b74f8cde5eec03bc17ff880
parent 72b325efec9e7641120773c34119699344d50ff8
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date: Sat, 12 Apr 2008 07:27:50 +0000
Added proper debugging stuff.
git-svn-id: http://svn.mediati.org/svn/r5u870/trunk@75 022568fa-442e-4ef8-a3e8-54dcafdb011a
Diffstat:
8 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/Kbuild b/Kbuild
@@ -1 +1,2 @@
+include $(src)/debug.mk
obj-m := usbcam/ r5u870.o
diff --git a/README b/README
@@ -86,6 +86,11 @@ Then you may load the module manually:
insmod r5u870.ko
+Debugging
+=========
+
+If you would like to enable debugging, please copy the debug.mk.orig file
+over the top of debug.mk, and rebuild the modules.
Driver Options
==============
diff --git a/debug.mk b/debug.mk
@@ -0,0 +1 @@
+
diff --git a/debug.mk.orig b/debug.mk.orig
@@ -0,0 +1 @@
+EXTRA_CFLAGS += -DCONFIG_USB_USBCAM_DEBUG
diff --git a/usbcam/Makefile b/usbcam/Makefile
@@ -1,3 +1,5 @@
+include $(src)/../debug.mk
+
usbcam-objs := usbcam_dev.o \
usbcam_fops.o \
usbcam_buf.o \
diff --git a/usbcam/usbcam.h b/usbcam/usbcam.h
@@ -31,8 +31,6 @@
#ifdef __KERNEL__
-#define CONFIG_USB_USBCAM_DEBUG
-
#include <linux/usb.h>
#include <linux/mutex.h>
#include <linux/module.h>
@@ -78,6 +76,7 @@ do { \
} \
} while (0)
extern void usbcam_hexdump(struct usbcam_dev *udp, const u8 *buf, size_t len);
+
#else
#define usbcam_dbg(UDP, SUBSYS, FMT, ARG...)
#define usbcam_assert(expr)
diff --git a/usbcam/usbcam_fops.c b/usbcam/usbcam_fops.c
@@ -49,6 +49,39 @@ const static unsigned int palette2pixelformat[] = {
[VIDEO_PALETTE_YUV422P] = V4L2_PIX_FMT_YUV422P,
};
+const static char *v4l_ioctl_names[] = {
+ "UNKNOWN",
+ "VIDIOCGCAP",
+ "VIDIOCGCHAN",
+ "VIDIOCSCHAN",
+ "VIDIOCGTUNER",
+ "VIDIOCSTUNER",
+ "VIDIOCGPICT",
+ "VIDIOCSPICT",
+ "VIDIOCCAPTURE",
+ "VIDIOCGWIN",
+ "VIDIOCSWIN",
+ "VIDIOCGFBUF",
+ "VIDIOCSFBUF",
+ "VIDIOCKEY",
+ "VIDIOCGFREQ",
+ "VIDIOCSFREQ",
+ "VIDIOCGAUDIO",
+ "VIDIOCSAUDIO",
+ "VIDIOCSYNC",
+ "VIDIOCMCAPTURE",
+ "VIDIOCGMBUF",
+ "VIDIOCGUNIT",
+ "VIDIOCGCAPTURE",
+ "VIDIOCSCAPTURE",
+ "VIDIOCSPLAYMODE",
+ "VIDIOCSWRITEMODE",
+ "VIDIOCGPLAYINFO",
+ "VIDIOCSMICROCODE",
+ "VIDIOCGVBIFMT",
+ "VIDIOCSVBIFMT",
+};
+
static unsigned int __pure
palette_to_pixelformat(unsigned int palette)
{
diff --git a/usbcam/usbcam_priv.h b/usbcam/usbcam_priv.h
@@ -26,8 +26,6 @@
#if !defined(__USBCAM_PRIV_H__)
#define __USBCAM_PRIV_H__
-#define CONFIG_USB_USBCAM_DEBUG
-
#include "usbcam.h"
#include <linux/kernel.h>
