Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / hw / pxa2xx_pcmcia.c

diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c
index b26c597..6e9c956 100644 (file)
--- a/hw/pxa2xx_pcmcia.c
+++ b/hw/pxa2xx_pcmcia.c
@@ -11,9 +11,9 @@
 #include "pcmcia.h"
 #include "pxa.h"
 
-struct pxa2xx_pcmcia_s {
-    struct pcmcia_socket_s slot;
-    struct pcmcia_card_s *card;
+struct PXA2xxPCMCIAState {
+    PCMCIASocket slot;
+    PCMCIACardState *card;
 
     qemu_irq irq;
     qemu_irq cd_irq;
@@ -22,7 +22,7 @@ struct pxa2xx_pcmcia_s {
 static uint32_t pxa2xx_pcmcia_common_read(void *opaque,
                 target_phys_addr_t offset)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
 
     if (s->slot.attached) {
         return s->card->common_read(s->card->state, offset);
@@ -34,7 +34,7 @@ static uint32_t pxa2xx_pcmcia_common_read(void *opaque,
 static void pxa2xx_pcmcia_common_write(void *opaque,
                 target_phys_addr_t offset, uint32_t value)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
 
     if (s->slot.attached) {
         s->card->common_write(s->card->state, offset, value);
@@ -44,7 +44,7 @@ static void pxa2xx_pcmcia_common_write(void *opaque,
 static uint32_t pxa2xx_pcmcia_attr_read(void *opaque,
                 target_phys_addr_t offset)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
 
     if (s->slot.attached) {
         return s->card->attr_read(s->card->state, offset);
@@ -56,7 +56,7 @@ static uint32_t pxa2xx_pcmcia_attr_read(void *opaque,
 static void pxa2xx_pcmcia_attr_write(void *opaque,
                 target_phys_addr_t offset, uint32_t value)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
 
     if (s->slot.attached) {
         s->card->attr_write(s->card->state, offset, value);
@@ -66,7 +66,7 @@ static void pxa2xx_pcmcia_attr_write(void *opaque,
 static uint32_t pxa2xx_pcmcia_io_read(void *opaque,
                 target_phys_addr_t offset)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
 
     if (s->slot.attached) {
         return s->card->io_read(s->card->state, offset);
@@ -78,7 +78,7 @@ static uint32_t pxa2xx_pcmcia_io_read(void *opaque,
 static void pxa2xx_pcmcia_io_write(void *opaque,
                 target_phys_addr_t offset, uint32_t value)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
 
     if (s->slot.attached) {
         s->card->io_write(s->card->state, offset, value);
@@ -123,20 +123,20 @@ static CPUWriteMemoryFunc *pxa2xx_pcmcia_io_writefn[] = {
 
 static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
     if (!s->irq)
         return;
 
     qemu_set_irq(s->irq, level);
 }
 
-struct pxa2xx_pcmcia_s *pxa2xx_pcmcia_init(target_phys_addr_t base)
+PXA2xxPCMCIAState *pxa2xx_pcmcia_init(target_phys_addr_t base)
 {
     int iomemtype;
-    struct pxa2xx_pcmcia_s *s;
+    PXA2xxPCMCIAState *s;
 
-    s = (struct pxa2xx_pcmcia_s *)
-            qemu_mallocz(sizeof(struct pxa2xx_pcmcia_s));
+    s = (PXA2xxPCMCIAState *)
+            qemu_mallocz(sizeof(PXA2xxPCMCIAState));
 
     /* Socket I/O Memory Space */
     iomemtype = cpu_register_io_memory(0, pxa2xx_pcmcia_io_readfn,
@@ -166,9 +166,9 @@ struct pxa2xx_pcmcia_s *pxa2xx_pcmcia_init(target_phys_addr_t base)
 }
 
 /* Insert a new card into a slot */
-int pxa2xx_pcmcia_attach(void *opaque, struct pcmcia_card_s *card)
+int pxa2xx_pcmcia_attach(void *opaque, PCMCIACardState *card)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
     if (s->slot.attached)
         return -EEXIST;
 
@@ -188,7 +188,7 @@ int pxa2xx_pcmcia_attach(void *opaque, struct pcmcia_card_s *card)
 /* Eject card from the slot */
 int pxa2xx_pcmcia_dettach(void *opaque)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
     if (!s->slot.attached)
         return -ENOENT;
 
@@ -209,7 +209,7 @@ int pxa2xx_pcmcia_dettach(void *opaque)
 /* Who to notify on card events */
 void pxa2xx_pcmcia_set_irq_cb(void *opaque, qemu_irq irq, qemu_irq cd_irq)
 {
-    struct pxa2xx_pcmcia_s *s = (struct pxa2xx_pcmcia_s *) opaque;
+    PXA2xxPCMCIAState *s = (PXA2xxPCMCIAState *) opaque;
     s->irq = irq;
     s->cd_irq = cd_irq;
 }