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
This commit is contained in:
Axel Dörfler 2008-04-09 17:48:36 +00:00
parent afaf6f2f1b
commit 400ba068e0
15 changed files with 29 additions and 44 deletions

View File

@ -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;

View File

@ -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) {

View File

@ -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) {

View File

@ -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;
}

View File

@ -522,7 +522,6 @@ status_t
init_driver(void)
{
PRINT(("init_driver()\n"));
load_driver_symbols(DRIVER_NAME);
void *settings_handle;
// get driver settings

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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

View File

@ -354,7 +354,7 @@ init_driver()
client_handle_t handle;
uint32 i;
#if DEBUG
#if DEBUG && !defined(__HAIKU__)
load_driver_symbols("ds");
#endif

View File

@ -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

View File

@ -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 {

View File

@ -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;

View File

@ -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) {

View File

@ -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, &notify_hooks);