From: Justin Wind <justin.wind@gmail.com>
Date: Fri, 25 May 2012 03:05:40 +0000 (-0700)
Subject: merge
X-Git-Url: http://git.squeep.com/?p=dcpu16;a=commitdiff_plain;h=a4194ad128ad2b396f3b483da1b48a7a9dedda2f;hp=-c

merge
---

a4194ad128ad2b396f3b483da1b48a7a9dedda2f
diff --combined hw_lem1802.c
index c54455d,4cdaa2f..5029541
--- a/hw_lem1802.c
+++ b/hw_lem1802.c
@@@ -466,22 -466,18 +466,22 @@@ void lem1802_hwi_(struct dcpu16 *vm, st
              display->video_base = reg_b;
              if (reg_b == 0)
                  display->cycle_activated = 0;
 +            MSG_DEBUG(vm, "%s>> video_base:0x%04x", __func__, reg_b);
              break;
  
          case 1: /* MEM_MAP_FONT */
              display->font_base = reg_b;
 +            MSG_DEBUG(vm, "%s>> font_base:0x%04x", __func__, reg_b);
              break;
  
          case 2: /* MEM_MAP_PALETTE */
              display->palette_base = reg_b;
 +            MSG_DEBUG(vm, "%s>> palette_base:0x%04x", __func__, reg_b);
              break;
  
          case 3: /* SET_BORDER_COLOR */
              display->border_color = reg_b & 0x000f;
 +            MSG_DEBUG(vm, "%s>> border_color_index:0x%01x", __func__, reg_b & 0x000f);
              break;
  
          case 4: /* MEM_DUMP_FONT */
@@@ -489,7 -485,6 +489,7 @@@
              display->cycle_state_copy_dst_addr_ = reg_b;
              display->cycle_state_copy_words_ = 256;
              display->cycle_state_ = CYCLE_COPY_TO_RAM;
 +            MSG_DEBUG(vm, "%s>> copying default font into 0x%04x - 0x%04x", __func__, reg_b, reg_b + 256);
              dcpu16_cycle_inc(vm, 256);
              break;
  
@@@ -498,7 -493,6 +498,7 @@@
              display->cycle_state_copy_dst_addr_ = reg_b;
              display->cycle_state_copy_words_ = 16;
              display->cycle_state_ = CYCLE_COPY_TO_RAM;
 +            MSG_DEBUG(vm, "%s>> copying default palette into 0x%04x - 0x%04x", __func__, reg_b, reg_b + 16);
              dcpu16_cycle_inc(vm, 16);
              break;
      }
@@@ -606,8 -600,6 +606,8 @@@ int lem1802_data_ctl_(struct dcpu16_hw 
              display->blink_rate = *rate_in;
          }
  
 +        MSG_DEBUG(hw->vm, "%s>> %s now:%u was:%u", __func__, "blink_rate", *rate_in, *rate_out);
 +
          return 0;
      }
  
@@@ -624,8 -616,6 +624,8 @@@
              display->refresh_rate = *rate_in;
          }
  
 +        MSG_DEBUG(hw->vm, "%s>> %s now:%u was:%u", __func__, "refresh_rate", *rate_in, *rate_out);
 +
          return 0;
      }
  
@@@ -639,8 -629,6 +639,8 @@@
  
          *s_out = lem1802_rfb_new_(in->argc, in->argv);
  
 +        MSG_DEBUG(hw->vm, "%s>> %s s:%p", __func__, "new_rfbScreen", *s_out);
 +
          return 0;
      }
  
@@@ -655,8 -643,6 +655,8 @@@
          rfbScreen->desktopName = "NYA ELEKTRISKA LEM1802";
          rfbScreen->frameBuffer = (char *)display->pixbuf;
  
 +        MSG_DEBUG(hw->vm, "%s>> %s rfbScreen:%p", __func__, "associate_rfbScreen", rfbScreen);
 +
          return 0;
      }
  #endif /* HAVE_LIBVNCSERVER */
@@@ -673,8 -659,6 +673,8 @@@
  
          (void)lem1802_renderers_iter_(iterp, &parg->name, &parg->args);
  
 +        MSG_DEBUG(hw->vm, "%s>> %s", __func__, "renderers_iter");
 +
          return 0;
      }
  
@@@ -687,7 -671,7 +687,7 @@@
          for (r = lem1802_renderers_; r->renderer; r++) {
              if (strcmp(renderer, r->name) == 0) {
                  display->render = r->renderer;
-                 MSG_DEBUG(hw->vm, "%s>> %s set to %s", __func__, "renderer", renderer);
+                 MSG_DEBUG(hw->vm, "%s>> renderer set to %s", __func__, renderer);
                  return 0;
              }
          }
@@@ -703,8 -687,6 +703,8 @@@
  
          display->renderer_data = data_in;
  
 +        MSG_DEBUG(hw->vm, "%s>> %s data:%p", __func__, "renderer_data", data_in);
 +
          return 0;
      }