Changeset 3444

Timestamp:

11/19/07 20:05:05 (6 years ago)

Author:

andrew

Message:

Remove s3c24xx_mmci dependency on sysemu.h.
Convert s3c24xx_mmci callbacks to qemu_irq api.

Location:

trunk/src/host/qemu-neo1973/hw

Files:

• neo1973.c (modified) (2 diffs)
• s3c.h (modified) (1 diff)
• s3c2410.c (modified) (1 diff)
• s3c24xx_mmci.c (modified) (3 diffs)

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

@@ -184 +184 @@
 
 /* Handlers for input ports */
-static void neo_mmc_cover_switch(void *irq, int in)
-{
-    qemu_set_irq((qemu_irq) irq, !in);
-}
-
-static void neo_mmc_writeprotect_switch(void *irq, int wp)
-{
-}
-
 static void neo_nand_wp_switch(void *opaque, int line, int level)
 {
@@ -263 +254 @@
 
     /* MMC/SD host */
-    s3c_mmci_handlers(s->cpu->mmci,
-                    s3c_gpio_in_get(s->cpu->io)[GTA01_IRQ_nSD_DETECT],
-                    neo_mmc_writeprotect_switch,
-                    neo_mmc_cover_switch);
+    s3c_mmci_handlers(s->cpu->mmci, 0,
+                    qemu_irq_invert(s3c_gpio_in_get(
+                                    s->cpu->io)[GTA01_IRQ_nSD_DETECT]));
 }
 

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

@@ -158 +158 @@
 struct s3c_mmci_state_s;
 struct s3c_mmci_state_s *s3c_mmci_init(target_phys_addr_t base,
-                qemu_irq irq, qemu_irq *dma);
-void s3c_mmci_handlers(struct s3c_mmci_state_s *s, void *opaque,
-                void (*readonly_cb)(void *, int),
-                void (*coverswitch_cb)(void *, int));
+                BlockDriverState *bd, qemu_irq irq, qemu_irq *dma);
+void s3c_mmci_handlers(struct s3c_mmci_state_s *s, qemu_irq readonly_cb,
+                qemu_irq coverswitch_cb);
 void s3c_mmci_reset(struct s3c_mmci_state_s *s);
 

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

@@ -2909 +2909 @@
                     s->irq[S3C_PIC_SPI1], s->drq[S3C_RQ_SPI1], s->io);
 
-    s->mmci = s3c_mmci_init(0x5a000000, s->irq[S3C_PIC_SDI], s->drq);
+    s->mmci = s3c_mmci_init(0x5a000000, sd_bdrv, s->irq[S3C_PIC_SDI], s->drq);
 
     if (usb_enabled) {

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

@@ -11 +11 @@
 #include "sd.h"
 #include "hw.h"
-#include "sysemu.h"
 
 struct s3c_mmci_state_s {
@@ -416 +415 @@
 
 struct s3c_mmci_state_s *s3c_mmci_init(target_phys_addr_t base,
-                qemu_irq irq, qemu_irq *dma)
+                BlockDriverState *bd, qemu_irq irq, qemu_irq *dma)
 {
     int iomemtype;
@@ -435 +434 @@
 
     /* Instantiate the actual storage */
-    s->card = sd_init(sd_bdrv);
+    s->card = sd_init(bd);
 
     return s;
 }
 
-void s3c_mmci_handlers(struct s3c_mmci_state_s *s, void *opaque,
-                void (*readonly_cb)(void *, int),
-                void (*coverswitch_cb)(void *, int))
-{
-    /*sd_set_cb(s->card, opaque, readonly_cb, coverswitch_cb);*/
-}
+void s3c_mmci_handlers(struct s3c_mmci_state_s *s, qemu_irq readonly_cb,
+                qemu_irq coverswitch_cb)
+{
+    sd_set_cb(s->card, readonly_cb, coverswitch_cb);
+}