[xtensa-cvscommit] linux/include/asm-xtensa addrspace.h,1.1.1.1,1.2

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/xtensa/linux/include/asm-xtensa
In directory sc8-pr-cvs1:/tmp/cvs-serv17851

Modified Files:
	addrspace.h 
Log Message:
Add casts to addrspace.h PHYSADDR() to avoid warnings building SONIC driver.


Index: addrspace.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/addrspace.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** addrspace.h	28 Aug 2002 16:11:31 -0000	1.1.1.1
--- addrspace.h	6 Feb 2003 01:25:38 -0000	1.2
***************
*** 11,17 ****
   * for more details.
   *
!  * Copyright (C) 2001 Tensilica Inc.
   *	Authors:	Joe Taylor <jo...@te..., jo...@ya...>
!  *			Marc Gauthier
   *			Chris Zankel <za...@te..., ch...@za...>
   */
--- 11,17 ----
   * for more details.
   *
!  * Copyright (C) 2001 - 2003 Tensilica Inc.
   *	Authors:	Joe Taylor <jo...@te..., jo...@ya...>
!  *			Marc Gauthier <ma...@te..., ma...@al...>
   *			Chris Zankel <za...@te..., ch...@za...>
   */
***************
*** 92,153 ****
   
  #define PHYSADDR(a)							     \
!     (((a) >= XCHAL_KSEG_BYPASS_VADDR					     \
!       && (a) < XCHAL_KSEG_BYPASS_VADDR + XCHAL_KSEG_BYPASS_SIZE) ?	     \
!         (a) - XCHAL_KSEG_BYPASS_VADDR + XCHAL_KSEG_BYPASS_PADDR :	     \
!         ((a) >= XCHAL_KSEG_CACHED_VADDR					     \
!          && a < XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_CACHED_SIZE) ?	     \
!             (a) - XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_CACHED_PADDR : (a))
  
  #define BYPASS_ADDR(a)							     \
!     (((a) >= XCHAL_KSEG_BYPASS_PADDR					     \
!       && (a) < XCHAL_KSEG_BYPASS_PADDR + XCHAL_KSEG_BYPASS_SIZE) ?	     \
!         (a) - XCHAL_KSEG_BYPASS_PADDR + XCHAL_KSEG_BYPASS_VADDR :	     \
!         ((a) >= XCHAL_KSEG_CACHED_PADDR					     \
!          && (a) < XCHAL_KSEG_CACHED_PADDR + XCHAL_KSEG_CACHED_SIZE) ?	     \
!             (a) - XCHAL_KSEG_CACHED_PADDR + XCHAL_KSEG_BYPASS_VADDR :	     \
!             ((a) >= XCHAL_KSEG_CACHED_VADDR				     \
!              && (a) < XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_CACHED_SIZE) ?    \
!                 (a) - XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_BYPASS_VADDR : (a))
   
  #define CACHED_ADDR(a)							     \
!     (((a) >= XCHAL_KSEG_BYPASS_PADDR					     \
!       && (a) < XCHAL_KSEG_BYPASS_PADDR + XCHAL_KSEG_BYPASS_SIZE) ?	     \
!         (a) - XCHAL_KSEG_BYPASS_PADDR + XCHAL_KSEG_CACHED_VADDR :	     \
!         ((a) >= XCHAL_KSEG_CACHED_PADDR					     \
!          && (a) < XCHAL_KSEG_CACHED_PADDR + XCHAL_KSEG_CACHED_SIZE) ?	     \
!             (a) - XCHAL_KSEG_CACHED_PADDR + XCHAL_KSEG_CACHED_VADDR :	     \
!             ((a) >= XCHAL_KSEG_BYPASS_VADDR				     \
!              && (a) < XCHAL_KSEG_BYPASS_VADDR + XCHAL_KSEG_BYPASS_SIZE) ?    \
!                 (a) - XCHAL_KSEG_BYPASS_VADDR + XCHAL_KSEG_CACHED_VADDR : (a))
  
  #define PHYSADDR_IO(a)							     \
!     (((a) >= XCHAL_KIO_BYPASS_VADDR					     \
!       && (a) < XCHAL_KIO_BYPASS_VADDR + XCHAL_KIO_BYPASS_SIZE) ?	     \
!         (a) - XCHAL_KIO_BYPASS_VADDR + XCHAL_KIO_BYPASS_PADDR :		     \
!         ((a) >= XCHAL_KIO_CACHED_VADDR					     \
!          && a < XCHAL_KIO_CACHED_VADDR + XCHAL_KIO_CACHED_SIZE) ?	     \
!             (a) - XCHAL_KIO_CACHED_VADDR + XCHAL_KIO_CACHED_PADDR : (a))
   
  #define BYPASS_ADDR_IO(a)						     \
!     (((a) >= XCHAL_KIO_BYPASS_PADDR					     \
!       && (a) < XCHAL_KIO_BYPASS_PADDR + XCHAL_KIO_BYPASS_SIZE) ?	     \
!         (a) - XCHAL_KIO_BYPASS_PADDR + XCHAL_KIO_BYPASS_VADDR :		     \
!         ((a) >= XCHAL_KIO_CACHED_PADDR					     \
!          && (a) < XCHAL_KIO_CACHED_PADDR + XCHAL_KIO_CACHED_SIZE) ?	     \
!             (a) - XCHAL_KIO_CACHED_PADDR + XCHAL_KIO_BYPASS_VADDR :	     \
!             ((a) >= XCHAL_KIO_CACHED_VADDR				     \
!              && (a) < XCHAL_KIO_CACHED_VADDR + XCHAL_KIO_CACHED_SIZE) ?	     \
!                 (a) - XCHAL_KIO_CACHED_VADDR + XCHAL_KIO_BYPASS_VADDR : (a))
   
  #define CACHED_ADDR_IO(a)						     \
!     (((a) >= XCHAL_KIO_BYPASS_PADDR					     \
!       && (a) < XCHAL_KIO_BYPASS_PADDR + XCHAL_KIO_BYPASS_SIZE) ?	     \
!         (a) - XCHAL_KIO_BYPASS_PADDR + XCHAL_KIO_CACHED_VADDR :		     \
!         ((a) >= XCHAL_KIO_CACHED_PADDR					     \
!          && (a) < XCHAL_KIO_CACHED_PADDR + XCHAL_KIO_CACHED_SIZE) ?	     \
!             (a) - XCHAL_KIO_CACHED_PADDR + XCHAL_KIO_CACHED_VADDR :	     \
!             ((a) >= XCHAL_KIO_BYPASS_VADDR				     \
!              && (a) < XCHAL_KIO_BYPASS_VADDR + XCHAL_KIO_BYPASS_SIZE) ?	     \
!                 (a) - XCHAL_KIO_BYPASS_VADDR + XCHAL_KIO_CACHED_VADDR : (a))
  
  #if 0
--- 92,153 ----
   
  #define PHYSADDR(a)							     \
!     (((unsigned)(a) >= XCHAL_KSEG_BYPASS_VADDR					     \
!       && (unsigned)(a) < XCHAL_KSEG_BYPASS_VADDR + XCHAL_KSEG_BYPASS_SIZE) ?	     \
!         (unsigned)(a) - XCHAL_KSEG_BYPASS_VADDR + XCHAL_KSEG_BYPASS_PADDR :	     \
!         ((unsigned)(a) >= XCHAL_KSEG_CACHED_VADDR					     \
!          && (unsigned)(a) < XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_CACHED_SIZE) ?	     \
!             (unsigned)(a) - XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_CACHED_PADDR : (unsigned)(a))
  
  #define BYPASS_ADDR(a)							     \
!     (((unsigned)(a) >= XCHAL_KSEG_BYPASS_PADDR					     \
!       && (unsigned)(a) < XCHAL_KSEG_BYPASS_PADDR + XCHAL_KSEG_BYPASS_SIZE) ?	     \
!         (unsigned)(a) - XCHAL_KSEG_BYPASS_PADDR + XCHAL_KSEG_BYPASS_VADDR :	     \
!         ((unsigned)(a) >= XCHAL_KSEG_CACHED_PADDR					     \
!          && (unsigned)(a) < XCHAL_KSEG_CACHED_PADDR + XCHAL_KSEG_CACHED_SIZE) ?	     \
!             (unsigned)(a) - XCHAL_KSEG_CACHED_PADDR + XCHAL_KSEG_BYPASS_VADDR :	     \
!             ((unsigned)(a) >= XCHAL_KSEG_CACHED_VADDR				     \
!              && (unsigned)(a) < XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_CACHED_SIZE) ?    \
!                 (unsigned)(a) - XCHAL_KSEG_CACHED_VADDR + XCHAL_KSEG_BYPASS_VADDR : (unsigned)(a))
   
  #define CACHED_ADDR(a)							     \
!     (((unsigned)(a) >= XCHAL_KSEG_BYPASS_PADDR					     \
!       && (unsigned)(a) < XCHAL_KSEG_BYPASS_PADDR + XCHAL_KSEG_BYPASS_SIZE) ?	     \
!         (unsigned)(a) - XCHAL_KSEG_BYPASS_PADDR + XCHAL_KSEG_CACHED_VADDR :	     \
!         ((unsigned)(a) >= XCHAL_KSEG_CACHED_PADDR					     \
!          && (unsigned)(a) < XCHAL_KSEG_CACHED_PADDR + XCHAL_KSEG_CACHED_SIZE) ?	     \
!             (unsigned)(a) - XCHAL_KSEG_CACHED_PADDR + XCHAL_KSEG_CACHED_VADDR :	     \
!             ((unsigned)(a) >= XCHAL_KSEG_BYPASS_VADDR				     \
!              && (unsigned)(a) < XCHAL_KSEG_BYPASS_VADDR + XCHAL_KSEG_BYPASS_SIZE) ?    \
!                 (unsigned)(a) - XCHAL_KSEG_BYPASS_VADDR + XCHAL_KSEG_CACHED_VADDR : (unsigned)(a))
  
  #define PHYSADDR_IO(a)							     \
!     (((unsigned)(a) >= XCHAL_KIO_BYPASS_VADDR					     \
!       && (unsigned)(a) < XCHAL_KIO_BYPASS_VADDR + XCHAL_KIO_BYPASS_SIZE) ?	     \
!         (unsigned)(a) - XCHAL_KIO_BYPASS_VADDR + XCHAL_KIO_BYPASS_PADDR :		     \
!         ((unsigned)(a) >= XCHAL_KIO_CACHED_VADDR					     \
!          && (unsigned)(a) < XCHAL_KIO_CACHED_VADDR + XCHAL_KIO_CACHED_SIZE) ?	     \
!             (unsigned)(a) - XCHAL_KIO_CACHED_VADDR + XCHAL_KIO_CACHED_PADDR : (unsigned)(a))
   
  #define BYPASS_ADDR_IO(a)						     \
!     (((unsigned)(a) >= XCHAL_KIO_BYPASS_PADDR					     \
!       && (unsigned)(a) < XCHAL_KIO_BYPASS_PADDR + XCHAL_KIO_BYPASS_SIZE) ?	     \
!         (unsigned)(a) - XCHAL_KIO_BYPASS_PADDR + XCHAL_KIO_BYPASS_VADDR :		     \
!         ((unsigned)(a) >= XCHAL_KIO_CACHED_PADDR					     \
!          && (unsigned)(a) < XCHAL_KIO_CACHED_PADDR + XCHAL_KIO_CACHED_SIZE) ?	     \
!             (unsigned)(a) - XCHAL_KIO_CACHED_PADDR + XCHAL_KIO_BYPASS_VADDR :	     \
!             ((unsigned)(a) >= XCHAL_KIO_CACHED_VADDR				     \
!              && (unsigned)(a) < XCHAL_KIO_CACHED_VADDR + XCHAL_KIO_CACHED_SIZE) ?	     \
!                 (unsigned)(a) - XCHAL_KIO_CACHED_VADDR + XCHAL_KIO_BYPASS_VADDR : (unsigned)(a))
   
  #define CACHED_ADDR_IO(a)						     \
!     (((unsigned)(a) >= XCHAL_KIO_BYPASS_PADDR					     \
!       && (unsigned)(a) < XCHAL_KIO_BYPASS_PADDR + XCHAL_KIO_BYPASS_SIZE) ?	     \
!         (unsigned)(a) - XCHAL_KIO_BYPASS_PADDR + XCHAL_KIO_CACHED_VADDR :		     \
!         ((unsigned)(a) >= XCHAL_KIO_CACHED_PADDR					     \
!          && (unsigned)(a) < XCHAL_KIO_CACHED_PADDR + XCHAL_KIO_CACHED_SIZE) ?	     \
!             (unsigned)(a) - XCHAL_KIO_CACHED_PADDR + XCHAL_KIO_CACHED_VADDR :	     \
!             ((unsigned)(a) >= XCHAL_KIO_BYPASS_VADDR				     \
!              && (unsigned)(a) < XCHAL_KIO_BYPASS_VADDR + XCHAL_KIO_BYPASS_SIZE) ?	     \
!                 (unsigned)(a) - XCHAL_KIO_BYPASS_VADDR + XCHAL_KIO_CACHED_VADDR : (unsigned)(a))
  
  #if 0