X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8259a.c;fp=palacios%2Fsrc%2Fdevices%2F8259a.c;h=34851dd83fb164e57b593ca2edeb21948f571fc1;hp=443fb0aacdfddcc060a07a984c7875ab3d7e52c6;hb=de6084de2145f3889a16d8498e5e7d44e96e0162;hpb=87b1679efe8bee960b65cfd730188ccc94966b71 diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c index 443fb0a..34851dd 100644 --- a/palacios/src/devices/8259a.c +++ b/palacios/src/devices/8259a.c @@ -421,6 +421,8 @@ static int write_master_port1(ushort_t port, void * src, uint_t length, struct v return -1; } + v3_clear_pending_intr(dev->vm); + if (IS_ICW1(cw)) { PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Master1)\n", cw); @@ -483,12 +485,16 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v return -1; } + v3_clear_pending_intr(dev->vm); + if (state->master_state == ICW2) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1); PrintDebug("8259 PIC: Setting ICW2 = %x (wr_Master2)\n", cw); state->master_icw2 = cw; + + if (cw1->sngl == 0) { state->master_state = ICW3; } else if (cw1->ic4 == 1) { @@ -497,6 +503,8 @@ static int write_master_port2(ushort_t port, void * src, uint_t length, struct v state->master_state = READY; } + + } else if (state->master_state == ICW3) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1); @@ -539,6 +547,8 @@ static int write_slave_port1(ushort_t port, void * src, uint_t length, struct vm return -1; } + v3_clear_pending_intr(dev->vm); + if (IS_ICW1(cw)) { PrintDebug("8259 PIC: Setting ICW1 = %x (wr_Slave1)\n", cw); state->slave_icw1 = cw; @@ -597,6 +607,9 @@ static int write_slave_port2(ushort_t port, void * src, uint_t length, struct vm return -1; } + v3_clear_pending_intr(dev->vm); + + if (state->slave_state == ICW2) { struct icw1 * cw1 = (struct icw1 *)&(state->master_icw1);