Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 613 → Rev 614

/shark/trunk/libc/stdlib/free.c
20,11 → 20,11
 
/**
------------
CVS : $Id: free.c,v 1.1.1.1 2002-03-29 14:12:53 pj Exp $
CVS : $Id: free.c,v 1.2 2004-05-07 10:09:10 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-03-29 14:12:53 $
Revision: $Revision: 1.2 $
Last update: $Date: 2004-05-07 10:09:10 $
------------
 
**/
62,6 → 62,10
f = kern_fsave();
//kern_cli();
p -= sizeof(size_t);
if (*(size_t *)p == 0) {
kern_frestore(f);
return;
}
kern_free(p,*((size_t *)p));
//kern_sti();
kern_frestore(f);
/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 = 1;
unsigned int bttv_debug = 0;
unsigned int bttv_verbose = 1;
unsigned int bttv_gpio = 1;
unsigned int bttv_gpio = 0;
 
/* config variables */
#ifdef __BIG_ENDIAN
/shark/trunk/drivers/bttv/bttv-risc.c
495,9 → 495,9
void
bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf)
{
if (in_interrupt())
BUG();
//videobuf_waiton(&buf->vb,0,0);
//if (in_interrupt())
// BUG();
videobuf_waiton(&buf->vb,0,0);
//videobuf_dma_pci_unmap(btv->dev, &buf->vb.dma);
//videobuf_dma_free(&buf->vb.dma);
btcx_riscmem_free(btv->dev,&buf->bottom);