i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22248 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-09-18 19:51:27 +00:00
parent ce1e9a2d44
commit 15a2aa6842
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/echo/echo.cpp
+12 -17
View File
@@ -68,7 +68,6 @@ static cb_notify_hooks cardbus_hooks = {
}; };
#else // CARDBUS #else // CARDBUS
static char pci_name[] = B_PCI_MODULE_NAME;
static pci_module_info *pci; static pci_module_info *pci;
int32 num_cards; int32 num_cards;
echo_dev cards[NUM_CARDS]; echo_dev cards[NUM_CARDS];
@@ -470,7 +469,7 @@ init_hardware(void)
PRINT(("init_hardware()\n")); PRINT(("init_hardware()\n"));
if (get_module(pci_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) {
@@ -508,7 +507,7 @@ init_hardware(void)
ix++; ix++;
} }
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
if(err!=B_OK) { if(err!=B_OK) {
PRINT(("no card found\n")); PRINT(("no card found\n"));
@@ -560,31 +559,27 @@ init_driver(void)
// Get card services client module // Get card services client module
if (get_module(CB_ENABLER_MODULE_NAME, (module_info **)&cbemi) != B_OK) { if (get_module(CB_ENABLER_MODULE_NAME, (module_info **)&cbemi) != B_OK) {
dprintf(DRIVER_NAME ": cardbus enabler module error\n"); dprintf(DRIVER_NAME ": cardbus enabler module error\n");
goto cb_error; return B_ERROR;
} }
// Create the devices lock // Create the devices lock
device_lock = create_sem(1, DRIVER_NAME " device"); device_lock = create_sem(1, DRIVER_NAME " device");
if (device_lock < B_OK) { if (device_lock < B_OK) {
dprintf(DRIVER_NAME ": create device semaphore error 0x%.8x\n", device_lock); dprintf(DRIVER_NAME ": create device semaphore error 0x%.8x\n", device_lock);
put_module(CB_ENABLER_MODULE_NAME); put_module(CB_ENABLER_MODULE_NAME);
goto cb_error; return B_ERROR;
} }
// Register driver // Register driver
cbemi->register_driver(DRIVER_NAME, descriptors, COUNT_DESCRIPTOR); cbemi->register_driver(DRIVER_NAME, descriptors, COUNT_DESCRIPTOR);
cbemi->install_notify(DRIVER_NAME, &cardbus_hooks); cbemi->install_notify(DRIVER_NAME, &cardbus_hooks);
LIST_INIT(&(devices)); LIST_INIT(&(devices));
return B_OK; return B_OK;
cb_error:
put_module(B_PCI_MODULE_NAME);
return B_ERROR;
#else #else
int ix=0; int ix=0;
pci_info info; pci_info info;
num_cards = 0; num_cards = 0;
if (get_module(pci_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) {
@@ -635,7 +630,7 @@ cb_error:
} }
if (!num_cards) { if (!num_cards) {
PRINT(("no cards\n")); PRINT(("no cards\n"));
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
PRINT(("no suitable cards found\n")); PRINT(("no suitable cards found\n"));
return ENODEV; return ENODEV;
} }
@@ -922,7 +917,7 @@ uninit_driver(void)
} }
memset(&cards, 0, sizeof(cards)); memset(&cards, 0, sizeof(cards));
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
#endif #endif
} }