help fix

[qemu.git] / vl.h

diff --git a/vl.h b/vl.h
index 485ccc020c69e8ad11b96b15d7d517a0d5e70ab9..f25bbaa5cffb9462f2280c985f576a2306d4f14c 100644 (file)
--- a/vl.h
+++ b/vl.h
@@ -188,7 +188,7 @@ typedef struct CharDriverState {
                                  IOCanRWHandler *fd_can_read, 
                                  IOReadHandler *fd_read, void *opaque);
     IOEventHandler *chr_event;
                                  IOCanRWHandler *fd_can_read, 
                                  IOReadHandler *fd_read, void *opaque);
     IOEventHandler *chr_event;

-    IOEventHandler *chr_send_event;
+    void (*chr_send_event)(struct CharDriverState *chr, int event);

     void *opaque;
 } CharDriverState;
 
     void *opaque;
 } CharDriverState;
 


@@ -200,8 +200,6 @@ void qemu_chr_add_read_handler(CharDriverState *s,
                                IOReadHandler *fd_read, void *opaque);
 void qemu_chr_add_event_handler(CharDriverState *s, IOEventHandler *chr_event);
                                
                                IOReadHandler *fd_read, void *opaque);
 void qemu_chr_add_event_handler(CharDriverState *s, IOEventHandler *chr_event);
                                

-CharDriverState *serial_hd;
-

 /* consoles */
 
 typedef struct DisplayState DisplayState;
 /* consoles */
 
 typedef struct DisplayState DisplayState;


@@ -214,6 +212,12 @@ int is_active_console(TextConsole *s);
 CharDriverState *text_console_init(DisplayState *ds);
 void console_select(unsigned int index);
 
 CharDriverState *text_console_init(DisplayState *ds);
 void console_select(unsigned int index);
 

+/* serial ports */
+
+#define MAX_SERIAL_PORTS 4
+
+extern CharDriverState *serial_hds[MAX_SERIAL_PORTS];
+

 /* network redirectors support */
 
 #define MAX_NICS 8
 /* network redirectors support */
 
 #define MAX_NICS 8


@@ -350,6 +354,7 @@ extern BlockDriver bdrv_raw;
 extern BlockDriver bdrv_cow;
 extern BlockDriver bdrv_qcow;
 extern BlockDriver bdrv_vmdk;
 extern BlockDriver bdrv_cow;
 extern BlockDriver bdrv_qcow;
 extern BlockDriver bdrv_vmdk;

+extern BlockDriver bdrv_cloop;

 
 void bdrv_init(void);
 BlockDriver *bdrv_find_format(const char *format_name);
 
 void bdrv_init(void);
 BlockDriver *bdrv_find_format(const char *format_name);


@@ -475,6 +480,8 @@ uint32_t pci_default_read_config(PCIDevice *d,
                                  uint32_t address, int len);
 void pci_default_write_config(PCIDevice *d, 
                               uint32_t address, uint32_t val, int len);
                                  uint32_t address, int len);
 void pci_default_write_config(PCIDevice *d, 
                               uint32_t address, uint32_t val, int len);

+void generic_pci_save(QEMUFile* f, void *opaque);
+int generic_pci_load(QEMUFile* f, void *opaque, int version_id);

 
 extern struct PIIX3State *piix3_state;
 
 
 extern struct PIIX3State *piix3_state;
 


@@ -532,7 +539,7 @@ void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base,
                          unsigned long vga_ram_offset, int vga_ram_size);
 
 /* sdl.c */
                          unsigned long vga_ram_offset, int vga_ram_size);
 
 /* sdl.c */

-void sdl_display_init(DisplayState *ds);
+void sdl_display_init(DisplayState *ds, int full_screen);

 
 /* ide.c */
 #define MAX_DISKS 4
 
 /* ide.c */
 #define MAX_DISKS 4


@@ -659,6 +666,31 @@ extern CPUWriteMemoryFunc *PPC_io_write[];
 extern CPUReadMemoryFunc *PPC_io_read[];
 extern int prep_enabled;
 
 extern CPUReadMemoryFunc *PPC_io_read[];
 extern int prep_enabled;
 

+/* sun4m.c */
+void sun4m_init(int ram_size, int vga_ram_size, int boot_device,
+             DisplayState *ds, const char **fd_filename, int snapshot,
+             const char *kernel_filename, const char *kernel_cmdline,
+             const char *initrd_filename);
+
+/* iommu.c */
+void iommu_init(uint32_t addr);
+uint32_t iommu_translate(uint32_t addr);
+
+/* lance.c */
+void lance_init(NetDriverState *nd, int irq, uint32_t leaddr, uint32_t ledaddr);
+
+/* tcx.c */
+void tcx_init(DisplayState *ds, uint32_t addr);
+
+/* sched.c */
+void sched_init();
+
+/* magic-load.c */
+void magic_init(const char *kfn, int kloadaddr, uint32_t addr);
+
+/* timer.c */
+void timer_init(uint32_t addr, int irq);
+

 /* NVRAM helpers */
 #include "hw/m48t59.h"
 
 /* NVRAM helpers */
 #include "hw/m48t59.h"