aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ngene/ngene.h
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2010-02-03 16:59:20 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:55 -0500
commit684688d87d697724c46be77858641ee2e8885b02 (patch)
treeaa44ac65ca876b3b71f8e4936d8e6f8c88302680 /drivers/media/dvb/ngene/ngene.h
parente890e7c0426ab99b032d5b387b1ca9fad6928895 (diff)
V4L/DVB: ngene: Make checkpatch.pl happy
Make checkpatch.pl happy. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ngene/ngene.h')
-rw-r--r--drivers/media/dvb/ngene/ngene.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index 1c6f0e742ad7..a7eb29846310 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -29,7 +29,7 @@
29#include <linux/interrupt.h> 29#include <linux/interrupt.h>
30#include <linux/i2c.h> 30#include <linux/i2c.h>
31#include <asm/dma.h> 31#include <asm/dma.h>
32#include <asm/scatterlist.h> 32#include <linux/scatterlist.h>
33 33
34#include <linux/dvb/frontend.h> 34#include <linux/dvb/frontend.h>
35 35
@@ -200,8 +200,6 @@ struct EVENT_BUFFER {
200 u32 Reserved[2]; 200 u32 Reserved[2];
201} __attribute__ ((__packed__)); 201} __attribute__ ((__packed__));
202 202
203typedef struct EVENT_BUFFER *PEVENT_BUFFER;
204
205/* Firmware commands. */ 203/* Firmware commands. */
206 204
207enum OPCODES { 205enum OPCODES {
@@ -488,18 +486,15 @@ struct ngene_command {
488 486
489#define EVENT_QUEUE_SIZE 16 487#define EVENT_QUEUE_SIZE 16
490 488
491typedef struct HW_SCATTER_GATHER_ELEMENT *PHW_SCATTER_GATHER_ELEMENT;
492typedef struct FWRB *PFWRB;
493
494/* Gathers the current state of a single channel. */ 489/* Gathers the current state of a single channel. */
495 490
496struct SBufferHeader { 491struct SBufferHeader {
497 struct BUFFER_HEADER ngeneBuffer; /* Physical descriptor */ 492 struct BUFFER_HEADER ngeneBuffer; /* Physical descriptor */
498 struct SBufferHeader *Next; 493 struct SBufferHeader *Next;
499 void *Buffer1; 494 void *Buffer1;
500 PHW_SCATTER_GATHER_ELEMENT scList1; 495 struct HW_SCATTER_GATHER_ELEMENT *scList1;
501 void *Buffer2; 496 void *Buffer2;
502 PHW_SCATTER_GATHER_ELEMENT scList2; 497 struct HW_SCATTER_GATHER_ELEMENT *scList2;
503}; 498};
504 499
505/* Sizeof SBufferHeader aligned to next 64 Bit boundary (hw restriction) */ 500/* Sizeof SBufferHeader aligned to next 64 Bit boundary (hw restriction) */
@@ -554,7 +549,7 @@ enum BufferExchangeFlags {
554 549
555typedef void *(IBufferExchange)(void *, void *, u32, u32, u32); 550typedef void *(IBufferExchange)(void *, void *, u32, u32, u32);
556 551
557typedef struct { 552struct MICI_STREAMINFO {
558 IBufferExchange *pExchange; 553 IBufferExchange *pExchange;
559 IBufferExchange *pExchangeVBI; /* Secondary (VBI, ancillary) */ 554 IBufferExchange *pExchangeVBI; /* Secondary (VBI, ancillary) */
560 u8 Stream; 555 u8 Stream;
@@ -566,7 +561,7 @@ typedef struct {
566 u16 nLinesVBI; 561 u16 nLinesVBI;
567 u16 nBytesPerLineVBI; 562 u16 nBytesPerLineVBI;
568 u32 CaptureLength; /* Used for audio and transport stream */ 563 u32 CaptureLength; /* Used for audio and transport stream */
569} MICI_STREAMINFO, *PMICI_STREAMINFO; 564};
570 565
571/****************************************************************************/ 566/****************************************************************************/
572/* STRUCTS ******************************************************************/ 567/* STRUCTS ******************************************************************/