Diff for /qemu/hw/tcx.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2018/04/24 16:37:52 version 1.1.1.2, 2018/04/24 16:41:35
Line 37  typedef struct TCXState { Line 37  typedef struct TCXState {
     uint8_t dac_index, dac_state;      uint8_t dac_index, dac_state;
 } TCXState;  } TCXState;
   
   static void tcx_screen_dump(void *opaque, const char *filename);
   
 static void tcx_draw_line32(TCXState *s1, uint8_t *d,   static void tcx_draw_line32(TCXState *s1, uint8_t *d, 
                             const uint8_t *s, int width)                              const uint8_t *s, int width)
 {  {
Line 81  static void tcx_draw_line8(TCXState *s1, Line 83  static void tcx_draw_line8(TCXState *s1,
   
 /* Fixed line length 1024 allows us to do nice tricks not possible on  /* Fixed line length 1024 allows us to do nice tricks not possible on
    VGA... */     VGA... */
 void tcx_update_display(void *opaque)  static void tcx_update_display(void *opaque)
 {  {
     TCXState *ts = opaque;      TCXState *ts = opaque;
     uint32_t page;      uint32_t page;
Line 158  void tcx_update_display(void *opaque) Line 160  void tcx_update_display(void *opaque)
     }      }
 }  }
   
 void tcx_invalidate_display(void *opaque)  static void tcx_invalidate_display(void *opaque)
 {  {
     TCXState *s = opaque;      TCXState *s = opaque;
     int i;      int i;
Line 269  static CPUWriteMemoryFunc *tcx_dac_write Line 271  static CPUWriteMemoryFunc *tcx_dac_write
     tcx_dac_writel,      tcx_dac_writel,
 };  };
   
 void *tcx_init(DisplayState *ds, uint32_t addr, uint8_t *vram_base,  void tcx_init(DisplayState *ds, uint32_t addr, uint8_t *vram_base,
                unsigned long vram_offset, int vram_size, int width, int height)                unsigned long vram_offset, int vram_size, int width, int height)
 {  {
     TCXState *s;      TCXState *s;
     int io_memory;      int io_memory;
   
     s = qemu_mallocz(sizeof(TCXState));      s = qemu_mallocz(sizeof(TCXState));
     if (!s)      if (!s)
         return NULL;          return;
     s->ds = ds;      s->ds = ds;
     s->addr = addr;      s->addr = addr;
     s->vram = vram_base;      s->vram = vram_base;
Line 289  void *tcx_init(DisplayState *ds, uint32_ Line 291  void *tcx_init(DisplayState *ds, uint32_
     io_memory = cpu_register_io_memory(0, tcx_dac_read, tcx_dac_write, s);      io_memory = cpu_register_io_memory(0, tcx_dac_read, tcx_dac_write, s);
     cpu_register_physical_memory(addr + 0x200000, TCX_DAC_NREGS, io_memory);      cpu_register_physical_memory(addr + 0x200000, TCX_DAC_NREGS, io_memory);
   
       graphic_console_init(s->ds, tcx_update_display, tcx_invalidate_display,
                            tcx_screen_dump, s);
     register_savevm("tcx", addr, 1, tcx_save, tcx_load, s);      register_savevm("tcx", addr, 1, tcx_save, tcx_load, s);
     qemu_register_reset(tcx_reset, s);      qemu_register_reset(tcx_reset, s);
     tcx_reset(s);      tcx_reset(s);
     dpy_resize(s->ds, width, height);      dpy_resize(s->ds, width, height);
     return s;  
 }  }
   
 void tcx_screen_dump(void *opaque, const char *filename)  static void tcx_screen_dump(void *opaque, const char *filename)
 {  {
     TCXState *s = opaque;      TCXState *s = opaque;
     FILE *f;      FILE *f;

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


unix.superglobalmegacorp.com