diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-02 18:02:05 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-02 18:02:05 +0200 |
| commit | e62517ef6a8d23cd78325a9661f8865bd222e004 (patch) | |
| tree | 76b7a0af867236c2989ceca1cffcae541ceda9c5 /vidix | |
| parent | 62dda60800a902fdaf9b0ec63d8488aaa48c485f (diff) | |
| parent | 27b167bb75b908541563bab964e97b06d621f837 (diff) | |
| download | mpv-e62517ef6a8d23cd78325a9661f8865bd222e004.tar.bz2 mpv-e62517ef6a8d23cd78325a9661f8865bd222e004.tar.xz | |
Merge svn changes up to r28065
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/sh_veu_vid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vidix/sh_veu_vid.c b/vidix/sh_veu_vid.c index 1d683e38c6..7ce49b4a94 100644 --- a/vidix/sh_veu_vid.c +++ b/vidix/sh_veu_vid.c @@ -312,7 +312,7 @@ static void sh_veu_wait_irq(vidix_playback_t *info) unsigned long n_pending; /* Wait for an interrupt */ - read(uio_dev.fd, &n_pending, sizeof(u_long)); + read(uio_dev.fd, &n_pending, sizeof(unsigned long)); write_reg(&uio_mmio, 0x100, VEVTR); /* ack int, write 0 to bit 0 */ } @@ -473,7 +473,7 @@ static void sh_veu_blit(vidix_playback_t *info, int frame) write_reg(&uio_mmio, addr + info->offset.u, VSACR); /* Enable interrupt in UIO driver */ - write(uio_dev.fd, &enable, sizeof(u_long)); + write(uio_dev.fd, &enable, sizeof(unsigned long)); write_reg(&uio_mmio, 1, VESTR); /* start operation */ } |