Removed ifdef __HAIKU__ for drivers that do not call the Package rule in their
Jamfiles. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39344 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
a1cdecff94
commit
3033e71f4b
|
@ -386,7 +386,6 @@ init_driver(void)
|
|||
|
||||
memset(&gCards[gCardsCount], 0, sizeof(ali_dev));
|
||||
gCards[gCardsCount].info = info;
|
||||
#ifdef __HAIKU__
|
||||
if ((err = (*gPCI->reserve_device)(info.bus, info.device, info.function,
|
||||
DRIVER_NAME, &gCards[gCardsCount])) < B_OK) {
|
||||
dprintf("%s: failed to reserve_device(%d, %d, %d,): %s\n",
|
||||
|
@ -394,13 +393,10 @@ init_driver(void)
|
|||
strerror(err));
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
if (ali_setup(&gCards[gCardsCount])) {
|
||||
TRACE("init_driver: setup of ali %ld failed\n", gCardsCount + 1);
|
||||
#ifdef __HAIKU__
|
||||
(*gPCI->unreserve_device)(info.bus, info.device, info.function,
|
||||
DRIVER_NAME, &gCards[gCardsCount]);
|
||||
#endif
|
||||
}
|
||||
else
|
||||
gCardsCount++;
|
||||
|
|
|
@ -378,7 +378,6 @@ init_driver(void)
|
|||
break;
|
||||
}
|
||||
|
||||
#ifdef __HAIKU__
|
||||
if ((err = (*pci->reserve_device)(cards[num_cards].info.bus,
|
||||
cards[num_cards].info.device, cards[num_cards].info.function,
|
||||
DRIVER_NAME, &cards[num_cards])) < B_OK) {
|
||||
|
@ -388,16 +387,13 @@ init_driver(void)
|
|||
cards[num_cards].info.function, strerror(err));
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
if (ice1712_setup(&cards[num_cards]) != B_OK) {
|
||||
//Vendor_ID and Device_ID has been modified
|
||||
TRACE("Setup of ice1712 %d failed\n", (int)(num_cards + 1));
|
||||
#ifdef __HAIKU__
|
||||
(*pci->unreserve_device)(cards[num_cards].info.bus,
|
||||
cards[num_cards].info.device,
|
||||
cards[num_cards].info.function,
|
||||
DRIVER_NAME, &cards[num_cards]);
|
||||
#endif
|
||||
} else {
|
||||
num_cards++;
|
||||
}
|
||||
|
@ -439,10 +435,8 @@ ice_1712_shutdown(ice1712 *ice)
|
|||
|
||||
save_settings(ice);
|
||||
|
||||
#ifdef __HAIKU__
|
||||
(*pci->unreserve_device)(ice->info.bus, ice->info.device,
|
||||
ice->info.function, DRIVER_NAME, ice);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue