diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-16 19:04:14 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-16 19:04:14 +0000 |
| commit | 3023f3329d87a6203d03a0e9ccb948772940da96 (patch) | |
| tree | 2e1bea1fcce30aa15940275277f52022d7325341 /hw/sm501.c | |
| parent | 9f8df9c10f5112014cffef0bf546bf344eeefc32 (diff) | |
graphical_console_init change (Stefano Stabellini)
Patch 5/7
This patch changes the graphical_console_init function to return an
allocated DisplayState instead of a QEMUConsole.
This patch contains just the graphical_console_init change and few other
modifications mainly in console.c and vl.c.
It was necessary to move the display frontends (e.g. sdl and vnc)
initialization after machine->init in vl.c.
This patch does *not* include any required changes to any device, these
changes come with the following patches.
Patch 6/7
This patch changes the QEMUMachine init functions not to take a
DisplayState as an argument because is not needed any more;
In few places the graphic hardware initialization function was called
only if DisplayState was not NULL, now they are always called.
Apart from these cases, the rest are all mechanical substitutions.
Patch 7/7
This patch updates the graphic device code to use the new
graphical_console_init function.
As for the previous patch, in few places graphical_console_init was called
only if DisplayState was not NULL, now it is always called.
Apart from these cases, the rest are all mechanical substitutions.
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@6344 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sm501.c')
| -rw-r--r-- | hw/sm501.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/sm501.c b/hw/sm501.c index 0dfd08a664..ca9528b60e 100644 --- a/hw/sm501.c +++ b/hw/sm501.c @@ -450,7 +450,6 @@ static const uint32_t sm501_mem_local_size[] = { typedef struct SM501State { /* graphic console status */ DisplayState *ds; - QEMUConsole *console; /* status & internal resources */ target_phys_addr_t base; @@ -994,7 +993,7 @@ static void sm501_draw_crt(SM501State * s) /* adjust console size */ if (s->last_width != width || s->last_height != height) { - qemu_console_resize(s->console, width, height); + qemu_console_resize(s->ds, width, height); s->last_width = width; s->last_height = height; full_update = 1; @@ -1051,7 +1050,7 @@ static void sm501_update_display(void *opaque) sm501_draw_crt(s); } -void sm501_init(DisplayState *ds, uint32_t base, unsigned long local_mem_base, +void sm501_init(uint32_t base, unsigned long local_mem_base, uint32_t local_mem_bytes, CharDriverState *chr) { SM501State * s; @@ -1069,7 +1068,6 @@ void sm501_init(DisplayState *ds, uint32_t base, unsigned long local_mem_base, s->misc_control = 0x00001000; /* assumes SH, active=low */ s->dc_panel_control = 0x00010000; s->dc_crt_control = 0x00010000; - s->ds = ds; /* allocate local memory */ s->local_mem = (uint8 *)phys_ram_base + local_mem_base; @@ -1093,6 +1091,6 @@ void sm501_init(DisplayState *ds, uint32_t base, unsigned long local_mem_base, 115200, chr, 1); /* create qemu graphic console */ - s->console = graphic_console_init(s->ds, sm501_update_display, NULL, - NULL, NULL, s); + s->ds = graphic_console_init(sm501_update_display, NULL, + NULL, NULL, s); } |