diff options
author | Gerd Knorr <devnull@localhost> | 2004-03-16 12:34:16 +0000 |
---|---|---|
committer | Gerd Knorr <devnull@localhost> | 2004-03-16 12:34:16 +0000 |
commit | 0936e8eeba58f9a7937356e3df175e4bf206ba08 (patch) | |
tree | 5045de8848517d4ca375f163d3d8de367a2fe18f /linux/drivers/media/video/cx88/cx88.h | |
parent | 1a7193208a5de7115bcd96806da8f77202cfbec4 (diff) | |
download | mediapointer-dvb-s2-0936e8eeba58f9a7937356e3df175e4bf206ba08.tar.gz mediapointer-dvb-s2-0936e8eeba58f9a7937356e3df175e4bf206ba08.tar.bz2 |
- plenty of cx88 audio fixes.
* grabbed some A2 code from dscaler cvs.
* merged patches by zarquon@earendel.org.
* code cleanups.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 97fae4ee1..5fadf124c 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -157,7 +157,7 @@ enum cx88_itype { struct cx88_input { enum cx88_itype type; unsigned int vmux; - u32 gpio0; + u32 gpio0, gpio1, gpio2, gpio3; }; struct cx88_board { @@ -250,6 +250,7 @@ struct cx8800_dev { struct pci_dev *pci; unsigned char pci_rev,pci_lat; u32 *lmmio; + u8 *bmmio; /* config info */ unsigned int board; @@ -285,6 +286,7 @@ struct cx8800_dev { #define cx_read(reg) readl(dev->lmmio + ((reg)>>2)) #define cx_write(reg,value) writel((value), dev->lmmio + ((reg)>>2)); +#define cx_writeb(reg,value) writeb((value), dev->bmmio + (reg)); #define cx_andor(reg,mask,value) \ writel((readl(dev->lmmio+((reg)>>2)) & ~(mask)) |\ |