Changeset 3582

Timestamp:

12/05/07 23:18:41 (5 years ago)

Author:

andrew

Message:

Add a paravirtual GTA02-like machine based on GTA01 + GPS.

Location:

trunk/src/host/qemu-neo1973

Files:

• hw/boards.h (modified) (1 diff)
• hw/neo1973.c (modified) (7 diffs)
• vl.c (modified) (1 diff)

trunk/src/host/qemu-neo1973/hw/boards.h

@@ -76 +76 @@
 /* neo1973.c */
 extern QEMUMachine gta01_machine;
+extern QEMUMachine gta02f_machine;
 
 /* palm.c */

trunk/src/host/qemu-neo1973/hw/neo1973.c

@@ -21 +21 @@
 #include "usb.h"
 #include "net.h"
+#include "sd.h"
 
 #define neo_printf(format, ...) \
@@ -82 +83 @@
     i2c_slave *lcm;
     CharDriverState *modem;
+    CharDriverState *gps;
     QEMUTimer *modem_timer;
     qemu_irq *kbd_pic;
@@ -107 +109 @@
 static void neo_gpspwr_switch(void *opaque, int line, int level)
 {
+    struct neo_board_s *s = (struct neo_board_s *) opaque;
+
     neo_printf("GPS powered %s.\n", level ? "up" : "down");
+
+    if (s->gps)
+        gps_enable(s->gps, level);
 }
 
@@ -391 +398 @@
 }
 
+static void neo_gps_setup(struct neo_board_s *s)
+{
+    s->gps = gps_antaris_serial_init();
+
+    s3c_uart_attach(s->cpu->uart[1], s->gps);
+}
+
 static void neo_reset(void *opaque)
 {
@@ -416 +430 @@
 
 /* Board init.  */
-static void gta01_init(int 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)
+static struct neo_board_s *neo1973_init_common(int ram_size, DisplayState *ds,
+                const char *kernel_filename, const char *cpu_model,
+                struct sd_card_s *mmc)
 {
     struct neo_board_s *s = (struct neo_board_s *)
             qemu_mallocz(sizeof(struct neo_board_s));
-    int sd_idx = drive_get_index(IF_SD, 0, 0);
 
     s->ram = 0x08000000;
     s->kernel = kernel_filename;
-    if (sd_idx >= 0)
-        s->mmc = sd_init(drives_table[sd_idx].bdrv, 0);
+    s->mmc = mmc;
 
     /* Setup CPU & memory */
@@ -469 +480 @@
 
     dpy_resize(ds, 480, 640);
+
+    return s;
+}
+
+static void gta01_init(int 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)
+{
+    int sd_idx = drive_get_index(IF_SD, 0, 0);
+    struct sd_card_s *sd = 0;
+
+    if (sd_idx >= 0)
+        sd = sd_init(drives_table[sd_idx].bdrv, 0);
+
+    neo1973_init_common(ram_size, ds, kernel_filename, cpu_model, sd);
+}
+
+static void gta02f_init(int 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 neo_board_s *neo;
+
+    neo = neo1973_init_common(ram_size, ds, kernel_filename, cpu_model, 0);
+
+    neo_gps_setup(neo);
 }
 
@@ -476 +515 @@
     gta01_init,
 };
+
+QEMUMachine gta02f_machine = {
+    "gta02fake",
+    "Paravirtual FIC Neo1973 rev GTA02 (S3C2410A)",
+    gta02f_init,
+};

trunk/src/host/qemu-neo1973/vl.c

@@ -8073 +8073 @@
     qemu_register_machine(&terrierpda_machine);
     qemu_register_machine(&gta01_machine);
+    qemu_register_machine(&gta02f_machine);
     qemu_register_machine(&palmte_machine);
     qemu_register_machine(&lm3s811evb_machine);