diff options
| author | Michael Hunold <devnull@localhost> | 2003-05-20 11:28:54 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-05-20 11:28:54 +0000 |
| commit | f7d00d3ba057517ced1a2970685d7c09fbfb8c41 (patch) | |
| tree | a032b9ce931478bda78f173aeeedb100082460ce /linux/drivers/media/dvb/ttpci | |
| parent | f0a907bf3c1152176cdfbb44ab98497f84a6152f (diff) | |
| download | mediapointer-dvb-s2-f7d00d3ba057517ced1a2970685d7c09fbfb8c41.tar.gz mediapointer-dvb-s2-f7d00d3ba057517ced1a2970685d7c09fbfb8c41.tar.bz2 | |
Some more ppc-compilation fixes:
- void* arguments can only be casted safely to unsigned long
- some debug print fixes where types did not match
But: the debi stuff in av7110 needs to be rewritten, because
u32 arguments are used as pointers, too... 8-/
Diffstat (limited to 'linux/drivers/media/dvb/ttpci')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index aa6a23350..d0637d62c 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -197,6 +197,8 @@ static u32 debiread(av7110_t *av7110, u32 config, int addr, int count) /* DEBI during interrupt */ +/* fixme: val can be a pointer to a memory or an u32 value -- this + won't work on 64bit platforms! */ static inline void iwdebi(av7110_t *av7110, u32 config, int addr, u32 val, int count) { @@ -867,7 +869,7 @@ pes_play(void *dest, dvb_ringbuffer_t *buf, int dlen) (void)dvb_ringbuffer_read(buf,dest,(size_t)blen,0); - DEB_S(("pread=%08x, pwrite=%08x\n",buf->pread, buf->pwrite)); + DEB_S(("pread=0x%08lx, pwrite=0x%08lx\n",(unsigned long)buf->pread, (unsigned long)buf->pwrite)); wake_up(&buf->queue); return blen; } @@ -2168,7 +2170,7 @@ Set22K(av7110_t *av7110, int state) static -int SendDiSEqCMsg(av7110_t *av7110, int len, u8 *msg, int burst) +int SendDiSEqCMsg(av7110_t *av7110, int len, u8 *msg, unsigned long burst) { int i; u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) + SendDiSEqC), @@ -3066,7 +3068,7 @@ static int dvb_get_stc(dmx_demux_t *demux, unsigned int num, (((uint64_t)fwstc[1]) << 16) | ((uint64_t)fwstc[0]); *base = 1; - DEB_EE(("av7110: stc = %llu\n", *stc)); + DEB_EE(("av7110: stc = %lu\n", (unsigned long)*stc)); return 0; } @@ -3105,7 +3107,7 @@ int av7110_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg) } case FE_DISEQC_SEND_BURST: - SendDiSEqCMsg (av7110, 0, NULL, (int) arg); + SendDiSEqCMsg (av7110, 0, NULL, (unsigned long)arg); break; default: diff --git a/linux/drivers/media/dvb/ttpci/budget.c b/linux/drivers/media/dvb/ttpci/budget.c index 9143989c8..22e06c493 100644 --- a/linux/drivers/media/dvb/ttpci/budget.c +++ b/linux/drivers/media/dvb/ttpci/budget.c @@ -76,7 +76,7 @@ void DiseqcSendByte (struct budget *budget, int data) static -int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, int burst) +int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long burst) { struct saa7146_dev *dev=budget->dev; int i; @@ -135,7 +135,7 @@ int budget_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg) } case FE_DISEQC_SEND_BURST: - SendDiSEqCMsg (budget, 0, NULL, (int) arg); + SendDiSEqCMsg (budget, 0, NULL, (unsigned long)arg); break; default: |