solo6x10.h (e5451c8f8330e03ad3cfa16048b4daf961af434f) solo6x10.h (2bc46b3ad3c15165f91459b07ff8682478683194)
1/*
2 * Copyright (C) 2010-2013 Bluecherry, LLC <http://www.bluecherrydvr.com>
3 *
4 * Original author:
5 * Ben Collins <bcollins@ubuntu.com>
6 *
7 * Additional work by:
8 * John Brooks <john.brooks@bluecherry.net>

--- 164 unchanged lines hidden (view full) ---

173 u8 jpeg_header[1024];
174 int jpeg_len;
175
176 u32 fmt;
177 enum solo_enc_types type;
178 u32 sequence;
179 struct vb2_queue vidq;
180 struct list_head vidq_active;
1/*
2 * Copyright (C) 2010-2013 Bluecherry, LLC <http://www.bluecherrydvr.com>
3 *
4 * Original author:
5 * Ben Collins <bcollins@ubuntu.com>
6 *
7 * Additional work by:
8 * John Brooks <john.brooks@bluecherry.net>

--- 164 unchanged lines hidden (view full) ---

173 u8 jpeg_header[1024];
174 int jpeg_len;
175
176 u32 fmt;
177 enum solo_enc_types type;
178 u32 sequence;
179 struct vb2_queue vidq;
180 struct list_head vidq_active;
181 void *alloc_ctx;
182 int desc_count;
183 int desc_nelts;
184 struct solo_p2m_desc *desc_items;
185 dma_addr_t desc_dma;
186 spinlock_t av_lock;
187};
188
189/* The SOLO6x10 PCI Device */

--- 74 unchanged lines hidden (view full) ---

264
265 /* VOP_HEADER handling */
266 void *vh_buf;
267 dma_addr_t vh_dma;
268 int vh_size;
269
270 /* Buffer handling */
271 struct vb2_queue vidq;
181 int desc_count;
182 int desc_nelts;
183 struct solo_p2m_desc *desc_items;
184 dma_addr_t desc_dma;
185 spinlock_t av_lock;
186};
187
188/* The SOLO6x10 PCI Device */

--- 74 unchanged lines hidden (view full) ---

263
264 /* VOP_HEADER handling */
265 void *vh_buf;
266 dma_addr_t vh_dma;
267 int vh_size;
268
269 /* Buffer handling */
270 struct vb2_queue vidq;
272 struct vb2_alloc_ctx *alloc_ctx;
273 u32 sequence;
274 struct task_struct *kthread;
275 struct mutex lock;
276 spinlock_t slock;
277 int old_write;
278 struct list_head vidq_active;
279};
280

--- 103 unchanged lines hidden --- 		271 u32 sequence;
272 struct task_struct *kthread;
273 struct mutex lock;
274 spinlock_t slock;
275 int old_write;
276 struct list_head vidq_active;
277};
278

--- 103 unchanged lines hidden ---