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

fthd: Rename FTHD_BUFFERS to FTHD_NUM_BUFS

Browse Source 
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
This commit is contained in:
Patrik Jakobsson
2016-05-01 18:17:28 +02:00
parent 80c04ac390
commit 782364ff96
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fthd_drv.h
View File

@@ -36,7 +36,7 @@
#define FTHD_PCI_S2_MEM 2
#define FTHD_PCI_ISP_IO 4
#define FTHD_BUFFERS 4
#define FTHD_NUM_BUFS 4
enum FW_CHAN_TYPE {
FW_CHAN_TYPE_OUT=0,
@@ -119,7 +119,7 @@ struct fthd_private {
struct mutex vb2_queue_lock;
struct list_head buffer_queue;
struct vb2_alloc_ctx *alloc_ctx;
struct h2t_buf_ctx h2t_bufs[FTHD_BUFFERS];
struct h2t_buf_ctx h2t_bufs[FTHD_NUM_BUFS];
struct v4l2_ctrl_handler v4l2_ctrl_handler;
int frametime;

15
fthd_v4l2.c
View File

@@ -73,12 +73,13 @@ static void fthd_buffer_cleanup(struct vb2_buffer *vb)
int i;
pr_debug("%p\n", vb);
for (i = 0; i < FTHD_BUFFERS; i++) {
for (i = 0; i < FTHD_NUM_BUFS; i++) {
if (dev_priv->h2t_bufs[i].vb == vb) {
ctx = dev_priv->h2t_bufs + i;
break;
};
}
}
if (!ctx || ctx->state == BUF_FREE)
return;
@@ -120,7 +121,7 @@ static void fthd_buffer_queue(struct vb2_buffer *vb)
int i;
pr_debug("vb = %p\n", vb);
for (i = 0; i < FTHD_BUFFERS; i++) {
for (i = 0; i < FTHD_NUM_BUFS; i++) {
if (dev_priv->h2t_bufs[i].vb == vb) {
ctx = dev_priv->h2t_bufs + i;
break;
@@ -163,7 +164,7 @@ static int fthd_buffer_prepare(struct vb2_buffer *vb)
int i;
pr_debug("%p\n", vb);
for (i = 0; i < FTHD_BUFFERS; i++) {
for (i = 0; i < FTHD_NUM_BUFS; i++) {
if (dev_priv->h2t_bufs[i].state == BUF_FREE ||
(dev_priv->h2t_bufs[i].state == BUF_ALLOC &&
dev_priv->h2t_bufs[i].vb == vb)) {
@@ -251,7 +252,7 @@ static int fthd_start_streaming(struct vb2_queue *vq, unsigned int count)
if (ret)
return ret;
for (i = 0; i < FTHD_BUFFERS && count; i++, count--) {
for (i = 0; i < FTHD_NUM_BUFS && count; i++, count--) {
ctx = dev_priv->h2t_bufs + i;
if (ctx->state != BUF_DRV_QUEUED)
continue;
@@ -279,7 +280,7 @@ static void fthd_stop_streaming(struct vb2_queue *vq)
pr_debug("done\n");
} else {
/* Firmware doesn't respond. */
for (i = 0; i < FTHD_BUFFERS;i++) {
for (i = 0; i < FTHD_NUM_BUFS;i++) {
ctx = dev_priv->h2t_bufs + i;
if (ctx->state == BUF_DRV_QUEUED ||
ctx->state == BUF_HW_QUEUED) {
@@ -500,7 +501,7 @@ static int fthd_v4l2_ioctl_g_parm(struct file *filp, void *priv,
if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
parm->parm.capture.readbuffers = FTHD_BUFFERS;
parm->parm.capture.readbuffers = FTHD_NUM_BUFS;
parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
parm->parm.capture.timeperframe = timeperframe;