From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1K2yvC-0002Z7-K2 for qemu-devel@nongnu.org; Sun, 01 Jun 2008 21:33:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1K2yvB-0002X9-Kp for qemu-devel@nongnu.org; Sun, 01 Jun 2008 21:33:14 -0400 Received: from [199.232.76.173] (port=57547 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K2yvB-0002Wi-G7 for qemu-devel@nongnu.org; Sun, 01 Jun 2008 21:33:13 -0400 Received: from savannah.gnu.org ([199.232.41.3]:48349 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1K2yvB-0006Pz-2x for qemu-devel@nongnu.org; Sun, 01 Jun 2008 21:33:13 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1K2yvA-0002fJ-Kc for qemu-devel@nongnu.org; Mon, 02 Jun 2008 01:33:12 +0000 Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1K2yvA-0002f3-CQ for qemu-devel@nongnu.org; Mon, 02 Jun 2008 01:33:12 +0000 MIME-Version: 1.0 Errors-To: balrog Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Andrzej Zaborowski Message-Id: Date: Mon, 02 Jun 2008 01:33:12 +0000 Subject: [Qemu-devel] [4643] Provide basic emulation for Sharp SL-6000 PDA (Tosa), Dmitry Baryshkov. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4643 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4643 Author: balrog Date: 2008-06-02 01:33:11 +0000 (Mon, 02 Jun 2008) Log Message: ----------- 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 Modified Paths: -------------- trunk/Makefile.target trunk/hw/boards.h trunk/hw/sharpsl.h trunk/hw/spitz.c trunk/hw/zaurus.c trunk/target-arm/machine.c Added Paths: ----------- trunk/hw/tosa.c Modified: trunk/Makefile.target =================================================================== --- trunk/Makefile.target 2008-06-02 01:20:15 UTC (rev 4642) +++ trunk/Makefile.target 2008-06-02 01:33:11 UTC (rev 4643) @@ -585,7 +585,7 @@ 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 Modified: trunk/hw/boards.h =================================================================== --- trunk/hw/boards.h 2008-06-02 01:20:15 UTC (rev 4642) +++ trunk/hw/boards.h 2008-06-02 01:33:11 UTC (rev 4643) @@ -111,4 +111,7 @@ /* musicpal.c */ extern QEMUMachine musicpal_machine; +/* tosa.c */ +extern QEMUMachine tosapda_machine; + #endif Modified: trunk/hw/sharpsl.h =================================================================== --- trunk/hw/sharpsl.h 2008-06-02 01:20:15 UTC (rev 4642) +++ trunk/hw/sharpsl.h 2008-06-02 01:33:11 UTC (rev 4643) @@ -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); Modified: trunk/hw/spitz.c =================================================================== --- trunk/hw/spitz.c 2008-06-02 01:20:15 UTC (rev 4642) +++ trunk/hw/spitz.c 2008-06-02 01:33:11 UTC (rev 4643) @@ -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 @@ 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 @@ 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 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 @@ 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 @@ { 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); Added: trunk/hw/tosa.c =================================================================== --- trunk/hw/tosa.c (rev 0) +++ trunk/hw/tosa.c 2008-06-02 01:33:11 UTC (rev 4643) @@ -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 + * 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, +}; Modified: trunk/hw/zaurus.c =================================================================== --- trunk/hw/zaurus.c 2008-06-02 01:20:15 UTC (rev 4642) +++ trunk/hw/zaurus.c 2008-06-02 01:33:11 UTC (rev 4643) @@ -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" Modified: trunk/target-arm/machine.c =================================================================== --- trunk/target-arm/machine.c 2008-06-02 01:20:15 UTC (rev 4642) +++ trunk/target-arm/machine.c 2008-06-02 01:33:11 UTC (rev 4643) @@ -20,6 +20,7 @@ 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)