[Linux-mips-commits]CVS: linux/include/asm-mips64 pci.h,1.2,1.3

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv13912

Modified Files:
	pci.h 
Log Message:
Synced up.

Index: pci.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/pci.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pci.h	2001/08/22 18:18:14	1.2
--- pci.h	2001/09/04 16:16:15	1.3
***************
*** 71,74 ****
--- 71,92 ----
  				void *vaddr, dma_addr_t dma_handle);
  
+ 
+ #ifdef CONFIG_MAPPED_PCI_IO
+ 
+ extern dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size,
+                                  int direction);
+ extern void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
+                              size_t size, int direction);
+ extern int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents,
+                       int direction);
+ extern void pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg,
+                          int nents, int direction);
+ extern void pci_dma_sync_single(struct pci_dev *hwdev, dma_addr_t dma_handle,
+                                 size_t size, int direction);
+ extern void pci_dma_sync_sg(struct pci_dev *hwdev, struct scatterlist *sg,
+                             int nelems, int direction);
+ 
+ #else /* CONFIG_MAPPED_PCI_IO  */
+ 
  /*
   * Map a single buffer of the indicated size for DMA in streaming mode.
***************
*** 78,82 ****
   * until either pci_unmap_single or pci_dma_sync_single is performed.
   */
! extern inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr,
  					size_t size, int direction)
  {
--- 96,100 ----
   * until either pci_unmap_single or pci_dma_sync_single is performed.
   */
! static inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr,
  					size_t size, int direction)
  {
***************
*** 87,91 ****
  	dma_cache_wback_inv((unsigned long)ptr, size);
  #endif
! 	return (bus_to_baddr[hwdev->bus->number] | __pa(ptr));
  }
  
--- 105,109 ----
  	dma_cache_wback_inv((unsigned long)ptr, size);
  #endif
! 	return virt_to_bus(ptr);
  }
  
***************
*** 98,102 ****
   * whatever the device wrote there.
   */
! extern inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
  				    size_t size, int direction)
  {
--- 116,120 ----
   * whatever the device wrote there.
   */
! static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
  				    size_t size, int direction)
  {
***************
*** 123,127 ****
   * the same here.
   */
! extern inline int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
  			     int nents, int direction)
  {
--- 141,145 ----
   * the same here.
   */
! static inline int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
  			     int nents, int direction)
  {
***************
*** 147,151 ****
   * pci_unmap_single() above.
   */
! extern inline void pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg,
  				int nents, int direction)
  {
--- 165,169 ----
   * pci_unmap_single() above.
   */
! static inline void pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg,
  				int nents, int direction)
  {
***************
*** 166,170 ****
   * device again owns the buffer.
   */
! extern inline void pci_dma_sync_single(struct pci_dev *hwdev,
  				       dma_addr_t dma_handle,
  				       size_t size, int direction)
--- 184,188 ----
   * device again owns the buffer.
   */
! static inline void pci_dma_sync_single(struct pci_dev *hwdev,
  				       dma_addr_t dma_handle,
  				       size_t size, int direction)
***************
*** 184,188 ****
   * same rules and usage.
   */
! extern inline void pci_dma_sync_sg(struct pci_dev *hwdev,
  				   struct scatterlist *sg,
  				   int nelems, int direction)
--- 202,206 ----
   * same rules and usage.
   */
! static inline void pci_dma_sync_sg(struct pci_dev *hwdev,
  				   struct scatterlist *sg,
  				   int nelems, int direction)
***************
*** 201,206 ****
  #endif
  }
  
! extern inline int pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask)
  {
  	/*
--- 219,225 ----
  #endif
  }
+ #endif /* CONFIG_MAPPED_PCI_IO  */
  
! static inline int pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask)
  {
  	/*
***************
*** 215,219 ****
  }
  
! /* Return the index of the PCI controller for device. */
  #define pci_controller_num(pdev)	(0)
  
--- 234,240 ----
  }
  
! /*
!  * Return the index of the PCI controller for device.
!  */
  #define pci_controller_num(pdev)	(0)