Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 612 → Rev 613

/shark/trunk/drivers/bttv/btcx-risc.c
51,10 → 51,12
void btcx_riscmem_free(struct pci_dev *pci,
struct btcx_riscmem *risc)
{
if (NULL == risc)
return;
if (NULL == risc->cpu)
return;
pci_free_consistent(pci, risc->size, risc->cpu, risc->dma);
vfree_32((void *)risc->cpu);
vfree((void *)risc->cpu);
memset(risc,0,sizeof(*risc));
if (debug) {
memcnt--;
/shark/trunk/drivers/bttv/bttv-driver.c
43,9 → 43,9
unsigned int bttv_num; /* number of Bt848s in use */
struct bttv bttvs[BTTV_MAX];
 
unsigned int bttv_debug = 0;
unsigned int bttv_debug = 1;
unsigned int bttv_verbose = 1;
unsigned int bttv_gpio = 0;
unsigned int bttv_gpio = 1;
 
/* config variables */
#ifdef __BIG_ENDIAN
/shark/trunk/drivers/linuxc26/linuxcomp.c
374,17 → 374,23
diff = (unsigned long)((((unsigned long)mem/4)+1)*4-(unsigned long)mem);
*(unsigned long *)(mem+diff) = *(unsigned long *)(mem-4) - diff - 4;
*(unsigned long *)(mem+diff) = diff;
return (mem+diff+4);
return ((void *)((unsigned long)(mem+diff+4) | 0x80000000));
}
 
void vfree(void *addr) {
 
if (addr != NULL)
free(addr);
if (addr == NULL) return;
 
if (((unsigned long)(addr) & 0x80000000) == 0x80000000) {
free(addr-*(unsigned long *)(addr-4)-4);
return;
}
 
free(addr);
 
return;
 
}