[Gc-linux-cvs] linux/include/linux linux_logo.h, NONE, 1.1 fb.h, 1.36, 1.37

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/include/linux
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/include/linux

Modified Files:
	fb.h 
Added Files:
	linux_logo.h 
Log Message:
Forward to v2.6.31.


--- NEW FILE: linux_logo.h ---
#ifndef _LINUX_LINUX_LOGO_H
#define _LINUX_LINUX_LOGO_H

/*
 *  Linux logo to be displayed on boot
 *
 *  Copyright (C) 1996 Larry Ewing (le...@is...)
 *  Copyright (C) 1996,1998 Jakub Jelinek (jj...@su...)
 *  Copyright (C) 2001 Greg Banks <gn...@al...>
 *  Copyright (C) 2001 Jan-Benedict Glaw <jb...@lu...>
 *  Copyright (C) 2003 Geert Uytterhoeven <ge...@li...>
 *
 *  Serial_console ascii image can be any size,
 *  but should contain %s to display the version
 */

#include <linux/init.h>


#define LINUX_LOGO_MONO		1	/* monochrome black/white */
#define LINUX_LOGO_VGA16	2	/* 16 colors VGA text palette */
#define LINUX_LOGO_CLUT224	3	/* 224 colors */
#define LINUX_LOGO_GRAY256	4	/* 256 levels grayscale */


struct linux_logo {
	int type;			/* one of LINUX_LOGO_* */
	unsigned int width;
	unsigned int height;
	unsigned int clutsize;		/* LINUX_LOGO_CLUT224 only */
	const unsigned char *clut;	/* LINUX_LOGO_CLUT224 only */
	const unsigned char *data;
};

extern const struct linux_logo logo_linux_mono;
extern const struct linux_logo logo_linux_vga16;
extern const struct linux_logo logo_linux_clut224;
extern const struct linux_logo logo_blackfin_vga16;
extern const struct linux_logo logo_blackfin_clut224;
extern const struct linux_logo logo_dec_clut224;
extern const struct linux_logo logo_mac_clut224;
extern const struct linux_logo logo_parisc_clut224;
extern const struct linux_logo logo_sgi_clut224;
extern const struct linux_logo logo_sun_clut224;
extern const struct linux_logo logo_superh_mono;
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
extern const struct linux_logo logo_m32r_clut224;
extern const struct linux_logo logo_spe_clut224;

extern const struct linux_logo *fb_find_logo(int depth);
#ifdef CONFIG_FB_LOGO_EXTRA
extern void fb_append_extra_logo(const struct linux_logo *logo,
				 unsigned int n);
#else
static inline void fb_append_extra_logo(const struct linux_logo *logo,
					unsigned int n)
{}
#endif

#endif /* _LINUX_LINUX_LOGO_H */

Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** fb.h	25 Oct 2009 18:53:46 -0000	1.36
--- fb.h	25 Oct 2009 18:56:56 -0000	1.37
***************
*** 678,681 ****
--- 678,684 ----
  	void (*fb_get_caps)(struct fb_info *info, struct fb_blit_caps *caps,
  			    struct fb_var_screeninfo *var);
+ 
+ 	/* teardown any resources to do with this framebuffer */
+ 	void (*fb_destroy)(struct fb_info *info);
  };
  
***************
*** 787,790 ****
--- 790,795 ----
  						  from userspace */
  #define FBINFO_MISC_TILEBLITTING       0x20000 /* use tile blitting */
+ #define FBINFO_MISC_FIRMWARE           0x40000 /* a replaceable firmware
+ 						  inited framebuffer */
  
  /* A driver may set this flag to indicate that it does want a set_par to be
***************
*** 815,818 ****
--- 820,824 ----
  	int flags;
  	struct mutex lock;		/* Lock for open/release/ioctl funcs */
+ 	struct mutex mm_lock;		/* Lock for fb_mmap and smem_* fields */
  	struct fb_var_screeninfo var;	/* Current var */
  	struct fb_fix_screeninfo fix;	/* Current fix */
***************
*** 855,859 ****
  	void *fbcon_par;                /* fbcon use-only private area */
  	/* From here on everything is device dependent */
! 	void *par;	
  };
  
--- 861,870 ----
  	void *fbcon_par;                /* fbcon use-only private area */
  	/* From here on everything is device dependent */
! 	void *par;
! 	/* we need the PCI or similiar aperture base/size not
! 	   smem_start/size as smem_start may just be an object
! 	   allocated inside the aperture so may not actually overlap */
! 	resource_size_t aperture_base;
! 	resource_size_t aperture_size;
  };
  
***************
*** 894,898 ****
  #define fb_memset sbus_memset_io
  
! #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__)
  
  #define fb_readb __raw_readb
--- 905,909 ----
  #define fb_memset sbus_memset_io
  
! #elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__)
  
  #define fb_readb __raw_readb