diff --git a/bochs/iodev/Makefile.in b/bochs/iodev/Makefile.in index aa7bc5de2..6eef61ddc 100644 --- a/bochs/iodev/Makefile.in +++ b/bochs/iodev/Makefile.in @@ -64,7 +64,7 @@ OBJS_THAT_CANNOT_BE_PLUGINS = \ OBJS_THAT_CAN_BE_PLUGINS = \ pic.o \ - pit_wrap.o \ + pit.o \ serial.o \ parallel.o \ floppy.o \ @@ -130,8 +130,8 @@ libbx_hdimage.la: hdimage.lo vmware3.lo vmware4.lo vvfat.lo $(CDROM_OBJS:.o=.lo) libbx_keyboard.la: keyboard.lo scancodes.lo $(LIBTOOL) --mode=link $(CXX) -module keyboard.lo scancodes.lo -o libbx_keyboard.la -rpath $(PLUGIN_PATH) -libbx_pit_wrap.la: pit82c54.lo pit_wrap.lo - $(LIBTOOL) --mode=link $(CXX) -module pit82c54.lo pit_wrap.lo -o libbx_pit.la -rpath $(PLUGIN_PATH) +libbx_pit.la: pit82c54.lo pit.lo + $(LIBTOOL) --mode=link $(CXX) -module pit82c54.lo pit.lo -o libbx_pit.la -rpath $(PLUGIN_PATH) libbx_serial.la: serial.lo serial_raw.lo $(LIBTOOL) --mode=link $(CXX) -module serial.lo serial_raw.lo -o libbx_serial.la -rpath $(PLUGIN_PATH) @@ -150,8 +150,8 @@ bx_hdimage.dll: hdimage.o vmware3.o vmware4.o vvfat.o $(CDROM_OBJS) bx_keyboard.dll: keyboard.o scancodes.o $(CXX) $(CXXFLAGS) -shared -o bx_keyboard.dll keyboard.o scancodes.o $(WIN32_DLL_IMPORT_LIBRARY) -bx_pit_wrap.dll: pit82c54.o pit_wrap.o - $(CXX) $(CXXFLAGS) -shared -o bx_pit.dll pit82c54.o pit_wrap.o $(WIN32_DLL_IMPORT_LIBRARY) +bx_pit.dll: pit82c54.o pit.o + $(CXX) $(CXXFLAGS) -shared -o bx_pit.dll pit82c54.o pit.o $(WIN32_DLL_IMPORT_LIBRARY) bx_gameport.dll: gameport.o $(CXX) $(CXXFLAGS) -shared -o bx_gameport.dll gameport.o $(WIN32_DLL_IMPORT_LIBRARY) -lwinmm @@ -311,11 +311,11 @@ pit82c54.o: pit82c54.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../cpudb.h ../gui/paramtree.h ../memory/memory.h ../pc_system.h \ ../gui/gui.h ../instrument/stubs/instrument.h ../plugin.h ../extplugin.h \ ../ltdl.h ../param_names.h pit82c54.h -pit_wrap.o: pit_wrap.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ +pit.o: pit.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../gui/siminterface.h \ ../cpudb.h ../gui/paramtree.h ../memory/memory.h ../pc_system.h \ ../gui/gui.h ../instrument/stubs/instrument.h ../plugin.h ../extplugin.h \ - ../ltdl.h ../param_names.h pit_wrap.h pit82c54.h virt_timer.h speaker.h + ../ltdl.h ../param_names.h pit.h pit82c54.h virt_timer.h speaker.h scancodes.o: scancodes.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../gui/siminterface.h \ ../cpudb.h ../gui/paramtree.h ../memory/memory.h ../pc_system.h \ @@ -506,11 +506,11 @@ pit82c54.lo: pit82c54.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../cpudb.h ../gui/paramtree.h ../memory/memory.h ../pc_system.h \ ../gui/gui.h ../instrument/stubs/instrument.h ../plugin.h ../extplugin.h \ ../ltdl.h ../param_names.h pit82c54.h -pit_wrap.lo: pit_wrap.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ +pit.lo: pit.@CPP_SUFFIX@ iodev.h ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../gui/siminterface.h \ ../cpudb.h ../gui/paramtree.h ../memory/memory.h ../pc_system.h \ ../gui/gui.h ../instrument/stubs/instrument.h ../plugin.h ../extplugin.h \ - ../ltdl.h ../param_names.h pit_wrap.h pit82c54.h virt_timer.h speaker.h + ../ltdl.h ../param_names.h pit.h pit82c54.h virt_timer.h speaker.h scancodes.lo: scancodes.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \ ../bx_debug/debug.h ../config.h ../osdep.h ../gui/siminterface.h \ ../cpudb.h ../gui/paramtree.h ../memory/memory.h ../pc_system.h \ diff --git a/bochs/iodev/devices.txt b/bochs/iodev/devices.txt index df54aec1c..41beeecbb 100644 --- a/bochs/iodev/devices.txt +++ b/bochs/iodev/devices.txt @@ -19,7 +19,7 @@ MOTHER BOARD (i440FX Support) devices.cc | | | +---- 8259A PIC pic.cc | +---- 82093AA I/O APIC ioapic.cc - | +---- 8254/82C54 Programmable Interval Timer pit_wrap.cc, pit82c54.cc + | +---- 8254/82C54 Programmable Interval Timer pit.cc, pit82c54.cc | | | | | +---- PC Speaker (lowlevel) speaker.cc | | @@ -56,7 +56,13 @@ Attached devices | +---- Windows cdrom_win32.cc | +---- Mac OSX cdrom_osx.cc | +---- Linux and others cdrom_misc.cc - +---- Network Support + | + +---- Graphics + | | + | +---- VGA, PCI VGA adapter vga.cc, pci_vga.cc + | +---- Cirrus Logic PCI/ISA CLGD5446 SVGA adapter svga_cirrus.cc + | + +---- Network support network/ | | | +---- Network Devices | | | @@ -75,12 +81,7 @@ Attached devices | +---- virtual Ethernet locator eth_vnet.cc | +---- backend for Slirp eth_slirp.cc | - +---- Graphics - | | - | +---- VGA, PCI VGA adapter vga.cc, pci_vga.cc - | +---- Cirrus Logic PCI/ISA CLGD5446 SVGA adapter svga_cirrus.cc - | - +---- Sound support + +---- Sound support sound/ | | | +---- Sound devices | | | @@ -92,7 +93,7 @@ Attached devices | +---- Dummy / Control Module soundmod.cc | +---- Host specific Modules soundlnx.cc, soundosx.cc, soundwin.cc | - +---- PCI USB adapter usb_common.cc + +---- USB support usb/ | +---- Host Controllers | | @@ -109,7 +110,7 @@ Attached devices +---- USB mass storage device (*) usb_msd.cc, scsi_device.cc +---- USB HP DeskJet 920C printer usb_printer.cc -(*) USB MSD uses hdimage code and cdrom.cc for image / device access +(*) USB MSD uses hdimage / cdrom code for image / device access Floppy uses hdimage code for VVFAT support BOCHS timer sycronisation modules diff --git a/bochs/iodev/pit_wrap.cc b/bochs/iodev/pit.cc similarity index 99% rename from bochs/iodev/pit_wrap.cc rename to bochs/iodev/pit.cc index 726a73e14..84a31a1f2 100644 --- a/bochs/iodev/pit_wrap.cc +++ b/bochs/iodev/pit.cc @@ -24,7 +24,7 @@ #define BX_PLUGGABLE #include "iodev.h" -#include "pit_wrap.h" +#include "pit.h" #include "virt_timer.h" #include "speaker.h" @@ -115,7 +115,7 @@ void bx_pit_c::init(void) Bit64u my_time_usec = bx_virt_timer.time_usec(); if (BX_PIT_THIS s.timer_handle[0] == BX_NULL_TIMER_HANDLE) { - BX_PIT_THIS s.timer_handle[0] = bx_virt_timer.register_timer(this, timer_handler, (unsigned) 100 , 1, 1, "pit_wrap"); + BX_PIT_THIS s.timer_handle[0] = bx_virt_timer.register_timer(this, timer_handler, (unsigned) 100 , 1, 1, "pit"); } BX_DEBUG(("RESETting timer.")); bx_virt_timer.deactivate_timer(BX_PIT_THIS s.timer_handle[0]); diff --git a/bochs/iodev/pit_wrap.h b/bochs/iodev/pit.h similarity index 96% rename from bochs/iodev/pit_wrap.h rename to bochs/iodev/pit.h index 4e3fb821d..3591dd81a 100644 --- a/bochs/iodev/pit_wrap.h +++ b/bochs/iodev/pit.h @@ -18,8 +18,8 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#ifndef _BX_PIT_WRAP_H -#define _BX_PIT_WRAP_H +#ifndef _BX_PIT_H +#define _BX_PIT_H #include "bochs.h" #include "pit82c54.h" @@ -68,4 +68,4 @@ private: BX_PIT_SMF Bit16u get_timer(int Timer); }; -#endif // #ifndef _BX_PIT_WRAP_H +#endif // #ifndef _BX_PIT_H