gwj / at91sam9263 · Commits

Commit ae184e4ab773aaef59226412ddf602a790170dc3

Authored by bellard
1 parent e6eccb38

dac write index register is r/w - CR1D access fix (Volker Ruppert) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@978 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 6 additions and 2 deletions
hw/cirrus_vga.c
  View file @ae184e4
@@ -1492,6 +1492,7 @@ cirrus_hook_write_cr(CirrusVGAState * s, unsigned reg_index, int reg_value) @@ -1492,6 +1492,7 @@ cirrus_hook_write_cr(CirrusVGAState * s, unsigned reg_index, int reg_value)
1492 case 0x1a: // Miscellaneous Control 1492 case 0x1a: // Miscellaneous Control
1493 case 0x1b: // Extended Display Control 1493 case 0x1b: // Extended Display Control
1494 case 0x1c: // Sync Adjust and Genlock 1494 case 0x1c: // Sync Adjust and Genlock
  1495 + case 0x1d: // Overlay Extended Control
1495 s->cr[reg_index] = reg_value; 1496 s->cr[reg_index] = reg_value;
1496 #ifdef DEBUG_CIRRUS 1497 #ifdef DEBUG_CIRRUS
1497 printf("cirrus: handled outport cr_index %02x, cr_value %02x\n", 1498 printf("cirrus: handled outport cr_index %02x, cr_value %02x\n",
@@ -1503,7 +1504,6 @@ cirrus_hook_write_cr(CirrusVGAState * s, unsigned reg_index, int reg_value) @@ -1503,7 +1504,6 @@ cirrus_hook_write_cr(CirrusVGAState * s, unsigned reg_index, int reg_value)
1503 case 0x26: // Attribute Controller Index Readback (R) 1504 case 0x26: // Attribute Controller Index Readback (R)
1504 case 0x27: // Part ID (R) 1505 case 0x27: // Part ID (R)
1505 break; 1506 break;
1506 - case 0x1d: // Overlay Extended Control  
1507 case 0x25: // Part Status 1507 case 0x25: // Part Status
1508 default: 1508 default:
1509 #ifdef DEBUG_CIRRUS 1509 #ifdef DEBUG_CIRRUS
@@ -2440,7 +2440,11 @@ static uint32_t vga_ioport_read(void *opaque, uint32_t addr) @@ -2440,7 +2440,11 @@ static uint32_t vga_ioport_read(void *opaque, uint32_t addr)
2440 case 0x3c7: 2440 case 0x3c7:
2441 val = s->dac_state; 2441 val = s->dac_state;
2442 break; 2442 break;
2443 - case 0x3c9: 2443 + case 0x3c8:
  2444 + val = s->dac_write_index;
  2445 + s->cirrus_hidden_dac_lockindex = 0;
  2446 + break;
  2447 + case 0x3c9:
2444 if (cirrus_hook_read_palette(s, &val)) 2448 if (cirrus_hook_read_palette(s, &val))
2445 break; 2449 break;
2446 val = s->palette[s->dac_read_index * 3 + s->dac_sub_index]; 2450 val = s->palette[s->dac_read_index * 3 + s->dac_sub_index];