Commit 5ce4aafd942d24d3fcde649f12636c9092c718c6
1 parent
d45952a0
target-ppc: move OpenBIOS machines type to ppc.h from hw/ppc_oldworld.c
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6231 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
8 additions
and
6 deletions
hw/ppc.h
| @@ -33,3 +33,11 @@ void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val); | @@ -33,3 +33,11 @@ void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val); | ||
| 33 | void ppc40x_irq_init (CPUState *env); | 33 | void ppc40x_irq_init (CPUState *env); |
| 34 | void ppc6xx_irq_init (CPUState *env); | 34 | void ppc6xx_irq_init (CPUState *env); |
| 35 | void ppc970_irq_init (CPUState *env); | 35 | void ppc970_irq_init (CPUState *env); |
| 36 | + | ||
| 37 | +/* PPC machines for OpenBIOS */ | ||
| 38 | +enum { | ||
| 39 | + ARCH_PREP = 0, | ||
| 40 | + ARCH_MAC99, | ||
| 41 | + ARCH_HEATHROW, | ||
| 42 | +}; | ||
| 43 | + |
hw/ppc_oldworld.c
| @@ -38,12 +38,6 @@ | @@ -38,12 +38,6 @@ | ||
| 38 | #define VGA_BIOS_SIZE 65536 | 38 | #define VGA_BIOS_SIZE 65536 |
| 39 | #define CFG_ADDR 0xf0000510 | 39 | #define CFG_ADDR 0xf0000510 |
| 40 | 40 | ||
| 41 | -enum { | ||
| 42 | - ARCH_PREP = 0, | ||
| 43 | - ARCH_MAC99, | ||
| 44 | - ARCH_HEATHROW, | ||
| 45 | -}; | ||
| 46 | - | ||
| 47 | /* temporary frame buffer OSI calls for the video.x driver. The right | 41 | /* temporary frame buffer OSI calls for the video.x driver. The right |
| 48 | solution is to modify the driver to use VGA PCI I/Os */ | 42 | solution is to modify the driver to use VGA PCI I/Os */ |
| 49 | /* XXX: to be removed. This is no way related to emulation */ | 43 | /* XXX: to be removed. This is no way related to emulation */ |