Changeset 26549

Timestamp:

02/28/14 18:46:41 (9 years ago)

Author:

obi

Message:

fix build

Location:

titan/titan

Files:

• fb.h (modified) (10 diffs)
• mipselport.h (modified) (6 diffs)
• sh4port.h (modified) (1 diff)

titan/titan/fb.h

@@ -13 +13 @@
                 node = node->next;
         }
-        debug(100, "framebuffer not found (%s)", name);
+        debug(444, "framebuffer not found (%s)", name);
         return NULL;
 }
@@ -112 +112 @@
         }
 
-        debug(100, "fbname=%s, fbwidth=%d, fbheight=%d, fbcol=%d, fbsize=%ld", newnode->name, newnode->width, newnode->height, newnode->colbytes, newnode->varfbsize);
+        debug(444, "fbname=%s, fbwidth=%d, fbheight=%d, fbcol=%d, fbsize=%ld", newnode->name, newnode->width, newnode->height, newnode->colbytes, newnode->varfbsize);
         return newnode;
 }
@@ -194 +194 @@
 
 // blinking work start
-#ifdef EPLAYER4
+#ifdef MIPSEL
         if (fd < 0)
         {
@@ -231 +231 @@
         }
 
-        debug(100, "%dk video mem", fix_screeninfo.smem_len/1024);
-
+        debug(444, "%dk video mem", fix_screeninfo.smem_len/1024);
+
+#ifdef MIPSEL
         lfb = (unsigned char*)mmap(0, fix_screeninfo.smem_len, PROT_WRITE|PROT_READ, MAP_SHARED, fd, 0);
         if (!lfb)
@@ -240 +241 @@
         }
 
-#ifdef EPLAYER4
         if (var_screeninfo.bits_per_pixel != 32)
         {
-                debug(100, "Only 32 bit per pixel supported. Framebuffer currently use %d", var_screeninfo.bits_per_pixel);
+                debug(444, "Only 32 bit per pixel supported. Framebuffer currently use %d", var_screeninfo.bits_per_pixel);
                 closefb();
                 return 0;
@@ -266 +266 @@
         return node;
 
-// blinking work start
+#ifdef MIPSEL
 nolfb:
         if (fd >= 0)
@@ -274 +274 @@
         }
 
-        debug(100, "framebuffer not available.");
-
+        debug(444, "framebuffer not available.");
+#endif
         return 0;
 // blinking work end
@@ -283 +283 @@
 {
 
-#ifdef EPLAYER4
+#ifdef MIPSEL
         if(lfb)
         {
-                debug(100, "ms_sync");
+                debug(444, "ms_sync");
                 msync(lfb, fix_screeninfo.smem_len, MS_SYNC);
                 munmap(lfb, fix_screeninfo.smem_len);
@@ -292 +292 @@
         if(fb->fd >= 0)
         {
-                debug(100, "close");
+                debug(444, "close");
                 disablemanualblit();
                 close(fb->fd);
@@ -337 +337 @@
 void changefbresolution(char *value, int flag)
 {
-        debug(100, "fb->colbytes: %d", fb->colbytes);
-#ifdef EPLAYER4
+        debug(444, "fb->colbytes: %d", fb->colbytes);
+#ifdef MIPSEL
         return;
 #endif

titan/titan/mipselport.h

@@ -153 +153 @@
         }
         
-        debug(100, "FB: line_length %d", fix_screeninfo.line_length);
-        debug(100, "FB: var_screeninfo.xres %d", var_screeninfo.xres);
-        debug(100, "FB: var_screeninfo.yres %d", var_screeninfo.yres);
-        debug(100, "FB: var_screeninfo.xres_virt %d", var_screeninfo.xres_virtual);
-        debug(100, "FB: var_screeninfo.yres_virt %d", var_screeninfo.yres_virtual);
-        debug(100, "FB: var_screeninfo.xoffset %d", var_screeninfo.xoffset);
-        debug(100, "FB: var_screeninfo.yoffset %d", var_screeninfo.yoffset);
-        debug(100, "FB: var_screeninfo.bits_per_pixel %d", var_screeninfo.bits_per_pixel);
-        debug(100, "FB: var_screeninfo.grayscale %d", var_screeninfo.grayscale);
+        debug(444, "FB: line_length %d", fix_screeninfo.line_length);
+        debug(444, "FB: var_screeninfo.xres %d", var_screeninfo.xres);
+        debug(444, "FB: var_screeninfo.yres %d", var_screeninfo.yres);
+        debug(444, "FB: var_screeninfo.xres_virt %d", var_screeninfo.xres_virtual);
+        debug(444, "FB: var_screeninfo.yres_virt %d", var_screeninfo.yres_virtual);
+        debug(444, "FB: var_screeninfo.xoffset %d", var_screeninfo.xoffset);
+        debug(444, "FB: var_screeninfo.yoffset %d", var_screeninfo.yoffset);
+        debug(444, "FB: var_screeninfo.bits_per_pixel %d", var_screeninfo.bits_per_pixel);
+        debug(444, "FB: var_screeninfo.grayscale %d", var_screeninfo.grayscale);
 
         if(ioctl(fb->fd, FBIOPUT_VSCREENINFO, &var_screeninfo) < 0)
@@ -170 +170 @@
                         perr("FBIOPUT_VSCREENINFO");
                 }
-                debug(100, "FB: double buffering not available");
-        }
-        else
-        {
-                debug(100, "FB: double buffering available!");
+                debug(444, "FB: double buffering not available");
+        }
+        else
+        {
+                debug(444, "FB: double buffering available!");
         }
 
@@ -180 +180 @@
 //      if ((var_screeninfo.xres!=fb->width) && (var_screeninfo.yres!=fb->height) && (var_screeninfo.bits_per_pixel!=fb->colbytes))
 //      {
-                debug(100, "SetMode failed: wanted: %dx%dx%d, got %dx%dx%d",
+                debug(444, "SetMode failed: wanted: %dx%dx%d, got %dx%dx%d",
                         fb->width, fb->height, fb->colbytes,
                         var_screeninfo.xres, var_screeninfo.yres, var_screeninfo.bits_per_pixel);
@@ -872 +872 @@
 int setvmpeg(struct dvbdev* node, int value, int flag)
 {
-        debug(1000, "in");
+        debug(4440, "in");
         char* vmpegdev = NULL, *tmpstr = NULL, *buf = NULL;
         int ret = 0;
@@ -901 +901 @@
                 snprintf(buf, MINMALLOC, vmpegdev, node->devnr);
                 snprintf(tmpstr, 10, "%x", value);
-                debug(100, "set %s to %s", buf, tmpstr);
+                debug(444, "set %s to %s", buf, tmpstr);
                 status.tvpic = 1;
                 ret = writesys(buf, tmpstr, 1);
@@ -910 +910 @@
         }
 
-        debug(1000, "out");
+        debug(4440, "out");
         return 0;
 }

titan/titan/sh4port.h

@@ -774 +774 @@
                 snprintf(buf, MINMALLOC, vmpegdev, node->devnr);
                 snprintf(tmpstr, MINMALLOC, "%x %x %x %x", posx, posy, width, height);
-                debug(100, "set %s to %s", buf, tmpstr);
+                debug(444, "set %s to %s", buf, tmpstr);
 
                 status.tvpic = 1;