Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1046 → Rev 1047

/shark/trunk/drivers/linuxc26/include/linux/pci.h
1,5 → 1,5
/*
* $Id: pci.h,v 1.3 2004-02-20 11:35:57 giacomo Exp $
* $Id: pci.h,v 1.4 2006-07-04 15:21:01 mauro Exp $
*
* PCI defines and function prototypes
* Copyright 1994, Drew Eckhardt
691,6 → 691,8
void *pci_pool_alloc (struct pci_pool *pool, int flags, dma_addr_t *handle);
void pci_pool_free (struct pci_pool *pool, void *vaddr, dma_addr_t addr);
 
void *pci_pool_alloc_usb (struct pci_pool *pool, int flags, dma_addr_t *handle);
 
#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
extern struct pci_dev *isa_bridge;
#endif
/shark/trunk/drivers/linuxc26/include/linux/vmalloc.h
24,8 → 24,10
*/
extern void *vmalloc(unsigned long size);
extern void *vmalloc_32(unsigned long size);
extern void *vmalloc_32_usb(unsigned long size);
extern void *__vmalloc(unsigned long size, int gfp_mask, pgprot_t prot);
extern void vfree(void *addr);
extern void vfree_usb(void *addr);
 
extern void *vmap(struct page **pages, unsigned int count,
unsigned long flags, pgprot_t prot);
/shark/trunk/drivers/linuxc26/include/asm/dma-mapping.h
7,8 → 7,11
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
 
void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, int flag);
dma_addr_t *dma_handle, int flag);
 
void *dma_alloc_coherent_usb(struct device *dev, size_t size,
dma_addr_t *dma_handle, int flag);
 
void dma_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle);
 
/shark/trunk/drivers/linuxc26/include/asm-generic/pci-dma-compat.h
22,6 → 22,13
return dma_alloc_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, dma_handle, GFP_ATOMIC);
}
 
static inline void *
pci_alloc_consistent_usb(struct pci_dev *hwdev, size_t size,
dma_addr_t *dma_handle)
{
return dma_alloc_coherent_usb(hwdev == NULL ? NULL : &hwdev->dev, size, dma_handle, GFP_ATOMIC);
}
 
static inline void
pci_free_consistent(struct pci_dev *hwdev, size_t size,
void *vaddr, dma_addr_t dma_handle)