diff options
| -rw-r--r-- | hw/mainstone.c | 7 | ||||
| -rw-r--r-- | hw/mst_fpga.c | 29 |
2 files changed, 34 insertions, 2 deletions
diff --git a/hw/mainstone.c b/hw/mainstone.c index 8970dd8e41..50691ca41e 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -149,6 +149,13 @@ static void mainstone_common_init(ram_addr_t ram_size, /* MMC/SD host */ pxa2xx_mmci_handlers(cpu->mmc, NULL, qdev_get_gpio_in(mst_irq, MMC_IRQ)); + pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[0], + qdev_get_gpio_in(mst_irq, S0_IRQ), + qdev_get_gpio_in(mst_irq, S0_CD_IRQ)); + pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[1], + qdev_get_gpio_in(mst_irq, S1_IRQ), + qdev_get_gpio_in(mst_irq, S1_CD_IRQ)); + smc91c111_init(&nd_table[0], MST_ETH_PHYS, qdev_get_gpio_in(mst_irq, ETHERNET_IRQ)); diff --git a/hw/mst_fpga.c b/hw/mst_fpga.c index 407bac9716..a04355cc7f 100644 --- a/hw/mst_fpga.c +++ b/hw/mst_fpga.c @@ -26,6 +26,12 @@ #define MST_PCMCIA0 0xe0 #define MST_PCMCIA1 0xe4 +#define MST_PCMCIAx_READY (1 << 10) +#define MST_PCMCIAx_nCD (1 << 5) + +#define MST_PCMCIA_CD0_IRQ 9 +#define MST_PCMCIA_CD1_IRQ 13 + typedef struct mst_irq_state{ SysBusDevice busdev; @@ -57,6 +63,21 @@ mst_fpga_set_irq(void *opaque, int irq, int level) else s->prev_level &= ~(1u << irq); + switch(irq) { + case MST_PCMCIA_CD0_IRQ: + if (level) + s->pcmcia0 &= ~MST_PCMCIAx_nCD; + else + s->pcmcia0 |= MST_PCMCIAx_nCD; + break; + case MST_PCMCIA_CD1_IRQ: + if (level) + s->pcmcia1 &= ~MST_PCMCIAx_nCD; + else + s->pcmcia1 |= MST_PCMCIAx_nCD; + break; + } + if ((s->intmskena & (1u << irq)) && level) s->intsetclr |= 1u << irq; @@ -141,11 +162,12 @@ mst_fpga_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) s->intsetclr = (value & 0xFEEFF); qemu_set_irq(s->parent, s->intsetclr & s->intmskena); break; + /* For PCMCIAx allow the to change only power and reset */ case MST_PCMCIA0: - s->pcmcia0 = value; + s->pcmcia0 = (value & 0x1f) | (s->pcmcia0 & ~0x1f); break; case MST_PCMCIA1: - s->pcmcia1 = value; + s->pcmcia1 = (value & 0x1f) | (s->pcmcia1 & ~0x1f); break; default: printf("Mainstone - mst_fpga_writeb: Bad register offset " @@ -180,6 +202,9 @@ static int mst_fpga_init(SysBusDevice *dev) s = FROM_SYSBUS(mst_irq_state, dev); + s->pcmcia0 = MST_PCMCIAx_READY | MST_PCMCIAx_nCD; + s->pcmcia1 = MST_PCMCIAx_READY | MST_PCMCIAx_nCD; + sysbus_init_irq(dev, &s->parent); /* alloc the external 16 irqs */ |