7b5d76dae3
Hi all, this patch adds a DisplayAllocator interface that allows display frontends (sdl in particular) to provide a preallocated display buffer for the graphical backend to use. Whenever a graphical backend cannot use qemu_create_displaysurface_from because its own internal pixel format cannot be exported directly (text mode or graphical mode with color depth 8 or 24), it creates another display buffer in memory using qemu_create_displaysurface and does the conversion. This new buffer needs to be blitted into the sdl surface buffer every time we need to update portions of the screen. We can avoid this using the DisplayAllocator interace: sdl provides its own implementation of qemu_create_displaysurface, giving back the sdl surface buffer directly (as we used to do before the DisplayState changes). Since the buffer returned by sdl could be in bgr format we need to put back in the handlers of that case. This approach is good if the two following conditions are true: 1) the sdl surface is a software surface that resides in main memory; 2) the host display color depth is either 16 or 32 bpp. If first condition is false we can have bad performances using sdl and vnc together. If the second condition is false performances are certainly not going to improve but they shouldn't get worse either. The first condition is always true, at least on linux/X11 systems; but I believe is true also on other platforms. The second condition is true in the vast majority of the cases. This patch should also have the good side effect of solving the sdl 2D slowness malc was reporting on MacOS, because SDL_BlitSurface is not going to be called anymore when the guest is in text mode or 24bpp. However the root problem is still present so I suspect we may still see some slowness on MacOS when the guest is in 32 or 16 bpp. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6839 c046a42c-6fe2-441c-8c8c-71466251a162
292 lines
9.4 KiB
C
292 lines
9.4 KiB
C
/*
|
|
* PalmOne's (TM) PDAs.
|
|
*
|
|
* Copyright (C) 2006-2007 Andrzej Zaborowski <balrog@zabor.org>
|
|
*
|
|
* 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 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.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
#include "hw.h"
|
|
#include "audio/audio.h"
|
|
#include "sysemu.h"
|
|
#include "console.h"
|
|
#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)
|
|
{
|
|
uint32_t *val = (uint32_t *) opaque;
|
|
return *val >> ((offset & 3) << 3);
|
|
}
|
|
|
|
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)
|
|
{
|
|
uint32_t *val = (uint32_t *) opaque;
|
|
return *val >> ((offset & 0) << 3);
|
|
}
|
|
|
|
static void static_write(void *opaque, target_phys_addr_t offset,
|
|
uint32_t value)
|
|
{
|
|
#ifdef SPY
|
|
printf("%s: value %08lx written at " PA_FMT "\n",
|
|
__FUNCTION__, value, offset);
|
|
#endif
|
|
}
|
|
|
|
static CPUReadMemoryFunc *static_readfn[] = {
|
|
static_readb,
|
|
static_readh,
|
|
static_readw,
|
|
};
|
|
|
|
static CPUWriteMemoryFunc *static_writefn[] = {
|
|
static_write,
|
|
static_write,
|
|
static_write,
|
|
};
|
|
|
|
/* Palm Tunsgten|E support */
|
|
|
|
/* Shared GPIOs */
|
|
#define PALMTE_USBDETECT_GPIO 0
|
|
#define PALMTE_USB_OR_DC_GPIO 1
|
|
#define PALMTE_TSC_GPIO 4
|
|
#define PALMTE_PINTDAV_GPIO 6
|
|
#define PALMTE_MMC_WP_GPIO 8
|
|
#define PALMTE_MMC_POWER_GPIO 9
|
|
#define PALMTE_HDQ_GPIO 11
|
|
#define PALMTE_HEADPHONES_GPIO 14
|
|
#define PALMTE_SPEAKER_GPIO 15
|
|
/* MPU private GPIOs */
|
|
#define PALMTE_DC_GPIO 2
|
|
#define PALMTE_MMC_SWITCH_GPIO 4
|
|
#define PALMTE_MMC1_GPIO 6
|
|
#define PALMTE_MMC2_GPIO 7
|
|
#define PALMTE_MMC3_GPIO 11
|
|
|
|
static struct mouse_transform_info_s 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;
|
|
|
|
#ifdef HAS_AUDIO
|
|
audio = AUD_init();
|
|
#endif
|
|
|
|
tsc = tsc2102_init(omap_gpio_in_get(cpu->gpio)[PALMTE_PINTDAV_GPIO],
|
|
audio);
|
|
|
|
omap_uwire_attach(cpu->microwire, tsc, 0);
|
|
omap_mcbsp_i2s_attach(cpu->mcbsp1, tsc210x_codec(tsc));
|
|
|
|
tsc210x_set_transform(tsc, &palmte_pointercal);
|
|
}
|
|
|
|
static struct {
|
|
int row;
|
|
int column;
|
|
} palmte_keymap[0x80] = {
|
|
[0 ... 0x7f] = { -1, -1 },
|
|
[0x3b] = { 0, 0 }, /* F1 -> Calendar */
|
|
[0x3c] = { 1, 0 }, /* F2 -> Contacts */
|
|
[0x3d] = { 2, 0 }, /* F3 -> Tasks List */
|
|
[0x3e] = { 3, 0 }, /* F4 -> Note Pad */
|
|
[0x01] = { 4, 0 }, /* Esc -> Power */
|
|
[0x4b] = { 0, 1 }, /* Left */
|
|
[0x50] = { 1, 1 }, /* Down */
|
|
[0x48] = { 2, 1 }, /* Up */
|
|
[0x4d] = { 3, 1 }, /* Right */
|
|
[0x4c] = { 4, 1 }, /* Centre */
|
|
[0x39] = { 4, 1 }, /* Spc -> Centre */
|
|
};
|
|
|
|
static void palmte_button_event(void *opaque, int keycode)
|
|
{
|
|
struct omap_mpu_state_s *cpu = (struct omap_mpu_state_s *) opaque;
|
|
|
|
if (palmte_keymap[keycode & 0x7f].row != -1)
|
|
omap_mpuio_key(cpu->mpuio,
|
|
palmte_keymap[keycode & 0x7f].row,
|
|
palmte_keymap[keycode & 0x7f].column,
|
|
!(keycode & 0x80));
|
|
}
|
|
|
|
static void palmte_onoff_gpios(void *opaque, int line, int level)
|
|
{
|
|
switch (line) {
|
|
case 0:
|
|
printf("%s: current to MMC/SD card %sabled.\n",
|
|
__FUNCTION__, level ? "dis" : "en");
|
|
break;
|
|
case 1:
|
|
printf("%s: internal speaker amplifier %s.\n",
|
|
__FUNCTION__, level ? "down" : "on");
|
|
break;
|
|
|
|
/* These LCD & Audio output signals have not been identified yet. */
|
|
case 2:
|
|
case 3:
|
|
case 4:
|
|
printf("%s: LCD GPIO%i %s.\n",
|
|
__FUNCTION__, line - 1, level ? "high" : "low");
|
|
break;
|
|
case 5:
|
|
case 6:
|
|
printf("%s: Audio GPIO%i %s.\n",
|
|
__FUNCTION__, line - 4, level ? "high" : "low");
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void palmte_gpio_setup(struct omap_mpu_state_s *cpu)
|
|
{
|
|
qemu_irq *misc_gpio;
|
|
|
|
omap_mmc_handlers(cpu->mmc,
|
|
omap_gpio_in_get(cpu->gpio)[PALMTE_MMC_WP_GPIO],
|
|
qemu_irq_invert(omap_mpuio_in_get(cpu->mpuio)
|
|
[PALMTE_MMC_SWITCH_GPIO]));
|
|
|
|
misc_gpio = qemu_allocate_irqs(palmte_onoff_gpios, cpu, 7);
|
|
omap_gpio_out_set(cpu->gpio, PALMTE_MMC_POWER_GPIO, misc_gpio[0]);
|
|
omap_gpio_out_set(cpu->gpio, PALMTE_SPEAKER_GPIO, misc_gpio[1]);
|
|
omap_gpio_out_set(cpu->gpio, 11, misc_gpio[2]);
|
|
omap_gpio_out_set(cpu->gpio, 12, misc_gpio[3]);
|
|
omap_gpio_out_set(cpu->gpio, 13, misc_gpio[4]);
|
|
omap_mpuio_out_set(cpu->mpuio, 1, misc_gpio[5]);
|
|
omap_mpuio_out_set(cpu->mpuio, 3, misc_gpio[6]);
|
|
|
|
/* Reset some inputs to initial state. */
|
|
qemu_irq_lower(omap_gpio_in_get(cpu->gpio)[PALMTE_USBDETECT_GPIO]);
|
|
qemu_irq_lower(omap_gpio_in_get(cpu->gpio)[PALMTE_USB_OR_DC_GPIO]);
|
|
qemu_irq_lower(omap_gpio_in_get(cpu->gpio)[4]);
|
|
qemu_irq_lower(omap_gpio_in_get(cpu->gpio)[PALMTE_HEADPHONES_GPIO]);
|
|
qemu_irq_lower(omap_mpuio_in_get(cpu->mpuio)[PALMTE_DC_GPIO]);
|
|
qemu_irq_raise(omap_mpuio_in_get(cpu->mpuio)[6]);
|
|
qemu_irq_raise(omap_mpuio_in_get(cpu->mpuio)[7]);
|
|
qemu_irq_raise(omap_mpuio_in_get(cpu->mpuio)[11]);
|
|
}
|
|
|
|
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, int vga_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 = palmte_binfo.ram_size;
|
|
int io;
|
|
static uint32_t cs0val = 0xffffffff;
|
|
static uint32_t cs1val = 0x0000e1a0;
|
|
static uint32_t cs2val = 0x0000e1a0;
|
|
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, 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);
|
|
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);
|
|
cpu_register_physical_memory(OMAP_CS1_BASE, OMAP_CS1_SIZE, io);
|
|
io = cpu_register_io_memory(0, 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);
|
|
cpu_register_physical_memory(OMAP_CS3_BASE, OMAP_CS3_SIZE, io);
|
|
|
|
palmte_microwire_setup(cpu);
|
|
|
|
qemu_add_kbd_event_handler(palmte_button_event, cpu);
|
|
|
|
palmte_gpio_setup(cpu);
|
|
|
|
/* Setup initial (reset) machine state */
|
|
if (nb_option_roms) {
|
|
rom_size = get_image_size(option_rom[0]);
|
|
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_loaded = 1;
|
|
cpu->env->regs[15] = 0x00000000;
|
|
} else
|
|
fprintf(stderr, "%s: error loading '%s'\n",
|
|
__FUNCTION__, option_rom[0]);
|
|
}
|
|
|
|
if (!rom_loaded && !kernel_filename) {
|
|
fprintf(stderr, "Kernel or ROM image must be specified\n");
|
|
exit(1);
|
|
}
|
|
|
|
/* Load the kernel. */
|
|
if (kernel_filename) {
|
|
/* Start at bootloader. */
|
|
cpu->env->regs[15] = palmte_binfo.loader_start;
|
|
|
|
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);
|
|
}
|
|
|
|
/* 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 = {
|
|
.name = "cheetah",
|
|
.desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
|
|
.init = palmte_init,
|
|
.ram_require = (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) |
|
|
RAMSIZE_FIXED,
|
|
};
|