dany/facetimehd
1
0
Fork 0
mirror of https://github.com/patjak/facetimehd.git synced 2026-04-09 11:02:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'my_fixes' of git://github.com/sschnelle/facetimehd

Browse Source
This commit is contained in:
Patrik Jakobsson
2015-11-28 21:16:40 +01:00
parent 311137ba01 2ff298739a
commit 8e83f8fbcd
5 changed files with 120 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fthd_drv.h
View File

@@ -26,6 +26,7 @@
#include <linux/mutex.h>
#include <media/videobuf2-dma-sg.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
#include "fthd_reg.h"
#include "fthd_ringbuf.h"
#include "fthd_buffer.h"
@@ -69,7 +70,7 @@ struct fthd_private {
/* waitqueue for signaling command completion */
wait_queue_head_t cmd_wq;
int cmd_ready;
/* Mapped PCI resources */
void __iomem *s2_io;
u32 s2_io_len;
@@ -124,6 +125,7 @@ struct fthd_private {
struct vb2_alloc_ctx *alloc_ctx;
struct h2t_buf_ctx h2t_bufs[FTHD_BUFFERS];
struct v4l2_ctrl_handler v4l2_ctrl_handler;
int frametime;
};