diff options
| author | Michael Hunold <devnull@localhost> | 2003-05-19 17:33:06 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-05-19 17:33:06 +0000 |
| commit | 1b96056da548c2823012c52a69e671310ff3445b (patch) | |
| tree | bdacde53ad08265b7713e75f44d2fba881f08591 /linux/include/media | |
| parent | 78fccbe2a473cdf42a87d98fedaa89f4880da05d (diff) | |
| download | mediapointer-dvb-s2-1b96056da548c2823012c52a69e671310ff3445b.tar.gz mediapointer-dvb-s2-1b96056da548c2823012c52a69e671310ff3445b.tar.bz2 | |
First try to use pci_consistent_dma() throughout the whole saa7146
driver subsystem.
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/saa7146.h | 14 | ||||
| -rw-r--r-- | linux/include/media/saa7146_vv.h | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index c369bd0b9..a7c52fdfd 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -12,6 +12,8 @@ #include <linux/i2c.h> /* for i2c subsystem */ #include <asm/io.h> /* for accessing devices */ #include <linux/stringify.h> +#include <linux/vmalloc.h> /* for vmalloc() */ +#include <linux/mm.h> /* for vmalloc_to_page() */ /* ugly, but necessary to build the dvb stuff under 2.4. */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) @@ -104,6 +106,12 @@ struct saa7146_extension void (*irq_func)(struct saa7146_dev*, u32* irq_mask); }; +struct saa7146_dma +{ + dma_addr_t dma_handle; + u32 *cpu_addr; +}; + struct saa7146_dev { struct module *module; @@ -134,13 +142,13 @@ struct saa7146_dev /* i2c-stuff */ struct semaphore i2c_lock; u32 i2c_bitrate; - u32 *i2c_mem; /* pointer to i2c memory */ + struct saa7146_dma d_i2c; /* pointer to i2c memory */ wait_queue_head_t i2c_wq; int i2c_op; /* memories */ - u32 *rps0; - u32 *rps1; + struct saa7146_dma d_rps0; + struct saa7146_dma d_rps1; }; /* from saa7146_i2c.c */ diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h index f45c32a4c..3534ac56c 100644 --- a/linux/include/media/saa7146_vv.h +++ b/linux/include/media/saa7146_vv.h @@ -126,7 +126,7 @@ struct saa7146_vv int current_hps_source; int current_hps_sync; - u32 *clipping; /* pointer to clipping memory */ + struct saa7146_dma d_clipping; /* pointer to clipping memory */ }; #define SAA7146_EXCLUSIVE 0x1 |