--- trunk/src/devices/dev_fb.c	2007/10/08 16:18:31	11
+++ trunk/src/devices/dev_fb.c	2007/10/08 16:18:38	12
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: dev_fb.c,v 1.99 2005/06/26 13:49:06 debug Exp $
+ *  $Id: dev_fb.c,v 1.106 2005/08/14 11:14:38 debug Exp $
  *  
  *  Generic framebuffer device.
  *
@@ -65,14 +65,7 @@
 #endif
 
 
-#define	FB_TICK_SHIFT		18
-
-#define	LOGO_XSIZE		256
-#define	LOGO_YSIZE		256
-#define	LOGO_BOTTOM_MARGIN	60
-/*  This must be a 256*256 pixels P4 ppm:  */
-#include "fb_logo.c"
-unsigned char *fb_logo = fb_logo_ppm + 11;
+#define	FB_TICK_SHIFT		19
 
 
 /*  #define FB_DEBUG  */
@@ -480,7 +473,7 @@
 		return;
 	}
 
-	/*  scaledown != 1:  */
+	/*  scaledown > 1:  */
 
 	scaledown = d->vfb_scaledown;
 	scaledownXscaledown = scaledown * scaledown;
@@ -623,12 +616,11 @@
 	if (!cpu->machine->use_x11)
 		return;
 
-#ifdef BINTRANS
 	do {
-		uint64_t low = -1, high;
+		uint64_t high, low = (uint64_t)(int64_t) -1;
 		int x, y;
 
-		memory_device_bintrans_access(cpu, cpu->mem,
+		memory_device_dyntrans_access(cpu, cpu->mem,
 		    extra, &low, &high);
 		if ((int64_t)low == -1)
 			break;
@@ -689,7 +681,6 @@
 			d->update_x2 = d->xsize-1;
 		}
 	} while (0);
-#endif
 
 #ifdef WITH_X11
 	/*  Do we need to redraw the cursor?  */
@@ -928,11 +919,11 @@
  */
 struct vfb_data *dev_fb_init(struct machine *machine, struct memory *mem,
 	uint64_t baseaddr, int vfb_type, int visible_xsize, int visible_ysize,
-	int xsize, int ysize, int bit_depth, char *name, int logo)
+	int xsize, int ysize, int bit_depth, char *name)
 {
 	struct vfb_data *d;
 	size_t size, nlen;
-	int x, y, flags;
+	int flags;
 	char title[400];
 	char *name2;
 
@@ -1016,27 +1007,6 @@
 	d->update_x2 = d->update_y2 = -1;
 
 
-	/*  A nice bootup logo:  */
-	if (logo) {
-		int logo_bottom_margin = LOGO_BOTTOM_MARGIN;
-
-		d->update_x1 = 0;
-		d->update_x2 = LOGO_XSIZE-1;
-		d->update_y1 = d->visible_ysize-LOGO_YSIZE-logo_bottom_margin;
-		d->update_y2 = d->visible_ysize-logo_bottom_margin;
-		for (y=0; y<LOGO_YSIZE; y++)
-			for (x=0; x<LOGO_XSIZE; x++) {
-				int s, a = ((y + d->visible_ysize - LOGO_YSIZE
-				    - logo_bottom_margin)*d->xsize + x)
-				    * d->bit_depth / 8;
-				int b = fb_logo[(y*LOGO_XSIZE+x) / 8] &
-				    (128 >> (x&7));
-				for (s=0; s<d->bit_depth / 8; s++)
-					if (a+s >= 0 && a+s < size)
-						d->framebuffer[a+s] = b? 0:255;
-			}
-	}
-
 	/*  Don't set the title to include the size of the framebuffer for
 	    VGA, since then the resolution might change during runtime.  */
 	if (strcmp(name, "VGA") == 0)
@@ -1064,7 +1034,7 @@
 
 	flags = MEM_DEFAULT;
 	if ((baseaddr & 0xfff) == 0)
-		flags = MEM_BINTRANS_OK | MEM_BINTRANS_WRITE_OK;
+		flags = MEM_DYNTRANS_OK | MEM_DYNTRANS_WRITE_OK;
 
 	flags |= MEM_READING_HAS_NO_SIDE_EFFECTS;