From 032d2aae788cfce6acaa700e4283dcda3217d37a Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Thu, 10 Jul 2003 20:26:05 +0000 Subject: [PATCH] - removed obsolete functions pluginRegisterDevice() and bx_load_plugins() --- bochs/main.cc | 8 +---- bochs/plugin.cc | 82 +++---------------------------------------------- bochs/plugin.h | 8 +---- 3 files changed, 6 insertions(+), 92 deletions(-) diff --git a/bochs/main.cc b/bochs/main.cc index b0d751ca5..0027d095b 100644 --- a/bochs/main.cc +++ b/bochs/main.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: main.cc,v 1.228 2003-07-10 19:13:28 vruppert Exp $ +// $Id: main.cc,v 1.229 2003-07-10 20:26:05 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -2054,12 +2054,6 @@ bx_begin_simulation (int argc, char *argv[]) // bx_init_hardware() and cpu_loop() bx_dbg_main(argc, argv); #else -#if BX_PLUGINS -#ifdef __GNUC__ -#warning bx_load_plugins doesnt do much anymore and should maybe be removed -#endif - bx_load_plugins (); -#endif bx_init_hardware(); diff --git a/bochs/plugin.cc b/bochs/plugin.cc index 005e44d84..1cf4ac7e9 100644 --- a/bochs/plugin.cc +++ b/bochs/plugin.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: plugin.cc,v 1.6 2003-05-02 12:22:45 vruppert Exp $ +// $Id: plugin.cc,v 1.7 2003-07-10 20:26:05 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // // This file defines the plugin and plugin-device registration functions and @@ -397,6 +397,9 @@ plugin_startup(void) pluginActivateTimer = builtinActivateTimer; #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)")); @@ -410,66 +413,6 @@ plugin_startup(void) /* Plugin system: Device registration */ /************************************************************************/ -#ifdef __GNUC__ -#warning BBD: when all plugin devices are converted to the "bx_devmodel" type with virtual functions, I intend to chop this out. -#endif -// (and the nasty current_plugin_context hack can go too) - -void pluginRegisterDevice(deviceInitMem_t init1, deviceInitDev_t init2, - deviceReset_t reset, deviceLoad_t load, - deviceSave_t save, char *name) -{ - device_t *device; - - device = (device_t *)malloc (sizeof (device_t)); - if (!device) - { - pluginlog->panic("can't allocate device_t"); - } - - device->name = name; - BX_ASSERT(current_plugin_context != NULL); - device->plugin = current_plugin_context; - device->use_devmodel_interface = 0; - device->device_init_mem = init1; - device->device_init_dev = init2; - device->device_reset = reset; - device->device_load_state = load; - device->device_save_state = save; - device->next = NULL; - - // Don't add every kind of device to the list. - switch (device->plugin->type) - { - case PLUGTYPE_CORE: - // Core devices are present whether or not we are using plugins, so - // they are managed by code iodev/devices.cc and should not be - // managed by the plugin system. - return; // Do not add core devices to the devices list. - case PLUGTYPE_OPTIONAL: - case PLUGTYPE_USER: - default: - // The plugin system will manage optional and user devices only. - break; - } - - if (!devices) - { - /* Empty list, this become the first entry. */ - devices = device; - } - else - { - /* Non-empty list. Add to end. */ - device_t *temp = devices; - - while (temp->next) - temp = temp->next; - - temp->next = device; - } -} - void pluginRegisterDeviceDevmodel(plugin_t *plugin, plugintype_t type, bx_devmodel_c *devmodel, char *name) { device_t *device; @@ -551,23 +494,6 @@ int bx_load_plugin (const char *name, plugintype_t type) plugin_load (namecopy, "", type); return 0; } - -/************************************************************************/ -/* Plugin system: Load ALL plugins */ -/************************************************************************/ - -int bx_load_plugins (void) -{ - pluginlog = new logfunctions(); - pluginlog->put("PLGIN"); - pluginlog->settype(PLUGINLOG); - -#if !BX_PLUGINS - pluginlog->info("plugins deactivated"); -#endif - - return 0; -} #endif /* end of #if BX_PLUGINS */ /*************************************************************************/ diff --git a/bochs/plugin.h b/bochs/plugin.h index 434a0450d..36247c6ef 100644 --- a/bochs/plugin.h +++ b/bochs/plugin.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: plugin.h,v 1.16 2003-06-21 12:55:19 vruppert Exp $ +// $Id: plugin.h,v 1.17 2003-07-10 20:26:05 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // // This file provides macros and types needed for plugins. It is based on @@ -42,7 +42,6 @@ extern "C" { #define BX_PLUGIN_GAMEPORT "gameport" -#define BX_REGISTER_DEVICE pluginRegisterDevice #define BX_REGISTER_DEVICE_DEVMODEL(a,b,c,d) pluginRegisterDeviceDevmodel(a,b,c,d) #if BX_PLUGINS @@ -210,9 +209,6 @@ typedef void (*deviceReset_t)(unsigned); typedef void (*deviceLoad_t)(void); typedef void (*deviceSave_t)(void); -BOCHSAPI void pluginRegisterDevice(deviceInitMem_t init_mem, deviceInitDev_t init_dev, - deviceReset_t reset, deviceLoad_t load, - deviceSave_t save, char *name); BOCHSAPI void pluginRegisterDeviceDevmodel(plugin_t *plugin, plugintype_t type, bx_devmodel_c *dev, char *name); BOCHSAPI bx_bool pluginDevicePresent(char *name); @@ -274,8 +270,6 @@ BOCHSAPI extern Bit8u (*pluginWr_memType)(Bit32u addr); void plugin_abort (void); -// called from bochs main (hack) -extern int bx_load_plugins (); int bx_load_plugin (const char *name, plugintype_t type); extern void bx_init_plugins (void); extern void bx_reset_plugins (unsigned);