[fuse-emulator-cvs] fuse/ui/fb fbdisplay.c,1.26,1.27 fbkeyboard.c,1.25,1.26

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/ui/fb
In directory sc8-pr-cvs1:/tmp/cvs-serv4792/ui/fb

Modified Files:
	fbdisplay.c fbkeyboard.c 
Log Message:
Fix up framebuffer UI (Darren).


Index: fbdisplay.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/fb/fbdisplay.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** fbdisplay.c	6 May 2003 14:35:30 -0000	1.26
--- fbdisplay.c	7 Oct 2003 11:05:44 -0000	1.27
***************
*** 56,62 ****
  
  /* A scaled copy of the image displayed on the Spectrum's screen */
! static WORD scaled_image[2*DISPLAY_SCREEN_HEIGHT][2*DISPLAY_SCREEN_WIDTH];
  static const ptrdiff_t scaled_pitch =
!                                      2 * DISPLAY_SCREEN_WIDTH * sizeof( WORD );
  
  /* Are we in a Timex display mode? */
--- 56,63 ----
  
  /* A scaled copy of the image displayed on the Spectrum's screen */
! static libspectrum_word
!   scaled_image[2*DISPLAY_SCREEN_HEIGHT][2*DISPLAY_SCREEN_WIDTH];
  static const ptrdiff_t scaled_pitch =
!   2 * DISPLAY_SCREEN_WIDTH * sizeof( libspectrum_word );
  
  /* Are we in a Timex display mode? */
***************
*** 72,76 ****
  
  static int fb_fd = -1;		/* The framebuffer's file descriptor */
! static WORD *image = 0, *gm = 0;
  
  static struct fb_fix_screeninfo fixed;
--- 73,77 ----
  
  static int fb_fd = -1;		/* The framebuffer's file descriptor */
! static libspectrum_word *image = 0, *gm = 0;
  
  static struct fb_fix_screeninfo fixed;
***************
*** 263,267 ****
      {
        int i;
!       WORD *point;
  
        if( hires ) {
--- 264,268 ----
      {
        int i;
!       libspectrum_word *point;
  
        if( hires ) {
***************
*** 289,293 ****
      {
        int i;
!       WORD *point;
  
        if( hires ) {
--- 290,294 ----
      {
        int i;
!       libspectrum_word *point;
  
        if( hires ) {
***************
*** 313,317 ****
      {
        int i;
!       WORD *point;
  
        for( i = 0, point = gm + y * display.xres_virtual + x;
--- 314,318 ----
      {
        int i;
!       libspectrum_word *point;
  
        for( i = 0, point = gm + y * display.xres_virtual + x;

Index: fbkeyboard.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/fb/fbkeyboard.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** fbkeyboard.c	7 Feb 2003 19:22:49 -0000	1.25
--- fbkeyboard.c	7 Oct 2003 11:05:44 -0000	1.26
***************
*** 1,4 ****
  /* fbkeyboard.c: routines for dealing with the linux fbdev display
!    Copyright (c) 2000-2002 Philip Kendall, Matan Ziv-Av, Darren Salt
  
     $Id$
--- 1,4 ----
  /* fbkeyboard.c: routines for dealing with the linux fbdev display
!    Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Darren Salt
  
     $Id$
***************
*** 29,32 ****
--- 29,33 ----
  #ifdef UI_FB			/* Use this iff we're using fbdev */
  
+ #include <stdio.h>
  #include <errno.h>
  #include <linux/kd.h>