motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made the etrax timers and serial-ports base address relocatable. Use target_phys_addr_t instead of target_ulong.

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4058 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
edgar_igl 2008-03-14 01:50:49 +00:00
parent 05ba7d5f34
commit ca87d03b77
4 changed files with 96 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/etraxfs.c
View file

@ -35,10 +35,10 @@ static void main_cpu_reset(void *opaque)
}
/* Init functions for different blocks. */
extern qemu_irq *etraxfs_pic_init(CPUState *env, target_ulong base);
/* TODO: Make these blocks relocate:able. */
extern void etraxfs_timer_init(CPUState *env, qemu_irq *irqs);
extern void etraxfs_ser_init(CPUState *env, qemu_irq *irqs);
extern qemu_irq *etraxfs_pic_init(CPUState *env, target_phys_addr_t base);
void etraxfs_timer_init(CPUState *env, qemu_irq *irqs,
target_phys_addr_t base);
void etraxfs_ser_init(CPUState *env, qemu_irq *irqs, target_phys_addr_t base);
static
void bareetraxfs_init (int ram_size, int vga_ram_size,
@ -84,8 +84,14 @@ void bareetraxfs_init (int ram_size, int vga_ram_size,
4, 0x0000, 0x0000, 0x0000, 0x0000);
pic = etraxfs_pic_init(env, 0xb001c000);
etraxfs_timer_init(env, pic);
etraxfs_ser_init(env, pic);
/* 2 timers. */
etraxfs_timer_init(env, pic, 0xb001e000);
etraxfs_timer_init(env, pic, 0xb005e000);
/* 4 serial ports. */
etraxfs_ser_init(env, pic, 0xb0026000);
etraxfs_ser_init(env, pic, 0xb0028000);
etraxfs_ser_init(env, pic, 0xb002a000);
etraxfs_ser_init(env, pic, 0xb002c000);
kernel_size = load_image(kernel_filename, phys_ram_base + 0x4000);
/* magic for boot. */