diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 25 | ||||
| -rw-r--r-- | v4l/.cvsignore | 4 | ||||
| -rw-r--r-- | v4l/Makefile | 4 |
3 files changed, 28 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 3641441fd..cd790a558 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -3157,10 +3157,27 @@ static struct video_device radio_template = /* ----------------------------------------------------------------------- */ /* irq handler */ -static char *irq_name[] = { "FMTCHG", "VSYNC", "HSYNC", "OFLOW", "HLOCK", - "VPRES", "6", "7", "I2CDONE", "GPINT", "10", - "RISCI", "FBUS", "FTRGT", "FDSR", "PPERR", - "RIPERR", "PABORT", "OCERR", "SCERR" }; +static char *irq_name[] = { + "FMTCHG", // format change detected (525 vs. 625) + "VSYNC", // vertical sync (new field) + "HSYNC", // horizontal sync + "OFLOW", // chroma/luma AGC overflow + "HLOCK", // horizontal lock changed + "VPRES", // video presence changed + "6", "7", + "I2CDONE", // hw irc operation finished + "GPINT", // gpio port triggered irq + "10", + "RISCI", // risc instruction triggered irq + "FBUS", // pixel data fifo dropped data (high pci bus latencies) + "FTRGT", // pixel data fifo overrun + "FDSR", // fifo data stream resyncronisation + "PPERR", // parity error (data transfer) + "RIPERR", // parity error (read risc instructions) + "PABORT", // pci abort + "OCERR", // risc instruction error + "SCERR", // syncronisation error +}; static void bttv_print_irqbits(u32 print, u32 mark) { diff --git a/v4l/.cvsignore b/v4l/.cvsignore new file mode 100644 index 000000000..e2696832b --- /dev/null +++ b/v4l/.cvsignore @@ -0,0 +1,4 @@ +*.ko +*.mod.c +.*.cmd +.version diff --git a/v4l/Makefile b/v4l/Makefile index e376afeb9..9df6f7a56 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -106,7 +106,7 @@ endif LC_ALL = POSIX export LC_ALL -default:: +default:: linux media $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules install:: @@ -117,6 +117,8 @@ clean:: -rm -f *~ *.o *.ko *.mod.c -rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd +linux media: + ln -s . $@ ################################################# # build tarballs |