Revision 15b18ec2

b/hw/spitz.c
699 699

  
700 700
/* CF Microdrive */
701 701

  
702
static void spitz_microdrive_attach(struct pxa2xx_state_s *cpu)
702
static void spitz_microdrive_attach(struct pxa2xx_state_s *cpu, int slot)
703 703
{
704 704
    struct pcmcia_card_s *md;
705 705
    int index;
......
711 711
    bs = drives_table[index].bdrv;
712 712
    if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) {
713 713
        md = dscm1xxxx_init(bs);
714
        pxa2xx_pcmcia_attach(cpu->pcmcia[1], md);
714
        pxa2xx_pcmcia_attach(cpu->pcmcia[slot], md);
715 715
    }
716 716
}
717 717

  
......
952 952

  
953 953
    if (model == terrier)
954 954
        /* A 6.0 GB microdrive is permanently sitting in CF slot 1.  */
955
        spitz_microdrive_attach(cpu);
955
        spitz_microdrive_attach(cpu, 1);
956 956
    else if (model != akita)
957
        /* A 4.0 GB microdrive is permanently sitting in CF slot 1.  */
958
        spitz_microdrive_attach(cpu);
957
        /* A 4.0 GB microdrive is permanently sitting in CF slot 0.  */
958
        spitz_microdrive_attach(cpu, 0);
959 959

  
960 960
    /* Setup initial (reset) machine state */
961 961
    cpu->env->regs[15] = spitz_binfo.loader_start;

Also available in: Unified diff