openpic: Unfold write_IRQreg

[qemu.git] / hw / tosa.c

diff --git a/hw/tosa.c b/hw/tosa.c
index 144685adcbeb5992c628850d4bcb3497982f367f..7b407f4f64c432a74c454d0dcab941625a62eb32 100644 (file)
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -11,17 +11,20 @@
 #include "hw.h"
 #include "pxa.h"
 #include "arm-misc.h"
 #include "hw.h"
 #include "pxa.h"
 #include "arm-misc.h"

-#include "sysemu.h"

 #include "devices.h"
 #include "sharpsl.h"
 #include "pcmcia.h"
 #include "block.h"
 #include "boards.h"
 #include "i2c.h"
 #include "devices.h"
 #include "sharpsl.h"
 #include "pcmcia.h"
 #include "block.h"
 #include "boards.h"
 #include "i2c.h"

+#include "ssi.h"
+#include "blockdev.h"
+#include "sysbus.h"

 
 #define TOSA_RAM    0x04000000
 #define TOSA_ROM       0x00800000
 
 
 #define TOSA_RAM    0x04000000
 #define TOSA_ROM       0x00800000
 

+#define TOSA_GPIO_USB_IN               (5)

 #define TOSA_GPIO_nSD_DETECT   (9)
 #define TOSA_GPIO_ON_RESET             (19)
 #define TOSA_GPIO_CF_IRQ               (21)    /* CF slot0 Ready */
 #define TOSA_GPIO_nSD_DETECT   (9)
 #define TOSA_GPIO_ON_RESET             (19)
 #define TOSA_GPIO_CF_IRQ               (21)    /* CF slot0 Ready */


@@ -38,26 +41,23 @@
 #define TOSA_GPIO_BT_LED               (TOSA_SCOOP_JC_GPIO_BASE + 0)
 #define TOSA_GPIO_NOTE_LED             (TOSA_SCOOP_JC_GPIO_BASE + 1)
 #define TOSA_GPIO_CHRG_ERR_LED         (TOSA_SCOOP_JC_GPIO_BASE + 2)
 #define TOSA_GPIO_BT_LED               (TOSA_SCOOP_JC_GPIO_BASE + 0)
 #define TOSA_GPIO_NOTE_LED             (TOSA_SCOOP_JC_GPIO_BASE + 1)
 #define TOSA_GPIO_CHRG_ERR_LED         (TOSA_SCOOP_JC_GPIO_BASE + 2)

+#define TOSA_GPIO_TC6393XB_L3V_ON      (TOSA_SCOOP_JC_GPIO_BASE + 5)

 #define TOSA_GPIO_WLAN_LED             (TOSA_SCOOP_JC_GPIO_BASE + 7)
 
 #define        DAC_BASE        0x4e
 #define DAC_CH1                0
 #define DAC_CH2                1
 
 #define TOSA_GPIO_WLAN_LED             (TOSA_SCOOP_JC_GPIO_BASE + 7)
 
 #define        DAC_BASE        0x4e
 #define DAC_CH1                0
 #define DAC_CH2                1
 

-static void tosa_microdrive_attach(struct pxa2xx_state_s *cpu)
+static void tosa_microdrive_attach(PXA2xxState *cpu)

 {
 {

-    struct pcmcia_card_s *md;
-    int index;
-    BlockDriverState *bs;
+    PCMCIACardState *md;
+    DriveInfo *dinfo;

 
 

-    index = drive_get_index(IF_IDE, 0, 0);
-    if (index == -1)
+    dinfo = drive_get(IF_IDE, 0, 0);
+    if (!dinfo || dinfo->media_cd)

         return;
         return;

-    bs = drives_table[index].bdrv;
-    if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) {
-        md = dscm1xxxx_init(bs);
-        pxa2xx_pcmcia_attach(cpu->pcmcia[0], md);
-    }
+    md = dscm1xxxx_init(dinfo);
+    pxa2xx_pcmcia_attach(cpu->pcmcia[0], md);

 }
 
 static void tosa_out_switch(void *opaque, int line, int level)
 }
 
 static void tosa_out_switch(void *opaque, int line, int level)


@@ -82,53 +82,61 @@ static void tosa_out_switch(void *opaque, int line, int level)
 }
 
 
 }
 
 

-static void tosa_gpio_setup(struct pxa2xx_state_s *cpu,
-                struct scoop_info_s *scp0,
-                struct scoop_info_s *scp1)
+static void tosa_gpio_setup(PXA2xxState *cpu,
+                DeviceState *scp0,
+                DeviceState *scp1,
+                TC6393xbState *tmio)

 {
     qemu_irq *outsignals = qemu_allocate_irqs(tosa_out_switch, cpu, 4);
     /* MMC/SD host */
     pxa2xx_mmci_handlers(cpu->mmc,
 {
     qemu_irq *outsignals = qemu_allocate_irqs(tosa_out_switch, cpu, 4);
     /* MMC/SD host */
     pxa2xx_mmci_handlers(cpu->mmc,

-                    scoop_gpio_in_get(scp0)[TOSA_GPIO_SD_WP],
-                    qemu_irq_invert(pxa2xx_gpio_in_get(cpu->gpio)[TOSA_GPIO_nSD_DETECT]));
+                    qdev_get_gpio_in(scp0, TOSA_GPIO_SD_WP),
+                    qemu_irq_invert(qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_nSD_DETECT)));

 
     /* Handle reset */
 
     /* Handle reset */

-    pxa2xx_gpio_out_set(cpu->gpio, TOSA_GPIO_ON_RESET, cpu->reset);
+    qdev_connect_gpio_out(cpu->gpio, TOSA_GPIO_ON_RESET, cpu->reset);

 
     /* PCMCIA signals: card's IRQ and Card-Detect */
     pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[0],
 
     /* PCMCIA signals: card's IRQ and Card-Detect */
     pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[0],

-                        pxa2xx_gpio_in_get(cpu->gpio)[TOSA_GPIO_CF_IRQ],
-                        pxa2xx_gpio_in_get(cpu->gpio)[TOSA_GPIO_CF_CD]);
+                        qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_CF_IRQ),
+                        qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_CF_CD));

 
     pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[1],
 
     pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[1],

-                        pxa2xx_gpio_in_get(cpu->gpio)[TOSA_GPIO_JC_CF_IRQ],
+                        qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_JC_CF_IRQ),

                         NULL);
 
                         NULL);
 

-    scoop_gpio_out_set(scp1, TOSA_GPIO_BT_LED, outsignals[0]);
-    scoop_gpio_out_set(scp1, TOSA_GPIO_NOTE_LED, outsignals[1]);
-    scoop_gpio_out_set(scp1, TOSA_GPIO_CHRG_ERR_LED, outsignals[2]);
-    scoop_gpio_out_set(scp1, TOSA_GPIO_WLAN_LED, outsignals[3]);
+    qdev_connect_gpio_out(scp1, TOSA_GPIO_BT_LED, outsignals[0]);
+    qdev_connect_gpio_out(scp1, TOSA_GPIO_NOTE_LED, outsignals[1]);
+    qdev_connect_gpio_out(scp1, TOSA_GPIO_CHRG_ERR_LED, outsignals[2]);
+    qdev_connect_gpio_out(scp1, TOSA_GPIO_WLAN_LED, outsignals[3]);
+
+    qdev_connect_gpio_out(scp1, TOSA_GPIO_TC6393XB_L3V_ON, tc6393xb_l3v_get(tmio));
+
+    /* UDC Vbus */
+    qemu_irq_raise(qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_USB_IN));

 }
 
 }
 

-static uint32_t tosa_ssp_read(void *opaque)
+static uint32_t tosa_ssp_tansfer(SSISlave *dev, uint32_t value)

 {
 {

+    fprintf(stderr, "TG: %d %02x\n", value >> 5, value & 0x1f);

     return 0;
 }
 
     return 0;
 }
 

-static void tosa_ssp_write(void *opaque, uint32_t value)
+static int tosa_ssp_init(SSISlave *dev)

 {
 {

-    fprintf(stderr, "TG: %d %02x\n", value >> 5, value & 0x1f);
+    /* Nothing to do.  */
+    return 0;

 }
 
 }
 

-struct tosa_dac_i2c {
+typedef struct {

     i2c_slave i2c;
     int len;
     char buf[3];
     i2c_slave i2c;
     int len;
     char buf[3];

-};
+} TosaDACState;

 
 static int tosa_dac_send(i2c_slave *i2c, uint8_t data)
 {
 
 static int tosa_dac_send(i2c_slave *i2c, uint8_t data)
 {

-    struct tosa_dac_i2c *s = (struct tosa_dac_i2c *)i2c;
+    TosaDACState *s = FROM_I2C_SLAVE(TosaDACState, i2c);

     s->buf[s->len] = data;
     if (s->len ++ > 2) {
 #ifdef VERBOSE
     s->buf[s->len] = data;
     if (s->len ++ > 2) {
 #ifdef VERBOSE


@@ -147,7 +155,7 @@ static int tosa_dac_send(i2c_slave *i2c, uint8_t data)
 
 static void tosa_dac_event(i2c_slave *i2c, enum i2c_event event)
 {
 
 static void tosa_dac_event(i2c_slave *i2c, enum i2c_event event)
 {

-    struct tosa_dac_i2c *s = (struct tosa_dac_i2c *)i2c;
+    TosaDACState *s = FROM_I2C_SLAVE(TosaDACState, i2c);

     s->len = 0;
     switch (event) {
     case I2C_START_SEND:
     s->len = 0;
     switch (event) {
     case I2C_START_SEND:


@@ -168,22 +176,23 @@ static void tosa_dac_event(i2c_slave *i2c, enum i2c_event event)
     }
 }
 
     }
 }
 

-int tosa_dac_recv(i2c_slave *s)
+static int tosa_dac_recv(i2c_slave *s)

 {
     printf("%s: recv not supported!!!\n", __FUNCTION__);
     return -1;
 }
 
 {
     printf("%s: recv not supported!!!\n", __FUNCTION__);
     return -1;
 }
 

-static void tosa_tg_init(struct pxa2xx_state_s *cpu)
+static int tosa_dac_init(i2c_slave *i2c)

 {
 {

-    struct i2c_bus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
-    struct i2c_slave *dac = i2c_slave_init(bus, 0, sizeof(struct tosa_dac_i2c));
-    dac->send = tosa_dac_send;
-    dac->event = tosa_dac_event;
-    dac->recv = tosa_dac_recv;
-    i2c_set_slave_address(dac, DAC_BASE);
-    pxa2xx_ssp_attach(cpu->ssp[1], tosa_ssp_read,
-                    tosa_ssp_write, cpu);
+    /* Nothing to do.  */
+    return 0;
+}
+
+static void tosa_tg_init(PXA2xxState *cpu)
+{
+    i2c_bus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
+    i2c_create_slave(bus, "tosa_dac", DAC_BASE);
+    ssi_create_slave(cpu->ssp[1], "tosa-ssp");

 }
 
 
 }
 
 


@@ -192,53 +201,76 @@ static struct arm_boot_info tosa_binfo = {
     .ram_size = 0x04000000,
 };
 
     .ram_size = 0x04000000,
 };
 

-static void tosa_init(ram_addr_t ram_size, int vga_ram_size,
-                const char *boot_device, DisplayState *ds,
+static void tosa_init(ram_addr_t ram_size,
+                const char *boot_device,

                 const char *kernel_filename, const char *kernel_cmdline,
                 const char *initrd_filename, const char *cpu_model)
 {
                 const char *kernel_filename, const char *kernel_cmdline,
                 const char *initrd_filename, const char *cpu_model)
 {

-    struct pxa2xx_state_s *cpu;
-    struct scoop_info_s *scp0, *scp1;
-
-    if (ram_size < (TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE)) {
-        fprintf(stderr, "This platform requires %i bytes of memory\n",
-                TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE);
-        exit(1);
-    }
+    PXA2xxState *cpu;
+    TC6393xbState *tmio;
+    DeviceState *scp0, *scp1;

 
     if (!cpu_model)
         cpu_model = "pxa255";
 
 
     if (!cpu_model)
         cpu_model = "pxa255";
 

-    cpu = pxa255_init(tosa_binfo.ram_size, NULL);
+    cpu = pxa255_init(tosa_binfo.ram_size);

 
     cpu_register_physical_memory(0, TOSA_ROM,
 
     cpu_register_physical_memory(0, TOSA_ROM,

-                    qemu_ram_alloc(TOSA_ROM) | IO_MEM_ROM);
+                    qemu_ram_alloc(NULL, "tosa.rom", TOSA_ROM) | IO_MEM_ROM);

 
 

-    tc6393xb_init(0x10000000, pxa2xx_gpio_in_get(cpu->gpio)[TOSA_GPIO_TC6393XB_INT]);
+    tmio = tc6393xb_init(0x10000000,
+            qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_TC6393XB_INT));

 
 

-    scp0 = scoop_init(cpu, 0, 0x08800000);
-    scp1 = scoop_init(cpu, 1, 0x14800040);
+    scp0 = sysbus_create_simple("scoop", 0x08800000, NULL);
+    scp1 = sysbus_create_simple("scoop", 0x14800040, NULL);

 
 

-    tosa_gpio_setup(cpu, scp0, scp1);
+    tosa_gpio_setup(cpu, scp0, scp1, tmio);

 
     tosa_microdrive_attach(cpu);
 
     tosa_tg_init(cpu);
 
 
     tosa_microdrive_attach(cpu);
 
     tosa_tg_init(cpu);
 

-    /* Setup initial (reset) machine state */
-    cpu->env->regs[15] = tosa_binfo.loader_start;
-

     tosa_binfo.kernel_filename = kernel_filename;
     tosa_binfo.kernel_cmdline = kernel_cmdline;
     tosa_binfo.initrd_filename = initrd_filename;
     tosa_binfo.board_id = 0x208;
     arm_load_kernel(cpu->env, &tosa_binfo);
     tosa_binfo.kernel_filename = kernel_filename;
     tosa_binfo.kernel_cmdline = kernel_cmdline;
     tosa_binfo.initrd_filename = initrd_filename;
     tosa_binfo.board_id = 0x208;
     arm_load_kernel(cpu->env, &tosa_binfo);

-    sl_bootparam_write(SL_PXA_PARAM_BASE - PXA2XX_SDRAM_BASE);
+    sl_bootparam_write(SL_PXA_PARAM_BASE);

 }
 
 }
 

-QEMUMachine tosapda_machine = {
+static QEMUMachine tosapda_machine = {

     .name = "tosa",
     .desc = "Tosa PDA (PXA255)",
     .init = tosa_init,
     .name = "tosa",
     .desc = "Tosa PDA (PXA255)",
     .init = tosa_init,

-    .ram_require = TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,

 };
 };

+
+static void tosapda_machine_init(void)
+{
+    qemu_register_machine(&tosapda_machine);
+}
+
+machine_init(tosapda_machine_init);
+
+static I2CSlaveInfo tosa_dac_info = {
+    .qdev.name = "tosa_dac",
+    .qdev.size = sizeof(TosaDACState),
+    .init = tosa_dac_init,
+    .event = tosa_dac_event,
+    .recv = tosa_dac_recv,
+    .send = tosa_dac_send
+};
+
+static SSISlaveInfo tosa_ssp_info = {
+    .qdev.name = "tosa-ssp",
+    .qdev.size = sizeof(SSISlave),
+    .init = tosa_ssp_init,
+    .transfer = tosa_ssp_tansfer
+};
+
+static void tosa_register_devices(void)
+{
+    i2c_register_slave(&tosa_dac_info);
+    ssi_register_slave(&tosa_ssp_info);
+}
+
+device_init(tosa_register_devices)