summary refs log tree commit diff stats
path: root/hw/gumstix.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-17 14:07:13 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-17 14:07:13 +0000
commit38641a52f2335c470349c55d9b1679112da99399 (patch)
treebf249a04efe5bb74fd36c6cb99a8cdd3c95f3dbc /hw/gumstix.c
parent6c41b2723f5cac6e62e68925e7a73f30b11a7a06 (diff)
downloadfocaccia-qemu-38641a52f2335c470349c55d9b1679112da99399.tar.gz
focaccia-qemu-38641a52f2335c470349c55d9b1679112da99399.zip
Convert PXA2xx GPIOs and SCOOP GPIOs to a qemu_irq based api (similar to omap, max7310 and s3c gpios).
Convert spitz and gumstix boards to use new api.
Remove now obsolete gpio_handler_t definition.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3670 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/gumstix.c')
-rw-r--r--hw/gumstix.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/hw/gumstix.c b/hw/gumstix.c
index a8f8a2fabb..235bd2e3a4 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -10,13 +10,6 @@
 
 #include "vl.h"
 
-static void connex_smc_irq(void *opaque, int line, int level)
-{
-    /* Interrupt line of NIC is connected to GPIO line 36 */
-    struct pxa2xx_state_s *cpu = (struct pxa2xx_state_s *) opaque;
-    pxa2xx_gpio_set(cpu->gpio, 36, level);
-}
-
 /* Board init. */
 enum gumstix_model_e { connex };
 
@@ -52,8 +45,9 @@ static void gumstix_common_init(int ram_size, int vga_ram_size,
 
     cpu->env->regs[15] = 0x00000000;
 
-    qemu_irq *irq = qemu_allocate_irqs(connex_smc_irq, cpu, 1);
-    smc91c111_init(&nd_table[0], 0x04000300, *irq);
+    /* Interrupt line of NIC is connected to GPIO line 36 */
+    smc91c111_init(&nd_table[0], 0x04000300,
+                    pxa2xx_gpio_in_get(cpu->gpio)[36]);
 }
 
 static void connex_init(int ram_size, int vga_ram_size,