From 501952efdd7a9f4d57a79b06d4d610b283ac9964 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sat, 10 Jan 2009 11:30:20 +0000
Subject: [PATCH] - removed unused logfunctions member 'type' and related
 method 'settype()' - updated FSF address in copyright

---
 bochs/bochs.h                 | 17 ++---------------
 bochs/config.cc               |  4 ++--
 bochs/cpu/apic.cc             |  6 ++----
 bochs/cpu/init.cc             |  5 ++---
 bochs/gui/gui.cc              |  5 ++---
 bochs/gui/siminterface.cc     | 21 +++++++++++++++++++--
 bochs/gui/siminterface.h      | 20 +++++++++++++++++++-
 bochs/iodev/acpi.cc           |  5 ++---
 bochs/iodev/biosdev.cc        |  6 ++----
 bochs/iodev/busmouse.cc       |  7 +++----
 bochs/iodev/cdrom.cc          |  7 +++----
 bochs/iodev/cmos.cc           |  7 +++----
 bochs/iodev/devices.cc        |  7 +++----
 bochs/iodev/dma.cc            |  7 +++----
 bochs/iodev/extfpuirq.cc      |  5 ++---
 bochs/iodev/floppy.cc         |  7 +++----
 bochs/iodev/gameport.cc       |  5 ++---
 bochs/iodev/guest2host.cc     |  7 +++----
 bochs/iodev/harddrv.cc        |  7 +++----
 bochs/iodev/ioapic.cc         |  5 ++---
 bochs/iodev/iodebug.cc        |  5 ++---
 bochs/iodev/keyboard.cc       |  7 +++----
 bochs/iodev/ne2k.cc           |  7 +++----
 bochs/iodev/parallel.cc       |  7 +++----
 bochs/iodev/pci.cc            |  5 ++---
 bochs/iodev/pci2isa.cc        |  5 ++---
 bochs/iodev/pci_ide.cc        |  5 ++---
 bochs/iodev/pcidev.cc         |  5 ++---
 bochs/iodev/pcipnic.cc        |  5 ++---
 bochs/iodev/pciusb.cc         |  5 ++---
 bochs/iodev/pcivga.cc         |  5 ++---
 bochs/iodev/pic.cc            |  5 ++---
 bochs/iodev/pit82c54.cc       |  3 +--
 bochs/iodev/pit_wrap.cc       |  5 ++---
 bochs/iodev/sb16.cc           |  5 ++---
 bochs/iodev/scsi_device.cc    |  6 ++----
 bochs/iodev/serial.cc         |  5 ++---
 bochs/iodev/serial_raw.cc     |  5 ++---
 bochs/iodev/slowdown_timer.cc |  5 ++---
 bochs/iodev/speaker.cc        |  5 ++---
 bochs/iodev/unmapped.cc       |  5 ++---
 bochs/iodev/usb_hid.cc        |  5 ++---
 bochs/iodev/usb_msd.cc        |  5 ++---
 bochs/iodev/virt_timer.cc     |  5 ++---
 bochs/logio.cc                | 32 ++++++++++++--------------------
 bochs/memory/misc_mem.cc      |  7 +++----
 bochs/plugin.cc               | 21 +++++++++++++++++++--
 bochs/plugin.h                | 20 +++++++++++++++++++-
 48 files changed, 185 insertions(+), 180 deletions(-)

diff --git a/bochs/bochs.h b/bochs/bochs.h
index 95ced2ba5..a125c6b2a 100644
--- a/bochs/bochs.h
+++ b/bochs/bochs.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: bochs.h,v 1.237 2009-01-02 11:51:03 vruppert Exp $
+// $Id: bochs.h,v 1.238 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //
 // bochs.h is the master header file for all C++ code.  It includes all
@@ -262,7 +262,6 @@ void print_tree(bx_param_c *node, int level = 0);
 typedef class BOCHSAPI logfunctions
 {
   char *prefix;
-  int type;
 // values of onoff: 0=ignore, 1=report, 2=ask, 3=fatal
 #define ACT_IGNORE 0
 #define ACT_REPORT 1
@@ -287,7 +286,6 @@ public:
   void fatal (const char *prefix, const char *fmt, va_list ap, int exit_status);
   void ask (int level, const char *prefix, const char *fmt, va_list ap);
   void put(const char *);
-  void settype(int);
   void setio(class iofunctions *);
   void setonoff(int loglev, int value) {
     assert (loglev >= 0 && loglev < N_LOGLEV);
@@ -311,17 +309,6 @@ public:
 
 #define BX_LOGPREFIX_SIZE 51
 
-enum {
-  IOLOG=0, FDLOG, GENLOG, CMOSLOG, CDLOG, DMALOG, ETHLOG, G2HLOG, HDLOG, KBDLOG,
-  NE2KLOG, PARLOG, PCILOG, PICLOG, PITLOG, SB16LOG, SERLOG, VGALOG,
-  DEVLOG, MEMLOG, DISLOG, GUILOG, IOAPICLOG, APICLOG, CPU0LOG, CPU1LOG,
-  CPU2LOG, CPU3LOG, CPU4LOG, CPU5LOG, CPU6LOG, CPU7LOG, CPU8LOG, CPU9LOG,
-  CPU10LOG, CPU11LOG, CPU12LOG, CPU13LOG, CPU14LOG, CPU15LOG, CTRLLOG,
-  UNMAPLOG, SERRLOG, BIOSLOG, PIT81LOG, PIT82LOG, IODEBUGLOG, PCI2ISALOG,
-  PLUGINLOG, EXTFPUIRQLOG , PCIVGALOG, PCIUSBLOG, VTIMERLOG, STIMERLOG,
-  PCIIDELOG, PCIDEVLOG, PCIPNICLOG, SPEAKERLOG, BUSMLOG, GAMELOG, ACPILOG
-};
-
 class BOCHSAPI iofunctions {
   int magic;
   char logprefix[BX_LOGPREFIX_SIZE];
diff --git a/bochs/config.cc b/bochs/config.cc
index a667e7db7..f27185f5d 100755
--- a/bochs/config.cc
+++ b/bochs/config.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: config.cc,v 1.148 2009-01-06 20:35:38 vruppert Exp $
+// $Id: config.cc,v 1.149 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "bochs.h"
 #include "iodev/iodev.h"
diff --git a/bochs/cpu/apic.cc b/bochs/cpu/apic.cc
index d50f386f7..f2cf8befa 100644
--- a/bochs/cpu/apic.cc
+++ b/bochs/cpu/apic.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: apic.cc,v 1.112 2008-12-01 19:06:14 sshwarts Exp $
+// $Id: apic.cc,v 1.113 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (c) 2002 Zwane Mwaikambo, Stanislav Shwartsman
@@ -16,7 +16,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -169,7 +169,6 @@ void apic_bus_broadcast_smi(void)
 bx_generic_apic_c::bx_generic_apic_c(bx_phy_address base)
 {
   put("APIC?");
-  settype(APICLOG);
   id = APIC_UNKNOWN_ID;
   set_base(base);
 }
@@ -321,7 +320,6 @@ void bx_local_apic_c::set_id(Bit8u newid)
     char buffer[16];
     sprintf(buffer, "APIC%x", id);
     put(buffer);
-    settype(CPU0LOG + id);
     sprintf(buffer, "CPU%x", id);
     cpu->put(buffer);
   } else {
diff --git a/bochs/cpu/init.cc b/bochs/cpu/init.cc
index 22de81761..de94d19a7 100644
--- a/bochs/cpu/init.cc
+++ b/bochs/cpu/init.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: init.cc,v 1.189 2009-01-10 10:07:57 sshwarts Exp $
+// $Id: init.cc,v 1.190 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -45,7 +45,6 @@ BX_CPU_C::BX_CPU_C(unsigned id): bx_cpuid(id)
   // in the constructor because the only access to it is via
   // global variables which aren't initialized quite yet.
   put("CPU");
-  settype (CPU0LOG);
 }
 
 #if BX_WITH_WX
diff --git a/bochs/gui/gui.cc b/bochs/gui/gui.cc
index e5986c31d..7d1cd4e57 100644
--- a/bochs/gui/gui.cc
+++ b/bochs/gui/gui.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: gui.cc,v 1.105 2008-05-04 09:29:45 vruppert Exp $
+// $Id: gui.cc,v 1.106 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 #include <signal.h>
@@ -102,7 +102,6 @@ static user_key_t user_keys[N_USER_KEYS] =
 bx_gui_c::bx_gui_c(void)
 {
   put("GUI"); // Init in specific_init
-  settype(GUILOG);
   statusitem_count = 0;
   framebuffer = NULL;
 }
diff --git a/bochs/gui/siminterface.cc b/bochs/gui/siminterface.cc
index 306799a3d..cf71ec4e2 100644
--- a/bochs/gui/siminterface.cc
+++ b/bochs/gui/siminterface.cc
@@ -1,5 +1,23 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: siminterface.cc,v 1.187 2009-01-06 20:35:39 vruppert Exp $
+// $Id: siminterface.cc,v 1.188 2009-01-10 11:30:20 vruppert Exp $
+/////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2009  The Bochs Project
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 /////////////////////////////////////////////////////////////////////////
 //
 // See siminterface.h for description of the siminterface concept.
@@ -267,7 +285,6 @@ void bx_init_siminterface()
 {
   siminterface_log = new logfunctions();
   siminterface_log->put("CTRL");
-  siminterface_log->settype(CTRLLOG);
   if (SIM == NULL)
     SIM = new bx_real_sim_c();
   if (root_param == NULL) {
diff --git a/bochs/gui/siminterface.h b/bochs/gui/siminterface.h
index 469502c20..a9eaa21a0 100644
--- a/bochs/gui/siminterface.h
+++ b/bochs/gui/siminterface.h
@@ -1,5 +1,23 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: siminterface.h,v 1.222 2009-01-06 20:35:39 vruppert Exp $
+// $Id: siminterface.h,v 1.223 2009-01-10 11:30:20 vruppert Exp $
+/////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2009  The Bochs Project
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 /////////////////////////////////////////////////////////////////////////
 //
 // Intro to siminterface by Bryce Denney:
diff --git a/bochs/iodev/acpi.cc b/bochs/iodev/acpi.cc
index 53515ff11..e651cda5b 100644
--- a/bochs/iodev/acpi.cc
+++ b/bochs/iodev/acpi.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: acpi.cc,v 1.18 2009-01-03 08:55:00 vruppert Exp $
+// $Id: acpi.cc,v 1.19 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2006  Volker Ruppert
@@ -16,7 +16,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //
 // PIIX4 ACPI support
@@ -107,7 +107,6 @@ Bit64u muldiv64(Bit64u a, Bit32u b, Bit32u c)
 bx_acpi_ctrl_c::bx_acpi_ctrl_c()
 {
   put("ACPI");
-  settype(ACPILOG);
   s.timer_index = BX_NULL_TIMER_HANDLE;
 }
 
diff --git a/bochs/iodev/biosdev.cc b/bochs/iodev/biosdev.cc
index c418586d6..ca113eb1d 100644
--- a/bochs/iodev/biosdev.cc
+++ b/bochs/iodev/biosdev.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: biosdev.cc,v 1.15 2008-12-29 20:16:07 sshwarts Exp $
+// $Id: biosdev.cc,v 1.16 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 // Here are the virtual ports use to display messages from the bioses :
@@ -67,11 +67,9 @@ bx_biosdev_c::bx_biosdev_c(void)
 {
   bioslog = new logfunctions();
   bioslog->put("BIOS");
-  bioslog->settype(BIOSLOG);
 
   vgabioslog = new logfunctions();
   vgabioslog->put("VBIOS");
-  vgabioslog->settype(BIOSLOG);
 }
 
 bx_biosdev_c::~bx_biosdev_c(void)
diff --git a/bochs/iodev/busmouse.cc b/bochs/iodev/busmouse.cc
index 0ad92463b..6adab8d01 100644
--- a/bochs/iodev/busmouse.cc
+++ b/bochs/iodev/busmouse.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: busmouse.cc,v 1.10 2008-12-29 20:16:07 sshwarts Exp $
+// $Id: busmouse.cc,v 1.11 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 // Initial code by Ben Lunt 'fys frontiernet net'
@@ -61,7 +61,6 @@ void libbusmouse_LTX_plugin_fini(void)
 bx_busm_c::bx_busm_c()
 {
   put("BUSM");
-  settype(BUSMLOG);
 }
 
 bx_busm_c::~bx_busm_c()
@@ -71,7 +70,7 @@ bx_busm_c::~bx_busm_c()
 
 void bx_busm_c::init(void)
 {
-  BX_DEBUG(("Init $Id: busmouse.cc,v 1.10 2008-12-29 20:16:07 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: busmouse.cc,v 1.11 2009-01-10 11:30:20 vruppert Exp $"));
 
   DEV_register_irq(BUS_MOUSE_IRQ, "Bus Mouse");
 
diff --git a/bochs/iodev/cdrom.cc b/bochs/iodev/cdrom.cc
index cdacde14c..d54ad6f35 100644
--- a/bochs/iodev/cdrom.cc
+++ b/bochs/iodev/cdrom.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cdrom.cc,v 1.92 2008-10-01 07:47:02 sshwarts Exp $
+// $Id: cdrom.cc,v 1.93 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // These are the low-level CDROM functions which are called
@@ -504,7 +504,6 @@ int GetCDCapacity(unsigned int hid, unsigned int tid, unsigned int lun)
 cdrom_interface::cdrom_interface(char *dev)
 {
   put("CD");
-  settype(CDLOG);
   fd = -1; // File descriptor not yet allocated
 
   if (dev == NULL) {
@@ -523,7 +522,7 @@ cdrom_interface::cdrom_interface(char *dev)
 
 void
 cdrom_interface::init(void) {
-  BX_DEBUG(("Init $Id: cdrom.cc,v 1.92 2008-10-01 07:47:02 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: cdrom.cc,v 1.93 2009-01-10 11:30:20 vruppert Exp $"));
   BX_INFO(("file = '%s'",path));
 }
 
diff --git a/bochs/iodev/cmos.cc b/bochs/iodev/cmos.cc
index d9232af51..a407bf691 100644
--- a/bochs/iodev/cmos.cc
+++ b/bochs/iodev/cmos.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cmos.cc,v 1.66 2008-12-29 20:16:07 sshwarts Exp $
+// $Id: cmos.cc,v 1.67 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
@@ -123,7 +123,6 @@ void libcmos_LTX_plugin_fini(void)
 bx_cmos_c::bx_cmos_c(void)
 {
   put("CMOS");
-  settype(CMOSLOG);
 
   for (unsigned i=0; i<128; i++) s.reg[i] = 0;
 
@@ -146,7 +145,7 @@ bx_cmos_c::~bx_cmos_c(void)
 
 void bx_cmos_c::init(void)
 {
-  BX_DEBUG(("Init $Id: cmos.cc,v 1.66 2008-12-29 20:16:07 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: cmos.cc,v 1.67 2009-01-10 11:30:20 vruppert Exp $"));
   // CMOS RAM & RTC
 
   DEV_register_ioread_handler(this, read_handler, 0x0070, "CMOS RAM", 1);
diff --git a/bochs/iodev/devices.cc b/bochs/iodev/devices.cc
index 3b444aa69..cb9586d21 100644
--- a/bochs/iodev/devices.cc
+++ b/bochs/iodev/devices.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: devices.cc,v 1.129 2009-01-04 21:46:20 vruppert Exp $
+// $Id: devices.cc,v 1.130 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -24,7 +24,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -51,7 +51,6 @@ bx_devices_c bx_devices;
 bx_devices_c::bx_devices_c()
 {
   put("DEV");
-  settype(DEVLOG);
 
   read_port_to_handler = NULL;
   write_port_to_handler = NULL;
@@ -113,7 +112,7 @@ void bx_devices_c::init(BX_MEM_C *newmem)
   unsigned i;
   const char def_name[] = "Default";
 
-  BX_DEBUG(("Init $Id: devices.cc,v 1.129 2009-01-04 21:46:20 vruppert Exp $"));
+  BX_DEBUG(("Init $Id: devices.cc,v 1.130 2009-01-10 11:30:20 vruppert Exp $"));
   mem = newmem;
 
   /* set no-default handlers, will be overwritten by the real default handler */
diff --git a/bochs/iodev/dma.cc b/bochs/iodev/dma.cc
index c548afbc9..401fa690b 100644
--- a/bochs/iodev/dma.cc
+++ b/bochs/iodev/dma.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: dma.cc,v 1.48 2008-12-29 20:16:07 sshwarts Exp $
+// $Id: dma.cc,v 1.49 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
@@ -58,7 +58,6 @@ void libdma_LTX_plugin_fini(void)
 bx_dma_c::bx_dma_c()
 {
   put("DMA");
-  settype(DMALOG);
 }
 
 bx_dma_c::~bx_dma_c()
@@ -123,7 +122,7 @@ unsigned bx_dma_c::get_TC(void)
 void bx_dma_c::init(void)
 {
   unsigned c, i, j;
-  BX_DEBUG(("Init $Id: dma.cc,v 1.48 2008-12-29 20:16:07 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: dma.cc,v 1.49 2009-01-10 11:30:20 vruppert Exp $"));
 
   /* 8237 DMA controller */
 
diff --git a/bochs/iodev/extfpuirq.cc b/bochs/iodev/extfpuirq.cc
index e80da793c..840c11a04 100644
--- a/bochs/iodev/extfpuirq.cc
+++ b/bochs/iodev/extfpuirq.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: extfpuirq.cc,v 1.11 2008-12-29 20:16:07 sshwarts Exp $
+// $Id: extfpuirq.cc,v 1.12 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //
 // External circuit for MSDOS compatible FPU exceptions
@@ -55,7 +55,6 @@ void libextfpuirq_LTX_plugin_fini(void)
 bx_extfpuirq_c::bx_extfpuirq_c(void)
 {
   put("EFIRQ");
-  settype(EXTFPUIRQLOG);
 }
 
 bx_extfpuirq_c::~bx_extfpuirq_c(void)
diff --git a/bochs/iodev/floppy.cc b/bochs/iodev/floppy.cc
index 77428e921..fc8d37cee 100644
--- a/bochs/iodev/floppy.cc
+++ b/bochs/iodev/floppy.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: floppy.cc,v 1.112 2008-12-29 20:16:07 sshwarts Exp $
+// $Id: floppy.cc,v 1.113 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -129,7 +129,6 @@ void libfloppy_LTX_plugin_fini(void)
 bx_floppy_ctrl_c::bx_floppy_ctrl_c()
 {
   put("FDD");
-  settype(FDLOG);
   s.floppy_timer_index = BX_NULL_TIMER_HANDLE;
 }
 
@@ -142,7 +141,7 @@ void bx_floppy_ctrl_c::init(void)
 {
   Bit8u i, cmos_value;
 
-  BX_DEBUG(("Init $Id: floppy.cc,v 1.112 2008-12-29 20:16:07 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: floppy.cc,v 1.113 2009-01-10 11:30:20 vruppert Exp $"));
   DEV_dma_register_8bit_channel(2, dma_read, dma_write, "Floppy Drive");
   DEV_register_irq(6, "Floppy Drive");
   for (unsigned addr=0x03F2; addr<=0x03F7; addr++) {
diff --git a/bochs/iodev/gameport.cc b/bochs/iodev/gameport.cc
index 09e4d6fb9..e8f049b7c 100644
--- a/bochs/iodev/gameport.cc
+++ b/bochs/iodev/gameport.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: gameport.cc,v 1.17 2008-12-29 20:16:08 sshwarts Exp $
+// $Id: gameport.cc,v 1.18 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2003  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //
 // Standard PC gameport
@@ -75,7 +75,6 @@ void libgameport_LTX_plugin_fini(void)
 bx_gameport_c::bx_gameport_c()
 {
   put("GAME");
-  settype(GAMELOG);
   joyfd = -1;
 }
 
diff --git a/bochs/iodev/guest2host.cc b/bochs/iodev/guest2host.cc
index 01ce34f1f..d93238846 100644
--- a/bochs/iodev/guest2host.cc
+++ b/bochs/iodev/guest2host.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: guest2host.cc,v 1.17 2008-12-29 20:16:08 sshwarts Exp $
+// $Id: guest2host.cc,v 1.18 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 #include "iodev.h"
@@ -35,7 +35,6 @@ bx_g2h_c bx_g2h;
 bx_g2h_c::bx_g2h_c()
 {
   put("G2H");
-  settype(G2HLOG);
   unsigned i;
 
   for (i=0; i<BX_MAX_G2H_CHANNELS; i++) {
@@ -51,7 +50,7 @@ bx_g2h_c::~bx_g2h_c()
 
 void bx_g2h_c::init(void)
 {
-  BX_DEBUG(("Init $Id: guest2host.cc,v 1.17 2008-12-29 20:16:08 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: guest2host.cc,v 1.18 2009-01-10 11:30:20 vruppert Exp $"));
   // Reserve a dword port for this interface
   for (Bit32u addr=BX_G2H_PORT; addr<=(BX_G2H_PORT+3); addr++) {
     bx_devices.register_io_read_handler(&bx_g2h,
diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc
index 0c8715294..f73040f24 100644
--- a/bochs/iodev/harddrv.cc
+++ b/bochs/iodev/harddrv.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: harddrv.cc,v 1.218 2008-12-29 20:16:08 sshwarts Exp $
+// $Id: harddrv.cc,v 1.219 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // Useful docs:
@@ -134,7 +134,6 @@ bx_hard_drive_c::bx_hard_drive_c()
 #endif
 
   put("HD");
-  settype(HDLOG);
   for (Bit8u channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
     for (Bit8u device=0; device<2; device ++) {
       channels[channel].drives[device].hard_drive =  NULL;
@@ -174,7 +173,7 @@ void bx_hard_drive_c::init(void)
   char  ata_name[20];
   bx_list_c *base;
 
-  BX_DEBUG(("Init $Id: harddrv.cc,v 1.218 2008-12-29 20:16:08 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: harddrv.cc,v 1.219 2009-01-10 11:30:20 vruppert Exp $"));
 
   for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
     sprintf(ata_name, "ata.%d.resources", channel);
diff --git a/bochs/iodev/ioapic.cc b/bochs/iodev/ioapic.cc
index 83899afc3..b6e562dda 100644
--- a/bochs/iodev/ioapic.cc
+++ b/bochs/iodev/ioapic.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ioapic.cc,v 1.40 2009-01-03 08:55:00 vruppert Exp $
+// $Id: ioapic.cc,v 1.41 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "iodev.h"
 
@@ -74,7 +74,6 @@ bx_ioapic_c::bx_ioapic_c()
   : bx_generic_apic_c(BX_IOAPIC_BASE_ADDR)
 {
   put("IOAP");
-  settype(IOAPICLOG);
 }
 
 #define BX_IOAPIC_DEFAULT_ID (BX_SMP_PROCESSORS)
diff --git a/bochs/iodev/iodebug.cc b/bochs/iodev/iodebug.cc
index 2bdc18e32..3f7607ff5 100644
--- a/bochs/iodev/iodebug.cc
+++ b/bochs/iodev/iodebug.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: iodebug.cc,v 1.28 2009-01-03 08:55:00 vruppert Exp $
+// $Id: iodebug.cc,v 1.29 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2008  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
@@ -66,7 +66,6 @@ struct bx_iodebug_s_type {
 bx_iodebug_c::bx_iodebug_c()
 {
   put("IODBG");
-  settype(IODEBUGLOG);
 }
 
 void bx_iodebug_c::init(void)
diff --git a/bochs/iodev/keyboard.cc b/bochs/iodev/keyboard.cc
index 548562304..d969b5a59 100644
--- a/bochs/iodev/keyboard.cc
+++ b/bochs/iodev/keyboard.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: keyboard.cc,v 1.135 2008-09-18 17:18:36 sshwarts Exp $
+// $Id: keyboard.cc,v 1.136 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // Now features proper implementation of keyboard opcodes 0xF4 to 0xF6
@@ -82,7 +82,6 @@ void libkeyboard_LTX_plugin_fini(void)
 bx_keyb_c::bx_keyb_c()
 {
   put("KBD");
-  settype(KBDLOG);
   pastebuf = NULL;
 }
 
@@ -126,7 +125,7 @@ void bx_keyb_c::resetinternals(bx_bool powerup)
 
 void bx_keyb_c::init(void)
 {
-  BX_DEBUG(("Init $Id: keyboard.cc,v 1.135 2008-09-18 17:18:36 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: keyboard.cc,v 1.136 2009-01-10 11:30:20 vruppert Exp $"));
   Bit32u   i;
 
   DEV_register_irq(1, "8042 Keyboard controller");
diff --git a/bochs/iodev/ne2k.cc b/bochs/iodev/ne2k.cc
index 4f43aadab..394030a24 100644
--- a/bochs/iodev/ne2k.cc
+++ b/bochs/iodev/ne2k.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ne2k.cc,v 1.102 2009-01-03 08:55:00 vruppert Exp $
+// $Id: ne2k.cc,v 1.103 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // Peter Grehan (grehan@iprg.nokia.com) coded the initial version of this
@@ -70,7 +70,6 @@ void libne2k_LTX_plugin_fini(void)
 bx_ne2k_c::bx_ne2k_c()
 {
   put("NE2K");
-  settype(NE2KLOG);
   s.tx_timer_index = BX_NULL_TIMER_HANDLE;
   ethdev = NULL;
 }
@@ -1417,7 +1416,7 @@ void bx_ne2k_c::init(void)
   Bit8u macaddr[6];
   bx_list_c *base;
 
-  BX_DEBUG(("Init $Id: ne2k.cc,v 1.102 2009-01-03 08:55:00 vruppert Exp $"));
+  BX_DEBUG(("Init $Id: ne2k.cc,v 1.103 2009-01-10 11:30:20 vruppert Exp $"));
 
   // Read in values from config interface
   base = (bx_list_c*) SIM->get_param(BXPN_NE2K);
diff --git a/bochs/iodev/parallel.cc b/bochs/iodev/parallel.cc
index 33e523f39..0f6027ac4 100644
--- a/bochs/iodev/parallel.cc
+++ b/bochs/iodev/parallel.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: parallel.cc,v 1.36 2008-12-29 20:16:08 sshwarts Exp $
+// $Id: parallel.cc,v 1.37 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 ////////////////////////////////////////////////////////
 // This code was just a few stubs until Volker.Ruppert@t-online.de
@@ -56,7 +56,6 @@ void libparallel_LTX_plugin_fini(void)
 bx_parallel_c::bx_parallel_c()
 {
   put("PAR");
-  settype(PARLOG);
   for (int i=0; i<BX_PARPORT_MAXDEV; i++) {
     s[i].output = NULL;
   }
@@ -78,7 +77,7 @@ void bx_parallel_c::init(void)
   char name[16], pname[20];
   bx_list_c *base;
 
-  BX_DEBUG(("Init $Id: parallel.cc,v 1.36 2008-12-29 20:16:08 sshwarts Exp $"));
+  BX_DEBUG(("Init $Id: parallel.cc,v 1.37 2009-01-10 11:30:20 vruppert Exp $"));
 
   for (unsigned i=0; i<BX_N_PARALLEL_PORTS; i++) {
     sprintf(pname, "ports.parallel.%d", i+1);
diff --git a/bochs/iodev/pci.cc b/bochs/iodev/pci.cc
index 796250d23..9fc393753 100644
--- a/bochs/iodev/pci.cc
+++ b/bochs/iodev/pci.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pci.cc,v 1.58 2009-01-03 08:55:00 vruppert Exp $
+// $Id: pci.cc,v 1.59 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //
 // i440FX Support - PMC/DBX
@@ -59,7 +59,6 @@ void libpci_LTX_plugin_fini(void)
 bx_pci_bridge_c::bx_pci_bridge_c()
 {
   put("PCI");
-  settype(PCILOG);
 }
 
 bx_pci_bridge_c::~bx_pci_bridge_c()
diff --git a/bochs/iodev/pci2isa.cc b/bochs/iodev/pci2isa.cc
index c0cdd0e57..e02daa949 100644
--- a/bochs/iodev/pci2isa.cc
+++ b/bochs/iodev/pci2isa.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pci2isa.cc,v 1.46 2009-01-03 08:55:00 vruppert Exp $
+// $Id: pci2isa.cc,v 1.47 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //
 // i440FX Support - PCI-to-ISA bridge (PIIX3)
@@ -60,7 +60,6 @@ void libpci2isa_LTX_plugin_fini(void)
 bx_piix3_c::bx_piix3_c()
 {
   put("P2I");
-  settype(PCI2ISALOG);
 }
 
 bx_piix3_c::~bx_piix3_c()
diff --git a/bochs/iodev/pci_ide.cc b/bochs/iodev/pci_ide.cc
index 5525a88e9..8e53a4e8c 100644
--- a/bochs/iodev/pci_ide.cc
+++ b/bochs/iodev/pci_ide.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pci_ide.cc,v 1.37 2009-01-03 08:55:00 vruppert Exp $
+// $Id: pci_ide.cc,v 1.38 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //
 // i440FX Support - PCI IDE controller (PIIX3)
@@ -62,7 +62,6 @@ void libpci_ide_LTX_plugin_fini(void)
 bx_pci_ide_c::bx_pci_ide_c()
 {
   put("PIDE");
-  settype(PCIIDELOG);
   s.bmdma[0].timer_index = BX_NULL_TIMER_HANDLE;
   s.bmdma[1].timer_index = BX_NULL_TIMER_HANDLE;
   s.bmdma[0].buffer = NULL;
diff --git a/bochs/iodev/pcidev.cc b/bochs/iodev/pcidev.cc
index 475f50f8b..6876e81c2 100644
--- a/bochs/iodev/pcidev.cc
+++ b/bochs/iodev/pcidev.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pcidev.cc,v 1.17 2008-12-30 15:33:38 vruppert Exp $
+// $Id: pcidev.cc,v 1.18 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 
 /*
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 /*
@@ -59,7 +59,6 @@ void libpcidev_LTX_plugin_fini(void)
 bx_pcidev_c::bx_pcidev_c()
 {
   put("PCI2H");
-  settype(PCIDEVLOG);
 }
 
 bx_pcidev_c::~bx_pcidev_c()
diff --git a/bochs/iodev/pcipnic.cc b/bochs/iodev/pcipnic.cc
index fabf752fc..a81b634ab 100644
--- a/bochs/iodev/pcipnic.cc
+++ b/bochs/iodev/pcipnic.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pcipnic.cc,v 1.29 2008-12-30 15:33:38 vruppert Exp $
+// $Id: pcipnic.cc,v 1.30 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2003  Fen Systems Ltd.
@@ -17,7 +17,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
@@ -53,7 +53,6 @@ void libpcipnic_LTX_plugin_fini(void)
 bx_pcipnic_c::bx_pcipnic_c()
 {
   put("PNIC");
-  settype(PCIPNICLOG);
 }
 
 bx_pcipnic_c::~bx_pcipnic_c()
diff --git a/bochs/iodev/pciusb.cc b/bochs/iodev/pciusb.cc
index 269e56b10..12c9fa872 100644
--- a/bochs/iodev/pciusb.cc
+++ b/bochs/iodev/pciusb.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pciusb.cc,v 1.69 2009-01-04 21:46:20 vruppert Exp $
+// $Id: pciusb.cc,v 1.70 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // Experimental PCI USB adapter
 // Benjamin D Lunt (fys at frontiernet net) coded most of this usb emulation.
@@ -127,7 +127,6 @@ void libpciusb_LTX_plugin_fini(void)
 bx_pciusb_c::bx_pciusb_c()
 {
   put("USB");
-  settype(PCIUSBLOG);
   for (int i=0; i<BX_USB_CONFDEV; i++) {
     memset((void*)&hub[i], 0, sizeof(bx_usb_t));
   }
diff --git a/bochs/iodev/pcivga.cc b/bochs/iodev/pcivga.cc
index 9df983c0f..e38b5008a 100644
--- a/bochs/iodev/pcivga.cc
+++ b/bochs/iodev/pcivga.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pcivga.cc,v 1.20 2009-01-03 08:55:00 vruppert Exp $
+// $Id: pcivga.cc,v 1.21 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002,2003 Mike Nordell
@@ -16,7 +16,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 //
 // Experimental PCI VGA adapter
@@ -59,7 +59,6 @@ void libpcivga_LTX_plugin_fini(void)
 bx_pcivga_c::bx_pcivga_c()
 {
   put("PCIVGA");
-  settype(PCIVGALOG);
 }
 
 bx_pcivga_c::~bx_pcivga_c()
diff --git a/bochs/iodev/pic.cc b/bochs/iodev/pic.cc
index 840dece7e..3933c6d33 100644
--- a/bochs/iodev/pic.cc
+++ b/bochs/iodev/pic.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pic.cc,v 1.50 2008-12-29 20:16:08 sshwarts Exp $
+// $Id: pic.cc,v 1.51 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
@@ -53,7 +53,6 @@ void libpic_LTX_plugin_fini(void)
 bx_pic_c::bx_pic_c(void)
 {
   put("PIC");
-  settype(PICLOG);
 }
 
 bx_pic_c::~bx_pic_c(void)
diff --git a/bochs/iodev/pit82c54.cc b/bochs/iodev/pit82c54.cc
index 3741f853e..127743874 100644
--- a/bochs/iodev/pit82c54.cc
+++ b/bochs/iodev/pit82c54.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pit82c54.cc,v 1.32 2008-02-15 22:05:43 sshwarts Exp $
+// $Id: pit82c54.cc,v 1.33 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 
 /*
@@ -155,7 +155,6 @@ pit_82C54::decrement (counter_type &thisctr)
 void pit_82C54::init(void)
 {
   put("PIT81");
-  settype(PIT81LOG);
 
   for(int i=0;i<3;i++) {
     BX_DEBUG(("Setting read_state to LSB"));
diff --git a/bochs/iodev/pit_wrap.cc b/bochs/iodev/pit_wrap.cc
index f1d03f248..21185314c 100644
--- a/bochs/iodev/pit_wrap.cc
+++ b/bochs/iodev/pit_wrap.cc
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////
-// $Id: pit_wrap.cc,v 1.71 2008-12-29 20:16:08 sshwarts Exp $
+// $Id: pit_wrap.cc,v 1.72 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 #include "iodev.h"
@@ -78,7 +78,6 @@ bx_pit_c bx_pit;
 bx_pit_c::bx_pit_c()
 {
   put("PIT");
-  settype(PITLOG);
   s.speaker_data_on=0;
 
   /* 8254 PIT (Programmable Interval Timer) */
diff --git a/bochs/iodev/sb16.cc b/bochs/iodev/sb16.cc
index 8a20038d7..0a75c9e22 100644
--- a/bochs/iodev/sb16.cc
+++ b/bochs/iodev/sb16.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: sb16.cc,v 1.65 2008-12-30 09:17:09 vruppert Exp $
+// $Id: sb16.cc,v 1.66 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -75,7 +75,6 @@ void libsb16_LTX_plugin_fini(void)
 bx_sb16_c::bx_sb16_c(void)
 {
   put("SB16");
-  settype(SB16LOG);
   mpu401.timer_handle = BX_NULL_TIMER_HANDLE;
   dsp.timer_handle = BX_NULL_TIMER_HANDLE;
   opl.timer_handle = BX_NULL_TIMER_HANDLE;
diff --git a/bochs/iodev/scsi_device.cc b/bochs/iodev/scsi_device.cc
index f662d5b1d..c2c5b64ca 100644
--- a/bochs/iodev/scsi_device.cc
+++ b/bochs/iodev/scsi_device.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: scsi_device.cc,v 1.7 2008-11-23 19:21:19 vruppert Exp $
+// $Id: scsi_device.cc,v 1.8 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2007  Volker Ruppert
@@ -16,7 +16,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // SCSI emulation layer ported from the Qemu project
 
@@ -51,7 +51,6 @@ scsi_device_t::scsi_device_t(device_image_t *_hdimage, int _tcq,
   cluster_size = 1;
 
   put("SCSID");
-  settype(PCIUSBLOG);
 }
 
 scsi_device_t::scsi_device_t(LOWLEVEL_CDROM *_cdrom, int _tcq,
@@ -68,7 +67,6 @@ scsi_device_t::scsi_device_t(LOWLEVEL_CDROM *_cdrom, int _tcq,
   cluster_size = 4;
 
   put("SCSIC");
-  settype(PCIUSBLOG);
 }
 
 scsi_device_t::~scsi_device_t(void)
diff --git a/bochs/iodev/serial.cc b/bochs/iodev/serial.cc
index 8db7dea39..92deea5b9 100644
--- a/bochs/iodev/serial.cc
+++ b/bochs/iodev/serial.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: serial.cc,v 1.86 2009-01-03 08:55:00 vruppert Exp $
+// $Id: serial.cc,v 1.87 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /////////////////////////////////////////////////////////////////////////
 
 // Peter Grehan (grehan@iprg.nokia.com) coded the original version of this
@@ -74,7 +74,6 @@ void libserial_LTX_plugin_fini(void)
 bx_serial_c::bx_serial_c(void)
 {
   put("SER");
-  settype(SERLOG);
   for (int i=0; i<BX_SERIAL_MAXDEV; i++) {
     s[i].io_mode = BX_SER_MODE_NULL;
     s[i].tty_id = -1;
diff --git a/bochs/iodev/serial_raw.cc b/bochs/iodev/serial_raw.cc
index e1248f94e..bc209ad7b 100644
--- a/bochs/iodev/serial_raw.cc
+++ b/bochs/iodev/serial_raw.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: serial_raw.cc,v 1.22 2008-01-26 22:24:02 sshwarts Exp $
+// $Id: serial_raw.cc,v 1.23 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
@@ -53,7 +53,6 @@ serial_raw::serial_raw(const char *devname)
 #endif
 
   put ("SERR");
-  settype (SERRLOG);
 #ifdef WIN32
   memset(&dcb, 0, sizeof(DCB));
   dcb.DCBlength = sizeof(DCB);
diff --git a/bochs/iodev/slowdown_timer.cc b/bochs/iodev/slowdown_timer.cc
index 7b54c6902..d38719064 100644
--- a/bochs/iodev/slowdown_timer.cc
+++ b/bochs/iodev/slowdown_timer.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: slowdown_timer.cc,v 1.30 2008-11-09 22:04:14 vruppert Exp $
+// $Id: slowdown_timer.cc,v 1.31 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -56,7 +56,6 @@ bx_slowdown_timer_c bx_slowdown_timer;
 bx_slowdown_timer_c::bx_slowdown_timer_c()
 {
   put("STIMER");
-  settype(STIMERLOG);
 
   s.start_time=0;
   s.start_emulated_time=0;
diff --git a/bochs/iodev/speaker.cc b/bochs/iodev/speaker.cc
index a55fac9f0..d49142610 100644
--- a/bochs/iodev/speaker.cc
+++ b/bochs/iodev/speaker.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: speaker.cc,v 1.11 2008-01-26 22:24:02 sshwarts Exp $
+// $Id: speaker.cc,v 1.12 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright 2003 by David N. Welton <davidw@dedasys.com>.
@@ -16,7 +16,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define BX_PLUGGABLE
 
@@ -55,7 +55,6 @@ void libspeaker_LTX_plugin_fini(void)
 bx_speaker_c::bx_speaker_c()
 {
   put("SPEAKER");
-  settype(SPEAKERLOG);
 
   beep_frequency = 0.0; // Off
 
diff --git a/bochs/iodev/unmapped.cc b/bochs/iodev/unmapped.cc
index d652aa0dc..0ac8db3c9 100644
--- a/bochs/iodev/unmapped.cc
+++ b/bochs/iodev/unmapped.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: unmapped.cc,v 1.28 2008-12-29 20:16:08 sshwarts Exp $
+// $Id: unmapped.cc,v 1.29 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -53,7 +53,6 @@ void libunmapped_LTX_plugin_fini(void)
 bx_unmapped_c::bx_unmapped_c(void)
 {
   put("UNMP");
-  settype(UNMAPLOG);
 }
 
 bx_unmapped_c::~bx_unmapped_c(void)
diff --git a/bochs/iodev/usb_hid.cc b/bochs/iodev/usb_hid.cc
index 3fe37ccc5..de62359fc 100644
--- a/bochs/iodev/usb_hid.cc
+++ b/bochs/iodev/usb_hid.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: usb_hid.cc,v 1.7 2008-01-26 22:24:02 sshwarts Exp $
+// $Id: usb_hid.cc,v 1.8 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2007  Volker Ruppert
@@ -16,7 +16,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // USB HID emulation support (mouse and tablet) ported from the Qemu project
 // USB keypad emulation based on code by Benjamin D Lunt (fys at frontiernet net)
@@ -367,7 +367,6 @@ usb_hid_device_t::usb_hid_device_t(usbdev_type type)
   memset((void*)&s, 0, sizeof(s));
 
   put("USBHI");
-  settype(PCIUSBLOG);
 }
 
 usb_hid_device_t::~usb_hid_device_t(void)
diff --git a/bochs/iodev/usb_msd.cc b/bochs/iodev/usb_msd.cc
index 123c03965..0fb63aa17 100644
--- a/bochs/iodev/usb_msd.cc
+++ b/bochs/iodev/usb_msd.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: usb_msd.cc,v 1.8 2008-01-26 22:24:02 sshwarts Exp $
+// $Id: usb_msd.cc,v 1.9 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2007  Volker Ruppert
@@ -16,7 +16,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // USB mass storage device support ported from the Qemu project
 
@@ -137,7 +137,6 @@ usb_msd_device_t::usb_msd_device_t(void)
   memset((void*)&s, 0, sizeof(s));
 
   put("USBMS");
-  settype(PCIUSBLOG);
 }
 
 usb_msd_device_t::~usb_msd_device_t(void)
diff --git a/bochs/iodev/virt_timer.cc b/bochs/iodev/virt_timer.cc
index 8d122322a..2333b3cf7 100644
--- a/bochs/iodev/virt_timer.cc
+++ b/bochs/iodev/virt_timer.cc
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////
-// $Id: virt_timer.cc,v 1.38 2008-12-19 12:52:34 vruppert Exp $
+// $Id: virt_timer.cc,v 1.39 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////
@@ -134,7 +134,6 @@ bx_virt_timer_c bx_virt_timer;
 bx_virt_timer_c::bx_virt_timer_c()
 {
   put("VTIMER");
-  settype(VTIMERLOG);
 
   setup();
 }
diff --git a/bochs/logio.cc b/bochs/logio.cc
index 7da6c3100..31d404b70 100644
--- a/bochs/logio.cc
+++ b/bochs/logio.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: logio.cc,v 1.70 2008-10-01 09:44:40 sshwarts Exp $
+// $Id: logio.cc,v 1.71 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -22,7 +22,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 #include "bochs.h"
@@ -61,7 +61,6 @@ void iofunctions::init(void)
   init_log(stderr);
   log = new logfunc_t(this);
   log->put("IO");
-  log->settype(IOLOG);
   log->ldebug("Init(log file: '%s').",logfn);
 }
 
@@ -161,18 +160,18 @@ void iofunctions::set_log_prefix(const char* prefix)
   strcpy(logprefix, prefix);
 }
 
-//  iofunctions::out(class, level, prefix, fmt, ap)
+//  iofunctions::out(level, prefix, fmt, ap)
 //  DO NOT nest out() from ::info() and the like.
 //    fmt and ap retained for direct printinf from iofunctions only!
 
-void iofunctions::out(int f, int l, const char *prefix, const char *fmt, va_list ap)
+void iofunctions::out(int level, const char *prefix, const char *fmt, va_list ap)
 {
   char c=' ', *s;
   assert(magic==MAGIC_LOGNUM);
   assert(this != NULL);
   assert(logfd != NULL);
 
-  switch(l) {
+  switch (level) {
     case LOGLEV_INFO: c='i'; break;
     case LOGLEV_PANIC: c='p'; break;
     case LOGLEV_PASS: c='s'; break;
@@ -217,9 +216,9 @@ void iofunctions::out(int f, int l, const char *prefix, const char *fmt, va_list
 
   fprintf(logfd," ");
 
-  if(l==LOGLEV_PANIC)
+  if(level==LOGLEV_PANIC)
     fprintf(logfd, ">>PANIC<< ");
-  if(l==LOGLEV_PASS)
+  if(level==LOGLEV_PASS)
     fprintf(logfd, ">>PASS<< ");
 
   vfprintf(logfd, fmt, ap);
@@ -276,7 +275,6 @@ logfunctions::logfunctions(void)
 {
   prefix = NULL;
   put(" ");
-  settype(GENLOG);
   if (io == NULL && Allocio == 0) {
     Allocio = 1;
     io = new iofunc_t(stderr);
@@ -292,7 +290,6 @@ logfunctions::logfunctions(iofunc_t *iofunc)
 {
   prefix = NULL;
   put(" ");
-  settype(GENLOG);
   setio(iofunc);
   // BUG: unfortunately this can be called before the bochsrc is read,
   // which means that the bochsrc has no effect on the actions.
@@ -346,11 +343,6 @@ void logfunctions::put(const char *p)
   prefix=tmpbuf;
 }
 
-void logfunctions::settype(int t)
-{
-  type=t;
-}
-
 void logfunctions::info(const char *fmt, ...)
 {
   va_list ap;
@@ -361,7 +353,7 @@ void logfunctions::info(const char *fmt, ...)
   if(!onoff[LOGLEV_INFO]) return;
 
   va_start(ap, fmt);
-  this->logio->out(this->type,LOGLEV_INFO,this->prefix, fmt, ap);
+  this->logio->out(LOGLEV_INFO, this->prefix, fmt, ap);
   if (onoff[LOGLEV_INFO] == ACT_ASK)
     ask(LOGLEV_INFO, this->prefix, fmt, ap);
   if (onoff[LOGLEV_INFO] == ACT_FATAL)
@@ -379,7 +371,7 @@ void logfunctions::error(const char *fmt, ...)
   if(!onoff[LOGLEV_ERROR]) return;
 
   va_start(ap, fmt);
-  this->logio->out(this->type,LOGLEV_ERROR,this->prefix, fmt, ap);
+  this->logio->out(LOGLEV_ERROR, this->prefix, fmt, ap);
   if (onoff[LOGLEV_ERROR] == ACT_ASK)
     ask(LOGLEV_ERROR, this->prefix, fmt, ap);
   if (onoff[LOGLEV_ERROR] == ACT_FATAL)
@@ -399,7 +391,7 @@ void logfunctions::panic(const char *fmt, ...)
   //if(!onoff[LOGLEV_PANIC]) return;
 
   va_start(ap, fmt);
-  this->logio->out(this->type,LOGLEV_PANIC,this->prefix, fmt, ap);
+  this->logio->out(LOGLEV_PANIC, this->prefix, fmt, ap);
 
   // This fixes a funny bug on linuxppc where va_list is no pointer but a struct
   va_end(ap);
@@ -424,7 +416,7 @@ void logfunctions::pass(const char *fmt, ...)
   //if(!onoff[LOGLEV_PASS]) return;
 
   va_start(ap, fmt);
-  this->logio->out(this->type,LOGLEV_PASS,this->prefix, fmt, ap);
+  this->logio->out(LOGLEV_PASS, this->prefix, fmt, ap);
 
   // This fixes a funny bug on linuxppc where va_list is no pointer but a struct
   va_end(ap);
@@ -447,7 +439,7 @@ void logfunctions::ldebug(const char *fmt, ...)
   if(!onoff[LOGLEV_DEBUG]) return;
 
   va_start(ap, fmt);
-  this->logio->out(this->type,LOGLEV_DEBUG,this->prefix, fmt, ap);
+  this->logio->out(LOGLEV_DEBUG, this->prefix, fmt, ap);
   if (onoff[LOGLEV_DEBUG] == ACT_ASK)
     ask(LOGLEV_DEBUG, this->prefix, fmt, ap);
   if (onoff[LOGLEV_DEBUG] == ACT_FATAL)
diff --git a/bochs/memory/misc_mem.cc b/bochs/memory/misc_mem.cc
index 89aa144d5..dca114fd0 100644
--- a/bochs/memory/misc_mem.cc
+++ b/bochs/memory/misc_mem.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: misc_mem.cc,v 1.120 2008-12-13 11:03:36 vruppert Exp $
+// $Id: misc_mem.cc,v 1.121 2009-01-10 11:30:20 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -24,7 +24,7 @@
 //
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 /////////////////////////////////////////////////////////////////////////
 
@@ -43,7 +43,6 @@ BX_MEM_C::BX_MEM_C()
   char mem[6];
   snprintf(mem, 6, "MEM0");
   put(mem);
-  settype(MEMLOG);
 
   vector = NULL;
   actual_vector = NULL;
@@ -76,7 +75,7 @@ void BX_MEM_C::init_memory(Bit32u memsize)
 {
   unsigned idx;
 
-  BX_DEBUG(("Init $Id: misc_mem.cc,v 1.120 2008-12-13 11:03:36 vruppert Exp $"));
+  BX_DEBUG(("Init $Id: misc_mem.cc,v 1.121 2009-01-10 11:30:20 vruppert Exp $"));
 
   if (BX_MEM_THIS actual_vector != NULL) {
     BX_INFO (("freeing existing memory vector"));
diff --git a/bochs/plugin.cc b/bochs/plugin.cc
index 3b6bf2f0f..5557affd7 100644
--- a/bochs/plugin.cc
+++ b/bochs/plugin.cc
@@ -1,5 +1,23 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: plugin.cc,v 1.28 2009-01-04 21:46:20 vruppert Exp $
+// $Id: plugin.cc,v 1.29 2009-01-10 11:30:20 vruppert Exp $
+/////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2009  The Bochs Project
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 /////////////////////////////////////////////////////////////////////////
 //
 // This file defines the plugin and plugin-device registration functions and
@@ -480,7 +498,6 @@ plugin_startup(void)
 #if BX_PLUGINS
   pluginlog = new logfunctions();
   pluginlog->put("PLGIN");
-  pluginlog->settype(PLUGINLOG);
   int status = lt_dlinit ();
   if (status != 0) {
     BX_ERROR (("initialization error in ltdl library (for loading plugins)"));
diff --git a/bochs/plugin.h b/bochs/plugin.h
index ed86ffe64..1fff8cf8b 100644
--- a/bochs/plugin.h
+++ b/bochs/plugin.h
@@ -1,5 +1,23 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: plugin.h,v 1.67 2009-01-04 21:46:20 vruppert Exp $
+// $Id: plugin.h,v 1.68 2009-01-10 11:30:20 vruppert Exp $
+/////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2009  The Bochs Project
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 /////////////////////////////////////////////////////////////////////////
 //
 // This file provides macros and types needed for plugins.  It is based on