Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 605 → Rev 604

/shark/trunk/drivers/bttv/shark_bttv26.c
30,15 → 30,11
return bttv_installed;
}
 
extern int videodev_init(void);
 
int BTTV26_init() {
 
if (bttv_installed == TRUE)
return 0;
 
videodev_init();
 
bttv_init_module();
 
bttv_installed = TRUE;
/shark/trunk/drivers/bttv/makefile
10,7 → 10,7
 
OBJS_PATH = $(BASE)/drivers/bttv
 
OBJS = bttv-if.o btcx-risc.o bttv-cards.o bttv-driver.o bttv-risc.o shark_bttv26.o
OBJS = bttv-if.o btcx-risc.o bttv-cards.o bttv-driver.o bttv-risc.o fg.o shark_bttv26.o
 
OTHERINCL += -I$(BASE)/drivers/bttv/include -I$(BASE)/drivers/linuxc26/include -I.
 
/shark/trunk/drivers/bttv/bttv-driver.c
2099,7 → 2099,6
return retval;
};
#endif
 
switch (cmd) {
 
/* *** v4l1 *** ************************************************ */
/shark/trunk/drivers/bttv/fg.c
0,0 → 1,22
/* Fast Frame Grabber for SHARK
*
* Giacomo Guidi
* <giacomo@gandalf.sssup.it>
*
*/
 
#include <drivers/fg.h>
 
#include <linuxcomp.h>
 
#include <linux/videodev2.h>
 
extern int bttv_ioctl_inode(int num, unsigned int cmg, void *arg);
 
int FG_init(unsigned int period, unsigned int wcet, unsigned int width,
unsigned int height, unsigned int color, unsigned int channel) {
return 0;
}
 
/shark/trunk/drivers/bttv/bttv-cards.c
2377,10 → 2377,12
if (autoload)
request_module("tda7432");
}
 
if (bttv_tvcards[btv->type].needs_tvaudio) {
if (autoload)
request_module("tvaudio");
}
 
/* tuner modules */
if (btv->pinnacle_id != UNSET) {
if (autoload)