--- trunk/src/devices/dev_rd94.c 2007/10/08 16:20:40 30 +++ trunk/src/devices/dev_rd94.c 2007/10/08 16:21:17 34 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2006 Anders Gavare. All rights reserved. + * Copyright (C) 2003-2007 Anders Gavare. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * - * $Id: dev_rd94.c,v 1.36 2006/07/23 14:37:34 debug Exp $ + * $Id: dev_rd94.c,v 1.39 2007/01/28 14:15:30 debug Exp $ * * Used by NEC-RD94, -R94, and -R96. */ @@ -70,7 +70,10 @@ d->interval --; if (d->interval <= 0) { debug("[ rd94: interval timer interrupt ]\n"); - cpu_interrupt(cpu, 5); + +fatal("TODO: rd94 legacy interrupt rewrite\n"); +abort(); +// cpu_interrupt(cpu, 5); } } } @@ -112,6 +115,9 @@ odata = 0; } debug("[ rd94: intstat1 ]\n"); + +fatal("TODO: rd94 legacy interrupt rewrite\n"); +abort(); /* cpu_interrupt_ack(cpu, 3); */ break; @@ -121,6 +127,9 @@ odata = 0; /* TODO */ } debug("[ rd94: intstat2 ]\n"); + +fatal("TODO: rd94 legacy interrupt rewrite\n"); +abort(); /* cpu_interrupt_ack(cpu, 4); */ break; @@ -130,7 +139,10 @@ odata = 0; /* return value does not matter? */ } debug("[ rd94: intstat3 ]\n"); - cpu_interrupt_ack(cpu, 5); + +fatal("TODO: rd94 legacy interrupt rewrite\n"); +abort(); +// cpu_interrupt_ack(cpu, 5); d->interval = d->interval_start; break; @@ -140,7 +152,9 @@ odata = 0; /* return value does not matter? */ } fatal("[ rd94: intstat4 ]\n"); - cpu_interrupt_ack(cpu, 6); +fatal("TODO: rd94 legacy interrupt rewrite\n"); +abort(); +// cpu_interrupt_ack(cpu, 6); break; case RD94_SYS_CPUID: @@ -208,7 +222,7 @@ } memset(d, 0, sizeof(struct rd94_data)); d->pciirq = devinit->irq_nr; - d->pci_data = bus_pci_init(devinit->machine, d->pciirq, + d->pci_data = bus_pci_init(devinit->machine, "TODO irq", 0,0, 0,0,0, 0,0,0); memory_device_register(devinit->machine->memory, devinit->name,