projects
/
vdummy
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of goat:git/vdummy
[vdummy]
/
vdummy.c
diff --git
a/vdummy.c
b/vdummy.c
index
a4d05b8
..
b434b6f
100644
(file)
--- a/
vdummy.c
+++ b/
vdummy.c
@@
-168,7
+168,7
@@
static int init(void)
return res;
}
return res;
}
- printk(KERN_INFO "vdummy device initialized\n");
+ printk(KERN_INFO "vdummy: initialized\n");
return 0;
}
return 0;
}
@@
-327,6
+327,7
@@
static void buf_queue(struct vb2_buffer *vb)
struct buffer *buf = (struct buffer*)((char*)vb - offsetof(struct buffer, vb));
spin_lock(&blist_lock);
struct buffer *buf = (struct buffer*)((char*)vb - offsetof(struct buffer, vb));
spin_lock(&blist_lock);
+ printk(KERN_INFO "vdummy: enqueue buffer\n");
if(buflist) {
buflist_tail->next = buf;
buflist_tail = buf;
if(buflist) {
buflist_tail->next = buf;
buflist_tail = buf;
@@
-339,14
+340,20
@@
static void buf_queue(struct vb2_buffer *vb)
static void clear_queue(enum vb2_buffer_state st)
{
static void clear_queue(enum vb2_buffer_state st)
{
+ struct buffer *list;
+
+ printk(KERN_INFO "vdummy: clear_queue\n");
+
spin_lock(&blist_lock);
spin_lock(&blist_lock);
- while(buflist) {
- struct buffer *buf = buflist;
- buflist = buflist->next;
- vb2_buffer_done(&buf->vb.vb2_buf, st);
- }
+ list = buflist;
buflist = buflist_tail = 0;
spin_unlock(&blist_lock);
buflist = buflist_tail = 0;
spin_unlock(&blist_lock);
+
+ while(list) {
+ struct buffer *buf = list;
+ list = list->next;
+ vb2_buffer_done(&buf->vb.vb2_buf, st);
+ }
}
static int start_streaming(struct vb2_queue *vbq, unsigned int count)
}
static int start_streaming(struct vb2_queue *vbq, unsigned int count)
@@
-363,12
+370,15
@@
static int start_streaming(struct vb2_queue *vbq, unsigned int count)
frame_interval = ktime_set(0, 1000000000ul / (unsigned long)framerate);
}
frame_interval = ktime_set(0, 1000000000ul / (unsigned long)framerate);
}
+ printk(KERN_INFO "vdummy: start streaming (interval: %ld ms)\n",
+ (long)ktime_to_ms(frame_interval));
hrtimer_start(&timer, frame_interval, HRTIMER_MODE_REL);
return 0;
}
static void stop_streaming(struct vb2_queue *vbq)
{
hrtimer_start(&timer, frame_interval, HRTIMER_MODE_REL);
return 0;
}
static void stop_streaming(struct vb2_queue *vbq)
{
+ printk(KERN_INFO "vdummy: stop streaming\n");
hrtimer_cancel(&timer);
streaming = 0;
hrtimer_cancel(&timer);
streaming = 0;
@@
-416,6
+426,8
@@
static int gen_frame(void)
struct buffer *buf = 0;
unsigned long flags;
struct buffer *buf = 0;
unsigned long flags;
+ printk(KERN_INFO "vdummy: gen_frame\n");
+
spin_lock_irqsave(&blist_lock, flags);
if(buflist) {
buf = buflist;
spin_lock_irqsave(&blist_lock, flags);
if(buflist) {
buf = buflist;
@@
-440,6
+452,7
@@
static int gen_frame(void)
enum hrtimer_restart timer_func(struct hrtimer *timer)
{
enum hrtimer_restart timer_func(struct hrtimer *timer)
{
- gen_frame();
+ printk(KERN_INFO "vdummy: timer!\n");
+ //gen_frame();
return streaming ? HRTIMER_RESTART : HRTIMER_NORESTART;
}
return streaming ? HRTIMER_RESTART : HRTIMER_NORESTART;
}