split dvb_ringbuffer dual-use functions
PATCH 1/1 split dvb_ringbuffer dual-use functions
split the suckers into kernel-memory and user-memory versions, annotate both properly.
Signed-off-by Al Viro <[email protected]>
--- drivers/media/dvb/dvb-core/dmxdev.c | 2 +- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 8 ++-- drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 78 ++++++++++++++++++--------- drivers/media/dvb/dvb-core/dvb_ringbuffer.h | 12 +++-- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/media/dvb/ttpci/av7110_av.c | 2 +- drivers/media/dvb/ttpci/av7110_ca.c | 2 +- 7 files changed, 69 insertions(+), 37 deletions(-)
drivers/media/dvb/dvb-core/dmxdev.c +1 -1
@@ -96,7 +96,7 @@ static ssize_t dvb_dmxdev_buffer_read(struct dvb_ringbuffer *src,if (avail > todo) avail = todo; - ret =dvb_ringbuffer_read (src, (u8 *)buf, avail,1 ); + ret =dvb_ringbuffer_read_user (src, buf, avail);if (ret <0 )break ;
drivers/media/dvb/dvb-core/dvb_ca_en50221.c +4 -4
@@ -1357,7 +1357,7 @@ static int dvb_ca_en50221_io_read_condition(struct dvb_ca_private *ca, idx =dvb_ringbuffer_pkt_next (&ca->slot_info[slot].rx_buffer,-1 , &fraglen);while (idx !=-1 ) { -dvb_ringbuffer_pkt_read (&ca->slot_info[slot].rx_buffer, idx,0 , hdr,2 ,0 ); +dvb_ringbuffer_pkt_read (&ca->slot_info[slot].rx_buffer, idx,0 , hdr,2 );if (connection_id ==-1 ) connection_id = hdr[0 ];if ((hdr[0 ] == connection_id) && ((hdr[1 ] &0x80 ) ==0 )) {
@@ -1438,7 +1438,7 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf, goto exit; } -dvb_ringbuffer_pkt_read (&ca->slot_info[slot].rx_buffer, idx,0 , hdr,2 ,0 ); +dvb_ringbuffer_pkt_read (&ca->slot_info[slot].rx_buffer, idx,0 , hdr,2 );if (connection_id ==-1 ) connection_id = hdr[0 ];if (hdr[0 ] == connection_id) {
@@ -1449,8 +1449,8 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf, fraglen -=2 ; } -if ((status =dvb_ringbuffer_pkt_read (&ca->slot_info[slot].rx_buffer, idx,2 , - (u8 *)buf + pktlen, fraglen,1 )) <0 ) { +if ((status =dvb_ringbuffer_pkt_read_user (&ca->slot_info[slot].rx_buffer, idx,2 , + buf + pktlen, fraglen)) <0 ) { goto exit; } pktlen += fraglen;
drivers/media/dvb/dvb-core/dvb_ringbuffer.c +53 -25
122 lines not on this page · raw message
drivers/media/dvb/dvb-core/dvb_ringbuffer.h +8 -4
@@ -61,7 +61,7 @@ struct dvb_ringbuffer { ** *** read min. 1000, max. <bufsize> bytes *** ** avail =dvb_ringbuffer_avail (rbuf); ** if (avail >= 1000) -** count =dvb_ringbuffer_read (rbuf, buffer,min (avail, bufsize),0 ); +** count =dvb_ringbuffer_read (rbuf, buffer,min (avail, bufsize)); ** else ** ... **
@@ -114,8 +114,10 @@ extern void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf);** <usermem> specifies whether <buf> resides in user space ** returns number of bytes transferred or -EFAULT */ -extern ssize_t dvb_ringbuffer_read (struct dvb_ringbuffer *rbuf,u8 *buf, -size_t len,int usermem); +extern ssize_t dvb_ringbuffer_read_user (struct dvb_ringbuffer *rbuf, +u8 __user *buf,size_t len); +extern void dvb_ringbuffer_read (struct dvb_ringbuffer *rbuf, +u8 *buf,size_t len);/* write routines & macros */
@@ -157,8 +159,10 @@ extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf,* <usermem> Set to 1 if <buf> is in userspace. * returns Number of bytes read, or -EFAULT. */ +extern ssize_t dvb_ringbuffer_pkt_read_user (struct dvb_ringbuffer *rbuf,size_t idx, +int offset,u8 __user *buf,size_t len);extern ssize_t dvb_ringbuffer_pkt_read (struct dvb_ringbuffer *rbuf,size_t idx, -int offset,u8 * buf,size_t len,int usermem); +int offset,u8 *buf,size_t len);/** * Dispose of a packet in the ring buffer.
drivers/media/dvb/ttpci/av7110.c +1 -1
@@ -587,7 +587,7 @@ static void gpioirq(unsigned long data) }DVB_RINGBUFFER_SKIP (cibuf,2 ); -dvb_ringbuffer_read (cibuf, av7110->debi_virt, len,0 ); +dvb_ringbuffer_read (cibuf, av7110->debi_virt, len);iwdebi (av7110,DEBINOSWAP ,TX_LEN , len,2 );iwdebi (av7110,DEBINOSWAP ,IRQ_STATE_EXT , len,2 );
drivers/media/dvb/ttpci/av7110_av.c +1 -1
@@ -269,7 +269,7 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)return -1 ; } -dvb_ringbuffer_read (buf, dest, (size_t ) blen,0 ); +dvb_ringbuffer_read (buf, dest, (size_t ) blen);dprintk (2 ,"pread=0x%08lx, pwrite=0x%08lx\n" , (unsigned long ) buf->pread, (unsigned long ) buf->pwrite);
drivers/media/dvb/ttpci/av7110_ca.c +1 -1
@@ -208,7 +208,7 @@ static ssize_t ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file,return -EINVAL ;DVB_RINGBUFFER_SKIP (cibuf,2 ); -return dvb_ringbuffer_read (cibuf, (u8 *)buf, len,1 ); +return dvb_ringbuffer_read_user (cibuf, buf, len); }static int dvb_ca_open (struct inode *inode,struct file *file)
Signature · 1 line
1.5.3.GIT