/shark/trunk/config/mk/gnu.mk |
---|
29,6 → 29,10 |
CFG_OPT += -DVM86 |
endif |
ifeq ($(findstring FORCE_PXC,$(FG)) , FORCE_PXC) |
CFG_OPT += -D__FORCE_PXC__ |
endif |
ifeq ($(findstring NEW,$(TRACER)) , NEW) |
ifeq ($(TSC),TRUE) |
CFG_OPT += -D__NEW_TRACER__ |
/shark/trunk/config/mk/linux.mk |
---|
29,6 → 29,10 |
CFG_OPT += -DVM86 |
endif |
ifeq ($(findstring FORCE_PXC,$(FG)) , FORCE_PXC) |
CFG_OPT += -D__FORCE_PXC__ |
endif |
ifeq ($(findstring NEW,$(TRACER)) , NEW) |
ifeq ($(TSC),TRUE) |
CFG_OPT += -D__NEW_TRACER__ |
/shark/trunk/config/config.mk |
---|
29,6 → 29,10 |
CFG_OPT += -DVM86 |
endif |
ifeq ($(findstring FORCE_PXC,$(FG)) , FORCE_PXC) |
CFG_OPT += -D__FORCE_PXC__ |
endif |
ifeq ($(findstring NEW,$(TRACER)) , NEW) |
ifeq ($(TSC),TRUE) |
CFG_OPT += -D__NEW_TRACER__ |
/shark/trunk/shark.cfg |
---|
48,3 → 48,10 |
# use a specific driver to enable it |
# VGA16 enable the VGA16 (4 bpp) video mode |
FB = VESA |
# Select the FrameGrabber Configuration |
# FG = NORMAL, FORCE_PXC |
# NORMAL default mode |
# FORCE_PXC it forces the frame grabber to init a PXC200 card |
FG = NORMAL |
/shark/trunk/drivers/bttv/include/drivers/fg.h |
---|
File deleted |
/shark/trunk/drivers/bttv/bttv-driver.c |
---|
2292,7 → 2292,7 |
if (NULL == btv->fbuf.base) |
return -EINVAL; |
if (!fh->ov.setup_ok) { |
dprintk("bttv%d: overlay: !setup_ok\n",btv->nr); |
//dprintk("bttv%d: overlay: !setup_ok\n",btv->nr); |
return -EINVAL; |
} |
} |
/shark/trunk/drivers/bttv/bttv-cards.c |
---|
262,7 → 262,7 |
{ 0xa0fca1a0, BTTV_ZOLTRIX, "Face to Face Tvmax" }, |
{ 0x01010071, BTTV_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, |
// likely broken, vendor id doesn't match the other magic views ... |
{ 0x200A1295, BTTV_PXC200, "Imagenation PXC200"}, |
//{ 0xa0fca04f, BTTV_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, |
{ 0, -1, NULL } |
2203,6 → 2203,9 |
if (BTTV_UNKNOWN == btv->type) { |
bttv_readee(btv,eeprom_data,0xa0); |
identify_by_eeprom(btv,eeprom_data); |
#ifdef __FORCE_PXC__ |
init_PXC200(btv); |
#endif |
} |
switch (btv->type) { |
/shark/trunk/drivers/linuxc26/videodev.c |
---|
389,7 → 389,8 |
void *file = NULL; |
int bttv_open(struct inode *inode, struct file *file); |
int bttv_release(struct inode *inode, struct file *file); |
/* Shark Inode emulation - Open */ |
int videodev_open_inode(int num) { |