MIPS RTC emulation.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2231 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									cd75cf10ca
								
							
						
					
					
						commit
						afdfa781e6
					
				@ -358,7 +358,7 @@ DEFINES += -DHAS_AUDIO
 | 
				
			|||||||
endif
 | 
					endif
 | 
				
			||||||
ifeq ($(TARGET_ARCH), mips)
 | 
					ifeq ($(TARGET_ARCH), mips)
 | 
				
			||||||
VL_OBJS+= mips_r4k.o mips_timer.o dma.o vga.o serial.o i8254.o i8259.o ide.o
 | 
					VL_OBJS+= mips_r4k.o mips_timer.o dma.o vga.o serial.o i8254.o i8259.o ide.o
 | 
				
			||||||
#VL_OBJS+= #pckbd.o fdc.o m48t59.o
 | 
					VL_OBJS+= mc146818rtc.o #pckbd.o fdc.o m48t59.o
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
ifeq ($(TARGET_BASE_ARCH), sparc)
 | 
					ifeq ($(TARGET_BASE_ARCH), sparc)
 | 
				
			||||||
ifeq ($(TARGET_ARCH), sparc64)
 | 
					ifeq ($(TARGET_ARCH), sparc64)
 | 
				
			||||||
 | 
				
			|||||||
@ -135,6 +135,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
 | 
				
			|||||||
    unsigned long bios_offset;
 | 
					    unsigned long bios_offset;
 | 
				
			||||||
    int ret;
 | 
					    int ret;
 | 
				
			||||||
    CPUState *env;
 | 
					    CPUState *env;
 | 
				
			||||||
 | 
					    static RTCState *rtc_state;
 | 
				
			||||||
    int i;
 | 
					    int i;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    env = cpu_init();
 | 
					    env = cpu_init();
 | 
				
			||||||
@ -179,12 +180,15 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
 | 
				
			|||||||
    cpu_mips_clock_init(env);
 | 
					    cpu_mips_clock_init(env);
 | 
				
			||||||
    cpu_mips_irqctrl_init();
 | 
					    cpu_mips_irqctrl_init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    rtc_state = rtc_init(0x70, 8);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Register 64 KB of ISA IO space at 0x14000000 */
 | 
					    /* Register 64 KB of ISA IO space at 0x14000000 */
 | 
				
			||||||
    isa_mmio_init(0x14000000, 0x00010000);
 | 
					    isa_mmio_init(0x14000000, 0x00010000);
 | 
				
			||||||
    isa_mem_base = 0x10000000;
 | 
					    isa_mem_base = 0x10000000;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    isa_pic = pic_init(pic_irq_request, env);
 | 
					    isa_pic = pic_init(pic_irq_request, env);
 | 
				
			||||||
    pit = pit_init(0x40, 0);
 | 
					    pit = pit_init(0x40, 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]);
 | 
					    serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]);
 | 
				
			||||||
    isa_vga_init(ds, phys_ram_base + ram_size, ram_size, 
 | 
					    isa_vga_init(ds, phys_ram_base + ram_size, ram_size, 
 | 
				
			||||||
                 vga_ram_size);
 | 
					                 vga_ram_size);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user