From 400ba068e0971623161ea2f939fd5ede8e5af25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 9 Apr 2008 17:48:36 +0000 Subject: [PATCH] Made sure load_driver_symbols() is not used anymore when building for Haiku; it's a no-op, and I removed the prototype from KernelExport.h. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24875 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/audio/ac97/auich/auich.c | 10 ++++------ .../kernel/drivers/audio/ac97/auvia/auvia.c | 14 ++++++-------- .../kernel/drivers/audio/ac97/es1370/es1370.c | 8 +++----- src/add-ons/kernel/drivers/audio/cmedia/cm.c | 8 ++++---- src/add-ons/kernel/drivers/audio/echo/echo.cpp | 1 - src/add-ons/kernel/drivers/audio/emuxki/emuxki.c | 6 ++---- src/add-ons/kernel/drivers/audio/sis7018/sis7018.c | 10 +++++----- .../kernel/drivers/audio/usb_audio/usb_audio.c | 2 +- src/add-ons/kernel/drivers/bus/firewire/fw_raw.c | 2 +- src/add-ons/kernel/drivers/bus/pcmcia/ds.c | 2 +- src/add-ons/kernel/drivers/dvb/cx23882/driver.c | 2 +- src/add-ons/kernel/drivers/input/wacom/wacom.c | 2 +- src/add-ons/kernel/drivers/network/sis900/device.c | 4 ---- .../kernel/drivers/ports/usb_serial/Driver.cpp | 1 - .../kernel/drivers/video/usb_vision/usb_vision.c | 1 - 15 files changed, 29 insertions(+), 44 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c index 8fe635f280..d7320d741b 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c +++ b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c @@ -745,17 +745,15 @@ auich_setup(auich_dev * card) status_t init_driver(void) { - int ix=0; + int ix = 0; void *settings_handle; - pci_info info; num_cards = 0; - + PRINT(("init_driver()\n")); - load_driver_symbols("auich"); - + // get driver settings - settings_handle = load_driver_settings ("auich.settings"); + settings_handle = load_driver_settings("auich.settings"); if (settings_handle != NULL) { const char *item; char *end; diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c index 8a0283f79d..65dd66cdf1 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c +++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c @@ -55,7 +55,6 @@ void uninit_driver(void); const char ** publish_devices(void); device_hooks * find_device(const char *); -static char pci_name[] = B_PCI_MODULE_NAME; pci_module_info *pci; int32 num_cards; @@ -567,15 +566,14 @@ auvia_setup(auvia_dev * card) status_t init_driver(void) { - int ix=0; - pci_info info; - num_cards = 0; - - PRINT(("init_driver()\n")); - load_driver_symbols("auvia"); + int ix = 0; - if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci)) + num_cards = 0; + + PRINT(("init_driver()\n")); + + if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci)) return ENOSYS; while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) { diff --git a/src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c b/src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c index 1744d774d5..ff7bfbaa7f 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c +++ b/src/add-ons/kernel/drivers/audio/ac97/es1370/es1370.c @@ -489,15 +489,13 @@ es1370_setup(es1370_dev * card) status_t init_driver(void) { - int ix=0; void *settings_handle; - pci_info info; num_cards = 0; - + int ix = 0; + PRINT(("init_driver()\n")); - load_driver_symbols("es1370"); - + // get driver settings settings_handle = load_driver_settings ("es1370.settings"); if (settings_handle != NULL) { diff --git a/src/add-ons/kernel/drivers/audio/cmedia/cm.c b/src/add-ons/kernel/drivers/audio/cmedia/cm.c index 6d26beba58..68f09a69ba 100644 --- a/src/add-ons/kernel/drivers/audio/cmedia/cm.c +++ b/src/add-ons/kernel/drivers/audio/cmedia/cm.c @@ -511,17 +511,17 @@ debug_cmedia( status_t init_driver(void) { - int ix=0; pci_info info; + int ix = 0; + num_cards = 0; ddprintf(("cmedia_pci: init_driver()\n")); - load_driver_symbols("cmedia_pci"); - if (get_module(pci_name, (module_info **) &pci)) + if (get_module(pci_name, (module_info **)&pci)) return ENOSYS; - if (get_module(gameport_name, (module_info **) &gameport)) { + if (get_module(gameport_name, (module_info **)&gameport)) { put_module(pci_name); return ENOSYS; } diff --git a/src/add-ons/kernel/drivers/audio/echo/echo.cpp b/src/add-ons/kernel/drivers/audio/echo/echo.cpp index b5afbc3a67..ee58496c4c 100644 --- a/src/add-ons/kernel/drivers/audio/echo/echo.cpp +++ b/src/add-ons/kernel/drivers/audio/echo/echo.cpp @@ -522,7 +522,6 @@ status_t init_driver(void) { PRINT(("init_driver()\n")); - load_driver_symbols(DRIVER_NAME); void *settings_handle; // get driver settings diff --git a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c index e224253b23..2d318d1ffb 100644 --- a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c +++ b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c @@ -2765,17 +2765,15 @@ emuxki_init(emuxki_dev * card) status_t init_driver(void) { - int ix=0; void *settings_handle; - pci_info info; num_cards = 0; + int ix = 0; PRINT(("init_driver()\n")); - load_driver_symbols("emuxki"); // get driver settings - settings_handle = load_driver_settings ("emuxki.settings"); + settings_handle = load_driver_settings("emuxki.settings"); if (settings_handle != NULL) { const char *item; char *end; diff --git a/src/add-ons/kernel/drivers/audio/sis7018/sis7018.c b/src/add-ons/kernel/drivers/audio/sis7018/sis7018.c index d0b80d32b2..51b3f4d6f5 100644 --- a/src/add-ons/kernel/drivers/audio/sis7018/sis7018.c +++ b/src/add-ons/kernel/drivers/audio/sis7018/sis7018.c @@ -284,18 +284,18 @@ status_t init_hardware (void) return err; } -/* init_driver - optional function - called every time the drive is loaded. */ -status_t init_driver (void) + +status_t +init_driver(void) { - int ix=0, jx=0; + int ix = 0, jx = 0; pci_info info; num_cards = 0; - + reload_sis7018_setting(); create_log(); TRACE("\n>>> init_driver()\n"); - load_driver_symbols(CHIPNAME); if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci)) return ENOSYS; diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/usb_audio.c b/src/add-ons/kernel/drivers/audio/usb_audio/usb_audio.c index 67bc04ec61..0f34f13246 100644 --- a/src/add-ons/kernel/drivers/audio/usb_audio/usb_audio.c +++ b/src/add-ons/kernel/drivers/audio/usb_audio/usb_audio.c @@ -812,7 +812,7 @@ init_driver(void) int i; DPRINTF((ID "init_driver(), built %s %s\n", __DATE__, __TIME__)); -#if DEBUG_DRIVER +#if DEBUG_DRIVER && !defined(__HAIKU__) if(load_driver_symbols(drivername) == B_OK) { DPRINTF((ID "loaded symbols\n")); } else { diff --git a/src/add-ons/kernel/drivers/bus/firewire/fw_raw.c b/src/add-ons/kernel/drivers/bus/firewire/fw_raw.c index 3e85c7195b..7b67d55ea1 100644 --- a/src/add-ons/kernel/drivers/bus/firewire/fw_raw.c +++ b/src/add-ons/kernel/drivers/bus/firewire/fw_raw.c @@ -977,7 +977,7 @@ init_driver() struct firewire_softc *sc = NULL; uint32 i; -#if DEBUG +#if DEBUG && !defined(__HAIKU__) load_driver_symbols("fw_raw"); #endif diff --git a/src/add-ons/kernel/drivers/bus/pcmcia/ds.c b/src/add-ons/kernel/drivers/bus/pcmcia/ds.c index a259bba660..6694837c71 100644 --- a/src/add-ons/kernel/drivers/bus/pcmcia/ds.c +++ b/src/add-ons/kernel/drivers/bus/pcmcia/ds.c @@ -354,7 +354,7 @@ init_driver() client_handle_t handle; uint32 i; -#if DEBUG +#if DEBUG && !defined(__HAIKU__) load_driver_symbols("ds"); #endif diff --git a/src/add-ons/kernel/drivers/dvb/cx23882/driver.c b/src/add-ons/kernel/drivers/dvb/cx23882/driver.c index 5bd1097386..41f0e859f2 100644 --- a/src/add-ons/kernel/drivers/dvb/cx23882/driver.c +++ b/src/add-ons/kernel/drivers/dvb/cx23882/driver.c @@ -120,7 +120,7 @@ init_driver(void) int index; int cards; -#ifdef DEBUG +#if defined(DEBUG) && !defined(__HAIKU__) set_dprintf_enabled(true); load_driver_symbols("cx23882"); #endif diff --git a/src/add-ons/kernel/drivers/input/wacom/wacom.c b/src/add-ons/kernel/drivers/input/wacom/wacom.c index 938fc6a0d9..349411fb99 100644 --- a/src/add-ons/kernel/drivers/input/wacom/wacom.c +++ b/src/add-ons/kernel/drivers/input/wacom/wacom.c @@ -582,7 +582,7 @@ init_driver(void) { DPRINTF_INFO((ID "init_driver(), built %s %s\n", __DATE__, __TIME__)); -#if DEBUG_DRIVER +#if DEBUG_DRIVER && !defined(__HAIKU__) if (load_driver_symbols(kDriverName) == B_OK) { DPRINTF_INFO((ID "loaded symbols\n")); } else { diff --git a/src/add-ons/kernel/drivers/network/sis900/device.c b/src/add-ons/kernel/drivers/network/sis900/device.c index addeaf0866..466924e04d 100644 --- a/src/add-ons/kernel/drivers/network/sis900/device.c +++ b/src/add-ons/kernel/drivers/network/sis900/device.c @@ -242,10 +242,6 @@ device_open(const char *name, uint32 flags, void **cookie) info = (struct sis_info *)*cookie; memset(info, 0, sizeof(struct sis_info)); -#ifdef DEBUG - load_driver_symbols("sis900"); -#endif - info->cookieMagic = SiS_COOKIE_MAGIC; info->thisArea = area; info->id = id; diff --git a/src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp b/src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp index 6d93ae5ddf..0ce072a9ef 100644 --- a/src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp +++ b/src/add-ons/kernel/drivers/ports/usb_serial/Driver.cpp @@ -134,7 +134,6 @@ init_driver() gSerialDevices[i] = 0; gDeviceNames[0] = NULL; - //load_driver_symbols(DRIVER_NAME); gDriverLock = create_sem(1, DRIVER_NAME"_devices_table_lock"); if (gDriverLock < B_OK) { diff --git a/src/add-ons/kernel/drivers/video/usb_vision/usb_vision.c b/src/add-ons/kernel/drivers/video/usb_vision/usb_vision.c index 620f49cbfd..a62aa09ac3 100644 --- a/src/add-ons/kernel/drivers/video/usb_vision/usb_vision.c +++ b/src/add-ons/kernel/drivers/video/usb_vision/usb_vision.c @@ -59,7 +59,6 @@ status_t init_driver (void){ usb_vision_devices[i] = 0; usb_vision_names[0] = NULL; - load_driver_symbols(DRIVER_NAME); (*usb->register_driver)(DRIVER_NAME, supported_devices, SIZEOF(supported_devices), DRIVER_NAME); (*usb->install_notify)(DRIVER_NAME, ¬ify_hooks);