gwj / at91sam9263 · Commits

Commit 2053152b7fb7049600dfe6e5cbe43490e58aa166

Authored by ths
1 parent 74287114

Single mode for PIC i8259, by Bernhard Kauer. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2575 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 6 additions and 3 deletions
hw/i8259.c
  View file @2053152
@@ -44,6 +44,7 @@ typedef struct PicState { @@ -44,6 +44,7 @@ typedef struct PicState {
44 uint8_t rotate_on_auto_eoi; 44 uint8_t rotate_on_auto_eoi;
45 uint8_t special_fully_nested_mode; 45 uint8_t special_fully_nested_mode;
46 uint8_t init4; /* true if 4 byte init */ 46 uint8_t init4; /* true if 4 byte init */
  47 + uint8_t single_mode; /* true if slave pic is not initialized */
47 uint8_t elcr; /* PIIX edge/trigger selection*/ 48 uint8_t elcr; /* PIIX edge/trigger selection*/
48 uint8_t elcr_mask; 49 uint8_t elcr_mask;
49 PicState2 *pics_state; 50 PicState2 *pics_state;
@@ -278,6 +279,7 @@ static void pic_reset(void *opaque) @@ -278,6 +279,7 @@ static void pic_reset(void *opaque)
278 s->rotate_on_auto_eoi = 0; 279 s->rotate_on_auto_eoi = 0;
279 s->special_fully_nested_mode = 0; 280 s->special_fully_nested_mode = 0;
280 s->init4 = 0; 281 s->init4 = 0;
  282 + s->single_mode = 0;
281 /* Note: ELCR is not reset */ 283 /* Note: ELCR is not reset */
282 } 284 }
283 285
@@ -298,8 +300,7 @@ static void pic_ioport_write(void *opaque, uint32_t addr, uint32_t val) @@ -298,8 +300,7 @@ static void pic_ioport_write(void *opaque, uint32_t addr, uint32_t val)
298 s->pics_state->irq_request(s->pics_state->irq_request_opaque, 0); 300 s->pics_state->irq_request(s->pics_state->irq_request_opaque, 0);
299 s->init_state = 1; 301 s->init_state = 1;
300 s->init4 = val & 1; 302 s->init4 = val & 1;
301 - if (val & 0x02)  
302 - hw_error("single mode not supported"); 303 + s->single_mode = val & 2;
303 if (val & 0x08) 304 if (val & 0x08)
304 hw_error("level sensitive irq not supported"); 305 hw_error("level sensitive irq not supported");
305 } else if (val & 0x08) { 306 } else if (val & 0x08) {
@@ -356,7 +357,7 @@ static void pic_ioport_write(void *opaque, uint32_t addr, uint32_t val) @@ -356,7 +357,7 @@ static void pic_ioport_write(void *opaque, uint32_t addr, uint32_t val)
356 break; 357 break;
357 case 1: 358 case 1:
358 s->irq_base = val & 0xf8; 359 s->irq_base = val & 0xf8;
359 - s->init_state = 2; 360 + s->init_state = s->single_mode && s->init4 ? 3 : 2;
360 break; 361 break;
361 case 2: 362 case 2:
362 if (s->init4) { 363 if (s->init4) {
@@ -468,6 +469,7 @@ static void pic_save(QEMUFile *f, void *opaque) @@ -468,6 +469,7 @@ static void pic_save(QEMUFile *f, void *opaque)
468 qemu_put_8s(f, &s->rotate_on_auto_eoi); 469 qemu_put_8s(f, &s->rotate_on_auto_eoi);
469 qemu_put_8s(f, &s->special_fully_nested_mode); 470 qemu_put_8s(f, &s->special_fully_nested_mode);
470 qemu_put_8s(f, &s->init4); 471 qemu_put_8s(f, &s->init4);
  472 + qemu_put_8s(f, &s->single_mode);
471 qemu_put_8s(f, &s->elcr); 473 qemu_put_8s(f, &s->elcr);
472 } 474 }
473 475
@@ -492,6 +494,7 @@ static int pic_load(QEMUFile *f, void *opaque, int version_id) @@ -492,6 +494,7 @@ static int pic_load(QEMUFile *f, void *opaque, int version_id)
492 qemu_get_8s(f, &s->rotate_on_auto_eoi); 494 qemu_get_8s(f, &s->rotate_on_auto_eoi);
493 qemu_get_8s(f, &s->special_fully_nested_mode); 495 qemu_get_8s(f, &s->special_fully_nested_mode);
494 qemu_get_8s(f, &s->init4); 496 qemu_get_8s(f, &s->init4);
  497 + qemu_get_8s(f, &s->single_mode);
495 qemu_get_8s(f, &s->elcr); 498 qemu_get_8s(f, &s->elcr);
496 return 0; 499 return 0;
497 } 500 }