Provide basic emulation for Sharp SL-6000 PDA (Tosa), Dmitry Baryshkov.

This adds basic support for emulating Sharp Zaurus SL-6000 PDA (tosa).
Currently it provides only basic support: no kbd/lcd, sound, ts, etc.
But it's able at least to boot Linux from CF.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4643 c046a42c-6fe2-441c-8c8c-71466251a162

7 files changed, 183 insertions, 15 deletions

diff --git a/Makefile.target b/Makefile.target
index 464ffdf537..68b1421a44 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -585,7 +585,7 @@ OBJS+= arm-semi.o
 OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
 OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
 OBJS+= pflash_cfi01.o gumstix.o
-OBJS+= spitz.o zaurus.o ide.o serial.o nand.o ecc.o
+OBJS+= zaurus.o ide.o serial.o nand.o ecc.o spitz.o tosa.o
 OBJS+= omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o
 OBJS+= omap2.o omap_dss.o
 OBJS+= palm.o tsc210x.o
diff --git a/hw/boards.h b/hw/boards.h
index 2d67a707a6..eacd324148 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -111,4 +111,7 @@ extern QEMUMachine mainstone2_machine;
 /* musicpal.c */
 extern QEMUMachine musicpal_machine;
 
+/* tosa.c */
+extern QEMUMachine tosapda_machine;
+
 #endif
diff --git a/hw/sharpsl.h b/hw/sharpsl.h
index c8340404c9..184aae6cdb 100644
--- a/hw/sharpsl.h
+++ b/hw/sharpsl.h
@@ -1,6 +1,14 @@
+/*
+ * Common declarations for the Zaurii.
+ *
+ * This file is licensed under the GNU GPL.
+ */
 #ifndef QEMU_SHARPSL_H
 #define QEMU_SHARPSL_H
 
+#define zaurus_printf(format, ...)	\
+    fprintf(stderr, "%s: " format, __FUNCTION__, ##__VA_ARGS__)
+
 /* zaurus.c */
 struct scoop_info_s *scoop_init(struct pxa2xx_state_s *cpu,
                 int instance, target_phys_addr_t target_base);
diff --git a/hw/spitz.c b/hw/spitz.c
index 34355eb304..fef557ad17 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -22,8 +22,6 @@
 #include "audio/audio.h"
 #include "boards.h"
 
-#define spitz_printf(format, ...)	\
-    fprintf(stderr, "%s: " format, __FUNCTION__, ##__VA_ARGS__)
 #undef REG_FMT
 #if TARGET_PHYS_ADDR_BITS == 32
 #define REG_FMT			"0x%02x"
@@ -90,7 +88,7 @@ static uint32_t sl_readb(void *opaque, target_phys_addr_t addr)
         return ecc_digest(&s->ecc, nand_getio(s->nand));
 
     default:
-        spitz_printf("Bad register offset " REG_FMT "\n", addr);
+        zaurus_printf("Bad register offset " REG_FMT "\n", addr);
     }
     return 0;
 }
@@ -134,7 +132,7 @@ static void sl_writeb(void *opaque, target_phys_addr_t addr,
         break;
 
     default:
-        spitz_printf("Bad register offset " REG_FMT "\n", addr);
+        zaurus_printf("Bad register offset " REG_FMT "\n", addr);
     }
 }
 
@@ -537,9 +535,9 @@ static int bl_intensity, bl_power;
 static void spitz_bl_update(struct pxa2xx_state_s *s)
 {
     if (bl_power && bl_intensity)
-        spitz_printf("LCD Backlight now at %i/63\n", bl_intensity);
+        zaurus_printf("LCD Backlight now at %i/63\n", bl_intensity);
     else
-        spitz_printf("LCD Backlight now off\n");
+        zaurus_printf("LCD Backlight now off\n");
 }
 
 static inline void spitz_bl_bit5(void *opaque, int line, int level)
@@ -570,9 +568,9 @@ static void spitz_lcdtg_dac_put(void *opaque, uint8_t cmd)
     switch (addr) {
     case LCDTG_RESCTL:
         if (value)
-            spitz_printf("LCD in QVGA mode\n");
+            zaurus_printf("LCD in QVGA mode\n");
         else
-            spitz_printf("LCD in VGA mode\n");
+            zaurus_printf("LCD in VGA mode\n");
         break;
 
     case LCDTG_DUTYCTRL:
@@ -780,16 +778,16 @@ static void spitz_out_switch(void *opaque, int line, int level)
 {
     switch (line) {
     case 0:
-        spitz_printf("Charging %s.\n", level ? "off" : "on");
+        zaurus_printf("Charging %s.\n", level ? "off" : "on");
         break;
     case 1:
-        spitz_printf("Discharging %s.\n", level ? "on" : "off");
+        zaurus_printf("Discharging %s.\n", level ? "on" : "off");
         break;
     case 2:
-        spitz_printf("Green LED %s.\n", level ? "on" : "off");
+        zaurus_printf("Green LED %s.\n", level ? "on" : "off");
         break;
     case 3:
-        spitz_printf("Orange LED %s.\n", level ? "on" : "off");
+        zaurus_printf("Orange LED %s.\n", level ? "on" : "off");
         break;
     case 4:
         spitz_bl_bit5(opaque, line, level);
diff --git a/hw/tosa.c b/hw/tosa.c
new file mode 100644
index 0000000000..97d41ece8c
--- /dev/null
+++ b/hw/tosa.c
@@ -0,0 +1,160 @@
+/* vim:set shiftwidth=4 ts=4 et: */
+/*
+ * PXA255 Sharp Zaurus SL-6000 PDA platform
+ *
+ * Copyright (c) 2008 Dmitry Baryshkov
+ *
+ * Code based on spitz platform by Andrzej Zaborowski <balrog@zabor.org>
+ * This code is licensed under the GNU GPL v2.
+ */
+
+#include "hw.h"
+#include "pxa.h"
+#include "arm-misc.h"
+#include "sysemu.h"
+#include "sharpsl.h"
+#include "pcmcia.h"
+#include "block.h"
+#include "boards.h"
+
+#define TOSA_RAM    0x04000000
+#define TOSA_ROM	0x00800000
+
+#define TOSA_GPIO_nSD_DETECT	(9)
+#define TOSA_GPIO_ON_RESET		(19)
+#define TOSA_GPIO_CF_IRQ		(21)	/* CF slot0 Ready */
+#define TOSA_GPIO_CF_CD			(13)
+#define TOSA_GPIO_JC_CF_IRQ		(36)	/* CF slot1 Ready */
+
+#define TOSA_SCOOP_GPIO_BASE	0
+#define TOSA_GPIO_IR_POWERDWN	(TOSA_SCOOP_GPIO_BASE + 2)
+#define TOSA_GPIO_SD_WP			(TOSA_SCOOP_GPIO_BASE + 3)
+#define TOSA_GPIO_PWR_ON		(TOSA_SCOOP_GPIO_BASE + 4)
+
+struct tc6393xb_s {
+    target_phys_addr_t target_base;
+};
+
+static uint32_t tc6393xb_readb(void *opaque, target_phys_addr_t addr)
+{
+    return 3;
+}
+static void tc6393xb_writeb(void *opaque, target_phys_addr_t addr,
+        uint32_t value)
+{
+}
+static void tosa_tc6393xb_register(struct pxa2xx_state_s *cpu)
+{
+    int iomemtype;
+    struct tc6393xb_s *s;
+    CPUReadMemoryFunc *tc6393xb_readfn[] = {
+        tc6393xb_readb,
+        tc6393xb_readb,
+        tc6393xb_readb,
+    };
+    CPUWriteMemoryFunc *tc6393xb_writefn[] = {
+        tc6393xb_writeb,
+        tc6393xb_writeb,
+        tc6393xb_writeb,
+    };
+
+    s = (struct tc6393xb_s *) qemu_mallocz(sizeof(struct tc6393xb_s));
+    s->target_base = 0x10000000;
+
+    iomemtype = cpu_register_io_memory(0, tc6393xb_readfn,
+                    tc6393xb_writefn, s);
+    cpu_register_physical_memory(s->target_base, 0x200000, iomemtype);
+}
+
+static void tosa_microdrive_attach(struct pxa2xx_state_s *cpu)
+{
+    struct pcmcia_card_s *md;
+    int index;
+    BlockDriverState *bs;
+
+    index = drive_get_index(IF_IDE, 0, 0);
+    if (index == -1)
+        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);
+    }
+}
+
+static void tosa_gpio_setup(struct pxa2xx_state_s *cpu,
+                struct scoop_info_s *scp0,
+                struct scoop_info_s *scp1)
+{
+    /* 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]));
+
+    /* Handle reset */
+    pxa2xx_gpio_out_set(cpu->gpio, TOSA_GPIO_ON_RESET, cpu->reset);
+
+    /* 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]);
+
+    pxa2xx_pcmcia_set_irq_cb(cpu->pcmcia[1],
+                        pxa2xx_gpio_in_get(cpu->gpio)[TOSA_GPIO_JC_CF_IRQ],
+                        NULL);
+
+}
+
+static struct arm_boot_info tosa_binfo = {
+    .loader_start = PXA2XX_SDRAM_BASE,
+    .ram_size = 0x04000000,
+};
+
+static void tosa_init(ram_addr_t ram_size, int vga_ram_size,
+                const char *boot_device, DisplayState *ds,
+                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);
+    }
+
+    if (!cpu_model)
+        cpu_model = "pxa255";
+
+    cpu = pxa255_init(tosa_binfo.ram_size, ds);
+
+    cpu_register_physical_memory(0, TOSA_ROM,
+                    qemu_ram_alloc(TOSA_ROM) | IO_MEM_ROM);
+
+    tosa_tc6393xb_register(cpu);
+
+    scp0 = scoop_init(cpu, 0, 0x08800000);
+    scp1 = scoop_init(cpu, 1, 0x14800040);
+
+    tosa_gpio_setup(cpu, scp0, scp1);
+
+    tosa_microdrive_attach(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);
+    sl_bootparam_write(SL_PXA_PARAM_BASE - PXA2XX_SDRAM_BASE);
+}
+
+QEMUMachine tosapda_machine = {
+    "tosa",
+    "Tosa PDA (PXA255)",
+    tosa_init,
+    TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
+};
diff --git a/hw/zaurus.c b/hw/zaurus.c
index f655392a8a..7b8f1520c3 100644
--- a/hw/zaurus.c
+++ b/hw/zaurus.c
@@ -21,8 +21,6 @@
 #include "pxa.h"
 #include "sharpsl.h"
 
-#define zaurus_printf(format, ...)	\
-    fprintf(stderr, "%s: " format, __FUNCTION__, ##__VA_ARGS__)
 #undef REG_FMT
 #if TARGET_PHYS_ADDR_BITS == 32
 #define REG_FMT			"0x%02x"
diff --git a/target-arm/machine.c b/target-arm/machine.c
index 5a5ed709f2..6637e72ed2 100644
--- a/target-arm/machine.c
+++ b/target-arm/machine.c
@@ -20,6 +20,7 @@ void register_machines(void)
     qemu_register_machine(&verdex_machine);
     qemu_register_machine(&mainstone2_machine);
     qemu_register_machine(&musicpal_machine);
+    qemu_register_machine(&tosapda_machine);
 }
 
 void cpu_save(QEMUFile *f, void *opaque)