Diff for /qemu/vl.h between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2018/04/24 16:38:38 version 1.1.1.3, 2018/04/24 16:40:48
Line 82  static inline char *realpath(const char  Line 82  static inline char *realpath(const char 
 #define tostring(s)     #s  #define tostring(s)     #s
 #endif  #endif
   
   #ifndef MIN
   #define MIN(a, b) (((a) < (b)) ? (a) : (b))
   #endif
   #ifndef MAX
   #define MAX(a, b) (((a) > (b)) ? (a) : (b))
   #endif
   
 /* vl.c */  /* vl.c */
 uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c);  uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c);
   
 void hw_error(const char *fmt, ...);  void hw_error(const char *fmt, ...);
   
 int get_image_size(const char *filename);  
 int load_image(const char *filename, uint8_t *addr);  
 extern const char *bios_dir;  extern const char *bios_dir;
   
 void pstrcpy(char *buf, int buf_size, const char *str);  void pstrcpy(char *buf, int buf_size, const char *str);
Line 158  typedef void QEMUPutKBDEvent(void *opaqu Line 163  typedef void QEMUPutKBDEvent(void *opaqu
 typedef void QEMUPutMouseEvent(void *opaque, int dx, int dy, int dz, int buttons_state);  typedef void QEMUPutMouseEvent(void *opaque, int dx, int dy, int dz, int buttons_state);
   
 void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque);  void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque);
 void qemu_add_mouse_event_handler(QEMUPutMouseEvent *func, void *opaque);  void qemu_add_mouse_event_handler(QEMUPutMouseEvent *func, void *opaque, int absolute);
   
 void kbd_put_keycode(int keycode);  void kbd_put_keycode(int keycode);
 void kbd_mouse_event(int dx, int dy, int dz, int buttons_state);  void kbd_mouse_event(int dx, int dy, int dz, int buttons_state);
   int kbd_mouse_is_absolute(void);
   
 /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx  /* keysym is a unicode code except for special keys (see QEMU_KEY_xxx
    constants) */     constants) */
Line 204  int qemu_set_fd_handler(int fd, Line 210  int qemu_set_fd_handler(int fd,
                         IOHandler *fd_write,                          IOHandler *fd_write,
                         void *opaque);                          void *opaque);
   
   /* Polling handling */
   
   /* return TRUE if no sleep should be done afterwards */
   typedef int PollingFunc(void *opaque);
   
   int qemu_add_polling_cb(PollingFunc *func, void *opaque);
   void qemu_del_polling_cb(PollingFunc *func, void *opaque);
   
 /* character device */  /* character device */
   
 #define CHR_EVENT_BREAK 0 /* serial break char */  #define CHR_EVENT_BREAK 0 /* serial break char */
Line 237  typedef struct CharDriverState { Line 251  typedef struct CharDriverState {
     int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg);      int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg);
     IOEventHandler *chr_event;      IOEventHandler *chr_event;
     void (*chr_send_event)(struct CharDriverState *chr, int event);      void (*chr_send_event)(struct CharDriverState *chr, int event);
       void (*chr_close)(struct CharDriverState *chr);
     void *opaque;      void *opaque;
 } CharDriverState;  } CharDriverState;
   
Line 254  int qemu_chr_ioctl(CharDriverState *s, i Line 269  int qemu_chr_ioctl(CharDriverState *s, i
 typedef struct DisplayState DisplayState;  typedef struct DisplayState DisplayState;
 typedef struct TextConsole TextConsole;  typedef struct TextConsole TextConsole;
   
 extern TextConsole *vga_console;  typedef void (*vga_hw_update_ptr)(void *);
   typedef void (*vga_hw_invalidate_ptr)(void *);
   typedef void (*vga_hw_screen_dump_ptr)(void *, const char *);
   
   TextConsole *graphic_console_init(DisplayState *ds, vga_hw_update_ptr update,
                                     vga_hw_invalidate_ptr invalidate,
                                     vga_hw_screen_dump_ptr screen_dump,
                                     void *opaque);
   void vga_hw_update(void);
   void vga_hw_invalidate(void);
   void vga_hw_screen_dump(const char *filename);
   
 TextConsole *graphic_console_init(DisplayState *ds);  int is_graphic_console(void);
 int is_active_console(TextConsole *s);  
 CharDriverState *text_console_init(DisplayState *ds);  CharDriverState *text_console_init(DisplayState *ds);
 void console_select(unsigned int index);  void console_select(unsigned int index);
   
Line 279  typedef struct VLANClientState VLANClien Line 303  typedef struct VLANClientState VLANClien
   
 struct VLANClientState {  struct VLANClientState {
     IOReadHandler *fd_read;      IOReadHandler *fd_read;
       /* Packets may still be sent if this returns zero.  It's used to
          rate-limit the slirp code.  */
       IOCanRWHandler *fd_can_read;
     void *opaque;      void *opaque;
     struct VLANClientState *next;      struct VLANClientState *next;
     struct VLANState *vlan;      struct VLANState *vlan;
Line 293  typedef struct VLANState { Line 320  typedef struct VLANState {
   
 VLANState *qemu_find_vlan(int id);  VLANState *qemu_find_vlan(int id);
 VLANClientState *qemu_new_vlan_client(VLANState *vlan,  VLANClientState *qemu_new_vlan_client(VLANState *vlan,
                                       IOReadHandler *fd_read, void *opaque);                                        IOReadHandler *fd_read,
                                         IOCanRWHandler *fd_can_read,
                                         void *opaque);
   int qemu_can_send_packet(VLANClientState *vc);
 void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size);  void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size);
   void qemu_handler_true(void *opaque);
   
 void do_info_network(void);  void do_info_network(void);
   
   /* TAP win32 */
   int tap_win32_init(VLANState *vlan, const char *ifname);
   void tap_win32_poll(void);
   
 /* NIC info */  /* NIC info */
   
 #define MAX_NICS 8  #define MAX_NICS 8
   
 typedef struct NICInfo {  typedef struct NICInfo {
     uint8_t macaddr[6];      uint8_t macaddr[6];
       const char *model;
     VLANState *vlan;      VLANState *vlan;
 } NICInfo;  } NICInfo;
   
Line 605  PCIBus *pci_grackle_init(uint32_t base); Line 641  PCIBus *pci_grackle_init(uint32_t base);
 PCIBus *pci_pmac_init(void);  PCIBus *pci_pmac_init(void);
 PCIBus *pci_apb_init(target_ulong special_base, target_ulong mem_base);  PCIBus *pci_apb_init(target_ulong special_base, target_ulong mem_base);
   
   void pci_nic_init(PCIBus *bus, NICInfo *nd);
   
 /* openpic.c */  /* openpic.c */
 typedef struct openpic_t openpic_t;  typedef struct openpic_t openpic_t;
 void openpic_set_irq(void *opaque, int n_IRQ, int level);  void openpic_set_irq(void *opaque, int n_IRQ, int level);
Line 641  struct DisplayState { Line 679  struct DisplayState {
     int depth;      int depth;
     int width;      int width;
     int height;      int height;
       void *opaque;
   
     void (*dpy_update)(struct DisplayState *s, int x, int y, int w, int h);      void (*dpy_update)(struct DisplayState *s, int x, int y, int w, int h);
     void (*dpy_resize)(struct DisplayState *s, int w, int h);      void (*dpy_resize)(struct DisplayState *s, int w, int h);
     void (*dpy_refresh)(struct DisplayState *s);      void (*dpy_refresh)(struct DisplayState *s);
       void (*dpy_copy)(struct DisplayState *s, int src_x, int src_y, int dst_x, int dst_y, int w, int h);
 };  };
   
 static inline void dpy_update(DisplayState *s, int x, int y, int w, int h)  static inline void dpy_update(DisplayState *s, int x, int y, int w, int h)
Line 659  static inline void dpy_resize(DisplaySta Line 700  static inline void dpy_resize(DisplaySta
 int vga_initialize(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,   int vga_initialize(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, 
                    unsigned long vga_ram_offset, int vga_ram_size,                     unsigned long vga_ram_offset, int vga_ram_size,
                    unsigned long vga_bios_offset, int vga_bios_size);                     unsigned long vga_bios_offset, int vga_bios_size);
 void vga_update_display(void);  
 void vga_invalidate_display(void);  
 void vga_screen_dump(const char *filename);  
   
 /* cirrus_vga.c */  /* cirrus_vga.c */
 void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,   void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, 
Line 675  void sdl_display_init(DisplayState *ds,  Line 713  void sdl_display_init(DisplayState *ds, 
 /* cocoa.m */  /* cocoa.m */
 void cocoa_display_init(DisplayState *ds, int full_screen);  void cocoa_display_init(DisplayState *ds, int full_screen);
   
   /* vnc.c */
   void vnc_display_init(DisplayState *ds, int display);
   
 /* ide.c */  /* ide.c */
 #define MAX_DISKS 4  #define MAX_DISKS 4
   
Line 729  int fdctrl_get_drive_type(fdctrl_t *fdct Line 770  int fdctrl_get_drive_type(fdctrl_t *fdct
 void isa_ne2000_init(int base, int irq, NICInfo *nd);  void isa_ne2000_init(int base, int irq, NICInfo *nd);
 void pci_ne2000_init(PCIBus *bus, NICInfo *nd);  void pci_ne2000_init(PCIBus *bus, NICInfo *nd);
   
   /* rtl8139.c */
   
   void pci_rtl8139_init(PCIBus *bus, NICInfo *nd);
   
 /* pckbd.c */  /* pckbd.c */
   
 void kbd_init(void);  void kbd_init(void);
Line 787  typedef struct PITState PITState; Line 832  typedef struct PITState PITState;
 PITState *pit_init(int base, int irq);  PITState *pit_init(int base, int irq);
 void pit_set_gate(PITState *pit, int channel, int val);  void pit_set_gate(PITState *pit, int channel, int val);
 int pit_get_gate(PITState *pit, int channel);  int pit_get_gate(PITState *pit, int channel);
   int pit_get_initial_count(PITState *pit, int channel);
   int pit_get_mode(PITState *pit, int channel);
 int pit_get_out(PITState *pit, int channel, int64_t current_time);  int pit_get_out(PITState *pit, int channel, int64_t current_time);
   
   /* pcspk.c */
   void pcspk_init(PITState *);
   int pcspk_audio_init(AudioState *);
   
 /* pc.c */  /* pc.c */
 extern QEMUMachine pc_machine;  extern QEMUMachine pc_machine;
 extern QEMUMachine isapc_machine;  extern QEMUMachine isapc_machine;
Line 804  extern QEMUMachine heathrow_machine; Line 855  extern QEMUMachine heathrow_machine;
 /* mips_r4k.c */  /* mips_r4k.c */
 extern QEMUMachine mips_machine;  extern QEMUMachine mips_machine;
   
   /* shix.c */
   extern QEMUMachine shix_machine;
   
 #ifdef TARGET_PPC  #ifdef TARGET_PPC
 ppc_tb_t *cpu_ppc_tb_init (CPUState *env, uint32_t freq);  ppc_tb_t *cpu_ppc_tb_init (CPUState *env, uint32_t freq);
 #endif  #endif
Line 826  uint32_t iommu_translate_local(void *opa Line 880  uint32_t iommu_translate_local(void *opa
 void lance_init(NICInfo *nd, int irq, uint32_t leaddr, uint32_t ledaddr);  void lance_init(NICInfo *nd, int irq, uint32_t leaddr, uint32_t ledaddr);
   
 /* tcx.c */  /* tcx.c */
 void *tcx_init(DisplayState *ds, uint32_t addr, uint8_t *vram_base,  void tcx_init(DisplayState *ds, uint32_t addr, uint8_t *vram_base,
                unsigned long vram_offset, int vram_size, int width, int height);                 unsigned long vram_offset, int vram_size, int width, int height);
 void tcx_update_display(void *opaque);  
 void tcx_invalidate_display(void *opaque);  
 void tcx_screen_dump(void *opaque, const char *filename);  
   
 /* slavio_intctl.c */  /* slavio_intctl.c */
 void *slavio_intctl_init();  void *slavio_intctl_init();
Line 840  void slavio_irq_info(void *opaque); Line 891  void slavio_irq_info(void *opaque);
 void slavio_pic_set_irq(void *opaque, int irq, int level);  void slavio_pic_set_irq(void *opaque, int irq, int level);
 void slavio_pic_set_irq_cpu(void *opaque, int irq, int level, unsigned int cpu);  void slavio_pic_set_irq_cpu(void *opaque, int irq, int level, unsigned int cpu);
   
 /* magic-load.c */  /* loader.c */
 int load_elf(const char *filename, uint8_t *addr);  int get_image_size(const char *filename);
   int load_image(const char *filename, uint8_t *addr);
   int load_elf(const char *filename, int64_t virt_to_phys_addend, uint64_t *pentry);
 int load_aout(const char *filename, uint8_t *addr);  int load_aout(const char *filename, uint8_t *addr);
   
 /* slavio_timer.c */  /* slavio_timer.c */
Line 942  void do_usb_del(const char *devname); Line 995  void do_usb_del(const char *devname);
 void usb_info(void);  void usb_info(void);
   
 /* integratorcp.c */  /* integratorcp.c */
 extern QEMUMachine integratorcp_machine;  extern QEMUMachine integratorcp926_machine;
   extern QEMUMachine integratorcp1026_machine;
   
   /* versatilepb.c */
   extern QEMUMachine versatilepb_machine;
   extern QEMUMachine versatileab_machine;
   
 /* ps2.c */  /* ps2.c */
 void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);  void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);
Line 951  void ps2_write_mouse(void *, int val); Line 1009  void ps2_write_mouse(void *, int val);
 void ps2_write_keyboard(void *, int val);  void ps2_write_keyboard(void *, int val);
 uint32_t ps2_read_data(void *);  uint32_t ps2_read_data(void *);
 void ps2_queue(void *, int b);  void ps2_queue(void *, int b);
   void ps2_keyboard_set_translation(void *opaque, int mode);
   
 /* smc91c111.c */  /* smc91c111.c */
 void smc91c111_init(NICInfo *, uint32_t, void *, int);  void smc91c111_init(NICInfo *, uint32_t, void *, int);
   
   /* pl110.c */
   void *pl110_init(DisplayState *ds, uint32_t base, void *pic, int irq, int);
   
   /* pl011.c */
   void pl011_init(uint32_t base, void *pic, int irq, CharDriverState *chr);
   
   /* pl050.c */
   void pl050_init(uint32_t base, void *pic, int irq, int is_mouse);
   
   /* pl080.c */
   void *pl080_init(uint32_t base, void *pic, int irq);
   
   /* pl190.c */
   void *pl190_init(uint32_t base, void *parent, int irq, int fiq);
   
   /* arm-timer.c */
   void sp804_init(uint32_t base, void *pic, int irq);
   void icp_pit_init(uint32_t base, void *pic, int irq);
   
   /* arm_boot.c */
   
   void arm_load_kernel(int ram_size, const char *kernel_filename,
                        const char *kernel_cmdline, const char *initrd_filename,
                        int board_id);
   
   /* sh7750.c */
   struct SH7750State;
   
   struct SH7750State *sh7750_init(CPUState * cpu);
   
   typedef struct {
       /* The callback will be triggered if any of the designated lines change */
       uint16_t portamask_trigger;
       uint16_t portbmask_trigger;
       /* Return 0 if no action was taken */
       int (*port_change_cb) (uint16_t porta, uint16_t portb,
                              uint16_t * periph_pdtra,
                              uint16_t * periph_portdira,
                              uint16_t * periph_pdtrb,
                              uint16_t * periph_portdirb);
   } sh7750_io_device;
   
   int sh7750_register_io_device(struct SH7750State *s,
                                 sh7750_io_device * device);
   /* tc58128.c */
   int tc58128_init(struct SH7750State *s, char *zone1, char *zone2);
   
 #endif /* defined(QEMU_TOOL) */  #endif /* defined(QEMU_TOOL) */
   
 /* monitor.c */  /* monitor.c */

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


unix.superglobalmegacorp.com