gwj / at91sam9263 · Commits

Commit 5f70aab1da0a71750a393e2d0d8796386b18a17d

Authored by aurel32
1 parent dfb021bc

Fix bug in omap_sx1.c introduced by r6344 

This patch changes the QEMUMachine init function not to take a
DisplayState as an argument because is not needed any more;

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6552 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 7 additions and 6 deletions
hw/omap_sx1.c
  View file @5f70aab
@@ -116,7 +116,7 @@ static struct arm_boot_info sx1_binfo = { @@ -116,7 +116,7 @@ static struct arm_boot_info sx1_binfo = {
116 }; 116 };
117 117
118 static void sx1_init(ram_addr_t ram_size, int vga_ram_size, 118 static void sx1_init(ram_addr_t ram_size, int vga_ram_size,
119 - const char *boot_device, DisplayState *ds, 119 + const char *boot_device,
120 const char *kernel_filename, const char *kernel_cmdline, 120 const char *kernel_filename, const char *kernel_cmdline,
121 const char *initrd_filename, const char *cpu_model, 121 const char *initrd_filename, const char *cpu_model,
122 const int version) 122 const int version)
@@ -201,24 +201,25 @@ static void sx1_init(ram_addr_t ram_size, int vga_ram_size, @@ -201,24 +201,25 @@ static void sx1_init(ram_addr_t ram_size, int vga_ram_size,
201 cpu->env->regs[15] = 0x00000000; 201 cpu->env->regs[15] = 0x00000000;
202 } 202 }
203 203
204 - qemu_console_resize(ds, 640, 480); 204 + /* TODO: fix next line */
  205 + //~ qemu_console_resize(ds, 640, 480);
205 } 206 }
206 207
207 static void sx1_init_v1(ram_addr_t ram_size, int vga_ram_size, 208 static void sx1_init_v1(ram_addr_t ram_size, int vga_ram_size,
208 - const char *boot_device, DisplayState *ds, 209 + const char *boot_device,
209 const char *kernel_filename, const char *kernel_cmdline, 210 const char *kernel_filename, const char *kernel_cmdline,
210 const char *initrd_filename, const char *cpu_model) 211 const char *initrd_filename, const char *cpu_model)
211 { 212 {
212 - sx1_init(ram_size, vga_ram_size, boot_device, ds, kernel_filename, 213 + sx1_init(ram_size, vga_ram_size, boot_device, kernel_filename,
213 kernel_cmdline, initrd_filename, cpu_model, 1); 214 kernel_cmdline, initrd_filename, cpu_model, 1);
214 } 215 }
215 216
216 static void sx1_init_v2(ram_addr_t ram_size, int vga_ram_size, 217 static void sx1_init_v2(ram_addr_t ram_size, int vga_ram_size,
217 - const char *boot_device, DisplayState *ds, 218 + const char *boot_device,
218 const char *kernel_filename, const char *kernel_cmdline, 219 const char *kernel_filename, const char *kernel_cmdline,
219 const char *initrd_filename, const char *cpu_model) 220 const char *initrd_filename, const char *cpu_model)
220 { 221 {
221 - sx1_init(ram_size, vga_ram_size, boot_device, ds, kernel_filename, 222 + sx1_init(ram_size, vga_ram_size, boot_device, kernel_filename,
222 kernel_cmdline, initrd_filename, cpu_model, 2); 223 kernel_cmdline, initrd_filename, cpu_model, 2);
223 } 224 }
224 225