Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv12073
Modified Files:
cs4281.c rme32.c rme96.c
Log Message:
- fixed compile warnings with cast for memcpy_fromio/toio.
- use copy_to_user_fromio() in proc output.
Index: cs4281.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cs4281.c 14 Aug 2003 11:05:38 -0000 1.44
+++ cs4281.c 14 Oct 2003 14:08:48 -0000 1.45
@@ -1178,23 +1178,11 @@
if (file->f_pos + size > CS4281_BA0_SIZE)
size = (long)CS4281_BA0_SIZE - file->f_pos;
if (size > 0) {
- char *tmp;
- long res;
- unsigned long virt;
- if ((tmp = kmalloc(size, GFP_KERNEL)) == NULL)
- return -ENOMEM;
- virt = chip->ba0 + file->f_pos;
- memcpy_fromio(tmp, virt, size);
- if (copy_to_user(buf, tmp, size))
- res = -EFAULT;
- else {
- res = size;
- file->f_pos += size;
- }
- kfree(tmp);
- return res;
+ if (copy_to_user_fromio(buf, chip->ba0 + file->f_pos, size))
+ return -EFAULT;
+ file->f_pos += size;
}
- return 0;
+ return size;
}
static long snd_cs4281_BA1_read(snd_info_entry_t *entry, void *file_private_data,
@@ -1207,23 +1195,11 @@
if (file->f_pos + size > CS4281_BA1_SIZE)
size = (long)CS4281_BA1_SIZE - file->f_pos;
if (size > 0) {
- char *tmp;
- long res;
- unsigned long virt;
- if ((tmp = kmalloc(size, GFP_KERNEL)) == NULL)
- return -ENOMEM;
- virt = chip->ba1 + file->f_pos;
- memcpy_fromio(tmp, virt, size);
- if (copy_to_user(buf, tmp, size))
- res = -EFAULT;
- else {
- res = size;
- file->f_pos += size;
- }
- kfree(tmp);
- return res;
+ if (copy_to_user_fromio(buf, chip->ba1 + file->f_pos, size))
+ return -EFAULT;
+ file->f_pos += size;
}
- return 0;
+ return size;
}
static struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
Index: rme32.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme32.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rme32.c 16 Aug 2003 09:58:29 -0000 1.26
+++ rme32.c 14 Oct 2003 14:08:48 -0000 1.27
@@ -1191,18 +1191,18 @@
}
bytes = diff << rme32->playback_frlog;
if (bytes > RME32_BUFFER_SIZE - rme32->playback_ptr) {
- memcpy_toio(rme32->iobase + RME32_IO_DATA_BUFFER +
rme32->playback_ptr,
+ memcpy_toio((void *)(rme32->iobase + RME32_IO_DATA_BUFFER +
rme32->playback_ptr),
runtime->dma_area + rme32->playback_ptr,
RME32_BUFFER_SIZE - rme32->playback_ptr);
bytes -= RME32_BUFFER_SIZE - rme32->playback_ptr;
if (bytes > RME32_BUFFER_SIZE) {
bytes = RME32_BUFFER_SIZE;
}
- memcpy_toio(rme32->iobase + RME32_IO_DATA_BUFFER,
+ memcpy_toio((void *)(rme32->iobase + RME32_IO_DATA_BUFFER),
runtime->dma_area, bytes);
rme32->playback_ptr = bytes;
} else if (bytes != 0) {
- memcpy_toio(rme32->iobase + RME32_IO_DATA_BUFFER +
rme32->playback_ptr,
+ memcpy_toio((void *)(rme32->iobase + RME32_IO_DATA_BUFFER +
rme32->playback_ptr),
runtime->dma_area + rme32->playback_ptr, bytes);
rme32->playback_ptr += bytes;
}
@@ -1223,17 +1223,17 @@
ptr = frameptr << rme32->capture_frlog;
if (ptr > rme32->capture_ptr) {
memcpy_fromio(runtime->dma_area + rme32->capture_ptr,
- rme32->iobase + RME32_IO_DATA_BUFFER +
- rme32->capture_ptr,
+ (void *)(rme32->iobase + RME32_IO_DATA_BUFFER +
+ rme32->capture_ptr),
ptr - rme32->capture_ptr);
rme32->capture_ptr += ptr - rme32->capture_ptr;
} else if (ptr < rme32->capture_ptr) {
memcpy_fromio(runtime->dma_area + rme32->capture_ptr,
- rme32->iobase + RME32_IO_DATA_BUFFER +
- rme32->capture_ptr,
+ (void *)(rme32->iobase + RME32_IO_DATA_BUFFER +
+ rme32->capture_ptr),
RME32_BUFFER_SIZE - rme32->capture_ptr);
memcpy_fromio(runtime->dma_area,
- rme32->iobase + RME32_IO_DATA_BUFFER,
+ (void *)(rme32->iobase + RME32_IO_DATA_BUFFER),
ptr);
rme32->capture_ptr = ptr;
}
Index: rme96.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme96.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rme96.c 12 Aug 2003 14:10:13 -0000 1.28
+++ rme96.c 14 Oct 2003 14:08:49 -0000 1.29
@@ -1524,21 +1524,21 @@
bytes = diff << rme96->playback_frlog;
if (bytes > RME96_BUFFER_SIZE - rme96->playback_ptr) {
- memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER +
- rme96->playback_ptr,
+ memcpy_toio((void *)(rme96->iobase + RME96_IO_PLAY_BUFFER +
+ rme96->playback_ptr),
runtime->dma_area + rme96->playback_ptr,
RME96_BUFFER_SIZE - rme96->playback_ptr);
bytes -= RME96_BUFFER_SIZE - rme96->playback_ptr;
if (bytes > RME96_BUFFER_SIZE) {
bytes = RME96_BUFFER_SIZE;
}
- memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER,
+ memcpy_toio((void *)(rme96->iobase + RME96_IO_PLAY_BUFFER),
runtime->dma_area,
bytes);
rme96->playback_ptr = bytes;
} else if (bytes != 0) {
- memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER +
- rme96->playback_ptr,
+ memcpy_toio((void *)(rme96->iobase + RME96_IO_PLAY_BUFFER +
+ rme96->playback_ptr),
runtime->dma_area + rme96->playback_ptr,
bytes);
rme96->playback_ptr += bytes;
@@ -1560,17 +1560,17 @@
ptr = frameptr << rme96->capture_frlog;
if (ptr > rme96->capture_ptr) {
memcpy_fromio(runtime->dma_area + rme96->capture_ptr,
- rme96->iobase + RME96_IO_REC_BUFFER +
- rme96->capture_ptr,
+ (void *)(rme96->iobase + RME96_IO_REC_BUFFER +
+ rme96->capture_ptr),
ptr - rme96->capture_ptr);
rme96->capture_ptr += ptr - rme96->capture_ptr;
} else if (ptr < rme96->capture_ptr) {
memcpy_fromio(runtime->dma_area + rme96->capture_ptr,
- rme96->iobase + RME96_IO_REC_BUFFER +
- rme96->capture_ptr,
+ (void *)(rme96->iobase + RME96_IO_REC_BUFFER +
+ rme96->capture_ptr),
RME96_BUFFER_SIZE - rme96->capture_ptr);
memcpy_fromio(runtime->dma_area,
- rme96->iobase + RME96_IO_REC_BUFFER,
+ (void *)(rme96->iobase + RME96_IO_REC_BUFFER),
ptr);
rme96->capture_ptr = ptr;
}
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
