- typos in README.dibusb fixed and comments added

- changed debug calls, added debug levels
- fixed bug, when enumerating the firmware files

3 files changed, 107 insertions, 81 deletions

diff --git a/linux/Documentation/dvb/README.dibusb b/linux/Documentation/dvb/README.dibusb
index a19154501..ed73aabdc 100644
--- a/linux/Documentation/dvb/README.dibusb
+++ b/linux/Documentation/dvb/README.dibusb
@@ -12,7 +12,7 @@ The drivers should work with
 	http://www.kworld.com.tw/asp/pindex.asp?id=4&pid=13
 
 - HAMA DVB-T USB device
-    http://www.hama.de/portal/articleId*110620/action*2598
+	http://www.hama.de/portal/articleId*110620/action*2598
  
 - DiBcom USB DVB-T reference device
 
@@ -103,8 +103,8 @@ as a slave device in vdr, was not working for me. Some work has to be done
 
 TODO: 
 - add some additional URBs for USB data transfer
-- due a firmware bug no write access destroys the USB mpeg transfers -> no 
-  writes during streaming, stop streaming, when adding another pid
+- due a firmware problem i2c writes during mpeg transfers destroy the stream
+  no i2c writes during streaming, interrupt streaming, when adding another pid
 
 2.1. Adding new devices 
 
@@ -143,7 +143,8 @@ Patches, comments and suggestions are very very welcome
    Some guys on the linux-dvb mailing list for encouraging me
    
    Peter Schildmann >peter.schildmann-nospam-at-web.de< for his 
-    user-level firmware loader, which saves a lot of time
+    user-level firmware loader, which saves a lot of time 
+    (when writing the vp7041 driver)
 
    Ulf Hermenau for helping me out with traditional chinese.
    
diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb.c
index 6c0ee84e8..30db454bc 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.c
+++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.c
@@ -43,17 +43,30 @@
 
 #include "dvb-dibusb.h"
 
-static int debug;
-module_param(debug, int, 0x644);
-MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
+/* debug */
+
+#ifdef CONFIG_DVB_DIBCOM_DEBUG
+#define dprintk_new(level,args...) \
+	    do { if ((debug & level)) { printk(args); } } while (0)
 
-#define dprintk if (debug) printk
 #define debug_dump(b,l) if (debug) {\
-	int i; printk("%s: %d > ",__FUNCTION__,l); \
-	for (i = 0; i < l; i++) printk("%02x ", b[i]); \
-	printk("\n");\
+	int i; deb_xfer("%s: %d > ",__FUNCTION__,l); \
+	for (i = 0; i < l; i++) deb_xfer("%02x ", b[i]); \
+	deb_xfer("\n");\
 }
 
+static int debug;
+module_param(debug, int, 0x644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=alotmore (|-able)).");
+#else
+#define dprintk_new(args...)
+#define debug_dump(b,l)
+#endif
+
+#define deb_info(args...) dprintk_new(0x01,args)
+#define deb_xfer(args...) dprintk_new(0x02,args)
+#define deb_alot(args...) dprintk_new(0x04,args)
+
 /* Version information */
 #define DRIVER_VERSION "0.0"
 #define DRIVER_DESC "DiBcom based USB Budget DVB-T device"
@@ -110,7 +123,7 @@ static int dibusb_readwrite_usb(struct usb_dibusb *dib,
 		if (ret)
 			err("recv bulk message failed: %d",ret);
 		else {
-			/*dprintk("rlen: %d\n",rlen);*/
+			deb_alot("rlen: %d\n",rlen);
 			debug_dump(rbuf,actlen);
 		}
 	}
@@ -132,7 +145,7 @@ static int dibusb_i2c_msg(struct usb_dibusb *dib, u8 addr,
 	int wo = (rbuf == NULL || rlen == 0), 
 		len = 2 + wlen + (wo ? 0 : 2);
 
-/*	dprintk("wo: %d, wlen: %d, len: %d\n",wo,wlen,len);*/
+	deb_alot("wo: %d, wlen: %d, len: %d\n",wo,wlen,len);
 	
 	sndbuf[0] = wo ? DIBUSB_REQ_I2C_WRITE : DIBUSB_REQ_I2C_READ;
 	sndbuf[1] = (addr & 0xfe) | (wo ? 0 : 1);
@@ -211,9 +224,9 @@ static void dibusb_urb_complete(struct urb *urb, struct pt_regs *ptregs)
 		return;
 
 	if (urb->status == 0) {
-		dprintk("URB return len: %d\n",urb->actual_length);
+		deb_info("URB return len: %d\n",urb->actual_length);
 		if (urb->actual_length % 188)
-			dprintk("TS Packets: %d, %d\n", urb->actual_length/188,urb->actual_length % 188);
+			deb_info("TS Packets: %d, %d\n", urb->actual_length/188,urb->actual_length % 188);
 		dvb_dmx_swfilter_packets(&dib->demux, (u8*) urb->transfer_buffer,urb->actual_length/188);
 	}
 
@@ -229,7 +242,7 @@ static int dibusb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 	struct dibusb_pid *dpid;
 	int ret = 0;
 
-	dprintk("pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type);
+	deb_info("pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type);
 
 	if ((dpid = dibusb_get_free_pid(dib)) == NULL) {
 		err("no free pid in list.");
@@ -265,7 +278,7 @@ static int dibusb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 	struct usb_dibusb *dib = dvbdmxfeed->demux->priv;
 	struct dibusb_pid *dpid = (struct dibusb_pid *) dvbdmxfeed->priv;
 
-	dprintk("stopfeed pid: 0x%04x, feedtype: %d",dvbdmxfeed->pid, dvbdmxfeed->type);
+	deb_info("stopfeed pid: 0x%04x, feedtype: %d",dvbdmxfeed->pid, dvbdmxfeed->type);
 
 	if (dpid == NULL)
 		err("channel in dmxfeed->priv was NULL");
@@ -405,7 +418,7 @@ static int dibusb_dvb_init(struct usb_dibusb *dib)
     if ((ret = dvb_register_adapter(&dib->adapter, DRIVER_DESC , 
 			THIS_MODULE)) < 0) {
 #endif
-		dprintk("dvb_register_adapter failed: error %d", ret);
+		deb_info("dvb_register_adapter failed: error %d", ret);
 		goto err;
 	}
 
@@ -466,7 +479,7 @@ success:
 
 static int dibusb_dvb_exit(struct usb_dibusb *dib)
 {
-	dprintk("unregistering DVB part\n");
+	deb_info("unregistering DVB part\n");
 	dvb_net_release(&dib->dvb_net);
 	dib->demux.dmx.close(&dib->demux.dmx);
 	dvb_dmxdev_release(&dib->dmxdev);
@@ -492,7 +505,7 @@ static int dibusb_init(struct usb_dibusb *dib)
 	
 	/*
 	 * when reloading the driver w/o replugging the device 
-	 * a timeout occures, this seems to help
+	 * a timeout occures, this helps
 	 */
 	usb_clear_halt(dib->udev,COMMAND_PIPE);
 	usb_clear_halt(dib->udev,RESULT_PIPE);
@@ -541,17 +554,18 @@ static int dibusb_loadfirmware(struct usb_device *udev,
 	u8 *b,*p;
 	int ret = 0,i;
 
-	for (i = 0; i < sizeof(valid_firmware_filenames); i++) {
+	for (i = 0; i < sizeof(valid_firmware_filenames)/sizeof(const char*); i++) {
 		if ((ret = request_firmware(&fw, valid_firmware_filenames[i], &udev->dev)) == 0) {
 			info("using firmware file (%s).",valid_firmware_filenames[i]);
 			break;
 		}
-		dprintk("tried to find '%s' firmware - unsuccessful. (%d)\n",
+		deb_info("tried to find '%s' firmware - unsuccessful. (%d)\n",
 				valid_firmware_filenames[i],ret);
 	}
 		
 	if (fw == NULL) {
-		err("did not find a valid firmware file.");
+		err("did not find a valid firmware file. "
+			"Please see linux/Documentation/dvb/ for more details on firmware-problems.");
 		return -EINVAL;
 	} 
 	p = kmalloc(fw->size,GFP_KERNEL);	
@@ -683,7 +697,6 @@ static struct usb_driver dibusb_driver = {
 static int __init usb_dibusb_init(void)
 {
 	int result;
-
 	if ((result = usb_register(&dibusb_driver))) {
 		err("usb_register failed. Error number %d",result);
 		return result;
diff --git a/linux/drivers/media/dvb/frontends/dib3000mb.c b/linux/drivers/media/dvb/frontends/dib3000mb.c
index 6d0da4688..afb90ad95 100644
--- a/linux/drivers/media/dvb/frontends/dib3000mb.c
+++ b/linux/drivers/media/dvb/frontends/dib3000mb.c
@@ -33,11 +33,22 @@
 
 #include "dib3000mb.h"
 
+/* debug */
+
+#ifdef CONFIG_DVB_DIBCOM_DEBUG
+#define dprintk_new(level,args...) \
+	do { if ((debug & level)) { printk(args); } } while (0)
+
 static int debug;
 module_param(debug, int, 0x644);
-MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
+MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=alotmore (|-able)).");
+#else
+#define dprintk_new(args...)
+#endif
 
-#define dprintk if (debug) printk
+#define deb_info(args...) dprintk_new(0x01,args)
+#define deb_xfer(args...) dprintk_new(0x02,args)
+#define deb_alot(args...) dprintk_new(0x04,args)
 
 /* Version information */
 #define DRIVER_VERSION "0.1"
@@ -71,7 +82,7 @@ static struct dvb_frontend_info dib3000mb_info = {
 #define wr(reg,val) if (dib3000mb_write_reg(state->i2c,reg,val)) \
 	{ err("while sending 0x%04x to 0x%04x.",val,reg); return -EREMOTEIO; }
 #define wr_foreach(a,v) { int i; \
-	dprintk("sizeof: %d %d\n",sizeof(a),sizeof(v));\
+	deb_alot("sizeof: %d %d\n",sizeof(a),sizeof(v));\
 	for (i=0; i < sizeof(a)/sizeof(u16); i++) \
 		wr(a[i],v[i]); \
 }
@@ -84,10 +95,10 @@ static u16 dib3000mb_read_reg(struct i2c_client *i2c, u16 reg)
 		{ .addr = i2c->addr, .flags = 0,        .buf = wb, .len = 2 },
 		{ .addr = i2c->addr, .flags = I2C_M_RD, .buf = rb, .len = 2 },
 	};
-/*	dprintk("reading from i2c bus (reg: %d)\n",reg);*/
+	deb_alot("reading from i2c bus (reg: %d)\n",reg);
 
 	if (i2c_transfer(i2c->adapter,msg,2) != 2)
-		dprintk("i2c read error\n");
+		deb_alot("i2c read error\n");
 
 	return (rb[0] << 8) | rb[1];
 }
@@ -99,7 +110,7 @@ static int dib3000mb_write_reg(struct i2c_client *i2c,u16 reg, u16 val)
 		(val >> 8) & 0xff, val & 0xff,
 	};
 	struct i2c_msg msg[] = { { .addr = i2c->addr, .flags = 0, .buf = b, .len = 4 } };
-/*	dprintk("writing to i2c bus (reg: %d, val: %d)\n",reg,val);*/
+	deb_alot("writing to i2c bus (reg: %d, val: %d)\n",reg,val);
 
 	return i2c_transfer(i2c->adapter,msg,1) != 1 ? -EREMOTEIO : 0 ;
 }
@@ -161,56 +172,56 @@ static int dib3000mb_get_frontend(struct dib3000mb_state *state,
 					||
 		((inv_test2 == 0) && (inv_test1==1 || inv_test1==2));
 
-	dprintk("inversion %d %d, %d\n",inv_test2,inv_test1, fep->inversion);
+	deb_info("inversion %d %d, %d\n",inv_test2,inv_test1, fep->inversion);
 	
 	switch ((tps_val = rd(DIB3000MB_REG_TPS_QAM))) {
 		case DIB3000MB_QAM_QPSK:
-			dprintk("QPSK ");
+			deb_info("QPSK ");
 			ofdm->constellation = QPSK;
 			break;
 		case DIB3000MB_QAM_QAM16:
-			dprintk("QAM16 ");
+			deb_info("QAM16 ");
 			ofdm->constellation = QAM_16;
 			break;
 		case DIB3000MB_QAM_QAM64:
-			dprintk("QAM64 ");
+			deb_info("QAM64 ");
 			ofdm->constellation = QAM_64;
 			break;
 		default:
 			err("Unexpected constellation returned by TPS (%d)",tps_val);
 			break;
  	}
-	dprintk("TPS: %d\n",tps_val);
+	deb_info("TPS: %d\n",tps_val);
 
 	if (rd(DIB3000MB_REG_TPS_HRCH)) {
-		dprintk("HRCH ON\n");
+		deb_info("HRCH ON\n");
 		tps_val = rd(DIB3000MB_REG_TPS_CODE_RATE_LP);
 		cr = &ofdm->code_rate_LP;
 		ofdm->code_rate_HP = FEC_NONE;
 		
 		switch ((tps_val = rd(DIB3000MB_REG_TPS_VIT_ALPHA))) {
 			case DIB3000MB_VIT_ALPHA_OFF:
-				dprintk("HIERARCHY_NONE ");
+				deb_info("HIERARCHY_NONE ");
 				ofdm->hierarchy_information = HIERARCHY_NONE;
 				break;
 			case DIB3000MB_VIT_ALPHA_1:
-				dprintk("HIERARCHY_1 ");
+				deb_info("HIERARCHY_1 ");
 				ofdm->hierarchy_information = HIERARCHY_1;
 				break;
 			case DIB3000MB_VIT_ALPHA_2:
-				dprintk("HIERARCHY_2 ");
+				deb_info("HIERARCHY_2 ");
 				ofdm->hierarchy_information = HIERARCHY_2;
 				break;
 			case DIB3000MB_VIT_ALPHA_4:
-				dprintk("HIERARCHY_4 ");
+				deb_info("HIERARCHY_4 ");
 				ofdm->hierarchy_information = HIERARCHY_4;
 				break;
 			default:
 				err("Unexpected ALPHA value returned by TPS (%d)",tps_val);
 		}	
-		dprintk("TPS: %d\n",tps_val);
+		deb_info("TPS: %d\n",tps_val);
 	} else {
-		dprintk("HRCH OFF\n");
+		deb_info("HRCH OFF\n");
 		tps_val = rd(DIB3000MB_REG_TPS_CODE_RATE_HP);
 		cr = &ofdm->code_rate_HP;
 		ofdm->code_rate_LP = FEC_NONE;
@@ -219,67 +230,67 @@ static int dib3000mb_get_frontend(struct dib3000mb_state *state,
 
 	switch (tps_val) {
 		case DIB3000MB_FEC_1_2:
-			dprintk("FEC_1_2 ");
+			deb_info("FEC_1_2 ");
 			*cr = FEC_1_2;
 			break;
 		case DIB3000MB_FEC_2_3:
-			dprintk("FEC_2_3 ");
+			deb_info("FEC_2_3 ");
 			*cr = FEC_2_3;
 			break;
 		case DIB3000MB_FEC_3_4:
-			dprintk("FEC_3_4 ");
+			deb_info("FEC_3_4 ");
 			*cr = FEC_3_4;
 			break;
 		case DIB3000MB_FEC_5_6:
-			dprintk("FEC_5_6 ");
+			deb_info("FEC_5_6 ");
 			*cr = FEC_4_5;
 			break;
 		case DIB3000MB_FEC_7_8:
-			dprintk("FEC_7_8 ");
+			deb_info("FEC_7_8 ");
 			*cr = FEC_7_8;
 			break;
 		default:
 			err("Unexpected FEC returned by TPS (%d)",tps_val);
 			break;
 	}
-	dprintk("TPS: %d\n",tps_val);
+	deb_info("TPS: %d\n",tps_val);
 	
 	switch ((tps_val = rd(DIB3000MB_REG_TPS_GUARD_TIME))) {
 		case DIB3000MB_GUARD_TIME_1_32:
-			dprintk("GUARD_INTERVAL_1_32 ");
+			deb_info("GUARD_INTERVAL_1_32 ");
 			ofdm->guard_interval = GUARD_INTERVAL_1_32;
 			break;
 		case DIB3000MB_GUARD_TIME_1_16:
-			dprintk("GUARD_INTERVAL_1_16 ");
+			deb_info("GUARD_INTERVAL_1_16 ");
 			ofdm->guard_interval = GUARD_INTERVAL_1_16;
 			break;
 		case DIB3000MB_GUARD_TIME_1_8:
-			dprintk("GUARD_INTERVAL_1_8 ");
+			deb_info("GUARD_INTERVAL_1_8 ");
 			ofdm->guard_interval = GUARD_INTERVAL_1_8;
 			break;
 		case DIB3000MB_GUARD_TIME_1_4:
-			dprintk("GUARD_INTERVAL_1_4 ");
+			deb_info("GUARD_INTERVAL_1_4 ");
 			ofdm->guard_interval = GUARD_INTERVAL_1_4;
 			break;
 		default:
 			err("Unexpected Guard Time returned by TPS (%d)",tps_val);
 			break;
 	}
-	dprintk("TPS: %d\n",tps_val);
+	deb_info("TPS: %d\n",tps_val);
 	
 	switch ((tps_val = rd(DIB3000MB_REG_TPS_FFT))) {
 		case DIB3000MB_FFT_2K:
-			dprintk("TRANSMISSION_MODE_2K ");
+			deb_info("TRANSMISSION_MODE_2K ");
 			ofdm->transmission_mode = TRANSMISSION_MODE_2K;
 			break;
 		case DIB3000MB_FFT_8K:
-			dprintk("TRANSMISSION_MODE_8K ");
+			deb_info("TRANSMISSION_MODE_8K ");
 			ofdm->transmission_mode = TRANSMISSION_MODE_8K;
 			break;
 		default:
 			err("unexpected transmission mode return by TPS (%d)",tps_val);
 	}
-	dprintk("TPS: %d\n",tps_val);
+	deb_info("TPS: %d\n",tps_val);
 	return 0;
 }
 
@@ -296,18 +307,18 @@ static int dib3000mb_fe_read_search_status(struct dib3000mb_state *state)
 	if (irq & 0x02) {
 		if (rd(DIB3000MB_REG_LOCK2_VALUE) & 0x01) {
 			if (dib3000mb_get_frontend(state,&fep) == 0) {
-				dprintk("reading tuning data from frontend succeeded.\n");
-				return dib3000mb_set_frontend(state,&fep,0);
+				deb_info("reading tuning data from frontend succeeded.\n");
+				return dib3000mb_set_frontend(state,&fep,0) == 0;
 			} else {
-				dprintk("reading tuning data failed -> tuning failed.\n");
+				deb_info("reading tuning data failed -> tuning failed.\n");
 				return 0;
 			}
 		} else {
-			dprintk("AS IRQ was pending, but LOCK2 was not & 0x01.\n");
+			deb_info("AS IRQ was pending, but LOCK2 was not & 0x01.\n");
 			return 0;
 		}
 	} else if (irq & 0x01) {
-		dprintk("Autosearch failed.\n");
+		deb_info("Autosearch failed.\n");
 		return 0;
 	}
 
@@ -471,7 +482,7 @@ static int dib3000mb_set_frontend(struct dib3000mb_state *state,
 		[ofdm->guard_interval == GUARD_INTERVAL_AUTO]
 		[fep->inversion == INVERSION_AUTO];
 
-	dprintk("seq? %d\n",seq);
+	deb_info("seq? %d\n",seq);
 	
 	wr(DIB3000MB_REG_SEQ,seq);
 	
@@ -511,7 +522,7 @@ static int dib3000mb_set_frontend(struct dib3000mb_state *state,
 		fe_cr == FEC_AUTO || 
 		fep->inversion == INVERSION_AUTO) {
 		
-		dprintk("autosearch enabled.\n");	
+		deb_info("autosearch enabled.\n");	
 		
 		wr(DIB3000MB_REG_ISI,DIB3000MB_ISI_INHIBIT);
 		
@@ -524,8 +535,8 @@ static int dib3000mb_set_frontend(struct dib3000mb_state *state,
 	} else {
 		wr(DIB3000MB_REG_RESTART,DIB3000MB_RESTART_CTRL);
 		wr(DIB3000MB_REG_RESTART,DIB3000MB_RESTART_OFF);
+		msleep(70);
 	}
-
 	return 0;
 }
 
@@ -615,11 +626,11 @@ static int dib3000mb_read_status(struct dib3000mb_state *state,fe_status_t *stat
 	*stat |= rd(DIB3000MB_REG_CARRIER_LOCK) ? FE_HAS_CARRIER : 0;
 	*stat |= rd(DIB3000MB_REG_VIT_LCK) ? FE_HAS_VITERBI : 0;
 	*stat |= rd(DIB3000MB_REG_TS_SYNC_LOCK) ? FE_HAS_SYNC : 0;
-	*stat |= rd(DIB3000MB_REG_TS_RS_LOCK) ? FE_HAS_LOCK : 0;
+	*stat |= *stat ? FE_HAS_LOCK : 0;
 
-	dprintk("actual status is %2x\n",*stat);
+	deb_info("actual status is %2x\n",*stat);
 	
-	dprintk("autoval: tps: %d, qam: %d, hrch: %d, alpha: %d, hp: %d, lp: %d, guard: %d, fft: %d cell: %d\n",
+	deb_info("autoval: tps: %d, qam: %d, hrch: %d, alpha: %d, hp: %d, lp: %d, guard: %d, fft: %d cell: %d\n",
 			rd(DIB3000MB_REG_TPS_LOCK),
 			rd(DIB3000MB_REG_TPS_QAM), 
 			rd(DIB3000MB_REG_TPS_HRCH),
@@ -630,7 +641,7 @@ static int dib3000mb_read_status(struct dib3000mb_state *state,fe_status_t *stat
 			rd(DIB3000MB_REG_TPS_FFT),
 			rd(DIB3000MB_REG_TPS_CELL_ID));
 
-	*stat = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
+	//*stat = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
 	return 0;
 }
 
@@ -660,50 +671,50 @@ static int dib3000mb_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg
 	int ret = 0;		
 	switch (cmd) {
 		case FE_GET_INFO:
-			dprintk("FE_GET_INFO\n");
+			deb_info("FE_GET_INFO\n");
 			memcpy(arg, &dib3000mb_info, sizeof(struct dvb_frontend_info));
 			break;
 
 		case FE_READ_STATUS: 
-			dprintk("FE_READ_STATUS\n");
+			deb_info("FE_READ_STATUS\n");
 			ret = dib3000mb_read_status(state,(fe_status_t *)arg);
 			break;
 
 		case FE_READ_BER:
-			dprintk("FE_READ_BER\n");
+			deb_info("FE_READ_BER\n");
 			ret = dib3000mb_read_ber(state,(u32 *)arg);
 			break;
 
 		case FE_READ_SIGNAL_STRENGTH:
-			dprintk("FE_READ_SIG_STRENGTH\n");
+			deb_info("FE_READ_SIG_STRENGTH\n");
 			ret = dib3000mb_signal_strength(state,(u16 *) arg);
 			break;
 
 		case FE_READ_SNR:
-			dprintk("FE_READ_SNR\n");
+			deb_info("FE_READ_SNR\n");
 			break;
 
 		case FE_READ_UNCORRECTED_BLOCKS: 
-			dprintk("FE_READ_UNCORRECTED_BLOCKS\n");
+			deb_info("FE_READ_UNCORRECTED_BLOCKS\n");
 			break;
 
 		case FE_SET_FRONTEND:
-			dprintk("FE_SET_FRONTEND\n");
+			deb_info("FE_SET_FRONTEND\n");
 			ret = dib3000mb_set_frontend(state,(struct dvb_frontend_parameters *) arg,1);
 			break;
 
 		case FE_GET_FRONTEND:
-			dprintk("FE_GET_FRONTEND\n");
+			deb_info("FE_GET_FRONTEND\n");
 			ret = dib3000mb_get_frontend(state,(struct dvb_frontend_parameters *) arg);
 			break;
 
 		case FE_SLEEP:
-			dprintk("FE_SLEEP\n");
+			deb_info("FE_SLEEP\n");
 			ret = dib3000mb_sleep(state);
 			break;
 
 		case FE_INIT:
-			dprintk("FE_INIT\n");
+			deb_info("FE_INIT\n");
 			ret = dib3000mb_fe_init(state,0);
 			break;
 
@@ -724,7 +735,7 @@ static int dib3000mb_attach_adapter(struct i2c_adapter *adapter)
 	struct dib3000mb_state *state;
 	int ret = -ENOMEM;
 
-	dprintk("i2c probe with adapter '%s'.\n",adapter->name);
+	deb_info("i2c probe with adapter '%s'.\n",adapter->name);
 	
 	if ((state = kmalloc(sizeof(struct dib3000mb_state),GFP_KERNEL)) == NULL)
 		return -ENOMEM;
@@ -781,7 +792,7 @@ static int dib3000mb_detach_client(struct i2c_client *client)
 {
 	struct dib3000mb_state *state = i2c_get_clientdata(client);
 
-	dprintk("i2c detach\n");
+	deb_info("i2c detach\n");
 
 	dvb_unregister_frontend(dib3000mb_ioctl, state->dvb);
 	i2c_detach_client(client);
@@ -795,7 +806,7 @@ static int dib3000mb_command(struct i2c_client *client,
 			      unsigned int cmd, void *arg)
 {
 	struct dib3000mb_state *state = i2c_get_clientdata(client);
-	dprintk("i2c command.\n");
+	deb_info("i2c command.\n");
 	switch(cmd) {
 		case FE_REGISTER:
 			state->dvb = arg;
@@ -829,6 +840,7 @@ static struct i2c_client client_template = {
 /* module stuff */
 static int __init dib3000mb_init(void)
 {
+	deb_info("debugging level: %d\n",debug);
 	return i2c_add_driver(&driver);
 }