From 957c9f0ef5e2ab576381fdf141798481aa16dd4b Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Wed, 10 Sep 2003 10:23:03 +0000 Subject: - add missing #includes - change io-variables from u32 to unsigned long - fix printk outputs --- linux/drivers/media/dvb/b2c2/skystar2.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'linux/drivers/media/dvb/b2c2/skystar2.c') diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c index f2710318e..8544edc56 100644 --- a/linux/drivers/media/dvb/b2c2/skystar2.c +++ b/linux/drivers/media/dvb/b2c2/skystar2.c @@ -21,6 +21,9 @@ #include #include #include +#include + +#include #include "dvb_i2c.h" #include "dvb_frontend.h" @@ -71,8 +74,8 @@ struct adapter { u32 PidFilterMax; u32 MacFilterMax; u32 irq; - u32 io_mem; - u32 io_port; + unsigned long io_mem; + unsigned long io_port; u8 mac_addr[8]; u32 dwSramType; @@ -284,7 +287,7 @@ static int master_xfer(struct dvb_i2c_bus *i2c, const struct i2c_msg *msgs, int dprintk("%s:\n", __FUNCTION__); for (i = 0; i < num; i++) { - printk("message %d: flags=%x, addr=0x%04x, buf=%x, len=%d \n", i, msgs[i].flags, msgs[i].addr, (u32) msgs[i].buf, msgs[i].len); + printk("message %d: flags=%x, addr=0x%04x, buf=%p, len=%d \n", i, msgs[i].flags, msgs[i].addr, msgs[i].buf, msgs[i].len); } } @@ -1941,7 +1944,7 @@ static void Initdmaqueue(struct adapter *adapter) adapter->dma_status = adapter->dma_status | 0x10000000; - dprintk("%s: allocated dma buffer at 0x%x, length=%d\n", __FUNCTION__, (int) adapter->dmaq1.buffer, SizeOfBufDMA1); + dprintk("%s: allocated dma buffer at 0x%p, length=%d\n", __FUNCTION__, adapter->dmaq1.buffer, SizeOfBufDMA1); } else { @@ -1967,7 +1970,7 @@ static void Initdmaqueue(struct adapter *adapter) adapter->dma_status = adapter->dma_status | 0x20000000; - dprintk("%s: allocated dma buffer at 0x%x, length=%d\n", __FUNCTION__, (int) adapter->dmaq2.buffer, (int) SizeOfBufDMA2); + dprintk("%s: allocated dma buffer at 0x%p, length=%d\n", __FUNCTION__, adapter->dmaq2.buffer, (int) SizeOfBufDMA2); } else { @@ -2044,7 +2047,7 @@ static int ClaimAdapter(struct adapter *adapter) adapter->io_port = pdev->resource[1].start; - adapter->io_mem = (u32) ioremap(pdev->resource[0].start, 0x800); + adapter->io_mem = (unsigned long) ioremap(pdev->resource[0].start, 0x800); if (adapter->io_mem == 0) { dprintk("%s: can not map io memory\n", __FUNCTION__); @@ -2052,7 +2055,7 @@ static int ClaimAdapter(struct adapter *adapter) return 2; } - dprintk("%s: io memory maped at %x\n", __FUNCTION__, adapter->io_mem); + dprintk("%s: io memory maped at %lx\n", __FUNCTION__, adapter->io_mem); return 1; } -- cgit v1.2.3