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:
@@ -745,17 +745,15 @@ auich_setup(auich_dev * card)
|
|||||||
status_t
|
status_t
|
||||||
init_driver(void)
|
init_driver(void)
|
||||||
{
|
{
|
||||||
int ix=0;
|
int ix = 0;
|
||||||
void *settings_handle;
|
void *settings_handle;
|
||||||
|
|
||||||
pci_info info;
|
pci_info info;
|
||||||
num_cards = 0;
|
num_cards = 0;
|
||||||
|
|
||||||
PRINT(("init_driver()\n"));
|
PRINT(("init_driver()\n"));
|
||||||
load_driver_symbols("auich");
|
|
||||||
|
|
||||||
// get driver settings
|
// get driver settings
|
||||||
settings_handle = load_driver_settings ("auich.settings");
|
settings_handle = load_driver_settings("auich.settings");
|
||||||
if (settings_handle != NULL) {
|
if (settings_handle != NULL) {
|
||||||
const char *item;
|
const char *item;
|
||||||
char *end;
|
char *end;
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ void uninit_driver(void);
|
|||||||
const char ** publish_devices(void);
|
const char ** publish_devices(void);
|
||||||
device_hooks * find_device(const char *);
|
device_hooks * find_device(const char *);
|
||||||
|
|
||||||
static char pci_name[] = B_PCI_MODULE_NAME;
|
|
||||||
pci_module_info *pci;
|
pci_module_info *pci;
|
||||||
|
|
||||||
int32 num_cards;
|
int32 num_cards;
|
||||||
@@ -567,15 +566,14 @@ auvia_setup(auvia_dev * card)
|
|||||||
status_t
|
status_t
|
||||||
init_driver(void)
|
init_driver(void)
|
||||||
{
|
{
|
||||||
int ix=0;
|
|
||||||
|
|
||||||
pci_info info;
|
pci_info info;
|
||||||
|
int ix = 0;
|
||||||
|
|
||||||
num_cards = 0;
|
num_cards = 0;
|
||||||
|
|
||||||
PRINT(("init_driver()\n"));
|
PRINT(("init_driver()\n"));
|
||||||
load_driver_symbols("auvia");
|
|
||||||
|
|
||||||
if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci))
|
if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci))
|
||||||
return ENOSYS;
|
return ENOSYS;
|
||||||
|
|
||||||
while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) {
|
while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) {
|
||||||
|
|||||||
@@ -489,14 +489,12 @@ es1370_setup(es1370_dev * card)
|
|||||||
status_t
|
status_t
|
||||||
init_driver(void)
|
init_driver(void)
|
||||||
{
|
{
|
||||||
int ix=0;
|
|
||||||
void *settings_handle;
|
void *settings_handle;
|
||||||
|
|
||||||
pci_info info;
|
pci_info info;
|
||||||
num_cards = 0;
|
num_cards = 0;
|
||||||
|
int ix = 0;
|
||||||
|
|
||||||
PRINT(("init_driver()\n"));
|
PRINT(("init_driver()\n"));
|
||||||
load_driver_symbols("es1370");
|
|
||||||
|
|
||||||
// get driver settings
|
// get driver settings
|
||||||
settings_handle = load_driver_settings ("es1370.settings");
|
settings_handle = load_driver_settings ("es1370.settings");
|
||||||
|
|||||||
@@ -511,17 +511,17 @@ debug_cmedia(
|
|||||||
status_t
|
status_t
|
||||||
init_driver(void)
|
init_driver(void)
|
||||||
{
|
{
|
||||||
int ix=0;
|
|
||||||
pci_info info;
|
pci_info info;
|
||||||
|
int ix = 0;
|
||||||
|
|
||||||
num_cards = 0;
|
num_cards = 0;
|
||||||
|
|
||||||
ddprintf(("cmedia_pci: init_driver()\n"));
|
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;
|
return ENOSYS;
|
||||||
|
|
||||||
if (get_module(gameport_name, (module_info **) &gameport)) {
|
if (get_module(gameport_name, (module_info **)&gameport)) {
|
||||||
put_module(pci_name);
|
put_module(pci_name);
|
||||||
return ENOSYS;
|
return ENOSYS;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -522,7 +522,6 @@ status_t
|
|||||||
init_driver(void)
|
init_driver(void)
|
||||||
{
|
{
|
||||||
PRINT(("init_driver()\n"));
|
PRINT(("init_driver()\n"));
|
||||||
load_driver_symbols(DRIVER_NAME);
|
|
||||||
|
|
||||||
void *settings_handle;
|
void *settings_handle;
|
||||||
// get driver settings
|
// get driver settings
|
||||||
|
|||||||
@@ -2765,17 +2765,15 @@ emuxki_init(emuxki_dev * card)
|
|||||||
status_t
|
status_t
|
||||||
init_driver(void)
|
init_driver(void)
|
||||||
{
|
{
|
||||||
int ix=0;
|
|
||||||
void *settings_handle;
|
void *settings_handle;
|
||||||
|
|
||||||
pci_info info;
|
pci_info info;
|
||||||
num_cards = 0;
|
num_cards = 0;
|
||||||
|
int ix = 0;
|
||||||
|
|
||||||
PRINT(("init_driver()\n"));
|
PRINT(("init_driver()\n"));
|
||||||
load_driver_symbols("emuxki");
|
|
||||||
|
|
||||||
// get driver settings
|
// get driver settings
|
||||||
settings_handle = load_driver_settings ("emuxki.settings");
|
settings_handle = load_driver_settings("emuxki.settings");
|
||||||
if (settings_handle != NULL) {
|
if (settings_handle != NULL) {
|
||||||
const char *item;
|
const char *item;
|
||||||
char *end;
|
char *end;
|
||||||
|
|||||||
@@ -284,10 +284,11 @@ status_t init_hardware (void)
|
|||||||
return err;
|
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;
|
pci_info info;
|
||||||
num_cards = 0;
|
num_cards = 0;
|
||||||
|
|
||||||
@@ -295,7 +296,6 @@ status_t init_driver (void)
|
|||||||
create_log();
|
create_log();
|
||||||
|
|
||||||
TRACE("\n>>> init_driver()\n");
|
TRACE("\n>>> init_driver()\n");
|
||||||
load_driver_symbols(CHIPNAME);
|
|
||||||
|
|
||||||
if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci))
|
if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci))
|
||||||
return ENOSYS;
|
return ENOSYS;
|
||||||
|
|||||||
@@ -812,7 +812,7 @@ init_driver(void)
|
|||||||
int i;
|
int i;
|
||||||
DPRINTF((ID "init_driver(), built %s %s\n", __DATE__, __TIME__));
|
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) {
|
if(load_driver_symbols(drivername) == B_OK) {
|
||||||
DPRINTF((ID "loaded symbols\n"));
|
DPRINTF((ID "loaded symbols\n"));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -977,7 +977,7 @@ init_driver()
|
|||||||
struct firewire_softc *sc = NULL;
|
struct firewire_softc *sc = NULL;
|
||||||
uint32 i;
|
uint32 i;
|
||||||
|
|
||||||
#if DEBUG
|
#if DEBUG && !defined(__HAIKU__)
|
||||||
load_driver_symbols("fw_raw");
|
load_driver_symbols("fw_raw");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -354,7 +354,7 @@ init_driver()
|
|||||||
client_handle_t handle;
|
client_handle_t handle;
|
||||||
uint32 i;
|
uint32 i;
|
||||||
|
|
||||||
#if DEBUG
|
#if DEBUG && !defined(__HAIKU__)
|
||||||
load_driver_symbols("ds");
|
load_driver_symbols("ds");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -120,7 +120,7 @@ init_driver(void)
|
|||||||
int index;
|
int index;
|
||||||
int cards;
|
int cards;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#if defined(DEBUG) && !defined(__HAIKU__)
|
||||||
set_dprintf_enabled(true);
|
set_dprintf_enabled(true);
|
||||||
load_driver_symbols("cx23882");
|
load_driver_symbols("cx23882");
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -582,7 +582,7 @@ init_driver(void)
|
|||||||
{
|
{
|
||||||
DPRINTF_INFO((ID "init_driver(), built %s %s\n", __DATE__, __TIME__));
|
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) {
|
if (load_driver_symbols(kDriverName) == B_OK) {
|
||||||
DPRINTF_INFO((ID "loaded symbols\n"));
|
DPRINTF_INFO((ID "loaded symbols\n"));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -242,10 +242,6 @@ device_open(const char *name, uint32 flags, void **cookie)
|
|||||||
info = (struct sis_info *)*cookie;
|
info = (struct sis_info *)*cookie;
|
||||||
memset(info, 0, sizeof(struct sis_info));
|
memset(info, 0, sizeof(struct sis_info));
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
load_driver_symbols("sis900");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
info->cookieMagic = SiS_COOKIE_MAGIC;
|
info->cookieMagic = SiS_COOKIE_MAGIC;
|
||||||
info->thisArea = area;
|
info->thisArea = area;
|
||||||
info->id = id;
|
info->id = id;
|
||||||
|
|||||||
@@ -134,7 +134,6 @@ init_driver()
|
|||||||
gSerialDevices[i] = 0;
|
gSerialDevices[i] = 0;
|
||||||
|
|
||||||
gDeviceNames[0] = NULL;
|
gDeviceNames[0] = NULL;
|
||||||
//load_driver_symbols(DRIVER_NAME);
|
|
||||||
|
|
||||||
gDriverLock = create_sem(1, DRIVER_NAME"_devices_table_lock");
|
gDriverLock = create_sem(1, DRIVER_NAME"_devices_table_lock");
|
||||||
if (gDriverLock < B_OK) {
|
if (gDriverLock < B_OK) {
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ status_t init_driver (void){
|
|||||||
usb_vision_devices[i] = 0;
|
usb_vision_devices[i] = 0;
|
||||||
|
|
||||||
usb_vision_names[0] = NULL;
|
usb_vision_names[0] = NULL;
|
||||||
load_driver_symbols(DRIVER_NAME);
|
|
||||||
|
|
||||||
(*usb->register_driver)(DRIVER_NAME, supported_devices, SIZEOF(supported_devices), DRIVER_NAME);
|
(*usb->register_driver)(DRIVER_NAME, supported_devices, SIZEOF(supported_devices), DRIVER_NAME);
|
||||||
(*usb->install_notify)(DRIVER_NAME, ¬ify_hooks);
|
(*usb->install_notify)(DRIVER_NAME, ¬ify_hooks);
|
||||||
|
|||||||
Reference in New Issue
Block a user