[Qemu-devel] [5946] Move spitz microdrive to PCMCIA socket 0.

[Qemu-devel] [5946] Move spitz microdrive to PCMCIA socket 0.

[Andrzej Zaborowski]

Revision: 5946
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5946
Author:   balrog
Date:     2008-12-07 23:33:34 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
Move spitz microdrive to PCMCIA socket 0.

Modified Paths:
--------------
    trunk/hw/spitz.c

Modified: trunk/hw/spitz.c
===================================================================
--- trunk/hw/spitz.c	2008-12-07 23:26:32 UTC (rev 5945)
+++ trunk/hw/spitz.c	2008-12-07 23:33:34 UTC (rev 5946)
@@ -699,7 +699,7 @@
 
 /* CF Microdrive */
 
-static void spitz_microdrive_attach(struct pxa2xx_state_s *cpu)
+static void spitz_microdrive_attach(struct pxa2xx_state_s *cpu, int slot)
 {
     struct pcmcia_card_s *md;
     int index;
@@ -711,7 +711,7 @@
     bs = drives_table[index].bdrv;
     if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) {
         md = dscm1xxxx_init(bs);
-        pxa2xx_pcmcia_attach(cpu->pcmcia[1], md);
+        pxa2xx_pcmcia_attach(cpu->pcmcia[slot], md);
     }
 }
 
@@ -952,10 +952,10 @@
 
     if (model == terrier)
         /* A 6.0 GB microdrive is permanently sitting in CF slot 1.  */
-        spitz_microdrive_attach(cpu);
+        spitz_microdrive_attach(cpu, 1);
     else if (model != akita)
-        /* A 4.0 GB microdrive is permanently sitting in CF slot 1.  */
-        spitz_microdrive_attach(cpu);
+        /* A 4.0 GB microdrive is permanently sitting in CF slot 0.  */
+        spitz_microdrive_attach(cpu, 0);
 
     /* Setup initial (reset) machine state */
     cpu->env->regs[15] = spitz_binfo.loader_start;