mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IER behavior change - better IRQ handling

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1453 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-06-05 15:24:23 +00:00
parent e68b9b2b10
commit cadae95f33
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/cuda.c
View File

@ -120,8 +120,9 @@ typedef struct CUDAState {
int data_in_index; int data_in_index;
int data_out_index; int data_out_index;
SetIRQFunc *set_irq;
int irq; int irq;
openpic_t *openpic; void *irq_opaque;
uint8_t autopoll; uint8_t autopoll;
uint8_t data_in[128]; uint8_t data_in[128];
uint8_t data_out[16]; uint8_t data_out[16];
@ -140,9 +141,9 @@ static void cuda_timer_update(CUDAState *s, CUDATimer *ti,
static void cuda_update_irq(CUDAState *s) static void cuda_update_irq(CUDAState *s)
{ {
if (s->ifr & s->ier & (SR_INT | T1_INT)) { if (s->ifr & s->ier & (SR_INT | T1_INT)) {
openpic_set_irq(s->openpic, s->irq, 1); s->set_irq(s->irq_opaque, s->irq, 1);
} else { } else {
openpic_set_irq(s->openpic, s->irq, 0); s->set_irq(s->irq_opaque, s->irq, 0);
} }
} }
@ -356,6 +357,7 @@ static void cuda_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
cuda_update_irq(s); cuda_update_irq(s);
break; break;
case 14: case 14:
#if 0
if (val & IER_SET) { if (val & IER_SET) {
/* set bits */ /* set bits */
s->ier |= val & 0x7f; s->ier |= val & 0x7f;
@ -363,6 +365,10 @@ static void cuda_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
/* reset bits */ /* reset bits */
s->ier &= ~val; s->ier &= ~val;
} }
#else
/* XXX: please explain me why the SPEC is not correct ! */
s->ier = val;
#endif
cuda_update_irq(s); cuda_update_irq(s);
break; break;
default: default:
@ -545,7 +551,7 @@ static void cuda_receive_packet_from_host(CUDAState *s,
#ifdef DEBUG_CUDA_PACKET #ifdef DEBUG_CUDA_PACKET
{ {
int i; int i;
printf("cuda_receive_packet_to_host:\n"); printf("cuda_receive_packet_from_host:\n");
for(i = 0; i < len; i++) for(i = 0; i < len; i++)
printf(" %02x", data[i]); printf(" %02x", data[i]);
printf("\n"); printf("\n");
@ -605,19 +611,21 @@ static CPUReadMemoryFunc *cuda_read[] = {
&cuda_readl, &cuda_readl,
}; };
int cuda_init(openpic_t *openpic, int irq) int cuda_init(SetIRQFunc *set_irq, void *irq_opaque, int irq)
{ {
CUDAState *s = &cuda_state; CUDAState *s = &cuda_state;
int cuda_mem_index; int cuda_mem_index;
s->openpic = openpic; s->set_irq = set_irq;
s->irq_opaque = irq_opaque;
s->irq = irq; s->irq = irq;
s->timers[0].timer = qemu_new_timer(vm_clock, cuda_timer1, s); s->timers[0].timer = qemu_new_timer(vm_clock, cuda_timer1, s);
s->timers[0].latch = 0x10000; s->timers[0].latch = 0x10000;
set_counter(s, &s->timers[0], 0xffff); set_counter(s, &s->timers[0], 0xffff);
s->timers[1].latch = 0x10000; s->timers[1].latch = 0x10000;
s->ier = T1_INT | SR_INT; // s->ier = T1_INT | SR_INT;
s->ier = 0;
set_counter(s, &s->timers[1], 0xffff); set_counter(s, &s->timers[1], 0xffff);
s->adb_poll_timer = qemu_new_timer(vm_clock, cuda_adb_poll, s); s->adb_poll_timer = qemu_new_timer(vm_clock, cuda_adb_poll, s);