gwj / at91sam9263 · Commits

Commit 28b9b5af25ec8c3f4235c20bb8c53c0fe1242e5f

Authored by bellard
1 parent e9b137c2

ppc update 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@949 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 15 additions and 4 deletions
@@ -239,6 +239,9 @@ extern int ram_size; @@ -239,6 +239,9 @@ extern int ram_size;
239 extern int bios_size; 239 extern int bios_size;
240 extern int rtc_utc; 240 extern int rtc_utc;
241 extern int cirrus_vga_enabled; 241 extern int cirrus_vga_enabled;
  242 +extern int graphic_width;
  243 +extern int graphic_height;
  244 +extern int graphic_depth;
242 245
243 /* XXX: make it dynamic */ 246 /* XXX: make it dynamic */
244 #if defined (TARGET_PPC) 247 #if defined (TARGET_PPC)
@@ -520,6 +523,11 @@ void pci_prep_init(void); @@ -520,6 +523,11 @@ void pci_prep_init(void);
520 void pci_pmac_init(void); 523 void pci_pmac_init(void);
521 void pci_ppc_bios_init(void); 524 void pci_ppc_bios_init(void);
522 525
  526 +/* openpic.c */
  527 +typedef struct openpic_t openpic_t;
  528 +void openpic_set_irq (openpic_t *opp, int n_IRQ, int level);
  529 +openpic_t *openpic_init (uint32_t isu_base, uint32_t idu_base, int nb_cpus);
  530 +
523 /* vga.c */ 531 /* vga.c */
524 532
525 #define VGA_RAM_SIZE (4096 * 1024) 533 #define VGA_RAM_SIZE (4096 * 1024)
@@ -569,6 +577,8 @@ void isa_ide_init(int iobase, int iobase2, int irq, @@ -569,6 +577,8 @@ void isa_ide_init(int iobase, int iobase2, int irq,
569 BlockDriverState *hd0, BlockDriverState *hd1); 577 BlockDriverState *hd0, BlockDriverState *hd1);
570 void pci_ide_init(BlockDriverState **hd_table); 578 void pci_ide_init(BlockDriverState **hd_table);
571 void pci_piix3_ide_init(BlockDriverState **hd_table); 579 void pci_piix3_ide_init(BlockDriverState **hd_table);
  580 +int pmac_ide_init (BlockDriverState **hd_table,
  581 + openpic_t *openpic, int irq);
572 582
573 /* oss.c */ 583 /* oss.c */
574 typedef enum { 584 typedef enum {
@@ -595,7 +605,7 @@ void DMA_hold_DREQ (int nchan); @@ -595,7 +605,7 @@ void DMA_hold_DREQ (int nchan);
595 void DMA_release_DREQ (int nchan); 605 void DMA_release_DREQ (int nchan);
596 void DMA_schedule(int nchan); 606 void DMA_schedule(int nchan);
597 void DMA_run (void); 607 void DMA_run (void);
598 -void DMA_init (void); 608 +void DMA_init (int high_page_enable);
599 void DMA_register_channel (int nchan, 609 void DMA_register_channel (int nchan,
600 DMA_transfer_handler transfer_handler, void *opaque); 610 DMA_transfer_handler transfer_handler, void *opaque);
601 611
@@ -707,9 +717,10 @@ int PPC_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size, @@ -707,9 +717,10 @@ int PPC_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size,
707 const unsigned char *arch, 717 const unsigned char *arch,
708 uint32_t RAM_size, int boot_device, 718 uint32_t RAM_size, int boot_device,
709 uint32_t kernel_image, uint32_t kernel_size, 719 uint32_t kernel_image, uint32_t kernel_size,
710 - uint32_t cmdline, uint32_t cmdline_size, 720 + const char *cmdline,
711 uint32_t initrd_image, uint32_t initrd_size, 721 uint32_t initrd_image, uint32_t initrd_size,
712 - uint32_t NVRAM_image); 722 + uint32_t NVRAM_image,
  723 + int width, int height, int depth);
713 724
714 /* adb.c */ 725 /* adb.c */
715 726
@@ -744,7 +755,7 @@ void adb_mouse_init(ADBBusState *bus); @@ -744,7 +755,7 @@ void adb_mouse_init(ADBBusState *bus);
744 /* cuda.c */ 755 /* cuda.c */
745 756
746 extern ADBBusState adb_bus; 757 extern ADBBusState adb_bus;
747 -int cuda_init(void); 758 +int cuda_init(openpic_t *openpic, int irq);
748 759
749 /* monitor.c */ 760 /* monitor.c */
750 void monitor_init(void); 761 void monitor_init(void);