Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into...

[qemu.git] / hw / arm / tosa.c

diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index dd224d33a21845850dc91dd0ebeb2c12c7b6c2e7..eef9d427e7648edee1fe8f1b7755d8ccc8986b69 100644 (file)
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -11,19 +11,20 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
  * GNU GPL, version 2 or (at your option) any later version.
  */
 

+#include "qemu/osdep.h"
+#include "qapi/error.h"

 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"
 #include "hw/devices.h"
 #include "hw/arm/sharpsl.h"
 #include "hw/pcmcia.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"
 #include "hw/devices.h"
 #include "hw/arm/sharpsl.h"
 #include "hw/pcmcia.h"

-#include "block/block.h"

 #include "hw/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/boards.h"
 #include "hw/i2c/i2c.h"

-#include "hw/ssi.h"
-#include "sysemu/blockdev.h"
+#include "hw/ssi/ssi.h"

 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"

+#include "sysemu/sysemu.h"

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


@@ -85,6 +86,12 @@ static void tosa_out_switch(void *opaque, int line, int level)
     }
 }
 
     }
 }
 

+static void tosa_reset(void *opaque, int line, int level)
+{
+    if (level) {
+        qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
+    }
+}

 
 static void tosa_gpio_setup(PXA2xxState *cpu,
                 DeviceState *scp0,
 
 static void tosa_gpio_setup(PXA2xxState *cpu,
                 DeviceState *scp0,


@@ -92,13 +99,16 @@ static void tosa_gpio_setup(PXA2xxState *cpu,
                 TC6393xbState *tmio)
 {
     qemu_irq *outsignals = qemu_allocate_irqs(tosa_out_switch, cpu, 4);
                 TC6393xbState *tmio)
 {
     qemu_irq *outsignals = qemu_allocate_irqs(tosa_out_switch, cpu, 4);

+    qemu_irq reset;
+

     /* MMC/SD host */
     pxa2xx_mmci_handlers(cpu->mmc,
                     qdev_get_gpio_in(scp0, TOSA_GPIO_SD_WP),
                     qemu_irq_invert(qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_nSD_DETECT)));
 
     /* Handle reset */
     /* MMC/SD host */
     pxa2xx_mmci_handlers(cpu->mmc,
                     qdev_get_gpio_in(scp0, TOSA_GPIO_SD_WP),
                     qemu_irq_invert(qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_nSD_DETECT)));
 
     /* Handle reset */

-    qdev_connect_gpio_out(cpu->gpio, TOSA_GPIO_ON_RESET, cpu->reset);
+    reset = qemu_allocate_irq(tosa_reset, cpu, 0);
+    qdev_connect_gpio_out(cpu->gpio, TOSA_GPIO_ON_RESET, 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],


@@ -126,25 +136,29 @@ static uint32_t tosa_ssp_tansfer(SSISlave *dev, uint32_t value)
     return 0;
 }
 
     return 0;
 }
 

-static int tosa_ssp_init(SSISlave *dev)
+static void tosa_ssp_realize(SSISlave *dev, Error **errp)

 {
     /* Nothing to do.  */
 {
     /* Nothing to do.  */

-    return 0;

 }
 
 }
 

+#define TYPE_TOSA_DAC "tosa_dac"
+#define TOSA_DAC(obj) OBJECT_CHECK(TosaDACState, (obj), TYPE_TOSA_DAC)
+

 typedef struct {
 typedef struct {

-    I2CSlave i2c;
+    I2CSlave parent_obj;
+

     int len;
     char buf[3];
 } TosaDACState;
 
 static int tosa_dac_send(I2CSlave *i2c, uint8_t data)
 {
     int len;
     char buf[3];
 } TosaDACState;
 
 static int tosa_dac_send(I2CSlave *i2c, uint8_t data)
 {

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

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

-        fprintf(stderr, "%s: message too long (%i bytes)\n", __FUNCTION__, s->len);
+        fprintf(stderr, "%s: message too long (%i bytes)\n", __func__, s->len);

 #endif
         return 1;
     }
 #endif
         return 1;
     }


@@ -157,45 +171,42 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data)
     return 0;
 }
 
     return 0;
 }
 

-static void tosa_dac_event(I2CSlave *i2c, enum i2c_event event)
+static int tosa_dac_event(I2CSlave *i2c, enum i2c_event event)

 {
 {

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

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

-        printf("%s: recv not supported!!!\n", __FUNCTION__);
+        printf("%s: recv not supported!!!\n", __func__);

         break;
     case I2C_FINISH:
 #ifdef VERBOSE
         if (s->len < 2)
         break;
     case I2C_FINISH:
 #ifdef VERBOSE
         if (s->len < 2)

-            printf("%s: message too short (%i bytes)\n", __FUNCTION__, s->len);
+            printf("%s: message too short (%i bytes)\n", __func__, s->len);

         if (s->len > 2)
         if (s->len > 2)

-            printf("%s: message too long\n", __FUNCTION__);
+            printf("%s: message too long\n", __func__);

 #endif
         break;
     default:
         break;
     }
 #endif
         break;
     default:
         break;
     }

-}

 
 

-static int tosa_dac_recv(I2CSlave *s)
-{
-    printf("%s: recv not supported!!!\n", __FUNCTION__);
-    return -1;
+    return 0;

 }
 
 }
 

-static int tosa_dac_init(I2CSlave *i2c)
+static uint8_t tosa_dac_recv(I2CSlave *s)

 {
 {

-    /* Nothing to do.  */
-    return 0;
+    printf("%s: recv not supported!!!\n", __func__);
+    return 0xff;

 }
 
 static void tosa_tg_init(PXA2xxState *cpu)
 {
     I2CBus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
 }
 
 static void tosa_tg_init(PXA2xxState *cpu)
 {
     I2CBus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);

-    i2c_create_slave(bus, "tosa_dac", DAC_BASE);
+    i2c_create_slave(bus, TYPE_TOSA_DAC, DAC_BASE);

     ssi_create_slave(cpu->ssp[1], "tosa-ssp");
 }
 
     ssi_create_slave(cpu->ssp[1], "tosa-ssp");
 }
 


@@ -205,25 +216,20 @@ static struct arm_boot_info tosa_binfo = {
     .ram_size = 0x04000000,
 };
 
     .ram_size = 0x04000000,
 };
 

-static void tosa_init(QEMUMachineInitArgs *args)
+static void tosa_init(MachineState *machine)

 {
 {

-    const char *cpu_model = args->cpu_model;
-    const char *kernel_filename = args->kernel_filename;
-    const char *kernel_cmdline = args->kernel_cmdline;
-    const char *initrd_filename = args->initrd_filename;
+    const char *kernel_filename = machine->kernel_filename;
+    const char *kernel_cmdline = machine->kernel_cmdline;
+    const char *initrd_filename = machine->initrd_filename;

     MemoryRegion *address_space_mem = get_system_memory();
     MemoryRegion *rom = g_new(MemoryRegion, 1);
     PXA2xxState *mpu;
     TC6393xbState *tmio;
     DeviceState *scp0, *scp1;
 
     MemoryRegion *address_space_mem = get_system_memory();
     MemoryRegion *rom = g_new(MemoryRegion, 1);
     PXA2xxState *mpu;
     TC6393xbState *tmio;
     DeviceState *scp0, *scp1;
 

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

     mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
 
     mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
 

-    memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM);
-    vmstate_register_ram_global(rom);
+    memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal);

     memory_region_set_readonly(rom, true);
     memory_region_add_subregion(address_space_mem, 0, rom);
 
     memory_region_set_readonly(rom, true);
     memory_region_add_subregion(address_space_mem, 0, rom);
 


@@ -247,31 +253,27 @@ static void tosa_init(QEMUMachineInitArgs *args)
     sl_bootparam_write(SL_PXA_PARAM_BASE);
 }
 
     sl_bootparam_write(SL_PXA_PARAM_BASE);
 }
 

-static QEMUMachine tosapda_machine = {
-    .name = "tosa",
-    .desc = "Tosa PDA (PXA255)",
-    .init = tosa_init,
-};
-
-static void tosapda_machine_init(void)
+static void tosapda_machine_init(MachineClass *mc)

 {
 {

-    qemu_register_machine(&tosapda_machine);
+    mc->desc = "Sharp SL-6000 (Tosa) PDA (PXA255)";
+    mc->init = tosa_init;
+    mc->block_default_type = IF_IDE;
+    mc->ignore_memory_transaction_failures = true;

 }
 
 }
 

-machine_init(tosapda_machine_init);
+DEFINE_MACHINE("tosa", tosapda_machine_init)

 
 static void tosa_dac_class_init(ObjectClass *klass, void *data)
 {
     I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
 
 
 static void tosa_dac_class_init(ObjectClass *klass, void *data)
 {
     I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
 

-    k->init = tosa_dac_init;

     k->event = tosa_dac_event;
     k->recv = tosa_dac_recv;
     k->send = tosa_dac_send;
 }
 
 static const TypeInfo tosa_dac_info = {
     k->event = tosa_dac_event;
     k->recv = tosa_dac_recv;
     k->send = tosa_dac_send;
 }
 
 static const TypeInfo tosa_dac_info = {

-    .name          = "tosa_dac",
+    .name          = TYPE_TOSA_DAC,

     .parent        = TYPE_I2C_SLAVE,
     .instance_size = sizeof(TosaDACState),
     .class_init    = tosa_dac_class_init,
     .parent        = TYPE_I2C_SLAVE,
     .instance_size = sizeof(TosaDACState),
     .class_init    = tosa_dac_class_init,


@@ -281,7 +283,7 @@ static void tosa_ssp_class_init(ObjectClass *klass, void *data)
 {
     SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
 
 {
     SSISlaveClass *k = SSI_SLAVE_CLASS(klass);
 

-    k->init = tosa_ssp_init;
+    k->realize = tosa_ssp_realize;

     k->transfer = tosa_ssp_tansfer;
 }
 
     k->transfer = tosa_ssp_tansfer;
 }