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@22459 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-10-06 14:04:09 +00:00
parent 4689d4f1ab
commit 082c9eb03a
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
+12 -14
View File
@@ -44,9 +44,7 @@ int32 ice_1712_int(void *arg);
//------------------------------------------------------ //------------------------------------------------------
static char pci_name[] = B_PCI_MODULE_NAME;
pci_module_info *pci; pci_module_info *pci;
static char mpu401_name[] = B_MPU_401_MODULE_NAME;
generic_mpu401_module *mpu401; generic_mpu401_module *mpu401;
int32 num_cards = 0; int32 num_cards = 0;
@@ -59,7 +57,7 @@ char *names[NUM_CARDS*20+1];
int32 api_version = B_CUR_DRIVER_API_VERSION; int32 api_version = B_CUR_DRIVER_API_VERSION;
#define MODULE_TEST_PATH "audio/multi/ice1712" #define MODULE_TEST_PATH "audio/hmulti/ice1712"
//------------------------------------------------------ //------------------------------------------------------
//------------------------------------------------------ //------------------------------------------------------
@@ -81,20 +79,20 @@ status_t init_hardware(void)
LOG_CREATE_ICE(); LOG_CREATE_ICE();
TRACE_ICE(("===init_hardware()===\n")); TRACE_ICE(("===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) {
if ((info.vendor_id == ICE1712_VENDOR_ID) && if ((info.vendor_id == ICE1712_VENDOR_ID) &&
(info.device_id == ICE1712_DEVICE_ID)) { (info.device_id == ICE1712_DEVICE_ID)) {
TRACE_ICE(("Found at least 1 card\n")); TRACE_ICE(("Found at least 1 card\n"));
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
return B_OK; return B_OK;
} }
ix++; ix++;
} }
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
return B_ERROR; return ENODEV;
} }
@@ -308,11 +306,11 @@ init_driver(void)
TRACE_ICE(("===init_driver()===\n")); TRACE_ICE(("===init_driver()===\n"));
if (get_module(pci_name, (module_info **)&pci)) if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci))
return ENOSYS; return ENOSYS;
if (get_module(mpu401_name, (module_info **) &mpu401)) { if (get_module(B_MPU_401_MODULE_NAME, (module_info **) &mpu401)) {
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
return ENOSYS; return ENOSYS;
} }
@@ -343,8 +341,8 @@ init_driver(void)
TRACE_ICE(("Number of succesfully initialised card : %d\n", num_cards)); TRACE_ICE(("Number of succesfully initialised card : %d\n", num_cards));
if (num_cards == 0) { if (num_cards == 0) {
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
put_module(mpu401_name); put_module(B_MPU_401_MODULE_NAME);
return ENODEV; return ENODEV;
} }
return B_OK; return B_OK;
@@ -385,8 +383,8 @@ uninit_driver(void)
ice_1712_shutdown(&cards[ix]); ice_1712_shutdown(&cards[ix]);
} }
memset(&cards, 0, sizeof(cards)); memset(&cards, 0, sizeof(cards));
put_module(mpu401_name); put_module(B_MPU_401_MODULE_NAME);
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
} }
//------------------------------------------------------ //------------------------------------------------------