Revision c171148c hw/mips_jazz.c

b/hw/mips_jazz.c
33 33
#include "net.h"
34 34
#include "scsi.h"
35 35

  
36
extern int nographic;
37

  
38 36
#ifdef TARGET_WORDS_BIGENDIAN
39 37
#define BIOS_FILENAME "mips_bios.bin"
40 38
#else
41 39
#define BIOS_FILENAME "mipsel_bios.bin"
42 40
#endif
43 41

  
44
#ifdef TARGET_MIPS64
45
#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL)
46
#else
47
#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffU)
48
#endif
49
#define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000))
50

  
51 42
enum jazz_model_e
52 43
{
53 44
    JAZZ_MAGNUM,
45
    JAZZ_PICA61,
54 46
};
55 47

  
56 48
static void main_cpu_reset(void *opaque)
......
196 188
    case JAZZ_MAGNUM:
197 189
        g364fb_mm_init(ds, vga_ram_size, 0, 0x40000000, 0x60000000);
198 190
        break;
191
    case JAZZ_PICA61:
192
        isa_vga_mm_init(ds, phys_ram_base + ram_size, ram_size, vga_ram_size,
193
                        0x40000000, 0x60000000, 0);
194
        break;
199 195
    default:
200 196
        break;
201 197
    }
......
268 264
    mips_jazz_init(ram_size, vga_ram_size, ds, cpu_model, JAZZ_MAGNUM);
269 265
}
270 266

  
267
static
268
void mips_pica61_init (int ram_size, int vga_ram_size,
269
                       const char *boot_device, DisplayState *ds,
270
                       const char *kernel_filename, const char *kernel_cmdline,
271
                       const char *initrd_filename, const char *cpu_model)
272
{
273
    mips_jazz_init(ram_size, vga_ram_size, ds, cpu_model, JAZZ_PICA61);
274
}
275

  
271 276
QEMUMachine mips_magnum_machine = {
272 277
    "magnum",
273 278
    "MIPS Magnum",
274 279
    mips_magnum_init,
275 280
};
281

  
282
QEMUMachine mips_pica61_machine = {
283
    "pica61",
284
    "Acer Pica 61",
285
    mips_pica61_init,
286
};

Also available in: Unified diff