[Linux-mips-commits]CVS: linux/drivers/video epson1356fb.c,1.3,1.4 epson1356fb.h,1.2,1.3 fbmem.c,1.3,1.4

[Steve L. <slo...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv21704

Modified Files:
	epson1356fb.c epson1356fb.h fbmem.c 
Log Message:
Some changes to SED1356 driver:
  - indent to Linux kernel style
  - intentional 32-bit VA unaligning when mmap'ing.


Index: epson1356fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/epson1356fb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** epson1356fb.c	2001/08/28 07:23:54	1.3
--- epson1356fb.c	2001/08/30 21:41:05	1.4
***************
*** 84,87 ****
--- 84,89 ----
   *  Frame buffer device API
   */
+ static int e1356fb_open(struct fb_info *fb, int user);
+ static int e1356fb_release(struct fb_info *fb, int user);
  static int e1356fb_get_fix(struct fb_fix_screeninfo* fix, 
  			   int con,
***************
*** 186,199 ****
  
[...4906 lines suppressed...]
! 	info->reg.lcd_inkcurs : info->reg.crttv_inkcurs;
  
!     fb_info.fb_size -= 1024;
!     // program cursor base address
!     writeb(0x00, &inkcurs->start_addr);
!     printk("e1356fb: reserving 1024 bytes for the hwcursor at %p\n",
! 	   fb_info.membase_virt + fb_info.fb_size);
  }
--- 2820,2830 ----
  e1356fb_hwcursor_init(struct fb_info_e1356* info)
  {
! 	reg_inkcurs_t* inkcurs = (IS_PANEL(info->fix.disp_type)) ?
! 		info->reg.lcd_inkcurs : info->reg.crttv_inkcurs;
  
! 	fb_info.fb_size -= 1024;
! 	// program cursor base address
! 	writeb(0x00, &inkcurs->start_addr);
! 	printk("e1356fb: reserving 1024 bytes for the hwcursor at %p\n",
! 	       fb_info.membase_virt + fb_info.fb_size);
  }

Index: epson1356fb.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/epson1356fb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** epson1356fb.h	2001/08/17 22:53:26	1.2
--- epson1356fb.h	2001/08/30 21:41:05	1.3
***************
*** 56,61 ****
  #define REG_BASE_BASIC     0x00
  typedef struct {
!     u8 rev_code;           // 00
!     u8 misc;               // 01
  } reg_basic_t;
  
--- 56,61 ----
  #define REG_BASE_BASIC     0x00
  typedef struct {
! 	u8 rev_code;           // 00
[...997 lines suppressed...]
! 			40000, 40000, 14318, 14318,
! 			DISP_TYPE_TFT,
! 			0, 0,
! 			0, 16,
! 			0, 0,
  #ifdef CONFIG_MTRR
! 			0,
  #endif
! 			0,
! 			{0},
! 			"640x480@85"
! 		},
! 		{   // par
! 			0, 0, 1024, 768, 16, 2,
! 			// timings will be set by modedb
! 			{0}, 0, 0, 0, 0, 0, 0, 0, 0,
! 			16
! 		}
  	}
  };

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fbmem.c	2001/08/25 02:19:28	1.3
--- fbmem.c	2001/08/30 21:41:05	1.4
***************
*** 130,133 ****
--- 130,135 ----
  extern int e1355fb_init(void);
  extern int e1355fb_setup(char*);
+ extern int e1356fb_init(void);
+ extern int e1356fb_setup(char*);
  extern int pvr2fb_init(void);
  extern int pvr2fb_setup(char*);
***************
*** 283,286 ****
--- 285,291 ----
  #ifdef CONFIG_FB_E1355
  	{ "e1355fb", e1355fb_init, e1355fb_setup },
+ #endif
+ #ifdef CONFIG_FB_E1356
+         { "e1356fb", e1356fb_init, e1356fb_setup },
  #endif
  #ifdef CONFIG_FB_PVR2