aboutsummaryrefslogtreecommitdiff
path: root/hw/etraxfs.c
diff options
context:
space:
mode:
authoredgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-09 23:33:30 +0000
committeredgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-09 23:33:30 +0000
commit5ef98b4742a291c732080c313051b1b36da1707d (patch)
treefe5b289f5af9c9d378f894fc24cef88b2e2d076c /hw/etraxfs.c
parent1b1a38b0aaf3a24b9b8162d8aef9e700a42f8d43 (diff)
downloadqemu-5ef98b4742a291c732080c313051b1b36da1707d.zip
qemu-5ef98b4742a291c732080c313051b1b36da1707d.tar.gz
qemu-5ef98b4742a291c732080c313051b1b36da1707d.tar.bz2
ETRAX: Add NMI support to the watchdog and the interrupt controller.
* Add NMI and GURU exceptions to teh interrupt controller. * Teach the watchdog timer to signal an NMI before reseting the chip. * Add etraxfs.h to hold api for etrax device models. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4720 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/etraxfs.c')
-rw-r--r--hw/etraxfs.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 72482e4..4348151 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -30,16 +30,7 @@
#include "devices.h"
#include "boards.h"
-#include "etraxfs_dma.h"
-
-/* Init functions for different blocks. */
-extern qemu_irq *etraxfs_pic_init(CPUState *env, target_phys_addr_t base);
-void etraxfs_timer_init(CPUState *env, qemu_irq *irqs,
- target_phys_addr_t base);
-void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
- qemu_irq *irq, target_phys_addr_t base);
-void etraxfs_ser_init(CPUState *env, qemu_irq *irq, CharDriverState *chr,
- target_phys_addr_t base);
+#include "etraxfs.h"
#define FLASH_SIZE 0x2000000
#define INTMEM_SIZE (128 * 1024)
@@ -62,7 +53,7 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
const char *initrd_filename, const char *cpu_model)
{
CPUState *env;
- qemu_irq *pic;
+ struct etraxfs_pic *pic;
void *etraxfs_dmac;
struct etraxfs_dma_client *eth[2] = {NULL, NULL};
int kernel_size;
@@ -110,13 +101,13 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
etraxfs_dmac = etraxfs_dmac_init(env, 0xb0000000, 10);
for (i = 0; i < 10; i++) {
/* On ETRAX, odd numbered channels are inputs. */
- etraxfs_dmac_connect(etraxfs_dmac, i, pic + 7 + i, i & 1);
+ etraxfs_dmac_connect(etraxfs_dmac, i, pic->irq + 7 + i, i & 1);
}
/* Add the two ethernet blocks. */
- eth[0] = etraxfs_eth_init(&nd_table[0], env, pic + 25, 0xb0034000);
+ eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0xb0034000);
if (nb_nics > 1)
- eth[1] = etraxfs_eth_init(&nd_table[1], env, pic + 26, 0xb0036000);
+ eth[1] = etraxfs_eth_init(&nd_table[1], env, pic->irq + 26, 0xb0036000);
/* The DMA Connector block is missing, hardwire things for now. */
etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);
@@ -127,12 +118,12 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
}
/* 2 timers. */
- etraxfs_timer_init(env, pic + 0x1b, 0xb001e000);
- etraxfs_timer_init(env, pic + 0x1b, 0xb005e000);
+ etraxfs_timer_init(env, pic->irq + 0x1b, pic->nmi + 1, 0xb001e000);
+ etraxfs_timer_init(env, pic->irq + 0x1b, pic->nmi + 1, 0xb005e000);
for (i = 0; i < 4; i++) {
if (serial_hds[i]) {
- etraxfs_ser_init(env, pic + 0x14 + i,
+ etraxfs_ser_init(env, pic->irq + 0x14 + i,
serial_hds[i], 0xb0026000 + i * 0x2000);
}
}