[linuxdc-cvs] CVS: linux/include/asm-sh io_powervr2dc.h,1.1,1.2 powervr2dc.h,1.1,1.2

[M. R. B. <mr...@us...>]

Update of /cvsroot/linuxdc/linux/include/asm-sh
In directory usw-pr-cvs1:/tmp/cvs-serv31881/include/asm-sh

Modified Files:
	io_powervr2dc.h powervr2dc.h 
Log Message:
Initial PCI and BBA support

Index: io_powervr2dc.h
===================================================================
RCS file: /cvsroot/linuxdc/linux/include/asm-sh/io_powervr2dc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** io_powervr2dc.h	2001/02/21 15:18:50	1.1
--- io_powervr2dc.h	2001/03/11 11:10:33	1.2
***************
*** 18,35 ****
  #include <linux/types.h>
  
! /* Not implemented quite yet. */
! /*
! extern unsigned char  powervr2dc_inb(unsigned long port);
  extern unsigned short powervr2dc_inw(unsigned long port);
! extern unsigned int  powervr2dc_inl(unsigned long port);
  
  extern void powervr2dc_outb(unsigned char value, unsigned long port);
  extern void powervr2dc_outw(unsigned short value, unsigned long port);
  extern void powervr2dc_outl(unsigned int value, unsigned long port);
- */
  
  /* The mysterious IRQ9 */
  extern int powervr2dc_irq_demux(int irq);
  
  #ifdef __WANT_IO_DEF
  
--- 18,43 ----
  #include <linux/types.h>
  
! extern unsigned char powervr2dc_inb(unsigned long port);
  extern unsigned short powervr2dc_inw(unsigned long port);
! extern unsigned int powervr2dc_inl(unsigned long port);
  
  extern void powervr2dc_outb(unsigned char value, unsigned long port);
  extern void powervr2dc_outw(unsigned short value, unsigned long port);
  extern void powervr2dc_outl(unsigned int value, unsigned long port);
  
+ extern unsigned char  powervr2dc_readb(unsigned long addr);
+ extern unsigned short powervr2dc_readw(unsigned long addr);
+ extern unsigned int   powervr2dc_readl(unsigned long addr);
+ 
+ extern void powervr2dc_writeb(unsigned char value, unsigned long addr);
+ extern void powervr2dc_writew(unsigned short value, unsigned long addr);
+ extern void powervr2dc_writel(unsigned int value, unsigned long addr);
+ 
  /* The mysterious IRQ9 */
  extern int powervr2dc_irq_demux(int irq);
  
+ /* This is in the machvec, so it needs to be proto'd here. */
+ extern void gaps_init_pci(void);
+ 
  #ifdef __WANT_IO_DEF
  
***************
*** 55,64 ****
  # define __outsl		generic_outsl
  
! # define __readb		generic_readb
! # define __readw		generic_readw
! # define __readl		generic_readl
! # define __writeb		generic_writeb
! # define __writew		generic_writew
! # define __writel		generic_writel
  
  /* This may change soon... */
--- 63,72 ----
  # define __outsl		generic_outsl
  
! # define __readb		powervr2dc_readb
! # define __readw		powervr2dc_readw
! # define __readl		powervr2dc_readl
! # define __writeb		powervr2dc_writeb
! # define __writew		powervr2dc_writew
! # define __writel		powervr2dc_writel
  
  /* This may change soon... */

Index: powervr2dc.h
===================================================================
RCS file: /cvsroot/linuxdc/linux/include/asm-sh/powervr2dc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** powervr2dc.h	2001/02/21 15:18:50	1.1
--- powervr2dc.h	2001/03/11 11:10:33	1.2
***************
*** 72,74 ****
--- 72,78 ----
  #define PVR2DC_REG_VERSION	0xa05f8004
  
+ /* G2 Bus registers */
+ 
+ #define PVR2DC_G2_STATUS	0xa05f688c	/* Current state of the bus */
+ 
  #endif /* __ASM_POWERVR2DC_H */