--- qemu/hw/palm.c 2018/04/24 16:49:03 1.1.1.1 +++ qemu/hw/palm.c 2018/04/24 17:25:23 1.1.1.3 @@ -5,18 +5,16 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. + * published by the Free Software Foundation; either version 2 or + * (at your option) version 3 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . */ #include "hw.h" #include "audio/audio.h" @@ -25,6 +23,7 @@ #include "omap.h" #include "boards.h" #include "arm-misc.h" +#include "devices.h" static uint32_t static_readb(void *opaque, target_phys_addr_t offset) { @@ -32,12 +31,14 @@ static uint32_t static_readb(void *opaqu return *val >> ((offset & 3) << 3); } -static uint32_t static_readh(void *opaque, target_phys_addr_t offset) { +static uint32_t static_readh(void *opaque, target_phys_addr_t offset) +{ uint32_t *val = (uint32_t *) opaque; return *val >> ((offset & 1) << 3); } -static uint32_t static_readw(void *opaque, target_phys_addr_t offset) { +static uint32_t static_readw(void *opaque, target_phys_addr_t offset) +{ uint32_t *val = (uint32_t *) opaque; return *val >> ((offset & 0) << 3); } @@ -82,20 +83,22 @@ static CPUWriteMemoryFunc *static_writef #define PALMTE_MMC2_GPIO 7 #define PALMTE_MMC3_GPIO 11 +static MouseTransformInfo palmte_pointercal = { + .x = 320, + .y = 320, + .a = { -5909, 8, 22465308, 104, 7644, -1219972, 65536 }, +}; + static void palmte_microwire_setup(struct omap_mpu_state_s *cpu) { - struct uwire_slave_s *tsc; - AudioState *audio = 0; + uWireSlave *tsc; -#ifdef HAS_AUDIO - audio = AUD_init(); -#endif - - tsc = tsc2102_init(omap_gpio_in_get(cpu->gpio)[PALMTE_PINTDAV_GPIO], - audio); + tsc = tsc2102_init(omap_gpio_in_get(cpu->gpio)[PALMTE_PINTDAV_GPIO]); omap_uwire_attach(cpu->microwire, tsc, 0); omap_mcbsp_i2s_attach(cpu->mcbsp1, tsc210x_codec(tsc)); + + tsc210x_set_transform(tsc, &palmte_pointercal); } static struct { @@ -183,14 +186,20 @@ static void palmte_gpio_setup(struct oma qemu_irq_raise(omap_mpuio_in_get(cpu->mpuio)[11]); } -static void palmte_init(int ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, +static struct arm_boot_info palmte_binfo = { + .loader_start = OMAP_EMIFF_BASE, + .ram_size = 0x02000000, + .board_id = 0x331, +}; + +static void palmte_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) { struct omap_mpu_state_s *cpu; int flash_size = 0x00800000; - int sdram_size = 0x02000000; + int sdram_size = palmte_binfo.ram_size; int io; static uint32_t cs0val = 0xffffffff; static uint32_t cs1val = 0x0000e1a0; @@ -198,27 +207,22 @@ static void palmte_init(int ram_size, in static uint32_t cs3val = 0xe1a0e1a0; ram_addr_t phys_flash; int rom_size, rom_loaded = 0; + DisplayState *ds = get_displaystate(); - if (ram_size < flash_size + sdram_size + OMAP15XX_SRAM_SIZE) { - fprintf(stderr, "This architecture uses %i bytes of memory\n", - flash_size + sdram_size + OMAP15XX_SRAM_SIZE); - exit(1); - } - - cpu = omap310_mpu_init(sdram_size, ds, cpu_model); + cpu = omap310_mpu_init(sdram_size, cpu_model); /* External Flash (EMIFS) */ cpu_register_physical_memory(OMAP_CS0_BASE, flash_size, (phys_flash = qemu_ram_alloc(flash_size)) | IO_MEM_ROM); - io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs0val); + io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val); cpu_register_physical_memory(OMAP_CS0_BASE + flash_size, OMAP_CS0_SIZE - flash_size, io); - io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs1val); + io = cpu_register_io_memory(static_readfn, static_writefn, &cs1val); cpu_register_physical_memory(OMAP_CS1_BASE, OMAP_CS1_SIZE, io); - io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs2val); + io = cpu_register_io_memory(static_readfn, static_writefn, &cs2val); cpu_register_physical_memory(OMAP_CS2_BASE, OMAP_CS2_SIZE, io); - io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs3val); + io = cpu_register_io_memory(static_readfn, static_writefn, &cs3val); cpu_register_physical_memory(OMAP_CS3_BASE, OMAP_CS3_SIZE, io); palmte_microwire_setup(cpu); @@ -230,16 +234,21 @@ static void palmte_init(int ram_size, in /* Setup initial (reset) machine state */ if (nb_option_roms) { rom_size = get_image_size(option_rom[0]); - if (rom_size > flash_size) + if (rom_size > flash_size) { fprintf(stderr, "%s: ROM image too big (%x > %x)\n", __FUNCTION__, rom_size, flash_size); - else if (rom_size > 0 && load_image(option_rom[0], - phys_ram_base + phys_flash) > 0) { + rom_size = 0; + } + if (rom_size > 0) { + rom_size = load_image_targphys(option_rom[0], OMAP_CS0_BASE, + flash_size); rom_loaded = 1; cpu->env->regs[15] = 0x00000000; - } else + } + if (rom_size < 0) { fprintf(stderr, "%s: error loading '%s'\n", __FUNCTION__, option_rom[0]); + } } if (!rom_loaded && !kernel_filename) { @@ -250,17 +259,30 @@ static void palmte_init(int ram_size, in /* Load the kernel. */ if (kernel_filename) { /* Start at bootloader. */ - cpu->env->regs[15] = OMAP_EMIFF_BASE; + cpu->env->regs[15] = palmte_binfo.loader_start; - arm_load_kernel(cpu->env, sdram_size, kernel_filename, kernel_cmdline, - initrd_filename, 0x331, OMAP_EMIFF_BASE); + palmte_binfo.kernel_filename = kernel_filename; + palmte_binfo.kernel_cmdline = kernel_cmdline; + palmte_binfo.initrd_filename = initrd_filename; + arm_load_kernel(cpu->env, &palmte_binfo); } - dpy_resize(ds, 320, 320); + /* FIXME: We shouldn't really be doing this here. The LCD controller + will set the size once configured, so this just sets an initial + size until the guest activates the display. */ + ds->surface = qemu_resize_displaysurface(ds, 320, 320); + dpy_resize(ds); } -QEMUMachine palmte_machine = { - "cheetah", - "Palm Tungsten|E aka. Cheetah PDA (OMAP310)", - palmte_init, +static QEMUMachine palmte_machine = { + .name = "cheetah", + .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)", + .init = palmte_init, }; + +static void palmte_machine_init(void) +{ + qemu_register_machine(&palmte_machine); +} + +machine_init(palmte_machine_init);