- add speaker log, pluginSpeaker, and beep_on/off methods in guis
This commit is contained in:
Christophe Bothamy
parent
d6fb513243
commit
8ad4cf6056
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: bochs.h,v 1.134 2004-01-29 17:49:01 mcb30 Exp $
|
||||
// $Id: bochs.h,v 1.135 2004-02-01 23:48:56 cbothamy Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -299,7 +299,8 @@ enum {
|
||||
UNMAPLOG, SERRLOG, BIOSLOG, PIT81LOG, PIT82LOG, IODEBUGLOG, PCI2ISALOG,
|
||||
PLUGINLOG, EXTFPUIRQLOG , PCIVGALOG, PCIUSBLOG, VTIMERLOG, STIMERLOG,
|
||||
PCIDEVLOG,
|
||||
PCIPNICLOG
|
||||
PCIPNICLOG,
|
||||
SPEAKERLOG,
|
||||
};
|
||||
|
||||
class BOCHSAPI iofunctions {
|
||||
|
||||
6560
bochs/configure
vendored
6560
bochs/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(bochs.h)
|
||||
AC_REVISION([[$Id: configure.in,v 1.245 2004-01-29 19:28:46 vruppert Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.246 2004-02-01 23:48:56 cbothamy Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -716,7 +716,7 @@ AC_ARG_ENABLE(ne2000,
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(BX_NE2K_SUPPORT, 1)
|
||||
NE2K_OBJS='ne2k.o'
|
||||
NETLOW_OBJS='eth.o eth_null.o'
|
||||
NETLOW_OBJS='eth.o eth_null.o eth_vnet.o'
|
||||
AC_CHECK_HEADER(net/bpf.h, NETLOW_OBJS="$NETLOW_OBJS eth_fbsd.o")
|
||||
AC_CHECK_HEADER(netpacket/packet.h, NETLOW_OBJS="$NETLOW_OBJS eth_linux.o")
|
||||
case "$target" in
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: gui.cc,v 1.74 2004-02-01 01:40:14 vruppert Exp $
|
||||
// $Id: gui.cc,v 1.75 2004-02-01 23:48:57 cbothamy Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -585,3 +585,16 @@ bx_gui_c::set_text_charbyte(Bit16u address, Bit8u data)
|
||||
BX_GUI_THIS char_changed[address >> 5] = 1;
|
||||
BX_GUI_THIS charmap_updated = 1;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
bx_gui_c::beep_on(float frequency)
|
||||
{
|
||||
BX_INFO(( "GUI Beep ON (frequency=%.2f)",frequency));
|
||||
}
|
||||
|
||||
void
|
||||
bx_gui_c::beep_off()
|
||||
{
|
||||
BX_INFO(( "GUI Beep OFF"));
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: gui.h,v 1.40 2003-06-28 08:04:31 vruppert Exp $
|
||||
// $Id: gui.h,v 1.41 2004-02-01 23:48:57 cbothamy Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -83,6 +83,8 @@ public:
|
||||
// this is called from the CPU model when the HLT instruction is executed.
|
||||
virtual void sim_is_idle(void) {}
|
||||
#endif
|
||||
virtual void beep_on(float frequency);
|
||||
virtual void beep_off();
|
||||
|
||||
// The following function(s) are defined already, and your
|
||||
// GUI code calls them
|
||||
@ -145,31 +147,31 @@ protected:
|
||||
// };
|
||||
// Then, each method must be defined later in the file.
|
||||
#define DECLARE_GUI_VIRTUAL_METHODS() \
|
||||
virtual void specific_init(int argc, char **argv, \
|
||||
unsigned x_tilesize, unsigned y_tilesize, \
|
||||
unsigned header_bar_y); \
|
||||
virtual void text_update(Bit8u *old_text, Bit8u *new_text, \
|
||||
unsigned long cursor_x, unsigned long cursor_y, \
|
||||
bx_vga_tminfo_t tm_info, unsigned rows); \
|
||||
virtual void graphics_tile_update(Bit8u *snapshot, unsigned x, unsigned y); \
|
||||
virtual void handle_events(void); \
|
||||
virtual void flush(void); \
|
||||
virtual void clear_screen(void); \
|
||||
virtual bx_bool palette_change(unsigned index, \
|
||||
unsigned red, unsigned green, unsigned blue); \
|
||||
virtual void dimension_update(unsigned x, unsigned y, unsigned fheight=0, \
|
||||
unsigned fwidth=0, unsigned bpp=8); \
|
||||
virtual unsigned create_bitmap(const unsigned char *bmap, \
|
||||
unsigned xdim, unsigned ydim); \
|
||||
virtual unsigned headerbar_bitmap(unsigned bmap_id, unsigned alignment, \
|
||||
void (*f)(void)); \
|
||||
virtual void replace_bitmap(unsigned hbar_id, unsigned bmap_id); \
|
||||
virtual void show_headerbar(void); \
|
||||
virtual int get_clipboard_text(Bit8u **bytes, Bit32s *nbytes); \
|
||||
virtual int set_clipboard_text(char *snapshot, Bit32u len); \
|
||||
virtual void mouse_enabled_changed_specific (bx_bool val); \
|
||||
virtual void exit(void); \
|
||||
/* end of DECLARE_GUI_VIRTUAL_METHODS */
|
||||
virtual void specific_init(int argc, char **argv, \
|
||||
unsigned x_tilesize, unsigned y_tilesize, \
|
||||
unsigned header_bar_y); \
|
||||
virtual void text_update(Bit8u *old_text, Bit8u *new_text, \
|
||||
unsigned long cursor_x, unsigned long cursor_y, \
|
||||
bx_vga_tminfo_t tm_info, unsigned rows); \
|
||||
virtual void graphics_tile_update(Bit8u *snapshot, unsigned x, unsigned y); \
|
||||
virtual void handle_events(void); \
|
||||
virtual void flush(void); \
|
||||
virtual void clear_screen(void); \
|
||||
virtual bx_bool palette_change(unsigned index, \
|
||||
unsigned red, unsigned green, unsigned blue); \
|
||||
virtual void dimension_update(unsigned x, unsigned y, unsigned fheight=0, \
|
||||
unsigned fwidth=0, unsigned bpp=8); \
|
||||
virtual unsigned create_bitmap(const unsigned char *bmap, \
|
||||
unsigned xdim, unsigned ydim); \
|
||||
virtual unsigned headerbar_bitmap(unsigned bmap_id, unsigned alignment, \
|
||||
void (*f)(void)); \
|
||||
virtual void replace_bitmap(unsigned hbar_id, unsigned bmap_id); \
|
||||
virtual void show_headerbar(void); \
|
||||
virtual int get_clipboard_text(Bit8u **bytes, Bit32s *nbytes); \
|
||||
virtual int set_clipboard_text(char *snapshot, Bit32u len); \
|
||||
virtual void mouse_enabled_changed_specific (bx_bool val); \
|
||||
virtual void exit(void); \
|
||||
/* end of DECLARE_GUI_VIRTUAL_METHODS */
|
||||
|
||||
#define BX_MAX_PIXMAPS 16
|
||||
#define BX_MAX_HEADERBAR_ENTRIES 11
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: x.cc,v 1.76 2003-08-11 19:27:57 vruppert Exp $
|
||||
// $Id: x.cc,v 1.77 2004-02-01 23:48:57 cbothamy Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -61,6 +61,8 @@ public:
|
||||
#if BX_USE_IDLE_HACK
|
||||
virtual void sim_is_idle(void);
|
||||
#endif
|
||||
virtual void beep_on(float frequency);
|
||||
virtual void beep_off();
|
||||
};
|
||||
|
||||
// declare one instance of the gui object and call macro to insert the
|
||||
@ -1845,4 +1847,17 @@ void bx_x_gui_c::sim_is_idle () {
|
||||
#endif
|
||||
#endif /* BX_USE_IDLE_HACK */
|
||||
|
||||
|
||||
void
|
||||
bx_x_gui_c::beep_on(float frequency)
|
||||
{
|
||||
BX_INFO(( "X11 Beep ON (frequency=%.2f)",frequency));
|
||||
}
|
||||
|
||||
void
|
||||
bx_x_gui_c::beep_off()
|
||||
{
|
||||
BX_INFO(( "X11 Beep OFF"));
|
||||
}
|
||||
|
||||
#endif /* if BX_WITH_X11 */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user