#include <linux/proc_fs.h>
#include <linux/ctype.h>
#include <linux/pagemap.h>
-#include <linux/delay.h>
#include <asm/io.h>
#include <asm/semaphore.h>
* Memory management
*
**********************************************************************/
+
+/* Here we want the physical address of the memory.
+ * This is used when initializing the contents of the area.
+ */
+static inline unsigned long kvirt_to_pa(unsigned long adr)
+{
+ unsigned long kva, ret;
+
+ kva = (unsigned long) page_address(vmalloc_to_page((void *)adr));
+ kva |= adr & (PAGE_SIZE-1); /* restore the offset */
+ ret = __pa(kva);
+ return ret;
+}
+
static void *rvmalloc(unsigned long size)
{
void *mem;
cond_resched();
/* sleep for 10 ms, hopefully ;) */
- msleep_interruptible(10);
+ current->state = TASK_INTERRUPTIBLE;
+
+ schedule_timeout(10*HZ/1000);
if (signal_pending(current))
return -EINTR;
CPIA_GRAB_SINGLE, 0, 0, 0);
/* FIXME: Trial & error - need up to 70ms for
the grab mode change to complete ? */
- msleep_interruptible(70);
+ current->state = TASK_INTERRUPTIBLE;
+ schedule_timeout(70*HZ / 1000);
if (signal_pending(current))
return -EINTR;
}
{
if (do_command(cam, CPIA_COMMAND_GotoHiPower, 0, 0, 0, 0))
return -EIO;
- msleep_interruptible(40); /* windows driver does it too */
+ current->state = TASK_INTERRUPTIBLE;
+ schedule_timeout(40*HZ/1000); /* windows driver does it too */
if(signal_pending(current))
return -EINTR;
if (do_command(cam, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0))
/* Wait 6 frames for the sensor to get all settings and
AEC/ACB to settle */
- msleep_interruptible(6*(cam->params.sensorFps.baserate ? 33 : 40) *
- (1 << cam->params.sensorFps.divisor) + 10);
+ current->state = TASK_INTERRUPTIBLE;
+ schedule_timeout((6*(cam->params.sensorFps.baserate ? 33 : 40) *
+ (1 << cam->params.sensorFps.divisor) + 10) *
+ HZ / 1000);
if(signal_pending(current))
return -EINTR;
pos = (unsigned long)(cam->frame_buf);
while (size > 0) {
- page = vmalloc_to_pfn((void *)pos);
- if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) {
+ page = kvirt_to_pa(pos);
+ if (remap_page_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) {
up(&cam->busy_lock);
return -EAGAIN;
}