Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3

Clean up whitespaces at v4l/dvb files

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Mauro Carvalho Chehab and committed by
Linus Torvalds
afd1a0c9 808824b5

+785 -785
+3 -3
drivers/media/common/saa7146_core.c
··· 174 174 175 175 int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt) 176 176 { 177 - u32 *cpu; 178 - dma_addr_t dma_addr; 177 + u32 *cpu; 178 + dma_addr_t dma_addr; 179 179 180 180 cpu = pci_alloc_consistent(pci, PAGE_SIZE, &dma_addr); 181 181 if (NULL == cpu) { ··· 405 405 406 406 pci_set_drvdata(pci, dev); 407 407 408 - init_MUTEX(&dev->lock); 408 + init_MUTEX(&dev->lock); 409 409 spin_lock_init(&dev->int_slock); 410 410 spin_lock_init(&dev->slock); 411 411
+16 -16
drivers/media/common/saa7146_fops.c
··· 1 1 #include <media/saa7146_vv.h> 2 2 3 - #define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && dev->vv_data->vbi_minor != -1) 3 + #define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && dev->vv_data->vbi_minor != -1) 4 4 5 5 /****************************************************************************/ 6 6 /* resource management functions, shamelessly stolen from saa7134 driver */ ··· 102 102 /* finish current buffer */ 103 103 if (NULL == q->curr) { 104 104 DEB_D(("aiii. no current buffer\n")); 105 - return; 105 + return; 106 106 } 107 - 107 + 108 108 q->curr->vb.state = state; 109 109 do_gettimeofday(&q->curr->vb.ts); 110 110 wake_up(&q->curr->vb.done); ··· 143 143 // fixme: fix this for vflip != 0 144 144 145 145 saa7146_write(dev, PROT_ADDR1, 0); 146 - saa7146_write(dev, MC2, (MASK_02|MASK_18)); 146 + saa7146_write(dev, MC2, (MASK_02|MASK_18)); 147 147 148 148 /* write the address of the rps-program */ 149 149 saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle); 150 150 /* turn on rps */ 151 151 saa7146_write(dev, MC1, (MASK_12 | MASK_28)); 152 - 152 + 153 153 /* 154 154 printk("vdma%d.base_even: 0x%08x\n", 1,saa7146_read(dev,BASE_EVEN1)); 155 155 printk("vdma%d.base_odd: 0x%08x\n", 1,saa7146_read(dev,BASE_ODD1)); ··· 246 246 goto out; 247 247 } 248 248 memset(fh,0,sizeof(*fh)); 249 - 249 + 250 250 file->private_data = fh; 251 251 fh->dev = dev; 252 252 fh->type = type; ··· 275 275 file->private_data = NULL; 276 276 } 277 277 up(&saa7146_devices_lock); 278 - return result; 278 + return result; 279 279 } 280 280 281 281 static int fops_release(struct inode *inode, struct file *file) ··· 405 405 static void vv_callback(struct saa7146_dev *dev, unsigned long status) 406 406 { 407 407 u32 isr = status; 408 - 408 + 409 409 DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status)); 410 410 411 411 if (0 != (isr & (MASK_27))) { ··· 454 454 handle different devices that might need different 455 455 configuration data) */ 456 456 dev->ext_vv_data = ext_vv; 457 - 457 + 458 458 vv->video_minor = -1; 459 459 vv->vbi_minor = -1; 460 460 461 - vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle); 461 + vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle); 462 462 if( NULL == vv->d_clipping.cpu_addr ) { 463 463 ERR(("out of memory. aborting.\n")); 464 464 kfree(vv); ··· 468 468 469 469 saa7146_video_uops.init(dev,vv); 470 470 saa7146_vbi_uops.init(dev,vv); 471 - 471 + 472 472 dev->vv_data = vv; 473 473 dev->vv_callback = &vv_callback; 474 474 ··· 480 480 struct saa7146_vv *vv = dev->vv_data; 481 481 482 482 DEB_EE(("dev:%p\n",dev)); 483 - 483 + 484 484 pci_free_consistent(dev->pci, SAA7146_RPS_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle); 485 - kfree(vv); 485 + kfree(vv); 486 486 dev->vv_data = NULL; 487 487 dev->vv_callback = NULL; 488 - 488 + 489 489 return 0; 490 490 } 491 491 ··· 498 498 DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type)); 499 499 500 500 // released by vfd->release 501 - vfd = video_device_alloc(); 501 + vfd = video_device_alloc(); 502 502 if (vfd == NULL) 503 503 return -ENOMEM; 504 504 ··· 530 530 int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev) 531 531 { 532 532 struct saa7146_vv *vv = dev->vv_data; 533 - 533 + 534 534 DEB_EE(("dev:%p\n",dev)); 535 535 536 536 if( VFL_TYPE_GRABBER == (*vid)->type ) {
+8 -8
drivers/media/common/saa7146_i2c.c
··· 276 276 int i = 0, count = 0; 277 277 u32* buffer = dev->d_i2c.cpu_addr; 278 278 int err = 0; 279 - int address_err = 0; 280 - int short_delay = 0; 279 + int address_err = 0; 280 + int short_delay = 0; 281 281 282 282 if (down_interruptible (&dev->i2c_lock)) 283 283 return -ERESTARTSYS; ··· 325 325 if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) { 326 326 goto out; 327 327 } 328 - address_err++; 328 + address_err++; 329 329 } 330 330 DEB_I2C(("error while sending message(s). starting again.\n")); 331 331 break; ··· 336 336 break; 337 337 } 338 338 339 - /* delay a bit before retrying */ 340 - msleep(10); 339 + /* delay a bit before retrying */ 340 + msleep(10); 341 341 342 342 } while (err != num && retries--); 343 343 344 - /* if every retry had an address error, exit right away */ 345 - if (address_err == retries) { 346 - goto out; 344 + /* if every retry had an address error, exit right away */ 345 + if (address_err == retries) { 346 + goto out; 347 347 } 348 348 349 349 /* if any things had to be read, get the results */
+2 -2
drivers/media/common/saa7146_vbi.c
··· 6 6 { 7 7 struct saa7146_vv *vv = dev->vv_data; 8 8 9 - u32 *cpu; 10 - dma_addr_t dma_addr; 9 + u32 *cpu; 10 + dma_addr_t dma_addr; 11 11 12 12 int count = 0; 13 13 int i;
+23 -23
drivers/media/common/saa7146_video.c
··· 150 150 maxh = vv->standard->v_max_out; 151 151 152 152 if (V4L2_FIELD_ANY == field) { 153 - field = (win->w.height > maxh/2) 154 - ? V4L2_FIELD_INTERLACED 155 - : V4L2_FIELD_TOP; 156 - } 157 - switch (field) { 158 - case V4L2_FIELD_TOP: 159 - case V4L2_FIELD_BOTTOM: 160 - case V4L2_FIELD_ALTERNATE: 161 - maxh = maxh / 2; 162 - break; 163 - case V4L2_FIELD_INTERLACED: 164 - break; 165 - default: { 153 + field = (win->w.height > maxh/2) 154 + ? V4L2_FIELD_INTERLACED 155 + : V4L2_FIELD_TOP; 156 + } 157 + switch (field) { 158 + case V4L2_FIELD_TOP: 159 + case V4L2_FIELD_BOTTOM: 160 + case V4L2_FIELD_ALTERNATE: 161 + maxh = maxh / 2; 162 + break; 163 + case V4L2_FIELD_INTERLACED: 164 + break; 165 + default: { 166 166 DEB_D(("no known field mode '%d'.\n",field)); 167 - return -EINVAL; 167 + return -EINVAL; 168 168 } 169 - } 169 + } 170 170 171 171 win->field = field; 172 172 if (win->w.width > maxw) ··· 887 887 888 888 DEB_EE(("VIDIOC_QUERYCAP\n")); 889 889 890 - strcpy(cap->driver, "saa7146 v4l2"); 890 + strcpy(cap->driver, "saa7146 v4l2"); 891 891 strlcpy(cap->card, dev->ext->name, sizeof(cap->card)); 892 892 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); 893 893 cap->version = SAA7146_VERSION_CODE; ··· 1011 1011 err = set_control(fh,arg); 1012 1012 return err; 1013 1013 } 1014 - case VIDIOC_G_PARM: 1015 - { 1016 - struct v4l2_streamparm *parm = arg; 1014 + case VIDIOC_G_PARM: 1015 + { 1016 + struct v4l2_streamparm *parm = arg; 1017 1017 if( parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ) { 1018 1018 return -EINVAL; 1019 1019 } 1020 - memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm)); 1020 + memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm)); 1021 1021 parm->parm.capture.readbuffers = 1; 1022 1022 // fixme: only for PAL! 1023 1023 parm->parm.capture.timeperframe.numerator = 1; 1024 1024 parm->parm.capture.timeperframe.denominator = 25; 1025 - return 0; 1026 - } 1025 + return 0; 1026 + } 1027 1027 case VIDIOC_G_FMT: 1028 1028 { 1029 1029 struct v4l2_format *f = arg; ··· 1383 1383 1384 1384 static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv) 1385 1385 { 1386 - INIT_LIST_HEAD(&vv->video_q.queue); 1386 + INIT_LIST_HEAD(&vv->video_q.queue); 1387 1387 1388 1388 init_timer(&vv->video_q.timeout); 1389 1389 vv->video_q.timeout.function = saa7146_buffer_timeout;
+46 -46
drivers/media/dvb/dvb-core/demux.h
··· 86 86 87 87 enum dmx_ts_pes 88 88 { /* also send packets to decoder (if it exists) */ 89 - DMX_TS_PES_AUDIO0, 89 + DMX_TS_PES_AUDIO0, 90 90 DMX_TS_PES_VIDEO0, 91 91 DMX_TS_PES_TELETEXT0, 92 92 DMX_TS_PES_SUBTITLE0, 93 93 DMX_TS_PES_PCR0, 94 94 95 - DMX_TS_PES_AUDIO1, 95 + DMX_TS_PES_AUDIO1, 96 96 DMX_TS_PES_VIDEO1, 97 97 DMX_TS_PES_TELETEXT1, 98 98 DMX_TS_PES_SUBTITLE1, 99 99 DMX_TS_PES_PCR1, 100 100 101 - DMX_TS_PES_AUDIO2, 101 + DMX_TS_PES_AUDIO2, 102 102 DMX_TS_PES_VIDEO2, 103 103 DMX_TS_PES_TELETEXT2, 104 104 DMX_TS_PES_SUBTITLE2, 105 105 DMX_TS_PES_PCR2, 106 106 107 - DMX_TS_PES_AUDIO3, 107 + DMX_TS_PES_AUDIO3, 108 108 DMX_TS_PES_VIDEO3, 109 109 DMX_TS_PES_TELETEXT3, 110 110 DMX_TS_PES_SUBTITLE3, ··· 121 121 122 122 123 123 struct dmx_ts_feed { 124 - int is_filtering; /* Set to non-zero when filtering in progress */ 125 - struct dmx_demux *parent; /* Back-pointer */ 126 - void *priv; /* Pointer to private data of the API client */ 127 - int (*set) (struct dmx_ts_feed *feed, 124 + int is_filtering; /* Set to non-zero when filtering in progress */ 125 + struct dmx_demux *parent; /* Back-pointer */ 126 + void *priv; /* Pointer to private data of the API client */ 127 + int (*set) (struct dmx_ts_feed *feed, 128 128 u16 pid, 129 129 int type, 130 130 enum dmx_ts_pes pes_type, 131 131 size_t circular_buffer_size, 132 132 struct timespec timeout); 133 - int (*start_filtering) (struct dmx_ts_feed* feed); 134 - int (*stop_filtering) (struct dmx_ts_feed* feed); 133 + int (*start_filtering) (struct dmx_ts_feed* feed); 134 + int (*stop_filtering) (struct dmx_ts_feed* feed); 135 135 }; 136 136 137 137 /*--------------------------------------------------------------------------*/ ··· 139 139 /*--------------------------------------------------------------------------*/ 140 140 141 141 struct dmx_section_filter { 142 - u8 filter_value [DMX_MAX_FILTER_SIZE]; 143 - u8 filter_mask [DMX_MAX_FILTER_SIZE]; 144 - u8 filter_mode [DMX_MAX_FILTER_SIZE]; 145 - struct dmx_section_feed* parent; /* Back-pointer */ 146 - void* priv; /* Pointer to private data of the API client */ 142 + u8 filter_value [DMX_MAX_FILTER_SIZE]; 143 + u8 filter_mask [DMX_MAX_FILTER_SIZE]; 144 + u8 filter_mode [DMX_MAX_FILTER_SIZE]; 145 + struct dmx_section_feed* parent; /* Back-pointer */ 146 + void* priv; /* Pointer to private data of the API client */ 147 147 }; 148 148 149 149 struct dmx_section_feed { 150 - int is_filtering; /* Set to non-zero when filtering in progress */ 151 - struct dmx_demux* parent; /* Back-pointer */ 152 - void* priv; /* Pointer to private data of the API client */ 150 + int is_filtering; /* Set to non-zero when filtering in progress */ 151 + struct dmx_demux* parent; /* Back-pointer */ 152 + void* priv; /* Pointer to private data of the API client */ 153 153 154 - int check_crc; 154 + int check_crc; 155 155 u32 crc_val; 156 156 157 - u8 *secbuf; 158 - u8 secbuf_base[DMX_MAX_SECFEED_SIZE]; 159 - u16 secbufp, seclen, tsfeedp; 157 + u8 *secbuf; 158 + u8 secbuf_base[DMX_MAX_SECFEED_SIZE]; 159 + u16 secbufp, seclen, tsfeedp; 160 160 161 - int (*set) (struct dmx_section_feed* feed, 161 + int (*set) (struct dmx_section_feed* feed, 162 162 u16 pid, 163 163 size_t circular_buffer_size, 164 164 int check_crc); 165 - int (*allocate_filter) (struct dmx_section_feed* feed, 165 + int (*allocate_filter) (struct dmx_section_feed* feed, 166 166 struct dmx_section_filter** filter); 167 - int (*release_filter) (struct dmx_section_feed* feed, 167 + int (*release_filter) (struct dmx_section_feed* feed, 168 168 struct dmx_section_filter* filter); 169 - int (*start_filtering) (struct dmx_section_feed* feed); 170 - int (*stop_filtering) (struct dmx_section_feed* feed); 169 + int (*start_filtering) (struct dmx_section_feed* feed); 170 + int (*stop_filtering) (struct dmx_section_feed* feed); 171 171 }; 172 172 173 173 /*--------------------------------------------------------------------------*/ ··· 205 205 }; 206 206 207 207 struct dmx_frontend { 208 - struct list_head connectivity_list; /* List of front-ends that can 208 + struct list_head connectivity_list; /* List of front-ends that can 209 209 be connected to a particular 210 210 demux */ 211 - enum dmx_frontend_source source; 211 + enum dmx_frontend_source source; 212 212 }; 213 213 214 214 /*--------------------------------------------------------------------------*/ ··· 240 240 #define DMX_FE_ENTRY(list) list_entry(list, struct dmx_frontend, connectivity_list) 241 241 242 242 struct dmx_demux { 243 - u32 capabilities; /* Bitfield of capability flags */ 244 - struct dmx_frontend* frontend; /* Front-end connected to the demux */ 245 - void* priv; /* Pointer to private data of the API client */ 246 - int (*open) (struct dmx_demux* demux); 247 - int (*close) (struct dmx_demux* demux); 248 - int (*write) (struct dmx_demux* demux, const char* buf, size_t count); 249 - int (*allocate_ts_feed) (struct dmx_demux* demux, 243 + u32 capabilities; /* Bitfield of capability flags */ 244 + struct dmx_frontend* frontend; /* Front-end connected to the demux */ 245 + void* priv; /* Pointer to private data of the API client */ 246 + int (*open) (struct dmx_demux* demux); 247 + int (*close) (struct dmx_demux* demux); 248 + int (*write) (struct dmx_demux* demux, const char* buf, size_t count); 249 + int (*allocate_ts_feed) (struct dmx_demux* demux, 250 250 struct dmx_ts_feed** feed, 251 251 dmx_ts_cb callback); 252 - int (*release_ts_feed) (struct dmx_demux* demux, 252 + int (*release_ts_feed) (struct dmx_demux* demux, 253 253 struct dmx_ts_feed* feed); 254 - int (*allocate_section_feed) (struct dmx_demux* demux, 254 + int (*allocate_section_feed) (struct dmx_demux* demux, 255 255 struct dmx_section_feed** feed, 256 256 dmx_section_cb callback); 257 - int (*release_section_feed) (struct dmx_demux* demux, 257 + int (*release_section_feed) (struct dmx_demux* demux, 258 258 struct dmx_section_feed* feed); 259 - int (*add_frontend) (struct dmx_demux* demux, 259 + int (*add_frontend) (struct dmx_demux* demux, 260 260 struct dmx_frontend* frontend); 261 - int (*remove_frontend) (struct dmx_demux* demux, 261 + int (*remove_frontend) (struct dmx_demux* demux, 262 262 struct dmx_frontend* frontend); 263 - struct list_head* (*get_frontends) (struct dmx_demux* demux); 264 - int (*connect_frontend) (struct dmx_demux* demux, 263 + struct list_head* (*get_frontends) (struct dmx_demux* demux); 264 + int (*connect_frontend) (struct dmx_demux* demux, 265 265 struct dmx_frontend* frontend); 266 - int (*disconnect_frontend) (struct dmx_demux* demux); 266 + int (*disconnect_frontend) (struct dmx_demux* demux); 267 267 268 - int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids); 268 + int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids); 269 269 270 270 int (*get_caps) (struct dmx_demux* demux, struct dmx_caps *caps); 271 271 272 272 int (*set_source) (struct dmx_demux* demux, const dmx_source_t *src); 273 273 274 - int (*get_stc) (struct dmx_demux* demux, unsigned int num, 274 + int (*get_stc) (struct dmx_demux* demux, unsigned int num, 275 275 u64 *stc, unsigned int *base); 276 276 }; 277 277
+1 -1
drivers/media/dvb/dvb-core/dmxdev.c
··· 947 947 948 948 case DMX_GET_STC: 949 949 if (!dmxdev->demux->get_stc) { 950 - ret=-EINVAL; 950 + ret=-EINVAL; 951 951 break; 952 952 } 953 953 ret = dmxdev->demux->get_stc(dmxdev->demux,
+32 -32
drivers/media/dvb/dvb-core/dmxdev.h
··· 53 53 }; 54 54 55 55 struct dmxdev_buffer { 56 - u8 *data; 57 - int size; 58 - int pread; 59 - int pwrite; 56 + u8 *data; 57 + int size; 58 + int pread; 59 + int pwrite; 60 60 wait_queue_head_t queue; 61 - int error; 61 + int error; 62 62 }; 63 63 64 64 struct dmxdev_filter { 65 65 struct dvb_device *dvbdev; 66 66 67 - union { 68 - struct dmx_section_filter *sec; 67 + union { 68 + struct dmx_section_filter *sec; 69 69 } filter; 70 70 71 - union { 72 - struct dmx_ts_feed *ts; 73 - struct dmx_section_feed *sec; 71 + union { 72 + struct dmx_ts_feed *ts; 73 + struct dmx_section_feed *sec; 74 74 } feed; 75 75 76 - union { 77 - struct dmx_sct_filter_params sec; 78 - struct dmx_pes_filter_params pes; 76 + union { 77 + struct dmx_sct_filter_params sec; 78 + struct dmx_pes_filter_params pes; 79 79 } params; 80 80 81 - int type; 82 - enum dmxdev_state state; 83 - struct dmxdev *dev; 84 - struct dmxdev_buffer buffer; 81 + int type; 82 + enum dmxdev_state state; 83 + struct dmxdev *dev; 84 + struct dmxdev_buffer buffer; 85 85 86 86 struct semaphore mutex; 87 87 88 - /* only for sections */ 89 - struct timer_list timer; 90 - int todo; 91 - u8 secheader[3]; 88 + /* only for sections */ 89 + struct timer_list timer; 90 + int todo; 91 + u8 secheader[3]; 92 92 93 - u16 pid; 93 + u16 pid; 94 94 }; 95 95 96 96 97 97 struct dmxdev_dvr { 98 - int state; 99 - struct dmxdev *dev; 100 - struct dmxdev_buffer buffer; 98 + int state; 99 + struct dmxdev *dev; 100 + struct dmxdev_buffer buffer; 101 101 }; 102 102 103 103 ··· 105 105 struct dvb_device *dvbdev; 106 106 struct dvb_device *dvr_dvbdev; 107 107 108 - struct dmxdev_filter *filter; 109 - struct dmxdev_dvr *dvr; 110 - struct dmx_demux *demux; 108 + struct dmxdev_filter *filter; 109 + struct dmxdev_dvr *dvr; 110 + struct dmx_demux *demux; 111 111 112 - int filternum; 113 - int capabilities; 112 + int filternum; 113 + int capabilities; 114 114 #define DMXDEV_CAP_DUPLEX 1 115 - struct dmx_frontend *dvr_orig_fe; 115 + struct dmx_frontend *dvr_orig_fe; 116 116 117 - struct dmxdev_buffer dvr_buffer; 117 + struct dmxdev_buffer dvr_buffer; 118 118 #define DVR_BUFFER_SIZE (10*188*1024) 119 119 120 120 struct semaphore mutex;
+1 -1
drivers/media/dvb/dvb-core/dvb_ca_en50221.c
··· 498 498 /* process the CFTABLE_ENTRY tuples, and any after those */ 499 499 while ((!end_chain) && (address < 0x1000)) { 500 500 if ((status = dvb_ca_en50221_read_tuple(ca, slot, &address, &tupleType, 501 - &tupleLength, tuple)) < 0) 501 + &tupleLength, tuple)) < 0) 502 502 return status; 503 503 switch (tupleType) { 504 504 case 0x1B: // CISTPL_CFTABLE_ENTRY
+154 -154
drivers/media/dvb/dvb-core/dvb_filter.c
··· 72 72 u8 pct; 73 73 74 74 if (pr) printk( "Pic header: "); 75 - pic->temporal_reference[field] = (( headr[0] << 2 ) | 75 + pic->temporal_reference[field] = (( headr[0] << 2 ) | 76 76 (headr[1] & 0x03) )& 0x03ff; 77 77 if (pr) printk( " temp ref: 0x%04x", pic->temporal_reference[field]); 78 78 79 79 pct = ( headr[1] >> 2 ) & 0x07; 80 - pic->picture_coding_type[field] = pct; 80 + pic->picture_coding_type[field] = pct; 81 81 if (pr) { 82 82 switch(pct){ 83 83 case I_FRAME: ··· 93 93 } 94 94 95 95 96 - pic->vinfo.vbv_delay = (( headr[1] >> 5 ) | ( headr[2] << 3) | 96 + pic->vinfo.vbv_delay = (( headr[1] >> 5 ) | ( headr[2] << 3) | 97 97 ( (headr[3] & 0x1F) << 11) ) & 0xffff; 98 98 99 99 if (pr) printk( " vbv delay: 0x%04x", pic->vinfo.vbv_delay); 100 100 101 - pic->picture_header_parameter = ( headr[3] & 0xe0 ) | 101 + pic->picture_header_parameter = ( headr[3] & 0xe0 ) | 102 102 ((headr[4] & 0x80) >> 3); 103 103 104 - if ( pct == B_FRAME ){ 105 - pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f; 106 - } 104 + if ( pct == B_FRAME ){ 105 + pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f; 106 + } 107 107 if (pr) printk( " pic head param: 0x%x", 108 108 pic->picture_header_parameter); 109 109 ··· 124 124 ((headr[0]<<4)& 0x30)| ((headr[1]>>4)& 0x0F), 125 125 ((headr[1]<<3)& 0x38)| ((headr[2]>>5)& 0x0F)); 126 126 127 - if ( ( headr[3] & 0x40 ) != 0 ){ 128 - pic->closed_gop = 1; 129 - } else { 130 - pic->closed_gop = 0; 131 - } 127 + if ( ( headr[3] & 0x40 ) != 0 ){ 128 + pic->closed_gop = 1; 129 + } else { 130 + pic->closed_gop = 0; 131 + } 132 132 if (pr) printk("closed: %d", pic->closed_gop); 133 133 134 - if ( ( headr[3] & 0x20 ) != 0 ){ 135 - pic->broken_link = 1; 136 - } else { 137 - pic->broken_link = 0; 138 - } 134 + if ( ( headr[3] & 0x20 ) != 0 ){ 135 + pic->broken_link = 1; 136 + } else { 137 + pic->broken_link = 0; 138 + } 139 139 if (pr) printk(" broken: %d\n", pic->broken_link); 140 140 141 141 return 0; ··· 146 146 /* needs 8 byte input */ 147 147 static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr) 148 148 { 149 - int sw; 149 + int sw; 150 150 int form = -1; 151 151 152 152 if (pr) printk("Reading sequence header\n"); ··· 154 154 vi->horizontal_size = ((headr[1] &0xF0) >> 4) | (headr[0] << 4); 155 155 vi->vertical_size = ((headr[1] &0x0F) << 8) | (headr[2]); 156 156 157 - sw = (int)((headr[3]&0xF0) >> 4) ; 157 + sw = (int)((headr[3]&0xF0) >> 4) ; 158 158 159 - switch( sw ){ 159 + switch( sw ){ 160 160 case 1: 161 161 if (pr) 162 162 printk("Videostream: ASPECT: 1:1"); ··· 165 165 case 2: 166 166 if (pr) 167 167 printk("Videostream: ASPECT: 4:3"); 168 - vi->aspect_ratio = 133; 168 + vi->aspect_ratio = 133; 169 169 break; 170 170 case 3: 171 171 if (pr) 172 172 printk("Videostream: ASPECT: 16:9"); 173 - vi->aspect_ratio = 177; 173 + vi->aspect_ratio = 177; 174 174 break; 175 175 case 4: 176 176 if (pr) 177 177 printk("Videostream: ASPECT: 2.21:1"); 178 - vi->aspect_ratio = 221; 178 + vi->aspect_ratio = 221; 179 179 break; 180 180 181 - case 5 ... 15: 181 + case 5 ... 15: 182 182 if (pr) 183 183 printk("Videostream: ASPECT: reserved"); 184 - vi->aspect_ratio = 0; 184 + vi->aspect_ratio = 0; 185 185 break; 186 186 187 - default: 188 - vi->aspect_ratio = 0; 189 - return -1; 187 + default: 188 + vi->aspect_ratio = 0; 189 + return -1; 190 190 } 191 191 192 192 if (pr) 193 193 printk(" Size = %dx%d",vi->horizontal_size,vi->vertical_size); 194 194 195 - sw = (int)(headr[3]&0x0F); 195 + sw = (int)(headr[3]&0x0F); 196 196 197 - switch ( sw ) { 197 + switch ( sw ) { 198 198 case 1: 199 199 if (pr) 200 200 printk(" FRate: 23.976 fps"); 201 - vi->framerate = 23976; 201 + vi->framerate = 23976; 202 202 form = -1; 203 203 break; 204 204 case 2: 205 205 if (pr) 206 206 printk(" FRate: 24 fps"); 207 - vi->framerate = 24000; 207 + vi->framerate = 24000; 208 208 form = -1; 209 209 break; 210 210 case 3: 211 211 if (pr) 212 212 printk(" FRate: 25 fps"); 213 - vi->framerate = 25000; 213 + vi->framerate = 25000; 214 214 form = VIDEO_MODE_PAL; 215 215 break; 216 216 case 4: 217 217 if (pr) 218 218 printk(" FRate: 29.97 fps"); 219 - vi->framerate = 29970; 219 + vi->framerate = 29970; 220 220 form = VIDEO_MODE_NTSC; 221 221 break; 222 222 case 5: 223 223 if (pr) 224 224 printk(" FRate: 30 fps"); 225 - vi->framerate = 30000; 225 + vi->framerate = 30000; 226 226 form = VIDEO_MODE_NTSC; 227 227 break; 228 228 case 6: 229 229 if (pr) 230 230 printk(" FRate: 50 fps"); 231 - vi->framerate = 50000; 231 + vi->framerate = 50000; 232 232 form = VIDEO_MODE_PAL; 233 233 break; 234 234 case 7: 235 235 if (pr) 236 236 printk(" FRate: 60 fps"); 237 - vi->framerate = 60000; 237 + vi->framerate = 60000; 238 238 form = VIDEO_MODE_NTSC; 239 239 break; 240 240 } 241 241 242 242 vi->bit_rate = (headr[4] << 10) | (headr[5] << 2) | (headr[6] & 0x03); 243 243 244 - vi->vbv_buffer_size 245 - = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5); 244 + vi->vbv_buffer_size 245 + = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5); 246 246 247 247 if (pr){ 248 248 printk(" BRate: %d Mbit/s",4*(vi->bit_rate)/10000); ··· 250 250 printk("\n"); 251 251 } 252 252 253 - vi->video_format = form; 253 + vi->video_format = form; 254 254 255 255 return 0; 256 256 } ··· 308 308 if (!found) return -1; 309 309 310 310 if (c+3 >= count) return -1; 311 - headr = mbuf+c; 311 + headr = mbuf+c; 312 312 313 313 ai->layer = (headr[1] & 0x06) >> 1; 314 314 ··· 368 368 if (c+5 >= count) return -1; 369 369 370 370 ai->layer = 0; // 0 for AC3 371 - headr = mbuf+c+2; 371 + headr = mbuf+c+2; 372 372 373 373 frame = (headr[2]&0x3f); 374 374 ai->bit_rate = ac3_bitrates[frame >> 1]*1000; ··· 396 396 #if 0 397 397 static u8 *skip_pes_header(u8 **bufp) 398 398 { 399 - u8 *inbuf = *bufp; 400 - u8 *buf = inbuf; 401 - u8 *pts = NULL; 402 - int skip = 0; 399 + u8 *inbuf = *bufp; 400 + u8 *buf = inbuf; 401 + u8 *pts = NULL; 402 + int skip = 0; 403 403 404 404 static const int mpeg1_skip_table[16] = { 405 405 1, 0xffff, 5, 10, 0xffff, 0xffff, 0xffff, 0xffff, 406 - 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff 406 + 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff 407 407 }; 408 408 409 409 410 - if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */ 411 - if (buf[7] & PTS_ONLY) 412 - pts = buf+9; 413 - else pts = NULL; 414 - buf = inbuf + 9 + inbuf[8]; 415 - } else { /* mpeg1 */ 416 - for (buf = inbuf + 6; *buf == 0xff; buf++) 417 - if (buf == inbuf + 6 + 16) { 418 - break; 419 - } 420 - if ((*buf & 0xc0) == 0x40) 421 - buf += 2; 422 - skip = mpeg1_skip_table [*buf >> 4]; 423 - if (skip == 5 || skip == 10) pts = buf; 424 - else pts = NULL; 410 + if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */ 411 + if (buf[7] & PTS_ONLY) 412 + pts = buf+9; 413 + else pts = NULL; 414 + buf = inbuf + 9 + inbuf[8]; 415 + } else { /* mpeg1 */ 416 + for (buf = inbuf + 6; *buf == 0xff; buf++) 417 + if (buf == inbuf + 6 + 16) { 418 + break; 419 + } 420 + if ((*buf & 0xc0) == 0x40) 421 + buf += 2; 422 + skip = mpeg1_skip_table [*buf >> 4]; 423 + if (skip == 5 || skip == 10) pts = buf; 424 + else pts = NULL; 425 425 426 - buf += mpeg1_skip_table [*buf >> 4]; 427 - } 426 + buf += mpeg1_skip_table [*buf >> 4]; 427 + } 428 428 429 - *bufp = buf; 430 - return pts; 429 + *bufp = buf; 430 + return pts; 431 431 } 432 432 #endif 433 433 434 434 #if 0 435 435 static void initialize_quant_matrix( u32 *matrix ) 436 436 { 437 - int i; 437 + int i; 438 438 439 - matrix[0] = 0x08101013; 440 - matrix[1] = 0x10131616; 441 - matrix[2] = 0x16161616; 442 - matrix[3] = 0x1a181a1b; 443 - matrix[4] = 0x1b1b1a1a; 444 - matrix[5] = 0x1a1a1b1b; 445 - matrix[6] = 0x1b1d1d1d; 446 - matrix[7] = 0x2222221d; 447 - matrix[8] = 0x1d1d1b1b; 448 - matrix[9] = 0x1d1d2020; 449 - matrix[10] = 0x22222526; 450 - matrix[11] = 0x25232322; 451 - matrix[12] = 0x23262628; 452 - matrix[13] = 0x28283030; 453 - matrix[14] = 0x2e2e3838; 454 - matrix[15] = 0x3a454553; 439 + matrix[0] = 0x08101013; 440 + matrix[1] = 0x10131616; 441 + matrix[2] = 0x16161616; 442 + matrix[3] = 0x1a181a1b; 443 + matrix[4] = 0x1b1b1a1a; 444 + matrix[5] = 0x1a1a1b1b; 445 + matrix[6] = 0x1b1d1d1d; 446 + matrix[7] = 0x2222221d; 447 + matrix[8] = 0x1d1d1b1b; 448 + matrix[9] = 0x1d1d2020; 449 + matrix[10] = 0x22222526; 450 + matrix[11] = 0x25232322; 451 + matrix[12] = 0x23262628; 452 + matrix[13] = 0x28283030; 453 + matrix[14] = 0x2e2e3838; 454 + matrix[15] = 0x3a454553; 455 455 456 - for ( i = 16 ; i < 32 ; i++ ) 457 - matrix[i] = 0x10101010; 456 + for ( i = 16 ; i < 32 ; i++ ) 457 + matrix[i] = 0x10101010; 458 458 } 459 459 #endif 460 460 461 461 #if 0 462 462 static void initialize_mpg_picture(struct mpg_picture *pic) 463 463 { 464 - int i; 464 + int i; 465 465 466 - /* set MPEG1 */ 467 - pic->mpeg1_flag = 1; 468 - pic->profile_and_level = 0x4A ; /* MP@LL */ 469 - pic->progressive_sequence = 1; 470 - pic->low_delay = 0; 466 + /* set MPEG1 */ 467 + pic->mpeg1_flag = 1; 468 + pic->profile_and_level = 0x4A ; /* MP@LL */ 469 + pic->progressive_sequence = 1; 470 + pic->low_delay = 0; 471 471 472 - pic->sequence_display_extension_flag = 0; 473 - for ( i = 0 ; i < 4 ; i++ ){ 474 - pic->frame_centre_horizontal_offset[i] = 0; 475 - pic->frame_centre_vertical_offset[i] = 0; 476 - } 477 - pic->last_frame_centre_horizontal_offset = 0; 478 - pic->last_frame_centre_vertical_offset = 0; 472 + pic->sequence_display_extension_flag = 0; 473 + for ( i = 0 ; i < 4 ; i++ ){ 474 + pic->frame_centre_horizontal_offset[i] = 0; 475 + pic->frame_centre_vertical_offset[i] = 0; 476 + } 477 + pic->last_frame_centre_horizontal_offset = 0; 478 + pic->last_frame_centre_vertical_offset = 0; 479 479 480 - pic->picture_display_extension_flag[0] = 0; 481 - pic->picture_display_extension_flag[1] = 0; 482 - pic->sequence_header_flag = 0; 480 + pic->picture_display_extension_flag[0] = 0; 481 + pic->picture_display_extension_flag[1] = 0; 482 + pic->sequence_header_flag = 0; 483 483 pic->gop_flag = 0; 484 - pic->sequence_end_flag = 0; 484 + pic->sequence_end_flag = 0; 485 485 } 486 486 #endif 487 487 488 488 #if 0 489 489 static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic ) 490 490 { 491 - int16_t last_h_offset; 492 - int16_t last_v_offset; 491 + int16_t last_h_offset; 492 + int16_t last_v_offset; 493 493 494 - int16_t *p_h_offset; 495 - int16_t *p_v_offset; 494 + int16_t *p_h_offset; 495 + int16_t *p_v_offset; 496 496 497 - if ( pic->mpeg1_flag ){ 498 - pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE; 499 - pic->top_field_first = 0; 500 - pic->repeat_first_field = 0; 501 - pic->progressive_frame = 1; 502 - pic->picture_coding_parameter = 0x000010; 503 - } 497 + if ( pic->mpeg1_flag ){ 498 + pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE; 499 + pic->top_field_first = 0; 500 + pic->repeat_first_field = 0; 501 + pic->progressive_frame = 1; 502 + pic->picture_coding_parameter = 0x000010; 503 + } 504 504 505 - /* Reset flag */ 506 - pic->picture_display_extension_flag[field_type] = 0; 505 + /* Reset flag */ 506 + pic->picture_display_extension_flag[field_type] = 0; 507 507 508 - last_h_offset = pic->last_frame_centre_horizontal_offset; 509 - last_v_offset = pic->last_frame_centre_vertical_offset; 510 - if ( field_type == FIRST_FIELD ){ 511 - p_h_offset = pic->frame_centre_horizontal_offset; 512 - p_v_offset = pic->frame_centre_vertical_offset; 513 - *p_h_offset = last_h_offset; 514 - *(p_h_offset + 1) = last_h_offset; 515 - *(p_h_offset + 2) = last_h_offset; 516 - *p_v_offset = last_v_offset; 517 - *(p_v_offset + 1) = last_v_offset; 518 - *(p_v_offset + 2) = last_v_offset; 519 - } else { 520 - pic->frame_centre_horizontal_offset[3] = last_h_offset; 521 - pic->frame_centre_vertical_offset[3] = last_v_offset; 522 - } 508 + last_h_offset = pic->last_frame_centre_horizontal_offset; 509 + last_v_offset = pic->last_frame_centre_vertical_offset; 510 + if ( field_type == FIRST_FIELD ){ 511 + p_h_offset = pic->frame_centre_horizontal_offset; 512 + p_v_offset = pic->frame_centre_vertical_offset; 513 + *p_h_offset = last_h_offset; 514 + *(p_h_offset + 1) = last_h_offset; 515 + *(p_h_offset + 2) = last_h_offset; 516 + *p_v_offset = last_v_offset; 517 + *(p_v_offset + 1) = last_v_offset; 518 + *(p_v_offset + 2) = last_v_offset; 519 + } else { 520 + pic->frame_centre_horizontal_offset[3] = last_h_offset; 521 + pic->frame_centre_vertical_offset[3] = last_v_offset; 522 + } 523 523 } 524 524 #endif 525 525 526 526 #if 0 527 527 static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type) 528 528 { 529 - pic->picture_header = 0; 530 - pic->sequence_header_data 531 - = ( INIT_HORIZONTAL_SIZE << 20 ) 532 - | ( INIT_VERTICAL_SIZE << 8 ) 533 - | ( INIT_ASPECT_RATIO << 4 ) 534 - | ( INIT_FRAME_RATE ); 535 - pic->mpeg1_flag = 0; 536 - pic->vinfo.horizontal_size 537 - = INIT_DISP_HORIZONTAL_SIZE; 538 - pic->vinfo.vertical_size 539 - = INIT_DISP_VERTICAL_SIZE; 540 - pic->picture_display_extension_flag[field_type] 541 - = 0; 542 - pic->pts_flag[field_type] = 0; 529 + pic->picture_header = 0; 530 + pic->sequence_header_data 531 + = ( INIT_HORIZONTAL_SIZE << 20 ) 532 + | ( INIT_VERTICAL_SIZE << 8 ) 533 + | ( INIT_ASPECT_RATIO << 4 ) 534 + | ( INIT_FRAME_RATE ); 535 + pic->mpeg1_flag = 0; 536 + pic->vinfo.horizontal_size 537 + = INIT_DISP_HORIZONTAL_SIZE; 538 + pic->vinfo.vertical_size 539 + = INIT_DISP_VERTICAL_SIZE; 540 + pic->picture_display_extension_flag[field_type] 541 + = 0; 542 + pic->pts_flag[field_type] = 0; 543 543 544 - pic->sequence_gop_header = 0; 545 - pic->picture_header = 0; 546 - pic->sequence_header_flag = 0; 547 - pic->gop_flag = 0; 548 - pic->sequence_end_flag = 0; 549 - pic->sequence_display_extension_flag = 0; 550 - pic->last_frame_centre_horizontal_offset = 0; 551 - pic->last_frame_centre_vertical_offset = 0; 544 + pic->sequence_gop_header = 0; 545 + pic->picture_header = 0; 546 + pic->sequence_header_flag = 0; 547 + pic->gop_flag = 0; 548 + pic->sequence_end_flag = 0; 549 + pic->sequence_display_extension_flag = 0; 550 + pic->last_frame_centre_horizontal_offset = 0; 551 + pic->last_frame_centre_vertical_offset = 0; 552 552 pic->channel = chan; 553 553 } 554 554 #endif ··· 588 588 buf[1]&=~0x40; 589 589 } 590 590 if (!len) 591 - return 0; 591 + return 0; 592 592 buf[3]=0x30|((p2ts->cc++)&0x0f); 593 593 rest=183-len; 594 594 if (rest) { 595 - buf[5]=0x00; 595 + buf[5]=0x00; 596 596 if (rest-1) 597 597 memset(buf+6, 0xff, rest-1); 598 598 }
+47 -47
drivers/media/dvb/dvb-core/dvb_filter.h
··· 29 29 30 30 struct dvb_filter_pes2ts { 31 31 unsigned char buf[188]; 32 - unsigned char cc; 33 - dvb_filter_pes2ts_cb_t *cb; 32 + unsigned char cc; 33 + dvb_filter_pes2ts_cb_t *cb; 34 34 void *priv; 35 35 }; 36 36 ··· 162 162 u32 bit_rate; 163 163 u32 comp_bit_rate; 164 164 u32 vbv_buffer_size; 165 - s16 vbv_delay; 165 + s16 vbv_delay; 166 166 u32 CSPF; 167 167 u32 off; 168 168 }; ··· 173 173 #define VIDEO_FRAME_PICTURE 0x03 174 174 175 175 struct mpg_picture { 176 - int channel; 176 + int channel; 177 177 struct dvb_video_info vinfo; 178 - u32 *sequence_gop_header; 179 - u32 *picture_header; 180 - s32 time_code; 181 - int low_delay; 182 - int closed_gop; 183 - int broken_link; 184 - int sequence_header_flag; 185 - int gop_flag; 186 - int sequence_end_flag; 178 + u32 *sequence_gop_header; 179 + u32 *picture_header; 180 + s32 time_code; 181 + int low_delay; 182 + int closed_gop; 183 + int broken_link; 184 + int sequence_header_flag; 185 + int gop_flag; 186 + int sequence_end_flag; 187 187 188 - u8 profile_and_level; 189 - s32 picture_coding_parameter; 190 - u32 matrix[32]; 191 - s8 matrix_change_flag; 188 + u8 profile_and_level; 189 + s32 picture_coding_parameter; 190 + u32 matrix[32]; 191 + s8 matrix_change_flag; 192 192 193 - u8 picture_header_parameter; 193 + u8 picture_header_parameter; 194 194 /* bit 0 - 2: bwd f code 195 195 bit 3 : fpb vector 196 196 bit 4 - 6: fwd f code 197 197 bit 7 : fpf vector */ 198 198 199 - int mpeg1_flag; 200 - int progressive_sequence; 201 - int sequence_display_extension_flag; 202 - u32 sequence_header_data; 203 - s16 last_frame_centre_horizontal_offset; 204 - s16 last_frame_centre_vertical_offset; 199 + int mpeg1_flag; 200 + int progressive_sequence; 201 + int sequence_display_extension_flag; 202 + u32 sequence_header_data; 203 + s16 last_frame_centre_horizontal_offset; 204 + s16 last_frame_centre_vertical_offset; 205 205 206 - u32 pts[2]; /* [0] 1st field, [1] 2nd field */ 207 - int top_field_first; 208 - int repeat_first_field; 209 - int progressive_frame; 210 - int bank; 211 - int forward_bank; 212 - int backward_bank; 213 - int compress; 214 - s16 frame_centre_horizontal_offset[OFF_SIZE]; 215 - /* [0-2] 1st field, [3] 2nd field */ 216 - s16 frame_centre_vertical_offset[OFF_SIZE]; 217 - /* [0-2] 1st field, [3] 2nd field */ 218 - s16 temporal_reference[2]; 219 - /* [0] 1st field, [1] 2nd field */ 206 + u32 pts[2]; /* [0] 1st field, [1] 2nd field */ 207 + int top_field_first; 208 + int repeat_first_field; 209 + int progressive_frame; 210 + int bank; 211 + int forward_bank; 212 + int backward_bank; 213 + int compress; 214 + s16 frame_centre_horizontal_offset[OFF_SIZE]; 215 + /* [0-2] 1st field, [3] 2nd field */ 216 + s16 frame_centre_vertical_offset[OFF_SIZE]; 217 + /* [0-2] 1st field, [3] 2nd field */ 218 + s16 temporal_reference[2]; 219 + /* [0] 1st field, [1] 2nd field */ 220 220 221 - s8 picture_coding_type[2]; 222 - /* [0] 1st field, [1] 2nd field */ 223 - s8 picture_structure[2]; 224 - /* [0] 1st field, [1] 2nd field */ 225 - s8 picture_display_extension_flag[2]; 226 - /* [0] 1st field, [1] 2nd field */ 227 - /* picture_display_extenion() 0:no 1:exit*/ 228 - s8 pts_flag[2]; 229 - /* [0] 1st field, [1] 2nd field */ 221 + s8 picture_coding_type[2]; 222 + /* [0] 1st field, [1] 2nd field */ 223 + s8 picture_structure[2]; 224 + /* [0] 1st field, [1] 2nd field */ 225 + s8 picture_display_extension_flag[2]; 226 + /* [0] 1st field, [1] 2nd field */ 227 + /* picture_display_extenion() 0:no 1:exit*/ 228 + s8 pts_flag[2]; 229 + /* [0] 1st field, [1] 2nd field */ 230 230 }; 231 231 232 232 struct dvb_audio_info {
+4 -4
drivers/media/dvb/dvb-core/dvb_frontend.c
··· 372 372 373 373 snprintf (name, sizeof(name), "kdvb-fe-%i", fe->dvb->num); 374 374 375 - lock_kernel(); 376 - daemonize(name); 377 - sigfillset(&current->blocked); 378 - unlock_kernel(); 375 + lock_kernel(); 376 + daemonize(name); 377 + sigfillset(&current->blocked); 378 + unlock_kernel(); 379 379 380 380 fepriv->status = 0; 381 381 dvb_frontend_init(fe);
+4 -4
drivers/media/dvb/dvb-core/dvb_frontend.h
··· 41 41 #include "dvbdev.h" 42 42 43 43 struct dvb_frontend_tune_settings { 44 - int min_delay_ms; 45 - int step_size; 46 - int max_drift; 47 - struct dvb_frontend_parameters parameters; 44 + int min_delay_ms; 45 + int step_size; 46 + int max_drift; 47 + struct dvb_frontend_parameters parameters; 48 48 }; 49 49 50 50 struct dvb_frontend;
+21 -21
drivers/media/dvb/dvb-core/dvb_net.c
··· 713 713 if (buffer1_len > 32768) 714 714 printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len); 715 715 /* printk("TS callback: %u bytes, %u TS cells @ %p.\n", 716 - buffer1_len, buffer1_len / TS_SZ, buffer1); */ 716 + buffer1_len, buffer1_len / TS_SZ, buffer1); */ 717 717 dvb_net_ule(dev, buffer1, buffer1_len); 718 718 return 0; 719 719 } ··· 721 721 722 722 static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) 723 723 { 724 - u8 *eth; 725 - struct sk_buff *skb; 724 + u8 *eth; 725 + struct sk_buff *skb; 726 726 struct net_device_stats *stats = &(((struct dvb_net_priv *) dev->priv)->stats); 727 727 int snap = 0; 728 728 ··· 754 754 return; 755 755 } 756 756 snap = 8; 757 - } 757 + } 758 758 if (pkt[7]) { 759 759 /* FIXME: assemble datagram from multiple sections */ 760 760 stats->rx_errors++; ··· 778 778 memcpy(eth + 14, pkt + 12 + snap, pkt_len - 12 - 4 - snap); 779 779 780 780 /* create ethernet header: */ 781 - eth[0]=pkt[0x0b]; 782 - eth[1]=pkt[0x0a]; 783 - eth[2]=pkt[0x09]; 784 - eth[3]=pkt[0x08]; 785 - eth[4]=pkt[0x04]; 786 - eth[5]=pkt[0x03]; 781 + eth[0]=pkt[0x0b]; 782 + eth[1]=pkt[0x0a]; 783 + eth[2]=pkt[0x09]; 784 + eth[3]=pkt[0x08]; 785 + eth[4]=pkt[0x04]; 786 + eth[5]=pkt[0x03]; 787 787 788 - eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0; 788 + eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0; 789 789 790 790 if (snap) { 791 791 eth[12] = pkt[18]; ··· 807 807 808 808 stats->rx_packets++; 809 809 stats->rx_bytes+=skb->len; 810 - netif_rx(skb); 810 + netif_rx(skb); 811 811 } 812 812 813 813 static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len, ··· 815 815 struct dmx_section_filter *filter, 816 816 enum dmx_success success) 817 817 { 818 - struct net_device *dev = filter->priv; 818 + struct net_device *dev = filter->priv; 819 819 820 820 /** 821 821 * we rely on the DVB API definition where exactly one complete ··· 885 885 { 886 886 int ret = 0, i; 887 887 struct dvb_net_priv *priv = dev->priv; 888 - struct dmx_demux *demux = priv->demux; 889 - unsigned char *mac = (unsigned char *) dev->dev_addr; 888 + struct dmx_demux *demux = priv->demux; 889 + unsigned char *mac = (unsigned char *) dev->dev_addr; 890 890 891 891 dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode); 892 892 down(&priv->mutex); ··· 1129 1129 struct dvb_net_priv *priv = dev->priv; 1130 1130 1131 1131 priv->in_use--; 1132 - return dvb_net_feed_stop(dev); 1132 + return dvb_net_feed_stop(dev); 1133 1133 } 1134 1134 1135 1135 static struct net_device_stats * dvb_net_get_stats(struct net_device *dev) 1136 1136 { 1137 - return &((struct dvb_net_priv*) dev->priv)->stats; 1137 + return &((struct dvb_net_priv*) dev->priv)->stats; 1138 1138 } 1139 1139 1140 1140 static void dvb_net_setup(struct net_device *dev) ··· 1360 1360 }; 1361 1361 1362 1362 static struct dvb_device dvbdev_net = { 1363 - .priv = NULL, 1364 - .users = 1, 1365 - .writers = 1, 1366 - .fops = &dvb_net_fops, 1363 + .priv = NULL, 1364 + .users = 1, 1365 + .writers = 1, 1366 + .fops = &dvb_net_fops, 1367 1367 }; 1368 1368 1369 1369
+123 -123
drivers/media/dvb/dvb-core/dvb_ringbuffer.c
··· 42 42 43 43 void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len) 44 44 { 45 - rbuf->pread=rbuf->pwrite=0; 46 - rbuf->data=data; 47 - rbuf->size=len; 45 + rbuf->pread=rbuf->pwrite=0; 46 + rbuf->data=data; 47 + rbuf->size=len; 48 48 49 - init_waitqueue_head(&rbuf->queue); 49 + init_waitqueue_head(&rbuf->queue); 50 50 51 - spin_lock_init(&(rbuf->lock)); 51 + spin_lock_init(&(rbuf->lock)); 52 52 } 53 53 54 54 55 55 56 56 int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf) 57 57 { 58 - return (rbuf->pread==rbuf->pwrite); 58 + return (rbuf->pread==rbuf->pwrite); 59 59 } 60 60 61 61 62 62 63 63 ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf) 64 64 { 65 - ssize_t free; 65 + ssize_t free; 66 66 67 - free = rbuf->pread - rbuf->pwrite; 68 - if (free <= 0) 69 - free += rbuf->size; 70 - return free-1; 67 + free = rbuf->pread - rbuf->pwrite; 68 + if (free <= 0) 69 + free += rbuf->size; 70 + return free-1; 71 71 } 72 72 73 73 74 74 75 75 ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf) 76 76 { 77 - ssize_t avail; 77 + ssize_t avail; 78 78 79 - avail = rbuf->pwrite - rbuf->pread; 80 - if (avail < 0) 81 - avail += rbuf->size; 82 - return avail; 79 + avail = rbuf->pwrite - rbuf->pread; 80 + if (avail < 0) 81 + avail += rbuf->size; 82 + return avail; 83 83 } 84 84 85 85 86 86 87 87 void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf) 88 88 { 89 - rbuf->pread = rbuf->pwrite; 89 + rbuf->pread = rbuf->pwrite; 90 90 } 91 91 92 92 93 93 94 94 void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf) 95 95 { 96 - unsigned long flags; 96 + unsigned long flags; 97 97 98 - spin_lock_irqsave(&rbuf->lock, flags); 99 - dvb_ringbuffer_flush(rbuf); 100 - spin_unlock_irqrestore(&rbuf->lock, flags); 98 + spin_lock_irqsave(&rbuf->lock, flags); 99 + dvb_ringbuffer_flush(rbuf); 100 + spin_unlock_irqrestore(&rbuf->lock, flags); 101 101 102 - wake_up(&rbuf->queue); 102 + wake_up(&rbuf->queue); 103 103 } 104 104 105 105 106 106 107 107 ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, size_t len, int usermem) 108 108 { 109 - size_t todo = len; 110 - size_t split; 109 + size_t todo = len; 110 + size_t split; 111 111 112 - split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0; 113 - if (split > 0) { 114 - if (!usermem) 115 - memcpy(buf, rbuf->data+rbuf->pread, split); 116 - else 117 - if (copy_to_user(buf, rbuf->data+rbuf->pread, split)) 118 - return -EFAULT; 119 - buf += split; 120 - todo -= split; 121 - rbuf->pread = 0; 122 - } 123 - if (!usermem) 124 - memcpy(buf, rbuf->data+rbuf->pread, todo); 125 - else 126 - if (copy_to_user(buf, rbuf->data+rbuf->pread, todo)) 127 - return -EFAULT; 112 + split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0; 113 + if (split > 0) { 114 + if (!usermem) 115 + memcpy(buf, rbuf->data+rbuf->pread, split); 116 + else 117 + if (copy_to_user(buf, rbuf->data+rbuf->pread, split)) 118 + return -EFAULT; 119 + buf += split; 120 + todo -= split; 121 + rbuf->pread = 0; 122 + } 123 + if (!usermem) 124 + memcpy(buf, rbuf->data+rbuf->pread, todo); 125 + else 126 + if (copy_to_user(buf, rbuf->data+rbuf->pread, todo)) 127 + return -EFAULT; 128 128 129 - rbuf->pread = (rbuf->pread + todo) % rbuf->size; 129 + rbuf->pread = (rbuf->pread + todo) % rbuf->size; 130 130 131 - return len; 131 + return len; 132 132 } 133 133 134 134 135 135 136 136 ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, size_t len) 137 137 { 138 - size_t todo = len; 139 - size_t split; 138 + size_t todo = len; 139 + size_t split; 140 140 141 - split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0; 141 + split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0; 142 142 143 - if (split > 0) { 144 - memcpy(rbuf->data+rbuf->pwrite, buf, split); 145 - buf += split; 146 - todo -= split; 147 - rbuf->pwrite = 0; 148 - } 149 - memcpy(rbuf->data+rbuf->pwrite, buf, todo); 150 - rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size; 143 + if (split > 0) { 144 + memcpy(rbuf->data+rbuf->pwrite, buf, split); 145 + buf += split; 146 + todo -= split; 147 + rbuf->pwrite = 0; 148 + } 149 + memcpy(rbuf->data+rbuf->pwrite, buf, todo); 150 + rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size; 151 151 152 - return len; 152 + return len; 153 153 } 154 154 155 155 ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, size_t len) 156 156 { 157 - int status; 158 - ssize_t oldpwrite = rbuf->pwrite; 157 + int status; 158 + ssize_t oldpwrite = rbuf->pwrite; 159 159 160 - DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8); 161 - DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff); 162 - DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY); 163 - status = dvb_ringbuffer_write(rbuf, buf, len); 160 + DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8); 161 + DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff); 162 + DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY); 163 + status = dvb_ringbuffer_write(rbuf, buf, len); 164 164 165 - if (status < 0) rbuf->pwrite = oldpwrite; 166 - return status; 165 + if (status < 0) rbuf->pwrite = oldpwrite; 166 + return status; 167 167 } 168 168 169 169 ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx, 170 - int offset, u8* buf, size_t len, int usermem) 170 + int offset, u8* buf, size_t len, int usermem) 171 171 { 172 - size_t todo; 173 - size_t split; 174 - size_t pktlen; 172 + size_t todo; 173 + size_t split; 174 + size_t pktlen; 175 175 176 - pktlen = rbuf->data[idx] << 8; 177 - pktlen |= rbuf->data[(idx + 1) % rbuf->size]; 178 - if (offset > pktlen) return -EINVAL; 179 - if ((offset + len) > pktlen) len = pktlen - offset; 176 + pktlen = rbuf->data[idx] << 8; 177 + pktlen |= rbuf->data[(idx + 1) % rbuf->size]; 178 + if (offset > pktlen) return -EINVAL; 179 + if ((offset + len) > pktlen) len = pktlen - offset; 180 180 181 - idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size; 182 - todo = len; 183 - split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0; 184 - if (split > 0) { 185 - if (!usermem) 186 - memcpy(buf, rbuf->data+idx, split); 187 - else 188 - if (copy_to_user(buf, rbuf->data+idx, split)) 189 - return -EFAULT; 190 - buf += split; 191 - todo -= split; 192 - idx = 0; 193 - } 194 - if (!usermem) 195 - memcpy(buf, rbuf->data+idx, todo); 196 - else 197 - if (copy_to_user(buf, rbuf->data+idx, todo)) 198 - return -EFAULT; 181 + idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size; 182 + todo = len; 183 + split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0; 184 + if (split > 0) { 185 + if (!usermem) 186 + memcpy(buf, rbuf->data+idx, split); 187 + else 188 + if (copy_to_user(buf, rbuf->data+idx, split)) 189 + return -EFAULT; 190 + buf += split; 191 + todo -= split; 192 + idx = 0; 193 + } 194 + if (!usermem) 195 + memcpy(buf, rbuf->data+idx, todo); 196 + else 197 + if (copy_to_user(buf, rbuf->data+idx, todo)) 198 + return -EFAULT; 199 199 200 - return len; 200 + return len; 201 201 } 202 202 203 203 void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx) 204 204 { 205 - size_t pktlen; 205 + size_t pktlen; 206 206 207 - rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED; 207 + rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED; 208 208 209 - // clean up disposed packets 210 - while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) { 211 - if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) { 212 - pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8; 213 - pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1); 214 - DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE); 215 - } else { 216 - // first packet is not disposed, so we stop cleaning now 217 - break; 218 - } 219 - } 209 + // clean up disposed packets 210 + while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) { 211 + if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) { 212 + pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8; 213 + pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1); 214 + DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE); 215 + } else { 216 + // first packet is not disposed, so we stop cleaning now 217 + break; 218 + } 219 + } 220 220 } 221 221 222 222 ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t* pktlen) 223 223 { 224 - int consumed; 225 - int curpktlen; 226 - int curpktstatus; 224 + int consumed; 225 + int curpktlen; 226 + int curpktstatus; 227 227 228 - if (idx == -1) { 228 + if (idx == -1) { 229 229 idx = rbuf->pread; 230 230 } else { 231 - curpktlen = rbuf->data[idx] << 8; 232 - curpktlen |= rbuf->data[(idx + 1) % rbuf->size]; 233 - idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size; 231 + curpktlen = rbuf->data[idx] << 8; 232 + curpktlen |= rbuf->data[(idx + 1) % rbuf->size]; 233 + idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size; 234 234 } 235 235 236 - consumed = (idx - rbuf->pread) % rbuf->size; 236 + consumed = (idx - rbuf->pread) % rbuf->size; 237 237 238 - while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) { 238 + while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) { 239 239 240 - curpktlen = rbuf->data[idx] << 8; 241 - curpktlen |= rbuf->data[(idx + 1) % rbuf->size]; 242 - curpktstatus = rbuf->data[(idx + 2) % rbuf->size]; 240 + curpktlen = rbuf->data[idx] << 8; 241 + curpktlen |= rbuf->data[(idx + 1) % rbuf->size]; 242 + curpktstatus = rbuf->data[(idx + 2) % rbuf->size]; 243 243 244 - if (curpktstatus == PKT_READY) { 245 - *pktlen = curpktlen; 246 - return idx; 247 - } 244 + if (curpktstatus == PKT_READY) { 245 + *pktlen = curpktlen; 246 + return idx; 247 + } 248 248 249 - consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE; 250 - idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size; 251 - } 249 + consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE; 250 + idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size; 251 + } 252 252 253 - // no packets available 254 - return -1; 253 + // no packets available 254 + return -1; 255 255 } 256 256 257 257
+10 -10
drivers/media/dvb/dvb-core/dvb_ringbuffer.h
··· 31 31 #include <linux/wait.h> 32 32 33 33 struct dvb_ringbuffer { 34 - u8 *data; 35 - ssize_t size; 36 - ssize_t pread; 37 - ssize_t pwrite; 34 + u8 *data; 35 + ssize_t size; 36 + ssize_t pread; 37 + ssize_t pwrite; 38 38 39 - wait_queue_head_t queue; 40 - spinlock_t lock; 39 + wait_queue_head_t queue; 40 + spinlock_t lock; 41 41 }; 42 42 43 43 #define DVB_RINGBUFFER_PKTHDRSIZE 3 ··· 106 106 ** returns number of bytes transferred or -EFAULT 107 107 */ 108 108 extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, 109 - size_t len, int usermem); 109 + size_t len, int usermem); 110 110 111 111 112 112 /* write routines & macros */ ··· 121 121 ** returns number of bytes transferred or -EFAULT 122 122 */ 123 123 extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, 124 - size_t len); 124 + size_t len); 125 125 126 126 127 127 /** ··· 133 133 * returns Number of bytes written, or -EFAULT, -ENOMEM, -EVINAL. 134 134 */ 135 135 extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, 136 - size_t len); 136 + size_t len); 137 137 138 138 /** 139 139 * Read from a packet in the ringbuffer. Note: unlike dvb_ringbuffer_read(), this ··· 149 149 * returns Number of bytes read, or -EFAULT. 150 150 */ 151 151 extern ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx, 152 - int offset, u8* buf, size_t len, int usermem); 152 + int offset, u8* buf, size_t len, int usermem); 153 153 154 154 /** 155 155 * Dispose of a packet in the ring buffer.
+66 -66
drivers/media/dvb/dvb-core/dvbdev.c
··· 47 47 static DECLARE_MUTEX(dvbdev_register_lock); 48 48 49 49 static const char * const dnames[] = { 50 - "video", "audio", "sec", "frontend", "demux", "dvr", "ca", 50 + "video", "audio", "sec", "frontend", "demux", "dvr", "ca", 51 51 "net", "osd" 52 52 }; 53 53 ··· 90 90 91 91 file->private_data = dvbdev; 92 92 old_fops = file->f_op; 93 - file->f_op = fops_get(dvbdev->fops); 94 - if(file->f_op->open) 95 - err = file->f_op->open(inode,file); 96 - if (err) { 97 - fops_put(file->f_op); 98 - file->f_op = fops_get(old_fops); 99 - } 100 - fops_put(old_fops); 101 - return err; 93 + file->f_op = fops_get(dvbdev->fops); 94 + if(file->f_op->open) 95 + err = file->f_op->open(inode,file); 96 + if (err) { 97 + fops_put(file->f_op); 98 + file->f_op = fops_get(old_fops); 99 + } 100 + fops_put(old_fops); 101 + return err; 102 102 } 103 103 return -ENODEV; 104 104 } ··· 117 117 118 118 int dvb_generic_open(struct inode *inode, struct file *file) 119 119 { 120 - struct dvb_device *dvbdev = file->private_data; 120 + struct dvb_device *dvbdev = file->private_data; 121 121 122 - if (!dvbdev) 123 - return -ENODEV; 122 + if (!dvbdev) 123 + return -ENODEV; 124 124 125 125 if (!dvbdev->users) 126 - return -EBUSY; 126 + return -EBUSY; 127 127 128 128 if ((file->f_flags & O_ACCMODE) == O_RDONLY) { 129 - if (!dvbdev->readers) 130 - return -EBUSY; 129 + if (!dvbdev->readers) 130 + return -EBUSY; 131 131 dvbdev->readers--; 132 132 } else { 133 - if (!dvbdev->writers) 134 - return -EBUSY; 133 + if (!dvbdev->writers) 134 + return -EBUSY; 135 135 dvbdev->writers--; 136 136 } 137 137 ··· 143 143 144 144 int dvb_generic_release(struct inode *inode, struct file *file) 145 145 { 146 - struct dvb_device *dvbdev = file->private_data; 146 + struct dvb_device *dvbdev = file->private_data; 147 147 148 148 if (!dvbdev) 149 - return -ENODEV; 149 + return -ENODEV; 150 150 151 151 if ((file->f_flags & O_ACCMODE) == O_RDONLY) { 152 152 dvbdev->readers++; ··· 163 163 int dvb_generic_ioctl(struct inode *inode, struct file *file, 164 164 unsigned int cmd, unsigned long arg) 165 165 { 166 - struct dvb_device *dvbdev = file->private_data; 166 + struct dvb_device *dvbdev = file->private_data; 167 167 168 - if (!dvbdev) 169 - return -ENODEV; 168 + if (!dvbdev) 169 + return -ENODEV; 170 170 171 171 if (!dvbdev->kernel_ioctl) 172 172 return -EINVAL; ··· 334 334 to the v4l "videodev.o" module, which is unnecessary for some 335 335 cards (ie. the budget dvb-cards don't need the v4l module...) */ 336 336 int dvb_usercopy(struct inode *inode, struct file *file, 337 - unsigned int cmd, unsigned long arg, 337 + unsigned int cmd, unsigned long arg, 338 338 int (*func)(struct inode *inode, struct file *file, 339 339 unsigned int cmd, void *arg)) 340 340 { 341 - char sbuf[128]; 342 - void *mbuf = NULL; 343 - void *parg = NULL; 344 - int err = -EINVAL; 341 + char sbuf[128]; 342 + void *mbuf = NULL; 343 + void *parg = NULL; 344 + int err = -EINVAL; 345 345 346 - /* Copy arguments into temp kernel buffer */ 347 - switch (_IOC_DIR(cmd)) { 348 - case _IOC_NONE: 346 + /* Copy arguments into temp kernel buffer */ 347 + switch (_IOC_DIR(cmd)) { 348 + case _IOC_NONE: 349 349 /* 350 350 * For this command, the pointer is actually an integer 351 351 * argument. 352 352 */ 353 353 parg = (void *) arg; 354 354 break; 355 - case _IOC_READ: /* some v4l ioctls are marked wrong ... */ 356 - case _IOC_WRITE: 357 - case (_IOC_WRITE | _IOC_READ): 358 - if (_IOC_SIZE(cmd) <= sizeof(sbuf)) { 359 - parg = sbuf; 360 - } else { 361 - /* too big to allocate from stack */ 362 - mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL); 363 - if (NULL == mbuf) 364 - return -ENOMEM; 365 - parg = mbuf; 366 - } 355 + case _IOC_READ: /* some v4l ioctls are marked wrong ... */ 356 + case _IOC_WRITE: 357 + case (_IOC_WRITE | _IOC_READ): 358 + if (_IOC_SIZE(cmd) <= sizeof(sbuf)) { 359 + parg = sbuf; 360 + } else { 361 + /* too big to allocate from stack */ 362 + mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL); 363 + if (NULL == mbuf) 364 + return -ENOMEM; 365 + parg = mbuf; 366 + } 367 367 368 - err = -EFAULT; 369 - if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd))) 370 - goto out; 371 - break; 372 - } 368 + err = -EFAULT; 369 + if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd))) 370 + goto out; 371 + break; 372 + } 373 373 374 - /* call driver */ 375 - if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD) 376 - err = -EINVAL; 374 + /* call driver */ 375 + if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD) 376 + err = -EINVAL; 377 377 378 - if (err < 0) 379 - goto out; 378 + if (err < 0) 379 + goto out; 380 380 381 - /* Copy results into user buffer */ 382 - switch (_IOC_DIR(cmd)) 383 - { 384 - case _IOC_READ: 385 - case (_IOC_WRITE | _IOC_READ): 386 - if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd))) 387 - err = -EFAULT; 388 - break; 389 - } 381 + /* Copy results into user buffer */ 382 + switch (_IOC_DIR(cmd)) 383 + { 384 + case _IOC_READ: 385 + case (_IOC_WRITE | _IOC_READ): 386 + if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd))) 387 + err = -EFAULT; 388 + break; 389 + } 390 390 391 391 out: 392 - kfree(mbuf); 393 - return err; 392 + kfree(mbuf); 393 + return err; 394 394 } 395 395 396 396 static int __init init_dvbdev(void) ··· 427 427 428 428 static void __exit exit_dvbdev(void) 429 429 { 430 - devfs_remove("dvb"); 430 + devfs_remove("dvb"); 431 431 class_destroy(dvb_class); 432 432 cdev_del(&dvb_device_cdev); 433 - unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); 433 + unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); 434 434 } 435 435 436 436 module_init(init_dvbdev);
+3 -3
drivers/media/dvb/dvb-core/dvbdev.h
··· 68 68 int writers; 69 69 int users; 70 70 71 - /* don't really need those !? -- FIXME: use video_usercopy */ 72 - int (*kernel_ioctl)(struct inode *inode, struct file *file, 71 + /* don't really need those !? -- FIXME: use video_usercopy */ 72 + int (*kernel_ioctl)(struct inode *inode, struct file *file, 73 73 unsigned int cmd, void *arg); 74 74 75 75 void *priv; ··· 97 97 generic_usercopy() someday... */ 98 98 99 99 extern int dvb_usercopy(struct inode *inode, struct file *file, 100 - unsigned int cmd, unsigned long arg, 100 + unsigned int cmd, unsigned long arg, 101 101 int (*func)(struct inode *inode, struct file *file, 102 102 unsigned int cmd, void *arg)); 103 103
+7 -7
drivers/media/video/bt832.c
··· 231 231 232 232 static struct i2c_driver driver = { 233 233 .owner = THIS_MODULE, 234 - .name = "i2c bt832 driver", 235 - .id = -1, /* FIXME */ 236 - .flags = I2C_DF_NOTIFY, 237 - .attach_adapter = bt832_probe, 238 - .detach_client = bt832_detach, 239 - .command = bt832_command, 234 + .name = "i2c bt832 driver", 235 + .id = -1, /* FIXME */ 236 + .flags = I2C_DF_NOTIFY, 237 + .attach_adapter = bt832_probe, 238 + .detach_client = bt832_detach, 239 + .command = bt832_command, 240 240 }; 241 241 static struct i2c_client client_template = 242 242 { 243 243 .name = "bt832", 244 244 .flags = I2C_CLIENT_ALLOW_USE, 245 - .driver = &driver, 245 + .driver = &driver, 246 246 }; 247 247 248 248
+39 -39
drivers/media/video/bttv-driver.c
··· 727 727 728 728 static void set_pll_freq(struct bttv *btv, unsigned int fin, unsigned int fout) 729 729 { 730 - unsigned char fl, fh, fi; 730 + unsigned char fl, fh, fi; 731 731 732 - /* prevent overflows */ 733 - fin/=4; 734 - fout/=4; 732 + /* prevent overflows */ 733 + fin/=4; 734 + fout/=4; 735 735 736 - fout*=12; 737 - fi=fout/fin; 736 + fout*=12; 737 + fi=fout/fin; 738 738 739 - fout=(fout%fin)*256; 740 - fh=fout/fin; 739 + fout=(fout%fin)*256; 740 + fh=fout/fin; 741 741 742 - fout=(fout%fin)*256; 743 - fl=fout/fin; 742 + fout=(fout%fin)*256; 743 + fl=fout/fin; 744 744 745 - btwrite(fl, BT848_PLL_F_LO); 746 - btwrite(fh, BT848_PLL_F_HI); 747 - btwrite(fi|BT848_PLL_X, BT848_PLL_XCI); 745 + btwrite(fl, BT848_PLL_F_LO); 746 + btwrite(fh, BT848_PLL_F_HI); 747 + btwrite(fi|BT848_PLL_X, BT848_PLL_XCI); 748 748 } 749 749 750 750 static void set_pll(struct bttv *btv) 751 751 { 752 - int i; 752 + int i; 753 753 754 - if (!btv->pll.pll_crystal) 755 - return; 754 + if (!btv->pll.pll_crystal) 755 + return; 756 756 757 757 if (btv->pll.pll_ofreq == btv->pll.pll_current) { 758 758 dprintk("bttv%d: PLL: no change required\n",btv->c.nr); 759 - return; 760 - } 759 + return; 760 + } 761 761 762 - if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) { 763 - /* no PLL needed */ 764 - if (btv->pll.pll_current == 0) 765 - return; 762 + if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) { 763 + /* no PLL needed */ 764 + if (btv->pll.pll_current == 0) 765 + return; 766 766 bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", 767 - btv->c.nr,btv->pll.pll_ifreq); 768 - btwrite(0x00,BT848_TGCTRL); 769 - btwrite(0x00,BT848_PLL_XCI); 770 - btv->pll.pll_current = 0; 771 - return; 772 - } 767 + btv->c.nr,btv->pll.pll_ifreq); 768 + btwrite(0x00,BT848_TGCTRL); 769 + btwrite(0x00,BT848_PLL_XCI); 770 + btv->pll.pll_current = 0; 771 + return; 772 + } 773 773 774 774 bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, 775 - btv->pll.pll_ifreq, btv->pll.pll_ofreq); 775 + btv->pll.pll_ifreq, btv->pll.pll_ofreq); 776 776 set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq); 777 777 778 - for (i=0; i<10; i++) { 778 + for (i=0; i<10; i++) { 779 779 /* Let other people run while the PLL stabilizes */ 780 780 bttv_printk("."); 781 781 msleep(10); 782 782 783 - if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) { 783 + if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) { 784 784 btwrite(0,BT848_DSTATUS); 785 - } else { 786 - btwrite(0x08,BT848_TGCTRL); 787 - btv->pll.pll_current = btv->pll.pll_ofreq; 785 + } else { 786 + btwrite(0x08,BT848_TGCTRL); 787 + btv->pll.pll_current = btv->pll.pll_ofreq; 788 788 bttv_printk(" ok\n"); 789 - return; 790 - } 791 - } 792 - btv->pll.pll_current = -1; 789 + return; 790 + } 791 + } 792 + btv->pll.pll_current = -1; 793 793 bttv_printk("failed\n"); 794 - return; 794 + return; 795 795 } 796 796 797 797 /* used to switch between the bt848's analog/digital video capture modes */
+2 -2
drivers/media/video/ir-kbd-i2c.c
··· 296 296 IR_KEYTAB_TYPE *ir_codes = NULL; 297 297 char *name; 298 298 int ir_type; 299 - struct IR_i2c *ir; 299 + struct IR_i2c *ir; 300 300 struct input_dev *input_dev; 301 301 302 302 ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL); ··· 304 304 if (!ir || !input_dev) { 305 305 kfree(ir); 306 306 input_free_device(input_dev); 307 - return -ENOMEM; 307 + return -ENOMEM; 308 308 } 309 309 310 310 ir->c = client_template;
+6 -6
drivers/media/video/msp3400.c
··· 1559 1559 static struct i2c_driver driver = { 1560 1560 .owner = THIS_MODULE, 1561 1561 .name = "msp3400", 1562 - .id = I2C_DRIVERID_MSP3400, 1563 - .flags = I2C_DF_NOTIFY, 1564 - .attach_adapter = msp_probe, 1565 - .detach_client = msp_detach, 1566 - .command = msp_command, 1562 + .id = I2C_DRIVERID_MSP3400, 1563 + .flags = I2C_DF_NOTIFY, 1564 + .attach_adapter = msp_probe, 1565 + .detach_client = msp_detach, 1566 + .command = msp_command, 1567 1567 .driver = { 1568 1568 .suspend = msp_suspend, 1569 1569 .resume = msp_resume, ··· 1574 1574 { 1575 1575 .name = "(unset)", 1576 1576 .flags = I2C_CLIENT_ALLOW_USE, 1577 - .driver = &driver, 1577 + .driver = &driver, 1578 1578 }; 1579 1579 1580 1580 static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
+8 -8
drivers/media/video/saa7134/saa6752hs.c
··· 523 523 h->standard = 0; 524 524 525 525 i2c_set_clientdata(&h->client, h); 526 - i2c_attach_client(&h->client); 526 + i2c_attach_client(&h->client); 527 527 return 0; 528 528 } 529 529 ··· 597 597 598 598 static struct i2c_driver driver = { 599 599 .owner = THIS_MODULE, 600 - .name = "i2c saa6752hs MPEG encoder", 601 - .id = I2C_DRIVERID_SAA6752HS, 602 - .flags = I2C_DF_NOTIFY, 603 - .attach_adapter = saa6752hs_probe, 604 - .detach_client = saa6752hs_detach, 605 - .command = saa6752hs_command, 600 + .name = "i2c saa6752hs MPEG encoder", 601 + .id = I2C_DRIVERID_SAA6752HS, 602 + .flags = I2C_DF_NOTIFY, 603 + .attach_adapter = saa6752hs_probe, 604 + .detach_client = saa6752hs_detach, 605 + .command = saa6752hs_command, 606 606 }; 607 607 608 608 static struct i2c_client client_template = 609 609 { 610 610 .name = "saa6752hs", 611 611 .flags = I2C_CLIENT_ALLOW_USE, 612 - .driver = &driver, 612 + .driver = &driver, 613 613 }; 614 614 615 615 static int __init saa6752hs_init_module(void)
+4 -4
drivers/media/video/saa7134/saa7134-alsa.c
··· 59 59 MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); 60 60 61 61 #define dprintk(fmt, arg...) if (debug) \ 62 - printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg) 62 + printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg) 63 63 64 64 /* 65 65 * Main chip structure ··· 208 208 209 209 static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs) 210 210 { 211 - struct saa7134_dmasound *dmasound = dev_id; 212 - struct saa7134_dev *dev = dmasound->priv_data; 211 + struct saa7134_dmasound *dmasound = dev_id; 212 + struct saa7134_dev *dev = dmasound->priv_data; 213 213 214 214 unsigned long report, status; 215 215 int loop, handled = 0; ··· 985 985 struct saa7134_dev *dev = NULL; 986 986 struct list_head *list; 987 987 988 - printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); 988 + printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); 989 989 990 990 list_for_each(list,&saa7134_devlist) { 991 991 dev = list_entry(list, struct saa7134_dev, devlist);
+40 -40
drivers/media/video/saa7134/saa7134-oss.c
··· 782 782 783 783 static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs) 784 784 { 785 - struct saa7134_dmasound *dmasound = dev_id; 786 - struct saa7134_dev *dev = dmasound->priv_data; 787 - unsigned long report, status; 788 - int loop, handled = 0; 785 + struct saa7134_dmasound *dmasound = dev_id; 786 + struct saa7134_dev *dev = dmasound->priv_data; 787 + unsigned long report, status; 788 + int loop, handled = 0; 789 789 790 - for (loop = 0; loop < 10; loop++) { 791 - report = saa_readl(SAA7134_IRQ_REPORT); 792 - status = saa_readl(SAA7134_IRQ_STATUS); 790 + for (loop = 0; loop < 10; loop++) { 791 + report = saa_readl(SAA7134_IRQ_REPORT); 792 + status = saa_readl(SAA7134_IRQ_STATUS); 793 793 794 - if (report & SAA7134_IRQ_REPORT_DONE_RA3) { 795 - handled = 1; 796 - saa_writel(SAA7134_IRQ_REPORT,report); 797 - saa7134_irq_oss_done(dev, status); 798 - } else { 799 - goto out; 800 - } 801 - } 794 + if (report & SAA7134_IRQ_REPORT_DONE_RA3) { 795 + handled = 1; 796 + saa_writel(SAA7134_IRQ_REPORT,report); 797 + saa7134_irq_oss_done(dev, status); 798 + } else { 799 + goto out; 800 + } 801 + } 802 802 803 - if (loop == 10) { 804 - dprintk("error! looping IRQ!"); 805 - } 803 + if (loop == 10) { 804 + dprintk("error! looping IRQ!"); 805 + } 806 806 out: 807 - return IRQ_RETVAL(handled); 807 + return IRQ_RETVAL(handled); 808 808 } 809 809 810 810 int saa7134_oss_init1(struct saa7134_dev *dev) 811 811 { 812 812 813 - if ((request_irq(dev->pci->irq, saa7134_oss_irq, 814 - SA_SHIRQ | SA_INTERRUPT, dev->name, 813 + if ((request_irq(dev->pci->irq, saa7134_oss_irq, 814 + SA_SHIRQ | SA_INTERRUPT, dev->name, 815 815 (void*) &dev->dmasound)) < 0) 816 816 return -1; 817 817 ··· 905 905 906 906 err = dev->dmasound.minor_dsp = 907 907 register_sound_dsp(&saa7134_dsp_fops, 908 - dsp_nr[dev->nr]); 908 + dsp_nr[dev->nr]); 909 909 if (err < 0) { 910 910 goto fail; 911 911 } ··· 923 923 return 0; 924 924 925 925 fail: 926 - unregister_sound_dsp(dev->dmasound.minor_dsp); 926 + unregister_sound_dsp(dev->dmasound.minor_dsp); 927 927 return 0; 928 928 929 929 ··· 956 956 957 957 static int saa7134_oss_init(void) 958 958 { 959 - struct saa7134_dev *dev = NULL; 960 - struct list_head *list; 959 + struct saa7134_dev *dev = NULL; 960 + struct list_head *list; 961 961 962 - printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n"); 962 + printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n"); 963 963 964 - list_for_each(list,&saa7134_devlist) { 965 - dev = list_entry(list, struct saa7134_dev, devlist); 964 + list_for_each(list,&saa7134_devlist) { 965 + dev = list_entry(list, struct saa7134_dev, devlist); 966 966 if (dev->dmasound.priv_data == NULL) { 967 967 oss_device_init(dev); 968 968 } else { 969 - printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name); 969 + printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name); 970 970 return -EBUSY; 971 971 } 972 - } 972 + } 973 973 974 - if (dev == NULL) 975 - printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); 974 + if (dev == NULL) 975 + printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); 976 976 977 977 dmasound_init = oss_device_init; 978 978 dmasound_exit = oss_device_exit; 979 979 980 - return 0; 980 + return 0; 981 981 982 982 } 983 983 984 984 static void saa7134_oss_exit(void) 985 985 { 986 - struct saa7134_dev *dev = NULL; 987 - struct list_head *list; 986 + struct saa7134_dev *dev = NULL; 987 + struct list_head *list; 988 988 989 - list_for_each(list,&saa7134_devlist) { 990 - dev = list_entry(list, struct saa7134_dev, devlist); 989 + list_for_each(list,&saa7134_devlist) { 990 + dev = list_entry(list, struct saa7134_dev, devlist); 991 991 992 992 /* Device isn't registered by OSS, probably ALSA's */ 993 993 if (!dev->dmasound.minor_dsp) 994 994 continue; 995 995 996 996 oss_device_exit(dev); 997 - } 997 + } 998 998 999 - printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); 999 + printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); 1000 1000 1001 - return; 1001 + return; 1002 1002 } 1003 1003 1004 1004 module_init(saa7134_oss_init);
+7 -7
drivers/media/video/tda9887.c
··· 819 819 820 820 static struct i2c_driver driver = { 821 821 .owner = THIS_MODULE, 822 - .name = "i2c tda9887 driver", 823 - .id = -1, /* FIXME */ 824 - .flags = I2C_DF_NOTIFY, 825 - .attach_adapter = tda9887_probe, 826 - .detach_client = tda9887_detach, 827 - .command = tda9887_command, 822 + .name = "i2c tda9887 driver", 823 + .id = -1, /* FIXME */ 824 + .flags = I2C_DF_NOTIFY, 825 + .attach_adapter = tda9887_probe, 826 + .detach_client = tda9887_detach, 827 + .command = tda9887_command, 828 828 .driver = { 829 829 .suspend = tda9887_suspend, 830 830 .resume = tda9887_resume, ··· 834 834 { 835 835 .name = "tda9887", 836 836 .flags = I2C_CLIENT_ALLOW_USE, 837 - .driver = &driver, 837 + .driver = &driver, 838 838 }; 839 839 840 840 static int __init tda9887_init_module(void)
+7 -7
drivers/media/video/tvaudio.c
··· 1506 1506 return -EIO; 1507 1507 } 1508 1508 tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name); 1509 - if (desc->flags) { 1510 - tvaudio_dbg("matches:%s%s%s.\n", 1511 - (desc->flags & CHIP_HAS_VOLUME) ? " volume" : "", 1512 - (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "", 1513 - (desc->flags & CHIP_HAS_INPUTSEL) ? " audiomux" : ""); 1514 - } 1509 + if (desc->flags) { 1510 + tvaudio_dbg("matches:%s%s%s.\n", 1511 + (desc->flags & CHIP_HAS_VOLUME) ? " volume" : "", 1512 + (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "", 1513 + (desc->flags & CHIP_HAS_INPUTSEL) ? " audiomux" : ""); 1514 + } 1515 1515 1516 1516 /* fill required data structures */ 1517 1517 strcpy(chip->c.name,desc->name); 1518 1518 chip->type = desc-chiplist; 1519 1519 chip->shadow.count = desc->registers+1; 1520 - chip->prevmode = -1; 1520 + chip->prevmode = -1; 1521 1521 /* register */ 1522 1522 i2c_attach_client(&chip->c); 1523 1523
+1 -1
drivers/media/video/tveeprom.c
··· 753 753 client->driver = &i2c_driver_tveeprom; 754 754 client->flags = I2C_CLIENT_ALLOW_USE; 755 755 snprintf(client->name, sizeof(client->name), "tveeprom"); 756 - i2c_attach_client(client); 756 + i2c_attach_client(client); 757 757 return 0; 758 758 } 759 759
+14 -14
include/linux/dvb/audio.h
··· 32 32 33 33 34 34 typedef enum { 35 - AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ 35 + AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ 36 36 AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */ 37 37 } audio_stream_source_t; 38 38 39 39 40 40 typedef enum { 41 41 AUDIO_STOPPED, /* Device is stopped */ 42 - AUDIO_PLAYING, /* Device is currently playing */ 42 + AUDIO_PLAYING, /* Device is currently playing */ 43 43 AUDIO_PAUSED /* Device is paused */ 44 44 } audio_play_state_t; 45 45 46 46 47 47 typedef enum { 48 - AUDIO_STEREO, 49 - AUDIO_MONO_LEFT, 48 + AUDIO_STEREO, 49 + AUDIO_MONO_LEFT, 50 50 AUDIO_MONO_RIGHT 51 51 } audio_channel_select_t; 52 52 53 53 54 54 typedef struct audio_mixer { 55 - unsigned int volume_left; 56 - unsigned int volume_right; 55 + unsigned int volume_left; 56 + unsigned int volume_right; 57 57 // what else do we need? bass, pass-through, ... 58 58 } audio_mixer_t; 59 59 60 60 61 61 typedef struct audio_status { 62 - int AV_sync_state; /* sync audio and video? */ 63 - int mute_state; /* audio is muted */ 64 - audio_play_state_t play_state; /* current playback state */ 65 - audio_stream_source_t stream_source; /* current stream source */ 66 - audio_channel_select_t channel_select; /* currently selected channel */ 67 - int bypass_mode; /* pass on audio data to */ 62 + int AV_sync_state; /* sync audio and video? */ 63 + int mute_state; /* audio is muted */ 64 + audio_play_state_t play_state; /* current playback state */ 65 + audio_stream_source_t stream_source; /* current stream source */ 66 + audio_channel_select_t channel_select; /* currently selected channel */ 67 + int bypass_mode; /* pass on audio data to */ 68 68 audio_mixer_t mixer_state; /* current mixer state */ 69 69 } audio_status_t; /* separate decoder hardware */ 70 70 ··· 74 74 int vocal1; /* into left and right t at 70% each */ 75 75 int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/ 76 76 int melody; /* mixed into the left channel and */ 77 - /* Vocal2 into the right channel at 100% each. */ 78 - /* if Melody is non-zero, the melody channel gets mixed*/ 77 + /* Vocal2 into the right channel at 100% each. */ 78 + /* if Melody is non-zero, the melody channel gets mixed*/ 79 79 } audio_karaoke_t; /* into left and right */ 80 80 81 81
+18 -18
include/linux/dvb/ca.h
··· 27 27 /* slot interface types and info */ 28 28 29 29 typedef struct ca_slot_info { 30 - int num; /* slot number */ 30 + int num; /* slot number */ 31 31 32 - int type; /* CA interface this slot supports */ 32 + int type; /* CA interface this slot supports */ 33 33 #define CA_CI 1 /* CI high level interface */ 34 34 #define CA_CI_LINK 2 /* CI link layer level interface */ 35 35 #define CA_CI_PHYS 4 /* CI physical layer level interface */ 36 36 #define CA_DESCR 8 /* built-in descrambler */ 37 37 #define CA_SC 128 /* simple smart card interface */ 38 38 39 - unsigned int flags; 39 + unsigned int flags; 40 40 #define CA_CI_MODULE_PRESENT 1 /* module (or card) inserted */ 41 41 #define CA_CI_MODULE_READY 2 42 42 } ca_slot_info_t; ··· 45 45 /* descrambler types and info */ 46 46 47 47 typedef struct ca_descr_info { 48 - unsigned int num; /* number of available descramblers (keys) */ 49 - unsigned int type; /* type of supported scrambling system */ 48 + unsigned int num; /* number of available descramblers (keys) */ 49 + unsigned int type; /* type of supported scrambling system */ 50 50 #define CA_ECD 1 51 51 #define CA_NDS 2 52 52 #define CA_DSS 4 53 53 } ca_descr_info_t; 54 54 55 55 typedef struct ca_caps { 56 - unsigned int slot_num; /* total number of CA card and module slots */ 57 - unsigned int slot_type; /* OR of all supported types */ 58 - unsigned int descr_num; /* total number of descrambler slots (keys) */ 59 - unsigned int descr_type; /* OR of all supported types */ 56 + unsigned int slot_num; /* total number of CA card and module slots */ 57 + unsigned int slot_type; /* OR of all supported types */ 58 + unsigned int descr_num; /* total number of descrambler slots (keys) */ 59 + unsigned int descr_type; /* OR of all supported types */ 60 60 } ca_caps_t; 61 61 62 62 /* a message to/from a CI-CAM */ 63 63 typedef struct ca_msg { 64 - unsigned int index; 65 - unsigned int type; 66 - unsigned int length; 67 - unsigned char msg[256]; 64 + unsigned int index; 65 + unsigned int type; 66 + unsigned int length; 67 + unsigned char msg[256]; 68 68 } ca_msg_t; 69 69 70 70 typedef struct ca_descr { 71 - unsigned int index; 72 - unsigned int parity; /* 0 == even, 1 == odd */ 73 - unsigned char cw[8]; 71 + unsigned int index; 72 + unsigned int parity; /* 0 == even, 1 == odd */ 73 + unsigned char cw[8]; 74 74 } ca_descr_t; 75 75 76 76 typedef struct ca_pid { 77 - unsigned int pid; 78 - int index; /* -1 == disable*/ 77 + unsigned int pid; 78 + int index; /* -1 == disable*/ 79 79 } ca_pid_t; 80 80 81 81 #define CA_RESET _IO('o', 128)
+10 -10
include/linux/dvb/dmx.h
··· 1 - /* 1 + /* 2 2 * dmx.h 3 3 * 4 4 * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de> ··· 38 38 { 39 39 DMX_OUT_DECODER, /* Streaming directly to decoder. */ 40 40 DMX_OUT_TAP, /* Output going to a memory buffer */ 41 - /* (to be retrieved via the read command).*/ 41 + /* (to be retrieved via the read command).*/ 42 42 DMX_OUT_TS_TAP /* Output multiplexed into a new TS */ 43 - /* (to be retrieved by reading from the */ 44 - /* logical DVR device). */ 43 + /* (to be retrieved by reading from the */ 44 + /* logical DVR device). */ 45 45 } dmx_output_t; 46 46 47 47 ··· 54 54 55 55 typedef enum 56 56 { 57 - DMX_PES_AUDIO0, 57 + DMX_PES_AUDIO0, 58 58 DMX_PES_VIDEO0, 59 59 DMX_PES_TELETEXT0, 60 60 DMX_PES_SUBTITLE0, 61 61 DMX_PES_PCR0, 62 62 63 - DMX_PES_AUDIO1, 63 + DMX_PES_AUDIO1, 64 64 DMX_PES_VIDEO1, 65 65 DMX_PES_TELETEXT1, 66 66 DMX_PES_SUBTITLE1, 67 67 DMX_PES_PCR1, 68 68 69 - DMX_PES_AUDIO2, 69 + DMX_PES_AUDIO2, 70 70 DMX_PES_VIDEO2, 71 71 DMX_PES_TELETEXT2, 72 72 DMX_PES_SUBTITLE2, 73 73 DMX_PES_PCR2, 74 74 75 - DMX_PES_AUDIO3, 75 + DMX_PES_AUDIO3, 76 76 DMX_PES_VIDEO3, 77 77 DMX_PES_TELETEXT3, 78 78 DMX_PES_SUBTITLE3, ··· 90 90 91 91 typedef enum 92 92 { 93 - DMX_SCRAMBLING_EV, 94 - DMX_FRONTEND_EV 93 + DMX_SCRAMBLING_EV, 94 + DMX_FRONTEND_EV 95 95 } dmx_event_t; 96 96 97 97
+29 -29
include/linux/dvb/osd.h
··· 98 98 } OSD_Command; 99 99 100 100 typedef struct osd_cmd_s { 101 - OSD_Command cmd; 102 - int x0; 103 - int y0; 104 - int x1; 105 - int y1; 106 - int color; 107 - void __user *data; 101 + OSD_Command cmd; 102 + int x0; 103 + int y0; 104 + int x1; 105 + int y1; 106 + int color; 107 + void __user *data; 108 108 } osd_cmd_t; 109 109 110 110 /* OSD_OpenRaw: set 'color' to desired window type */ 111 111 typedef enum { 112 - OSD_BITMAP1, /* 1 bit bitmap */ 113 - OSD_BITMAP2, /* 2 bit bitmap */ 114 - OSD_BITMAP4, /* 4 bit bitmap */ 115 - OSD_BITMAP8, /* 8 bit bitmap */ 116 - OSD_BITMAP1HR, /* 1 Bit bitmap half resolution */ 117 - OSD_BITMAP2HR, /* 2 bit bitmap half resolution */ 118 - OSD_BITMAP4HR, /* 4 bit bitmap half resolution */ 119 - OSD_BITMAP8HR, /* 8 bit bitmap half resolution */ 120 - OSD_YCRCB422, /* 4:2:2 YCRCB Graphic Display */ 121 - OSD_YCRCB444, /* 4:4:4 YCRCB Graphic Display */ 122 - OSD_YCRCB444HR, /* 4:4:4 YCRCB graphic half resolution */ 123 - OSD_VIDEOTSIZE, /* True Size Normal MPEG Video Display */ 124 - OSD_VIDEOHSIZE, /* MPEG Video Display Half Resolution */ 125 - OSD_VIDEOQSIZE, /* MPEG Video Display Quarter Resolution */ 126 - OSD_VIDEODSIZE, /* MPEG Video Display Double Resolution */ 127 - OSD_VIDEOTHSIZE, /* True Size MPEG Video Display Half Resolution */ 128 - OSD_VIDEOTQSIZE, /* True Size MPEG Video Display Quarter Resolution*/ 129 - OSD_VIDEOTDSIZE, /* True Size MPEG Video Display Double Resolution */ 130 - OSD_VIDEONSIZE, /* Full Size MPEG Video Display */ 131 - OSD_CURSOR /* Cursor */ 112 + OSD_BITMAP1, /* 1 bit bitmap */ 113 + OSD_BITMAP2, /* 2 bit bitmap */ 114 + OSD_BITMAP4, /* 4 bit bitmap */ 115 + OSD_BITMAP8, /* 8 bit bitmap */ 116 + OSD_BITMAP1HR, /* 1 Bit bitmap half resolution */ 117 + OSD_BITMAP2HR, /* 2 bit bitmap half resolution */ 118 + OSD_BITMAP4HR, /* 4 bit bitmap half resolution */ 119 + OSD_BITMAP8HR, /* 8 bit bitmap half resolution */ 120 + OSD_YCRCB422, /* 4:2:2 YCRCB Graphic Display */ 121 + OSD_YCRCB444, /* 4:4:4 YCRCB Graphic Display */ 122 + OSD_YCRCB444HR, /* 4:4:4 YCRCB graphic half resolution */ 123 + OSD_VIDEOTSIZE, /* True Size Normal MPEG Video Display */ 124 + OSD_VIDEOHSIZE, /* MPEG Video Display Half Resolution */ 125 + OSD_VIDEOQSIZE, /* MPEG Video Display Quarter Resolution */ 126 + OSD_VIDEODSIZE, /* MPEG Video Display Double Resolution */ 127 + OSD_VIDEOTHSIZE, /* True Size MPEG Video Display Half Resolution */ 128 + OSD_VIDEOTQSIZE, /* True Size MPEG Video Display Quarter Resolution*/ 129 + OSD_VIDEOTDSIZE, /* True Size MPEG Video Display Double Resolution */ 130 + OSD_VIDEONSIZE, /* Full Size MPEG Video Display */ 131 + OSD_CURSOR /* Cursor */ 132 132 } osd_raw_window_t; 133 133 134 134 typedef struct osd_cap_s { 135 - int cmd; 135 + int cmd; 136 136 #define OSD_CAP_MEMSIZE 1 /* memory size */ 137 - long val; 137 + long val; 138 138 } osd_cap_t; 139 139 140 140
+22 -22
include/linux/dvb/video.h
··· 36 36 37 37 typedef enum { 38 38 VIDEO_FORMAT_4_3, /* Select 4:3 format */ 39 - VIDEO_FORMAT_16_9, /* Select 16:9 format. */ 39 + VIDEO_FORMAT_16_9, /* Select 16:9 format. */ 40 40 VIDEO_FORMAT_221_1 /* 2.21:1 */ 41 41 } video_format_t; 42 42 ··· 54 54 55 55 56 56 typedef enum { 57 - VIDEO_PAN_SCAN, /* use pan and scan format */ 57 + VIDEO_PAN_SCAN, /* use pan and scan format */ 58 58 VIDEO_LETTER_BOX, /* use letterbox format */ 59 59 VIDEO_CENTER_CUT_OUT /* use center cut out format */ 60 60 } video_displayformat_t; ··· 66 66 } video_size_t; 67 67 68 68 typedef enum { 69 - VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */ 69 + VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */ 70 70 VIDEO_SOURCE_MEMORY /* If this source is selected, the stream 71 71 comes from the user through the write 72 72 system call */ ··· 75 75 76 76 typedef enum { 77 77 VIDEO_STOPPED, /* Video is stopped */ 78 - VIDEO_PLAYING, /* Video is currently playing */ 78 + VIDEO_PLAYING, /* Video is currently playing */ 79 79 VIDEO_FREEZED /* Video is freezed */ 80 80 } video_play_state_t; 81 81 82 82 83 83 struct video_event { 84 - int32_t type; 84 + int32_t type; 85 85 #define VIDEO_EVENT_SIZE_CHANGED 1 86 86 #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 87 - time_t timestamp; 87 + time_t timestamp; 88 88 union { 89 - video_size_t size; 89 + video_size_t size; 90 90 unsigned int frame_rate; /* in frames per 1000sec */ 91 91 } u; 92 92 }; 93 93 94 94 95 95 struct video_status { 96 - int video_blank; /* blank video on freeze? */ 97 - video_play_state_t play_state; /* current state of playback */ 98 - video_stream_source_t stream_source; /* current source (demux/memory) */ 99 - video_format_t video_format; /* current aspect ratio of stream*/ 100 - video_displayformat_t display_format;/* selected cropping mode */ 96 + int video_blank; /* blank video on freeze? */ 97 + video_play_state_t play_state; /* current state of playback */ 98 + video_stream_source_t stream_source; /* current source (demux/memory) */ 99 + video_format_t video_format; /* current aspect ratio of stream*/ 100 + video_displayformat_t display_format;/* selected cropping mode */ 101 101 }; 102 102 103 103 104 104 struct video_still_picture { 105 - char __user *iFrame; /* pointer to a single iframe in memory */ 106 - int32_t size; 105 + char __user *iFrame; /* pointer to a single iframe in memory */ 106 + int32_t size; 107 107 }; 108 108 109 109 ··· 111 111 struct video_highlight { 112 112 int active; /* 1=show highlight, 0=hide highlight */ 113 113 uint8_t contrast1; /* 7- 4 Pattern pixel contrast */ 114 - /* 3- 0 Background pixel contrast */ 114 + /* 3- 0 Background pixel contrast */ 115 115 uint8_t contrast2; /* 7- 4 Emphasis pixel-2 contrast */ 116 - /* 3- 0 Emphasis pixel-1 contrast */ 116 + /* 3- 0 Emphasis pixel-1 contrast */ 117 117 uint8_t color1; /* 7- 4 Pattern pixel color */ 118 - /* 3- 0 Background pixel color */ 118 + /* 3- 0 Background pixel color */ 119 119 uint8_t color2; /* 7- 4 Emphasis pixel-2 color */ 120 - /* 3- 0 Emphasis pixel-1 color */ 120 + /* 3- 0 Emphasis pixel-1 color */ 121 121 uint32_t ypos; /* 23-22 auto action mode */ 122 - /* 21-12 start y */ 123 - /* 9- 0 end y */ 122 + /* 21-12 start y */ 123 + /* 9- 0 end y */ 124 124 uint32_t xpos; /* 23-22 button color number */ 125 - /* 21-12 start x */ 126 - /* 9- 0 end x */ 125 + /* 21-12 start x */ 126 + /* 9- 0 end x */ 127 127 } video_highlight_t; 128 128 129 129
+2 -2
include/media/saa7146.h
··· 112 112 113 113 /* different device locks */ 114 114 spinlock_t slock; 115 - struct semaphore lock; 115 + struct semaphore lock; 116 116 117 117 unsigned char __iomem *mem; /* pointer to mapped IO memory */ 118 118 int revision; /* chip revision; needed for bug-workarounds*/ ··· 133 133 void (*vv_callback)(struct saa7146_dev *dev, unsigned long status); 134 134 135 135 /* i2c-stuff */ 136 - struct semaphore i2c_lock; 136 + struct semaphore i2c_lock; 137 137 u32 i2c_bitrate; 138 138 struct saa7146_dma d_i2c; /* pointer to i2c memory */ 139 139 wait_queue_head_t i2c_wq;
+5 -5
include/media/saa7146_vv.h
··· 113 113 /* vbi capture */ 114 114 struct saa7146_dmaqueue vbi_q; 115 115 /* vbi workaround interrupt queue */ 116 - wait_queue_head_t vbi_wq; 116 + wait_queue_head_t vbi_wq; 117 117 int vbi_fieldcount; 118 118 struct saa7146_fh *vbi_streaming; 119 119 ··· 181 181 }; 182 182 183 183 struct saa7146_use_ops { 184 - void (*init)(struct saa7146_dev *, struct saa7146_vv *); 185 - int(*open)(struct saa7146_dev *, struct file *); 186 - void (*release)(struct saa7146_dev *, struct file *); 187 - void (*irq_done)(struct saa7146_dev *, unsigned long status); 184 + void (*init)(struct saa7146_dev *, struct saa7146_vv *); 185 + int(*open)(struct saa7146_dev *, struct file *); 186 + void (*release)(struct saa7146_dev *, struct file *); 187 + void (*irq_done)(struct saa7146_dev *, unsigned long status); 188 188 ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); 189 189 }; 190 190