← Back to branch summary

~ubuntu-branches/ubuntu/quantal/vice/quantal

« back to all changes in this revision

Viewing changes to src/vdc/vdc-mem.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2006-07-30 19:15:59 UTC
  • mto: (9.1.1 lenny) (1.1.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20060730191559-g31ymd2mk102kzff
Tags: upstream-1.19
Import upstream version 1.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/vdc/vdc-mem.c
257
257
 
258
258
      case 20:                  /* R20/21 Attribute Start Address hi/lo */
259
259
      case 21:
260
 
        vdc.attribute_adr = ((vdc.regs[20] << 8) | vdc.regs[21])
261
 
                            & vdc.vdc_address_mask;
 
260
        /* Attribute address will be taken at first displayed line.  */
262
261
#ifdef REG_DEBUG
263
262
        log_message(vdc.log, "Update attribute_adr: %x.", vdc.attribute_adr);
264
263
#endif
296
295
        break;
297
296
 
298
297
      case 25:
299
 
        if (7 - (vdc.regs[25] & 7) != vdc.xsmooth) {
 
298
        if ((vdc.regs[25] & 15) != vdc.xsmooth) {
300
299
#ifdef ALLOW_UNALIGNED_ACCESS
301
 
            vdc.xsmooth = 7 - (vdc.regs[25] & 7);
 
300
            vdc.xsmooth = (vdc.regs[25] & 15);
302
301
            vdc.raster.xsmooth = vdc.xsmooth;
303
302
#else
304
303
            vdc.xsmooth = 0;
318
317
        break;
319
318
 
320
319
      case 26:
321
 
        if ((!(vdc.regs[25] & 0x40)) && (vdc.regs[26] != oldval))
 
320
        if ((vdc.regs[26] != oldval) && ((vdc.regs[25] & 0xC0) != 0xC0))
322
321
            vdc.force_repaint = 1;
323
322
#ifdef REG_DEBUG
324
323
        log_message(vdc.log, "Color register %x.", vdc.regs[26]);
405
404
        return 0xff;
406
405
    } else {
407
406
        /* Emulate vblank bit.  */
408
 
        if (vdc.raster.current_line > vdc.last_displayed_line)
 
407
        if ((vdc.raster.current_line < vdc.first_displayed_line) ||
 
408
           (vdc.raster.current_line > vdc.last_displayed_line))
409
409
            return 0xb8 | vdc.revision;
410
410
 
411
411
        return 0x98 | vdc.revision;