V4L/DVB (7965): annotate bcx_riscmem (d8eaa58b) · Commits · 戴 / test

drivers/media/video/bt8xx/bttv-risc.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ bttv_risc_packed(struct bttv btv, struct btcx_riscmem risc,
		{
		u32 instructions,line,todo;
		struct scatterlist *sg;
		u32 *rp;
		__le32 *rp;
		int rc;

		/* estimate risc mem: worst case is one write per page border +
		@@ -128,7 +128,8 @@ bttv_risc_planar(struct bttv btv, struct btcx_riscmem risc,
		unsigned int cpadding)
		{
		unsigned int instructions,line,todo,ylen,chroma;
		u32 *rp,ri;
		__le32 *rp;
		u32 ri;
		struct scatterlist *ysg;
		struct scatterlist *usg;
		struct scatterlist *vsg;
		@@ -244,7 +245,8 @@ bttv_risc_overlay(struct bttv btv, struct btcx_riscmem risc,
		{
		int dwords,rc,line,maxy,start,end,skip,nskips;
		struct btcx_skiplist *skips;
		u32 *rp,ri,ra;
		__le32 *rp;
		u32 ri,ra;
		u32 addr;

		/* skip list for window clipping */

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ int btcx_riscmem_alloc(struct pci_dev *pci,
		struct btcx_riscmem *risc,
		unsigned int size)
		{
		u32 *cpu;
		__le32 *cpu;
		dma_addr_t dma;

		if (NULL != risc->cpu && risc->size < size)

+2 −2

+4 −4

Original line number	Diff line number	Diff line
		@@ -823,7 +823,7 @@ static void cx23885_dev_unregister(struct cx23885_dev *dev)
		iounmap(dev->lmmio);
		}

		static u32* cx23885_risc_field(u32 rp, struct scatterlist sglist,
		static __le32* cx23885_risc_field(__le32 rp, struct scatterlist sglist,
		unsigned int offset, u32 sync_line,
		unsigned int bpl, unsigned int padding,
		unsigned int lines)
		@@ -883,7 +883,7 @@ int cx23885_risc_buffer(struct pci_dev pci, struct btcx_riscmem risc,
		unsigned int padding, unsigned int lines)
		{
		u32 instructions, fields;
		u32 *rp;
		__le32 *rp;
		int rc;

		fields = 0;
		@@ -924,7 +924,7 @@ static int cx23885_risc_databuffer(struct pci_dev *pci,
		unsigned int lines)
		{
		u32 instructions;
		u32 *rp;
		__le32 *rp;
		int rc;

		/* estimate risc mem: worst case is one write per page border +
		@@ -951,7 +951,7 @@ static int cx23885_risc_databuffer(struct pci_dev *pci,
		int cx23885_risc_stopper(struct pci_dev pci, struct btcx_riscmem risc,
		u32 reg, u32 mask, u32 value)
		{
		u32 *rp;
		__le32 *rp;
		int rc;

		if ((rc = btcx_riscmem_alloc(pci, risc, 4*16)) < 0)

+4 −4

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ static DEFINE_MUTEX(devlist);

		/* @lpi: lines per IRQ, or 0 to not generate irqs. Note: IRQ to be
		generated _after_ lpi lines are transferred. */
		static u32* cx88_risc_field(u32 rp, struct scatterlist sglist,
		static __le32* cx88_risc_field(__le32 rp, struct scatterlist sglist,
		unsigned int offset, u32 sync_line,
		unsigned int bpl, unsigned int padding,
		unsigned int lines, unsigned int lpi)
		@@ -130,7 +130,7 @@ int cx88_risc_buffer(struct pci_dev pci, struct btcx_riscmem risc,
		unsigned int bpl, unsigned int padding, unsigned int lines)
		{
		u32 instructions,fields;
		u32 *rp;
		__le32 *rp;
		int rc;

		fields = 0;
		@@ -168,7 +168,7 @@ int cx88_risc_databuffer(struct pci_dev pci, struct btcx_riscmem risc,
		unsigned int lines, unsigned int lpi)
		{
		u32 instructions;
		u32 *rp;
		__le32 *rp;
		int rc;

		/* estimate risc mem: worst case is one write per page border +
		@@ -193,7 +193,7 @@ int cx88_risc_databuffer(struct pci_dev pci, struct btcx_riscmem risc,
		int cx88_risc_stopper(struct pci_dev pci, struct btcx_riscmem risc,
		u32 reg, u32 mask, u32 value)
		{
		u32 *rp;
		__le32 *rp;
		int rc;

		if ((rc = btcx_riscmem_alloc(pci, risc, 4*16)) < 0)