Revision 74e91155 hw/macio.c

b/hw/macio.c
31 31 
    int pic_mem_index;
32 32 
    int dbdma_mem_index;
33 33 
    int cuda_mem_index;
34 
    int nvram_mem_index;
34 
    void *nvram;
35 35 
    int nb_ide;
36 36 
    int ide_mem_index[4];
37 37 
};
......
68 68 
                                         macio_state->ide_mem_index[i]);
69 69 
        }
70 70 
    }
71 
    if (macio_state->nvram_mem_index >= 0) {
72 
        cpu_register_physical_memory(addr + 0x60000, 0x20000,
73 
                                     macio_state->nvram_mem_index);
74 
    }
71 
    if (macio_state->nvram != NULL)
72 
        macio_nvram_map(macio_state->nvram, addr + 0x60000);
75 73 
}
76 74 

  		





  77
  75
  
    
void macio_init (PCIBus *bus, int device_id, int is_oldworld, int pic_mem_index,


  		





  78
  
  
    
                 int dbdma_mem_index, int cuda_mem_index, int nvram_mem_index,


  		





  
  76
  
    
                 int dbdma_mem_index, int cuda_mem_index, void *nvram,


  		





  79
  77
  
    
                 int nb_ide, int *ide_mem_index)


  		





  80
  78
  
    
{


  		





  81
  79
  
    
    PCIDevice *d;


  		





  ......




  90
  88
  
    
    macio_state->pic_mem_index = pic_mem_index;


  		





  91
  89
  
    
    macio_state->dbdma_mem_index = dbdma_mem_index;


  		





  92
  90
  
    
    macio_state->cuda_mem_index = cuda_mem_index;


  		





  93
  
  
    
    macio_state->nvram_mem_index = nvram_mem_index;


  		





  
  91
  
    
    macio_state->nvram = nvram;


  		





  94
  92
  
    
    if (nb_ide > 4)


  		





  95
  93
  
    
        nb_ide = 4;


  		





  96
  94
  
    
    macio_state->nb_ide = nb_ide;


  		












Also available in:
  Unified diff