Changeset 1647

Timestamp:

04/03/07 16:17:53 (6 years ago)

Author:

andrew

Message:

Allow multiple devices on each UART, add modem ioctls.
Invert GSM power-on signal.
Explicitely use bash and GNU make in scripts. (GNU echo is still needed so we're not 100% BSD-friendly yet)

Location:

trunk/src/host/qemu-neo1973

Files:

• hw/neo1973.c (modified) (1 diff)
• hw/s3c.h (modified) (1 diff)
• hw/s3c2410.c (modified) (9 diffs)
• openmoko/download.sh (modified) (1 diff)
• openmoko/env (modified) (1 diff)
• openmoko/flash.sh (modified) (3 diffs)
• vl.h (modified) (1 diff)

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

@@ -101 +101 @@
 static void neo_gsm_switch(int line, int level, void *opaque)
 {
-    neo_printf("GSM %sabled.\n", level ? "en" : "dis");
+    neo_printf("GSM %sabled.\n", level ? "dis" : "en");
 }
 

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

@@ -110 +110 @@
 struct s3c_uart_state_s;
 struct s3c_uart_state_s *s3c_uart_init(target_phys_addr_t base,
-                void *pic, void *dma, int irq[], int drq[],
-                CharDriverState *chr);
+                void *pic, void *dma, int irq[], int drq[]);
+void s3c_uart_attach(struct s3c_uart_state_s *s, CharDriverState *chr);
 
 struct s3c_adc_state_s;

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

@@ -1050 +1050 @@
     int rxstart;
     int rxlen;
-    CharDriverState *chr;
+#define UART_MAX_CHR    4
+    int chr_num;
+    CharDriverState *chr[UART_MAX_CHR];
 
     uint8_t lcontrol;
@@ -1075 +1077 @@
 {
     QEMUSerialSetParams ssp;
+    int i;
     if (!s->chr)
         return;
@@ -1098 +1101 @@
     ssp.stop_bits = (s->lcontrol & (1 << 2)) ? 2 : 1;
 
-    qemu_chr_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
+    for (i = 0; i < s->chr_num; i ++)
+        qemu_chr_ioctl(s->chr[i], CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
 }
 
@@ -1235 +1239 @@
     struct s3c_uart_state_s *s = (struct s3c_uart_state_s *) opaque;
     uint8_t ch;
+    int i, afc;
     addr -= s->base;
 
@@ -1257 +1262 @@
         break;
     case S3C_UMCON:
-        s->mcontrol = value & 0xe1;
+        if ((s->mcontrol ^ value) & (1 << 4)) {
+            afc = (value >> 4) & 1;
+            for (i = 0; i < s->chr_num; i ++)
+                qemu_chr_ioctl(s->chr[i], CHR_IOCTL_MODEM_SET_AFC, &afc);
+        }
+        s->mcontrol = value & 0x11;
         break;
     case S3C_UTXH:
         ch = value & 0xff;
-        if (s->chr)
-            qemu_chr_write(s->chr, &ch, 1);
+        for (i = 0; i < s->chr_num; i ++)
+            qemu_chr_write(s->chr[i], &ch, 1);
         s3c_uart_empty(s);
         break;
@@ -1287 +1297 @@
 
 struct s3c_uart_state_s *s3c_uart_init(target_phys_addr_t base,
-                void *pic, void *dma, int irq[], int drq[],
-                CharDriverState *chr)
+                void *pic, void *dma, int irq[], int drq[])
 {
     int iomemtype;
@@ -1299 +1308 @@
     s->irq = irq;
     s->drq = drq;
-    s->chr = chr;
 
     s3c_uart_reset(s);
@@ -1307 +1315 @@
     cpu_register_physical_memory(s->base, 0xfff, iomemtype);
 
-    if (chr)
-        qemu_chr_add_read_handler(chr, s3c_uart_is_empty, s3c_uart_rx, s);
+    return s;
+}
+
+void s3c_uart_attach(struct s3c_uart_state_s *s, CharDriverState *chr)
+{
+    if (s->chr_num >= UART_MAX_CHR)
+        cpu_abort(cpu_single_env, "%s: Too many devices\n", __FUNCTION__);
+    s->chr[s->chr_num ++] = chr;
+
+    qemu_chr_add_read_handler(chr, s3c_uart_is_empty, s3c_uart_rx, s);
     /* S3C2410 UART doesn't seem to understand break conditions.  */
-
-    return s;
 }
 
@@ -2190 +2204 @@
     cpu_register_physical_memory(s->nand_base, 0xffffff, iomemtype);
 
-    for (i = 0; s3c2410_uart[i].base; i ++)
+    for (i = 0; s3c2410_uart[i].base; i ++) {
         s->uart[i] = s3c_uart_init(s3c2410_uart[i].base, s->pic, s->dma,
-                        s3c2410_uart[i].irq, s3c2410_uart[i].dma,
-                        serial_hds[i]);
+                        s3c2410_uart[i].irq, s3c2410_uart[i].dma);
+        if (serial_hds[i])
+            s3c_uart_attach(s->uart[i], serial_hds[i]);
+    }
 
     s->timers = s3c_timers_init(0x51000000, s->pic, s->dma);

trunk/src/host/qemu-neo1973/openmoko/download.sh

@@ -1 @@
-#! /bin/sh
+#! /bin/bash
 # Chooses and downloads some OpenMoko image snapshots for flash.sh to use.
 #

trunk/src/host/qemu-neo1973/openmoko/env

@@ -8 +8 @@
 qemu="$src_dir/$qemu_relative"
 flash_image=openmoko-flash.image
+make=gmake
 
 kernel_addr=0x32000000

trunk/src/host/qemu-neo1973/openmoko/flash.sh

@@ -1 @@
-#! /bin/sh
+#! /bin/bash
 # Generates a ready to use OpenMoko NAND flash image.  Vaguely based
 # on devirginator and http://wiki.openmoko.org/wiki/NAND_bad_blocks.
@@ -32 +32 @@
 fi
 
-make splash.gz || exit -1
+${make} splash.gz || exit -1
 
 # Find the most recent OpenMoko images in the current directory.
@@ -57 +57 @@
 
 rm -rf $flash_image
-make $flash_image || exit -1
+${make} $flash_image || exit -1
 
 # Launch the emulator assuming that u-boot is now functional enough

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

@@ -292 +292 @@
 #define CHR_IOCTL_PP_WRITE_CONTROL    6
 #define CHR_IOCTL_PP_READ_STATUS      7
+
+#define CHR_IOCTL_MODEM_SET_AFC       8
 
 typedef void IOEventHandler(void *opaque, int event);