---

yaml --- r: 294848 b: refs/heads/master c: 70fa444 h: refs/heads/master v: v3
git-mirror · Jan 21, 2012 · e3b6840 · e3b6840
1 parent 6bc7177
commit e3b6840
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b32126f94333afd012daf5b48b594b86ae8128
+refs/heads/master: 70fa444d81b4fea992c2899467d5c4939a35100c
diff --git a/trunk/drivers/media/dvb/dvb-usb/az6007.c b/trunk/drivers/media/dvb/dvb-usb/az6007.c
@@ -3,13 +3,15 @@
  * see Documentation/dvb/README.dvb-usb for more information
  */
 
-#include "az6007.h"
 #include "drxk.h"
 #include "mt2063.h"
 #include "dvb_ca_en50221.h"
+#include "dvb-usb.h"
+
+#define DVB_USB_LOG_PREFIX "az6007"
 
 /* HACK: Should be moved to the right place */
-#define USB_PID_AZUREWAVE_6007		0xccd
+#define USB_PID_AZUREWAVE_6007		0x0ccd
 #define USB_PID_TERRATEC_H7		0x10b4
 
 /* debug */
@@ -18,6 +20,11 @@ module_param_named(debug, dvb_usb_az6007_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))."
 		 DVB_USB_DEBUG_STATUS);
 
+#define deb_info(args...) dprintk(dvb_usb_az6007_debug, 0x01, args)
+#define deb_xfer(args...) dprintk(dvb_usb_az6007_debug, 0x02, args)
+#define deb_rc(args...)   dprintk(dvb_usb_az6007_debug, 0x04, args)
+#define deb_fe(args...)   dprintk(dvb_usb_az6007_debug, 0x08, args)
+
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct az6007_device_state {

diff --git a/trunk/drivers/media/dvb/dvb-usb/az6007.h b/trunk/drivers/media/dvb/dvb-usb/az6007.h