summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/saa7146.h39
-rw-r--r--linux/include/media/saa7146_vv.h32
2 files changed, 35 insertions, 36 deletions
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h
index 2265e8f45..43b85afc6 100644
--- a/linux/include/media/saa7146.h
+++ b/linux/include/media/saa7146.h
@@ -77,7 +77,7 @@ struct saa7146_vv;
/* saa7146 page table */
struct saa7146_pgtable {
unsigned int size;
- u32 *cpu;
+ u32 *cpu;
dma_addr_t dma;
/* used for offsets for u,v planes for planar capture modes */
unsigned long offset;
@@ -105,20 +105,20 @@ struct saa7146_extension
#define SAA7146_USE_I2C_IRQ 0x1
#define SAA7146_I2C_SHORT_DELAY 0x2
int flags;
-
+
/* pairs of subvendor and subdevice ids for
supported devices, last entry 0xffff, 0xfff */
struct module *module;
struct pci_driver driver;
struct pci_device_id *pci_tbl;
-
+
/* extension functions */
int (*probe)(struct saa7146_dev *);
int (*attach)(struct saa7146_dev *, struct saa7146_pci_extension_data *);
int (*detach)(struct saa7146_dev*);
u32 irq_mask; /* mask to indicate, which irq-events are handled by the extension */
- void (*irq_func)(struct saa7146_dev*, u32* irq_mask);
+ void (*irq_func)(struct saa7146_dev*, u32* irq_mask);
};
struct saa7146_dma
@@ -134,8 +134,8 @@ struct saa7146_dev
struct list_head item;
/* different device locks */
- spinlock_t slock;
- struct semaphore lock;
+ spinlock_t slock;
+ struct semaphore lock;
unsigned char __iomem *mem; /* pointer to mapped IO memory */
int revision; /* chip revision; needed for bug-workarounds*/
@@ -144,8 +144,8 @@ struct saa7146_dev
char name[32];
struct pci_dev *pci;
u32 int_todo;
- spinlock_t int_slock;
-
+ spinlock_t int_slock;
+
/* extension handling */
struct saa7146_extension *ext; /* indicates if handled by extension */
void *ext_priv; /* pointer for extension private use (most likely some private data) */
@@ -161,7 +161,7 @@ struct saa7146_dev
struct saa7146_dma d_i2c; /* pointer to i2c memory */
wait_queue_head_t i2c_wq;
int i2c_op;
-
+
/* memories */
struct saa7146_dma d_rps0;
struct saa7146_dma d_rps1;
@@ -190,8 +190,8 @@ int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop);
/* some i2c constants */
#define SAA7146_I2C_TIMEOUT 100 /* i2c-timeout-value in ms */
-#define SAA7146_I2C_RETRIES 3 /* how many times shall we retry an i2c-operation? */
-#define SAA7146_I2C_DELAY 5 /* time we wait after certain i2c-operations */
+#define SAA7146_I2C_RETRIES 3 /* how many times shall we retry an i2c-operation? */
+#define SAA7146_I2C_DELAY 5 /* time we wait after certain i2c-operations */
/* unsorted defines */
#define ME1 0x0000000800
@@ -284,7 +284,7 @@ int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop);
#define MASK_W1 0xffff0000 /* Mask value for word 1 */
#define MASK_PA 0xfffffffc /* Mask value for physical address */
-#define MASK_PR 0xfffffffe /* Mask value for protection register */
+#define MASK_PR 0xfffffffe /* Mask value for protection register */
#define MASK_ER 0xffffffff /* Mask value for the entire register */
#define MASK_NONE 0x00000000 /* No mask */
@@ -307,7 +307,7 @@ int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop);
#define BASE_ODD3 0x30 /* Video DMA 3 registers */
#define BASE_EVEN3 0x34
#define PROT_ADDR3 0x38
-#define PITCH3 0x3C
+#define PITCH3 0x3C
#define BASE_PAGE3 0x40 /* Video DMA 3 base page */
#define NUM_LINE_BYTE3 0x44
@@ -335,15 +335,15 @@ int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop);
#define DEBI_CONFIG 0x7C
#define DEBI_COMMAND 0x80
#define DEBI_PAGE 0x84
-#define DEBI_AD 0x88
+#define DEBI_AD 0x88
-#define I2C_TRANSFER 0x8C
-#define I2C_STATUS 0x90
+#define I2C_TRANSFER 0x8C
+#define I2C_STATUS 0x90
#define BASE_A1_IN 0x94 /* Audio 1 input DMA */
#define PROT_A1_IN 0x98
#define PAGE_A1_IN 0x9C
-
+
#define BASE_A1_OUT 0xA0 /* Audio 1 output DMA */
#define PROT_A1_OUT 0xA4
#define PAGE_A1_OUT 0xA8
@@ -383,12 +383,12 @@ int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop);
#define RPS_ADDR0 0x104 /* RPS task 0 address register */
#define RPS_ADDR1 0x108 /* RPS task 1 address register */
-#define ISR 0x10C /* Interrupt status register */
+#define ISR 0x10C /* Interrupt status register */
#define PSR 0x110 /* Primary status register */
#define SSR 0x114 /* Secondary status register */
#define EC1R 0x118 /* Event counter set 1 register */
-#define EC2R 0x11C /* Event counter set 2 register */
+#define EC2R 0x11C /* Event counter set 2 register */
#define PCI_VDP1 0x120 /* Video DMA pointer of FIFO 1 */
#define PCI_VDP2 0x124 /* Video DMA pointer of FIFO 2 */
@@ -462,4 +462,3 @@ int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop);
#define SAA7146_I2C_BUS_BIT_RATE_60 (0x300)
#endif
-
diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h
index 1b9f4dbd3..f3aa24f81 100644
--- a/linux/include/media/saa7146_vv.h
+++ b/linux/include/media/saa7146_vv.h
@@ -31,7 +31,7 @@ struct saa7146_video_dma {
struct saa7146_format {
char *name;
- u32 pixelformat;
+ u32 pixelformat;
u32 trans;
u8 depth;
u8 flags;
@@ -45,10 +45,10 @@ struct saa7146_standard
int v_offset; /* number of lines of vertical offset before processing */
int v_field; /* number of lines in a field for HPS to process */
-
+
int h_offset; /* horizontal offset of processing window */
int h_pixels; /* number of horizontal pixels to process */
-
+
int v_max_out;
int h_max_out;
};
@@ -90,7 +90,7 @@ struct saa7146_fh {
/* video overlay */
struct saa7146_overlay ov;
-
+
/* video capture */
struct videobuf_queue video_q;
struct v4l2_pix_format video_fmt;
@@ -127,11 +127,11 @@ struct saa7146_vv
struct saa7146_format *ov_fmt;
struct saa7146_overlay *ov_data;
struct saa7146_fh *ov_suspend;
-
+
/* video capture */
struct saa7146_dmaqueue video_q;
enum v4l2_field last_field;
-
+
/* common: fixme? shouldn't this be in saa7146_fh?
(this leads to a more complicated question: shall the driver
store the different settings (for example S_INPUT) for every open
@@ -139,11 +139,11 @@ struct saa7146_vv
all opens? currently, we do the latter, like all other
drivers do... */
struct saa7146_standard *standard;
-
+
int vflip;
- int hflip;
- int current_hps_source;
- int current_hps_sync;
+ int hflip;
+ int current_hps_source;
+ int current_hps_sync;
struct saa7146_dma d_clipping; /* pointer to clipping memory */
@@ -157,7 +157,7 @@ struct saa7146_vv
struct saa7146_extension_ioctls
{
unsigned int cmd;
- int flags;
+ int flags;
};
/* flags */
@@ -166,16 +166,16 @@ struct saa7146_extension_ioctls
struct saa7146_ext_vv
{
/* informations about the video capabilities of the device */
- int inputs;
- int audios;
+ int inputs;
+ int audios;
u32 capabilities;
- int flags;
+ int flags;
/* additionally supported transmission standards */
struct saa7146_standard *stds;
int num_stds;
int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
-
+
struct saa7146_extension_ioctls *ioctls;
int (*ioctl)(struct saa7146_fh*, unsigned int cmd, void *arg);
};
@@ -264,7 +264,7 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits);
/* misc defines */
#define SAA7146_NO_SWAP (0x0)
-#define SAA7146_TWO_BYTE_SWAP (0x1)
+#define SAA7146_TWO_BYTE_SWAP (0x1)
#define SAA7146_FOUR_BYTE_SWAP (0x2)
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-08 03:39:06 +0000